diff --git a/server/api/v1/sys_auto_code.go b/server/api/v1/sys_auto_code.go
index 1b80dbfd49b5827207cf2f67b60568a5c62a812e..9f1beb6f43c6cf15e8beed75ce3c3feb69210ab4 100644
--- a/server/api/v1/sys_auto_code.go
+++ b/server/api/v1/sys_auto_code.go
@@ -8,6 +8,7 @@ import (
"gin-vue-admin/service"
"gin-vue-admin/utils"
"github.com/gin-gonic/gin"
+ "github.com/pkg/errors"
"go.uber.org/zap"
"net/url"
"os"
@@ -78,9 +79,16 @@ func CreateTemp(c *gin.Context) {
}
err := service.CreateTemp(a)
if err != nil {
- c.Writer.Header().Add("success", "false")
- c.Writer.Header().Add("msg", url.QueryEscape(err.Error()))
- _ = os.Remove("./ginvueadmin.zip")
+ if errors.Is(err, model.AutoMoveErr) {
+ c.Writer.Header().Add("success", "false")
+ c.Writer.Header().Add("msgtype", "success")
+ c.Writer.Header().Add("msg", url.QueryEscape(err.Error()))
+ } else {
+ c.Writer.Header().Add("success", "false")
+ c.Writer.Header().Add("msg", url.QueryEscape(err.Error()))
+ _ = os.Remove("./ginvueadmin.zip")
+ }
+
} else {
c.Writer.Header().Add("Content-Disposition", fmt.Sprintf("attachment; filename=%s", "ginvueadmin.zip")) // fmt.Sprintf("attachment; filename=%s", filename)对下载的文件重命名
c.Writer.Header().Add("Content-Type", "application/json")
diff --git a/server/model/sys_auto_code.go b/server/model/sys_auto_code.go
index cedf0b212e06e9c4178bf11aca8cacfd61266726..78b77778df5d1640d5124f2bd1c8c6cfe7815219 100644
--- a/server/model/sys_auto_code.go
+++ b/server/model/sys_auto_code.go
@@ -1,5 +1,7 @@
package model
+import "errors"
+
// 初始版本自动化代码工具
type AutoCodeStruct struct {
StructName string `json:"structName"`
@@ -24,3 +26,5 @@ type Field struct {
FieldSearchType string `json:"fieldSearchType"`
DictType string `json:"dictType"`
}
+
+var AutoMoveErr error = errors.New("创建代码成功并移动文件成功")
diff --git a/web/src/utils/request.js b/web/src/utils/request.js
index 6a0ffbdaef9f4585edc11292ace9bfedab3b6539..c92c4b764855cadf849db2fe1745e3e1d04008b7 100644
--- a/web/src/utils/request.js
+++ b/web/src/utils/request.js
@@ -68,7 +68,7 @@ service.interceptors.response.use(
Message({
showClose: true,
message: response.data.msg || decodeURI(response.headers.msg),
- type: 'error',
+ type: response.headers.msgtype||'error',
})
if (response.data.data && response.data.data.reload) {
store.commit('user/LoginOut')
diff --git a/web/src/view/dashboard/component/RaddarChart.vue b/web/src/view/dashboard/component/RaddarChart.vue
deleted file mode 100644
index 351f8f72a80e441c332a6fab155fac9e6fbdec34..0000000000000000000000000000000000000000
--- a/web/src/view/dashboard/component/RaddarChart.vue
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
diff --git a/web/src/view/dashboard/component/Sunburst.vue b/web/src/view/dashboard/component/Sunburst.vue
deleted file mode 100644
index 01fac5c64549446e3cc089be8453f56b689d63c5..0000000000000000000000000000000000000000
--- a/web/src/view/dashboard/component/Sunburst.vue
+++ /dev/null
@@ -1,391 +0,0 @@
-
-
-
-
-
-
-
diff --git a/web/src/view/dashboard/component/animition.vue b/web/src/view/dashboard/component/animition.vue
deleted file mode 100644
index c794062eba2192aaff1e99118378def39f77cbda..0000000000000000000000000000000000000000
--- a/web/src/view/dashboard/component/animition.vue
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/web/src/view/dashboard/component/stackMap.vue b/web/src/view/dashboard/component/stackMap.vue
deleted file mode 100644
index ffb04947dd10178c8dee2e63b8686a2b7e225baf..0000000000000000000000000000000000000000
--- a/web/src/view/dashboard/component/stackMap.vue
+++ /dev/null
@@ -1,167 +0,0 @@
-
-
-
-
-
-
-
diff --git a/web/src/view/dashboard/index.vue b/web/src/view/dashboard/index.vue
index 116249f2d7b3723bc27a1cb19208d39a82b9a46b..01b49ec17885a89905a72a3cd757726cc54a33fe 100644
--- a/web/src/view/dashboard/index.vue
+++ b/web/src/view/dashboard/index.vue
@@ -1,27 +1,5 @@