initdb默认string长度改为191

server/api/v1/sys_auto_code.go

@@ -30,22 +30,12 @@ func PreviewTemp(c *gin.Context) {
 		response.FailWithMessage(err.Error(), c)
 		return
 	}
-	if a.AutoCreateApiToSql {
-		if err := service.AutoCreateApi(&a); err != nil {
-			global.GVA_LOG.Error("自动化创建失败!请自行清空垃圾数据!", zap.Any("err", err))
-			c.Writer.Header().Add("success", "false")
-			c.Writer.Header().Add("msg", url.QueryEscape("自动化创建失败!请自行清空垃圾数据!"))
-			return
-		}
-	}
-	m, err := service.PreviewTemp(a)
+	autoCode, err := service.PreviewTemp(a)
 	if err != nil {
-		c.Writer.Header().Add("success", "false")
-		c.Writer.Header().Add("msg", url.QueryEscape(err.Error()))
+		global.GVA_LOG.Error("预览失败!", zap.Any("err", err))
+		response.FailWithMessage("预览失败", c)
 	} else {
-		c.Writer.Header().Add("Content-Type", "application/json")
-		c.Writer.Header().Add("success", "true")
-		c.JSON(200, m)
+		response.OkWithDetailed(gin.H{"autoCode": autoCode}, "预览成功", c)
 	}
 }
 

server/cmd/gva/mysql.go

