Browse Source

自动填充API功能不再需要手动清理垃圾数据

pixel 4 years ago
parent
commit
c89d5235e2

+ 1 - 1
server/api/v1/sys_auto_code.go

@@ -74,7 +74,7 @@ func CreateTemp(c *gin.Context) {
 			},
 		}
 		for _, v := range apiList {
-			errC := service.CreateApi(v)
+			errC := service.AutoCreateApi(v)
 			if errC != nil {
 				c.Writer.Header().Add("success", "false")
 				c.Writer.Header().Add("msg", url.QueryEscape(fmt.Sprintf("自动化创建失败,%v,请自行清空垃圾数据", errC)))

+ 22 - 0
server/service/sys_api.go

@@ -34,6 +34,28 @@ func DeleteApi(api model.SysApi) (err error) {
 	return err
 }
 
+// @title    AutoCreateApi
+// @description   delete a base api by path and method, 删除基础api
+// @param     api             model.SysApi
+// @auth                     (2020/04/05  20:22)
+// @return                    error
+
+func AutoCreateApi(api model.SysApi) (err error) {
+	err = global.GVA_DB.Transaction(func(tx *gorm.DB) error {
+		var fApi model.SysApi
+		var txErr error
+		fxErr := tx.Where("path = ? AND method = ?", api.Path, api.Method).First(&fApi).Error
+		if errors.Is(fxErr, gorm.ErrRecordNotFound) {
+			txErr = tx.Create(&api).Error
+			if txErr != nil{
+				return txErr
+			}
+		}
+		return nil
+	})
+	return err
+}
+
 // @title    GetInfoList
 // @description   get apis by pagination, 分页获取数据
 // @auth                     (2020/04/05  20:22)

+ 0 - 15
web/src/style/main.scss

@@ -1322,20 +1322,5 @@ $mainHight: 100vh;
             font-size: 30px;
             margin-bottom: 8px;
         }
-        .el-icon-user {
-            color: #ff9c6e;
-        }
-        .el-icon-setting {
-            color: #69c0ff;
-        }
-        .el-icon-menu {
-            color: #b37feb;
-        }
-        .el-icon-cpu {
-            color: #ffd666;
-        }
-        .el-icon-document-checked {
-            color: #ff85c0;
-        }
     }
 }

+ 3 - 3
web/src/view/dashboard/component/todoList/index.vue

@@ -47,9 +47,9 @@
         completed: todos => todos.filter(todo => todo.done)
     }
     const defalutList = [
-        { text: 'star this repository', done: false },
-        { text: 'follow author', done: false },
-        { text: 'vue-element-admin', done: true }
+        { text: '工作流功能绘制工具', done: false },
+        { text: '工作流流转方法', done: false },
+        { text: '自动化代码优化', done: false }
     ]
     export default {
         components: { Todo },

+ 15 - 9
web/src/view/dashboard/index.vue

@@ -29,7 +29,7 @@
                     <div class="text"><h4>早安,管理员, 请开始您一天的工作吧!</h4>
                         <p class="tips-text">
                             <i class="el-icon-sunny"></i>
-                            <span>今日晴,18℃ - 28℃,出门记得防晒哦。</span>
+                            <span>今日晴,0℃ - 10℃,天气寒冷,注意添加衣物。</span>
                         </p>
                     </div>
                  </div>
@@ -62,7 +62,7 @@
              <el-row :gutter="20">
                  <el-col :span="4" v-for="(card,key) in toolCards" :key="key" @click.native="toTarget(card.name)">
                       <el-card shadow="hover" class="grid-content">
-                        <i :class="card.icon"></i>
+                        <i :class="card.icon" :style="{color:card.color}"></i>
                         <p>{{card.label}}</p>  
                     </el-card>  
                  </el-col>
@@ -102,33 +102,39 @@ export default {
         toolCards:[
             {
                 label:"用户管理",
-                icon:"el-icon el-icon-user",
-                name:"user"
+                icon:"el-icon el-icon-monitor",
+                name:"user",
+                color:"#ff9c6e"
             },
             {
                 label:"角色管理",
                 icon:"el-icon el-icon-setting",
-                name:"authority"
+                name:"authority",
+                color:"#69c0ff"
             },
             {
                 label:"菜单管理",
                 icon:"el-icon el-icon-menu",
-                name:"menu"
+                name:"menu",
+                color:"#b37feb"
             },
             {
                 label:"代码生成器",
                 icon:"el-icon el-icon-cpu",
-                name:"autoCode"
+                name:"autoCode",
+                color:"#ffd666"
             },
             {
                 label:"表单生成器",
                 icon:"el-icon el-icon-document-checked",
-                name:"formCreate"
+                name:"formCreate",
+                color:"#ff85c0"
             },
             {
                 label:"关于我们",
                 icon:"el-icon el-icon-user",
-                name:"about"
+                name:"about",
+                color:"#5cdbd3"
             }
 
         ]

+ 1 - 1
web/vue.config.js

@@ -23,7 +23,7 @@ module.exports = {
             // 把key的路径代理到target位置
             // detail: https://cli.vuejs.org/config/#devserver-proxy
             [process.env.VUE_APP_BASE_API]: { //需要代理的路径   例如 '/api'
-                target: `http://139.9.113.229:8888/`, //代理到 目标路径
+                target: `http://127.0.0.1:8888/`, //代理到 目标路径
                 changeOrigin: true,
                 pathRewrite: { // 修改路径数据
                     ['^' + process.env.VUE_APP_BASE_API]: '' // 举例 '^/api:""' 把路径中的/api字符串删除