@@ -44,7 +44,7 @@ func (m *_mysql) Init() {
 	m._config.DisableForeignKeyConstraintWhenMigrating = true
 	m.db, m.err = gorm.Open(mysql.New(mysql.Config{
 		DSN:                       global.GVA_CONFIG.Mysql.Dsn(), // DSN data source name
-		DefaultStringSize:         256,                           // string 类型字段的默认长度
+		DefaultStringSize:         191,                           // string 类型字段的默认长度
 		DisableDatetimePrecision:  true,                          // 禁用 datetime 精度，MySQL 5.6 之前的数据库不支持
 		DontSupportRenameIndex:    true,                          // 重命名索引时采用删除并新建的方式，MySQL 5.7 之前的数据库和 MariaDB 不支持重命名索引
 		DontSupportRenameColumn:   true,                          // 用 `change` 重命名列，MySQL 8 之前的数据库和 MariaDB 不支持重命名列

server/cmd/information/system/api.go

@@ -92,6 +92,7 @@ var apis = []model.SysApi{
 	{global.GVA_MODEL{ID: 77, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/workflowProcess/getMyNeed", "获取我的待办", "workflowProcess", "GET"},
 	{global.GVA_MODEL{ID: 78, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/workflowProcess/getWorkflowMoveByID", "根据id获取当前节点详情和历史", "workflowProcess", "GET"},
 	{global.GVA_MODEL{ID: 79, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/workflowProcess/completeWorkflowMove", "提交工作流", "workflowProcess", "POST"},
+	{global.GVA_MODEL{ID: 80, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/autoCode/preview", "预览自动化代码", "autoCode", "POST"},
 }
 
 //@author: [SliverHorn](https://github.com/SliverHorn)

server/cmd/information/system/casbin.go

@@ -55,6 +55,7 @@ var carbines = []gormadapter.CasbinRule{
 	{PType: "p", V0: "888", V1: "/customer/customer", V2: "GET"},
 	{PType: "p", V0: "888", V1: "/customer/customerList", V2: "GET"},
 	{PType: "p", V0: "888", V1: "/autoCode/createTemp", V2: "POST"},
+	{PType: "p", V0: "888", V1: "/autoCode/preview", V2: "POST"},
 	{PType: "p", V0: "888", V1: "/autoCode/getTables", V2: "GET"},
 	{PType: "p", V0: "888", V1: "/autoCode/getDB", V2: "GET"},
 	{PType: "p", V0: "888", V1: "/autoCode/getColumn", V2: "GET"},

server/service/sys_auto_code.go

@@ -67,18 +67,20 @@ func PreviewTemp(autoCode model.AutoCodeStruct) (map[string]string, error) {
 			return nil, err
 		}
 		builder := strings.Builder{}
-		builder.WriteString("```\n")
+		builder.WriteString("```")
+		if ext != "" && strings.Contains(ext, ".") {
+			builder.WriteString(strings.Replace(ext, ".", "", -1))
+		}
+		builder.WriteString("\n\n")
 		data, err := ioutil.ReadAll(f)
 		if err != nil {
 			return nil, err
 		}
 		builder.Write(data)
-		builder.WriteString("\n```")
-		if ext != "" && strings.Contains(ext, ".") {
-			builder.WriteString(strings.Replace(ext, ".", "", -1))
-		}
+		builder.WriteString("\n\n```")
 
-		ret[value.autoCodePath] = builder.String()
+		pathArr := strings.Split(value.autoCodePath,"\\")
+		ret[pathArr[1]+"-"+pathArr[3]] = builder.String()
 		_ = f.Close()
 
 	}

web/package.json

@@ -1,75 +1,77 @@
 {
-    "name": "gin-vue-admin",
-    "version": "0.1.0",
-    "private": true,
-    "scripts": {
-        "serve": "node openDocument.js && vue-cli-service serve",
-        "build": "vue-cli-service build",
-        "lint": "vue-cli-service lint"
+  "name": "gin-vue-admin",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "serve": "node openDocument.js && vue-cli-service serve",
+    "build": "vue-cli-service build",
+    "lint": "vue-cli-service lint"
+  },
+  "dependencies": {
+    "@antv/dom-util": "2.0.2",
+    "@antv/g-canvas": "^0.4.12",
+    "@antv/g6": "3.5.2",
+    "@antv/matrix-util": "2.0.7",
+    "@antv/util": "~2.0.9",
+    "@moefe/vue-aplayer": "^2.0.0-beta.5",
+    "axios": "^0.19.2",
+    "core-js": "^3.6.5",
+    "echarts": "^4.7.0",
+    "element-ui": "^2.12.0",
+    "highlight.js": "^10.6.0",
+    "marked": "^2.0.0",
+    "node-sass": "^4.14.1",
+    "path": "^0.12.7",
+    "qs": "^6.8.0",
+    "quill": "^1.3.7",
+    "sass-loader": "^8.0.0",
+    "screenfull": "^5.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.4",
+    "spark-md5": "^3.0.1",
+    "timeline-vuejs": "1.1.1",
+    "vue": "^2.6.10",
+    "vue-particle-line": "^0.1.4",
+    "vue-router": "^3.1.3",
+    "vue-simple-uploader": "^0.7.4",
+    "vuescroll": "^4.14.4",
+    "vuex": "^3.1.1",
+    "vuex-persist": "^2.1.0"
+  },
+  "devDependencies": {
+    "@vue/cli-plugin-babel": "^4.5.6",
+    "@vue/cli-plugin-eslint": "^4.5.6",
+    "@vue/cli-service": "^4.5.6",
+    "babel-eslint": "^10.1.0",
+    "eslint": "^6.7.2",
+    "eslint-plugin-vue": "^6.2.2",
+    "vue-template-compiler": "^2.6.10",
+    "core-js": "^3.3.2",
+    "node-sass": "^4.12.0",
+    "numericjs": "^1.2.6",
+    "raw-loader": "^3.1.0",
+    "sass-loader": "^8.0.0"
+  },
+  "eslintConfig": {
+    "root": true,
+    "env": {
+      "node": true
     },
-    "dependencies": {
-        "@moefe/vue-aplayer": "^2.0.0-beta.5",
-        "axios": "^0.19.2",
-        "core-js": "^3.6.5",
-        "echarts": "^4.7.0",
-        "element-ui": "^2.12.0",
-        "node-sass": "^4.14.1",
-        "path": "^0.12.7",
-        "qs": "^6.8.0",
-        "quill": "^1.3.7",
-        "sass-loader": "^8.0.0",
-        "screenfull": "^5.0.2",
-        "script-ext-html-webpack-plugin": "^2.1.4",
-        "spark-md5": "^3.0.1",
-        "timeline-vuejs": "1.1.1",
-        "vue": "^2.6.10",
-        "vue-particle-line": "^0.1.4",
-        "vue-router": "^3.1.3",
-        "vue-simple-uploader": "^0.7.4",
-        "vuescroll": "^4.14.4",
-        "vuex": "^3.1.1",
-        "vuex-persist": "^2.1.0",
-        "@antv/dom-util": "2.0.2",
-        "@antv/matrix-util": "2.0.7",
-        "@antv/g-canvas": "^0.4.12",
-        "@antv/g6": "3.5.2",
-        "@antv/util": "~2.0.9"
-    },
-    "devDependencies": {
-        "@vue/cli-plugin-babel": "^4.5.6",
-        "@vue/cli-plugin-eslint": "^4.5.6",
-        "@vue/cli-service": "^4.5.6",
-        "babel-eslint": "^10.1.0",
-        "eslint": "^6.7.2",
-        "eslint-plugin-vue": "^6.2.2",
-        "vue-template-compiler": "^2.6.10",
-        "core-js": "^3.3.2",
-        "node-sass": "^4.12.0",
-        "numericjs": "^1.2.6",
-        "raw-loader": "^3.1.0",
-        "sass-loader": "^8.0.0"
-    },
-    "eslintConfig": {
-        "root": true,
-        "env": {
-            "node": true
-        },
-        "extends": [
-            "plugin:vue/essential",
-            "eslint:recommended"
-        ],
-        "rules": {},
-        "parserOptions": {
-            "parser": "babel-eslint"
-        }
-    },
-    "postcss": {
-        "plugins": {
-            "autoprefixer": {}
-        }
-    },
-    "browserslist": [
-        "> 1%",
-        "last 2 versions"
-    ]
-}
+    "extends": [
+      "plugin:vue/essential",
+      "eslint:recommended"
+    ],
+    "rules": {},
+    "parserOptions": {
+      "parser": "babel-eslint"
+    }
+  },
+  "postcss": {
+    "plugins": {
+      "autoprefixer": {}
+    }
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions"
+  ]
+}

web/src/api/autoCode.js

@@ -1,16 +1,13 @@
 import service from '@/utils/request'
-// @Tags api
-// @Summary 分页获取角色列表
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body modelInterface.PageInfo true "分页获取用户列表"
-// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}"
-// @Router /api/getApiList [post]
-// {
-//  page     int
-//	pageSize int
-// }
+
+export const preview = (data) => {
+    return service({
+        url: "/autoCode/preview",
+        method: 'post',
+        data,
+    })
+}
+
 export const createTemp = (data) => {
     return service({
         url: "/autoCode/createTemp",
@@ -20,7 +17,6 @@ export const createTemp = (data) => {
     })
 }
 
-
 // @Tags SysApi
 // @Summary 获取当前所有数据库
 // @Security ApiKeyAuth

web/src/view/systemTools/autoCode/component/previewCodeDialg.vue

@@ -0,0 +1,58 @@
+<template>
+    <div class="previewCode">
+        <el-tabs v-model="activeName">
+            <el-tab-pane :label="key" :name="key" v-for="(item,key) in previewCode" :key="key">
+                <div style="background:#fff;padding:0 20px" :id="key"></div>
+            </el-tab-pane>
+        </el-tabs>
+    </div>
+</template>
+
+<script>
+import marked from "marked"
+import hljs from "highlight.js";
+// import 'highlight.js/styles/atelier-cave-light.css';
+import 'highlight.js/styles/atelier-plateau-light.css';
+export default {
+    props:{
+        previewCode:{
+            type:Object,
+            default(){
+                return {}
+            }
+        }
+    },
+    data(){
+        return{
+             activeName: "",
+        }
+    },
+    mounted(){
+        marked.setOptions({
+          renderer: new marked.Renderer(),
+          highlight: function(code) {
+            return hljs.highlightAuto(code).value;
+          },
+          pedantic: false,
+          gfm: true,
+          tables: true,
+          breaks: false,
+          sanitize: false,
+          smartLists: true,
+          smartypants: false,
+          xhtml: false
+        }
+      );
+        for(const key in this.previewCode){
+            if(this.activeName == ""){
+                this.activeName = key
+            }
+            document.getElementById(key).innerHTML = marked(this.previewCode[key])
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+    
+</style>

web/src/view/systemTools/autoCode/index.vue

@@ -58,7 +58,7 @@
         <el-input v-model="form.description" placeholder="中文描述作为自动api描述"></el-input>
       </el-form-item>
       <el-form-item label="文件名称" prop="packageName">
-        <el-input v-model="form.packageName"></el-input>
+        <el-input v-model="form.packageName" placeholder="生成文件的默认名称"></el-input>
       </el-form-item>
       <el-form-item label="自动创建api">
         <el-checkbox v-model="form.autoCreateApiToSql"></el-checkbox>
@@ -117,6 +117,7 @@
     <el-tag type="danger">id , created_at , updated_at , deleted_at 会自动生成请勿重复创建</el-tag>
     <!-- 组件列表 -->
     <div class="button-box clearflex">
+      <el-button @click="enterForm(true)" type="primary">预览代码</el-button>
       <el-button @click="enterForm" type="primary">生成代码</el-button>
     </div>
     <!-- 组件弹窗 -->
@@ -127,6 +128,13 @@
         <el-button type="primary" @click="enterDialog">确 定</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog :visible.sync="previewFlag">
+      <PreviewCodeDialg v-if="previewFlag" :previewCode="preViewCode"></PreviewCodeDialg>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="previewFlag = false">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -144,8 +152,9 @@ const fieldTemplate = {
 };
 
 import FieldDialog from "@/view/systemTools/autoCode/component/fieldDialog.vue";
+import PreviewCodeDialg from "@/view/systemTools/autoCode/component/previewCodeDialg.vue";
 import { toUpperCase, toHump } from "@/utils/stringFun.js";
-import { createTemp, getDB, getTable, getColumn } from "@/api/autoCode.js";
+import { createTemp, getDB, getTable, getColumn, preview } from "@/api/autoCode.js";
 import { getDict } from "@/utils/dictionary";
 
 export default {
@@ -153,6 +162,7 @@ export default {
   data() {
     return {
       activeNames: [""],
+      preViewCode:{},
       dbform: {
         dbName: "",
         tableName: ""
@@ -191,11 +201,13 @@ export default {
       },
       dialogMiddle: {},
       bk: {},
-      dialogFlag: false
+      dialogFlag: false,
+      previewFlag:false
     };
   },
   components: {
-    FieldDialog
+    FieldDialog,
+    PreviewCodeDialg
   },
   methods: {
     editAndAddField(item) {
@@ -250,7 +262,7 @@ export default {
     deleteField(index) {
       this.form.fields.splice(index, 1);
     },
-    async enterForm() {
+    async enterForm(isPreview) {
       if (this.form.fields.length <= 0) {
         this.$message({
           type: "error",
@@ -277,31 +289,38 @@ export default {
             });
             return false;
           }
-          const data = await createTemp(this.form);
-          if (data.headers?.success == "false") {
-            return;
-          } else {
-            this.$message({
-              type: "success",
-              message: "自动化代码创建成功，正在下载"
-            });
-          }
-          const blob = new Blob([data]);
-          const fileName = "ginvueadmin.zip";
-          if ("download" in document.createElement("a")) {
-            // 不是IE浏览器
-            let url = window.URL.createObjectURL(blob);
-            let link = document.createElement("a");
-            link.style.display = "none";
-            link.href = url;
-            link.setAttribute("download", fileName);
-            document.body.appendChild(link);
-            link.click();
-            document.body.removeChild(link); // 下载完成移除元素
-            window.URL.revokeObjectURL(url); // 释放掉blob对象
-          } else {
-            // IE 10+
-            window.navigator.msSaveBlob(blob, fileName);
+          if(isPreview){
+            const data = await preview(this.form);
+            console.log(data.code == 0)
+            this.preViewCode = data.data.autoCode
+            this.previewFlag = true
+          }else{
+            const data = await createTemp(this.form);
+            if (data.headers?.success == "false") {
+              return;
+            } else {
+              this.$message({
+                type: "success",
+                message: "自动化代码创建成功，正在下载"
+              });
+            }
+            const blob = new Blob([data]);
+            const fileName = "ginvueadmin.zip";
+            if ("download" in document.createElement("a")) {
+              // 不是IE浏览器
+              let url = window.URL.createObjectURL(blob);
+              let link = document.createElement("a");
+              link.style.display = "none";
+              link.href = url;
+              link.setAttribute("download", fileName);
+              document.body.appendChild(link);
+              link.click();
+              document.body.removeChild(link); // 下载完成移除元素
+              window.URL.revokeObjectURL(url); // 释放掉blob对象
+            } else {
+              // IE 10+
+              window.navigator.msSaveBlob(blob, fileName);
+            }
           }
         } else {
           return false;
@@ -373,6 +392,7 @@ export default {
 .button-box {
   padding: 10px 20px;
   .el-button {
+    margin-right: 20px;
     float: right;
   }
 }