diff --git a/api/v1/system/tools_gen_table.go b/api/v1/system/tools_gen_table.go index e5a44d0..af53177 100644 --- a/api/v1/system/tools_gen_table.go +++ b/api/v1/system/tools_gen_table.go @@ -49,7 +49,7 @@ type ToolsGenTableImportTableReq struct { type ToolsGenTableDeleteReq struct { g.Meta `path:"/tools/gen/tableDelete" tags:"代码生成" method:"delete" summary:"删除已导入的表"` commonApi.Author - Ids []int `p:"ids" v:required#删除的id必须` + Ids []int `p:"ids" v:"required#删除的id必须"` } type ToolsGenTableEditReq struct { diff --git a/internal/app/system/logic/toolsGenTable/tools_gen_table.go b/internal/app/system/logic/toolsGenTable/tools_gen_table.go index 46c51cb..ec11405 100644 --- a/internal/app/system/logic/toolsGenTable/tools_gen_table.go +++ b/internal/app/system/logic/toolsGenTable/tools_gen_table.go @@ -518,6 +518,14 @@ func (s *sToolsGenTable) GenData(ctx context.Context, tableId int64) (data g.Map "newArray": func() []interface{} { return []interface{}{} }, + "strTrim":func(str interface{},trimStr interface{}) string { + strCon:=gconv.String(str) + strSub:=gconv.String(trimStr) + if len(strCon)>len(strSub){ + strCon = gstr.StrEx(strCon,strSub) + } + return strCon + }, }) //树形菜单选项 @@ -525,6 +533,7 @@ func (s *sToolsGenTable) GenData(ctx context.Context, tableId int64) (data g.Map "table": extendData, "goModName": g.Cfg().MustGet(ctx, "gen.goModName").String(), "apiVersion": g.Cfg().MustGet(ctx, "gen.apiName").String(), + "modulePath":gstr.StrEx(extendData.PackageName,"internal/app/"), } apiKey := "api" apiValue := "" @@ -985,15 +994,12 @@ func (s *sToolsGenTable) GenCode(ctx context.Context, ids []int) (err error) { genData, extendData, err = s.GenData(ctx, gconv.Int64(id)) liberr.ErrIsNil(ctx, err) packageName := extendData.PackageName - pluginName := "" - if gstr.ContainsI(extendData.PackageName, "plugins") { - pluginName = "plugins/" - } businessName := gstr.CaseCamelLower(extendData.BusinessName) + modulePath := gstr.StrEx(extendData.PackageName,"internal/app/") for key, code := range genData { switch key { case "api": - path := strings.Join([]string{curDir, "/", apiName, "/", pluginName, extendData.ModuleName, "/", extendData.TableName, ".go"}, "") + path := strings.Join([]string{curDir, "/", apiName, "/", modulePath, "/", extendData.TableName, ".go"}, "") err = s.createFile(path, code, extendData.Overwrite) liberr.ErrIsNil(ctx, err) case "controller": @@ -1039,7 +1045,7 @@ func (s *sToolsGenTable) GenCode(ctx context.Context, ids []int) (err error) { err = s.createFile(path, code, extendData.Overwrite) liberr.ErrIsNil(ctx, err) case "sql": - path := strings.Join([]string{curDir, "/resource/data/gen_sql/", extendData.ModuleName, "/", extendData.TableName, ".sql"}, "") + path := strings.Join([]string{curDir, "/resource/data/gen_sql/", modulePath, "/", extendData.TableName, ".sql"}, "") hasSql := gfile.Exists(path) err = s.createFile(path, code, extendData.Overwrite) liberr.ErrIsNil(ctx, err) @@ -1051,32 +1057,32 @@ func (s *sToolsGenTable) GenCode(ctx context.Context, ids []int) (err error) { commonService.Cache().Remove(ctx, consts.CacheSysAuthMenu) } case "tsApi": - path := strings.Join([]string{frontDir, "/src/api/" + pluginName, extendData.ModuleName, "/", businessName, ".ts"}, "") + path := strings.Join([]string{frontDir, "/src/api/", modulePath, "/", businessName, ".ts"}, "") err = s.createFile(path, code, extendData.Overwrite) liberr.ErrIsNil(ctx, err) case "tsModel": - path := strings.Join([]string{frontDir, "/src/views/" + pluginName, extendData.ModuleName, "/", businessName + "/list/component/model", ".ts"}, "") + path := strings.Join([]string{frontDir, "/src/views/",modulePath, "/", businessName + "/list/component/model", ".ts"}, "") err = s.createFile(path, code, extendData.Overwrite) liberr.ErrIsNil(ctx, err) case "vue": - path := strings.Join([]string{frontDir, "/src/views/" + pluginName, extendData.ModuleName, "/", businessName, "/list/index.vue"}, "") + path := strings.Join([]string{frontDir, "/src/views/",modulePath, "/", businessName, "/list/index.vue"}, "") err = s.createFile(path, code, extendData.Overwrite) liberr.ErrIsNil(ctx, err) case "vueDetail": - path := strings.Join([]string{frontDir, "/src/views/" + pluginName, extendData.ModuleName, "/", businessName + "/list/component/detail", ".vue"}, "") + path := strings.Join([]string{frontDir, "/src/views/" ,modulePath, "/", businessName + "/list/component/detail", ".vue"}, "") err = s.createFile(path, code, extendData.Overwrite) liberr.ErrIsNil(ctx, err) case "vueEdit": - path := strings.Join([]string{frontDir, "/src/views/" + pluginName, extendData.ModuleName, "/", businessName + "/list/component/edit", ".vue"}, "") + path := strings.Join([]string{frontDir, "/src/views/" ,modulePath, "/", businessName + "/list/component/edit", ".vue"}, "") err = s.createFile(path, code, extendData.Overwrite) liberr.ErrIsNil(ctx, err) } } //生成模块路由 - err = s.genModuleRouter(curDir, goModName, extendData.ModuleName) + err = s.genModuleRouter(curDir, goModName, extendData.ModuleName,modulePath) liberr.ErrIsNil(ctx, err) //生成模块boot logic - err = s.genModuleBootLogic(curDir, extendData.ModuleName) + err = s.genModuleBootLogic(curDir, extendData.ModuleName,modulePath) liberr.ErrIsNil(ctx, err) //生成对应模块的业务logic err = s.genModuleLogic(curDir, goModName, extendData.PackageName) @@ -1232,12 +1238,13 @@ func (s *sToolsGenTable) genModuleLogic(curDir, goModName, packageName string) ( return } -func (s *sToolsGenTable) genModuleRouter(curDir, goModName, moduleName string) (err error) { - path := strings.Join([]string{curDir, "/internal/router/" + moduleName + ".go"}, "") +func (s *sToolsGenTable) genModuleRouter(curDir, goModName, moduleName,modulePath string) (err error) { + modulePathName :=gstr.CaseCamelLower(gstr.Replace(modulePath,"/","_")) + path := strings.Join([]string{curDir, "/internal/router/" + modulePathName + ".go"}, "") if gfile.IsFile(path) || moduleName == "system" { return } - moduleNameUpper := gstr.CaseCamel(moduleName) + moduleNameUpper := gstr.CaseCamel(modulePathName) code := fmt.Sprintf(`package router import ( "context" @@ -1247,13 +1254,14 @@ import ( func (router *Router) Bind%sModuleController(ctx context.Context, group *ghttp.RouterGroup) { %sRouter.R.BindController(ctx, group) -}`, moduleName, goModName, moduleName, moduleNameUpper, moduleName) +}`, moduleName, goModName, modulePath, moduleNameUpper, moduleName) err = s.createFile(path, code, true) return } -func (s *sToolsGenTable) genModuleBootLogic(curDir, moduleName string) (err error) { - path := strings.Join([]string{curDir, "/internal/app/boot/" + moduleName + ".go"}, "") +func (s *sToolsGenTable) genModuleBootLogic(curDir, moduleName,modulePath string) (err error) { + modulePathName :=gstr.CaseCamelLower(gstr.Replace(modulePath,"/","_")) + path := strings.Join([]string{curDir, "/internal/app/boot/" + modulePathName + ".go"}, "") if gfile.IsFile(path) || moduleName == "system" { return } @@ -1261,7 +1269,7 @@ func (s *sToolsGenTable) genModuleBootLogic(curDir, moduleName string) (err erro import ( _ "github.com/tiger1103/gfast/v3/internal/app/%s/logic" ) -`, moduleName) +`, modulePath) err = s.createFile(path, code, true) return } diff --git a/internal/consts/version.go b/internal/consts/version.go index 9ad902e..eb4db43 100644 --- a/internal/consts/version.go +++ b/internal/consts/version.go @@ -9,5 +9,5 @@ package consts const ( Logo = `CiAgIF9fX19fX19fX19fXyAgICAgICAgICAgX18gCiAgLyBfX19fLyBfX19fL19fXyBfX19fX18vIC9fCiAvIC8gX18vIC9fICAvIF9fIGAvIF9fXy8gX18vCi8gL18vIC8gX18vIC8gL18vIChfXyAgKSAvXyAgClxfX19fL18vICAgIFxfXyxfL19fX18vXF9fLyAg` - Version = "3.2.10" + Version = "3.2.11" ) diff --git a/resource/data/gfast-v32.sql b/resource/data/gfast-v32.sql index 2c8112f..82fbe0d 100644 --- a/resource/data/gfast-v32.sql +++ b/resource/data/gfast-v32.sql @@ -11,7 +11,7 @@ Target Server Version : 50736 File Encoding : 65001 - Date: 03/11/2023 18:09:10 + Date: 10/11/2023 12:08:21 */ SET NAMES utf8mb4; @@ -199,15 +199,15 @@ INSERT INTO `casbin_rule` VALUES ('p', '2', '33', 'All', '', '', ''); -- ---------------------------- DROP TABLE IF EXISTS `demo_city_code`; CREATE TABLE `demo_city_code` ( - `id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '城市ID', - `pid` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '城市父ID', - `deep` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '级别', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '城市名称', - `pinyin_prefix` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '城市拼音头', - `pinyin` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '城市拼音', - `ext_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '完整ID', - `ext_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '城市全称', - `weathercode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '天气预报的编码', + `id` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '城市ID', + `pid` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '城市父ID', + `deep` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '级别', + `name` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '城市名称', + `pinyin_prefix` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '城市拼音头', + `pinyin` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '城市拼音', + `ext_id` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '完整ID', + `ext_name` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '城市全称', + `weathercode` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '天气预报的编码', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `id，name,code`(`id`, `name`, `weathercode`) USING BTREE COMMENT '这三个字段并列一起，必须是唯一的' ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '省市区县和天气预报编码' ROW_FORMAT = DYNAMIC; @@ -4055,7 +4055,7 @@ CREATE TABLE `sys_auth_rule` ( UNIQUE INDEX `name`(`name`) USING BTREE, INDEX `pid`(`pid`) USING BTREE, INDEX `weigh`(`weigh`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 175 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '菜单节点表' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 59 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '菜单节点表' ROW_FORMAT = COMPACT; -- ---------------------------- -- Records of sys_auth_rule @@ -4352,7 +4352,7 @@ CREATE TABLE `sys_job_log` ( `created_at` datetime NULL DEFAULT NULL COMMENT '执行日期', `result` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '执行结果', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 2375 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '任务日志表' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 2379 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '任务日志表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of sys_job_log @@ -6181,6 +6181,10 @@ INSERT INTO `sys_job_log` VALUES (2371, 'checkUserOnline', '2023-11-03 17:10:06' INSERT INTO `sys_job_log` VALUES (2372, 'checkUserOnline', '2023-11-03 17:20:06', '在线用户定时更新，执行成功'); INSERT INTO `sys_job_log` VALUES (2373, 'checkUserOnline', '2023-11-03 17:30:06', '在线用户定时更新，执行成功'); INSERT INTO `sys_job_log` VALUES (2374, 'checkUserOnline', '2023-11-03 17:40:06', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (2375, 'checkUserOnline', '2023-11-03 18:10:06', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (2376, 'checkUserOnline', '2023-11-03 18:30:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (2377, 'checkUserOnline', '2023-11-06 09:00:06', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (2378, 'checkUserOnline', '2023-11-06 09:10:06', '在线用户定时更新，执行成功'); -- ---------------------------- -- Table structure for sys_login_log @@ -6198,7 +6202,7 @@ CREATE TABLE `sys_login_log` ( `login_time` datetime NULL DEFAULT NULL COMMENT '登录时间', `module` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '登录模块', PRIMARY KEY (`info_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 189 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统访问记录' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 190 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统访问记录' ROW_FORMAT = COMPACT; -- ---------------------------- -- Records of sys_login_log @@ -6391,6 +6395,7 @@ INSERT INTO `sys_login_log` VALUES (185, 'wangming', '::1', '内网IP', 'Safari' INSERT INTO `sys_login_log` VALUES (186, 'wangming', '::1', '内网IP', 'Safari', 'CPU iPhone OS 11_0 like Mac OS X', 1, '登录成功', '2023-11-03 15:59:13', '微信小程序'); INSERT INTO `sys_login_log` VALUES (187, '18687460581', '::1', '内网IP', 'Safari', 'CPU iPhone OS 11_0 like Mac OS X', 1, '登录成功', '2023-11-03 16:02:25', '微信小程序'); INSERT INTO `sys_login_log` VALUES (188, '18687460581', '::1', '内网IP', 'Safari', 'CPU iPhone OS 11_0 like Mac OS X', 1, '登录成功', '2023-11-03 16:03:56', '微信小程序'); +INSERT INTO `sys_login_log` VALUES (189, 'demo', '::1', '内网IP', 'Chrome', 'Windows 10', 1, '登录成功', '2023-11-06 08:57:18', '系统后台'); -- ---------------------------- -- Table structure for sys_oper_log @@ -6409,10 +6414,10 @@ CREATE TABLE `sys_oper_log` ( `oper_ip` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '主机地址', `oper_location` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '操作地点', `oper_param` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '请求参数', - `error_msg` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '错误消息', + `error_msg` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '错误消息', `oper_time` datetime NULL DEFAULT NULL COMMENT '操作时间', PRIMARY KEY (`oper_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 8923 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '操作日志记录' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 8959 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '操作日志记录' ROW_FORMAT = COMPACT; -- ---------------------------- -- Records of sys_oper_log @@ -15339,6 +15344,42 @@ INSERT INTO `sys_oper_log` VALUES (8919, '', 0, '/api/v1/system/tools/gen/relati INSERT INTO `sys_oper_log` VALUES (8920, '', 0, '/api/v1/system/dict/type/optionSelect', 'GET', 1, 'demo', '财务部门', '/api/v1/system/dict/type/optionSelect', '::1', '内网IP', '{}', '', '2023-11-03 17:41:49'); INSERT INTO `sys_oper_log` VALUES (8921, '代码生成配置', 0, '/api/v1/system/tools/gen/columnList', 'GET', 1, 'demo', '财务部门', '/api/v1/system/tools/gen/columnList?tableId=96', '::1', '内网IP', '{\"tableId\":\"96\"}', '', '2023-11-03 17:41:49'); INSERT INTO `sys_oper_log` VALUES (8922, '', 0, '/api/v1/system/tools/gen/relationTable', 'GET', 1, 'demo', '财务部门', '/api/v1/system/tools/gen/relationTable', '::1', '内网IP', '{}', '', '2023-11-03 17:41:49'); +INSERT INTO `sys_oper_log` VALUES (8923, '代码生成', 0, '/api/v1/system/tools/gen/tableList', 'GET', 1, 'demo', '财务部门', '/api/v1/system/tools/gen/tableList?tableName=&tableComment=&pageNum=1&pageSize=10', '::1', '内网IP', '{\"pageNum\":\"1\",\"pageSize\":\"10\",\"tableComment\":\"\",\"tableName\":\"\"}', '', '2023-11-03 18:31:01'); +INSERT INTO `sys_oper_log` VALUES (8924, '代码生成配置', 0, '/api/v1/system/tools/gen/columnList', 'GET', 1, 'demo', '财务部门', '/api/v1/system/tools/gen/columnList?tableId=96', '::1', '内网IP', '{\"tableId\":\"96\"}', '', '2023-11-03 18:31:04'); +INSERT INTO `sys_oper_log` VALUES (8925, '', 0, '/api/v1/system/dict/type/optionSelect', 'GET', 1, 'demo', '财务部门', '/api/v1/system/dict/type/optionSelect', '::1', '内网IP', '{}', '', '2023-11-03 18:31:04'); +INSERT INTO `sys_oper_log` VALUES (8926, '', 0, '/api/v1/system/tools/gen/relationTable', 'GET', 1, 'demo', '财务部门', '/api/v1/system/tools/gen/relationTable', '::1', '内网IP', '{}', '', '2023-11-03 18:31:04'); +INSERT INTO `sys_oper_log` VALUES (8927, '', 0, '/api/v1/system/dict/type/optionSelect', 'GET', 1, 'demo', '财务部门', '/api/v1/system/dict/type/optionSelect', '::1', '内网IP', '{}', '', '2023-11-03 18:31:06'); +INSERT INTO `sys_oper_log` VALUES (8928, '代码生成配置', 0, '/api/v1/system/tools/gen/columnList', 'GET', 1, 'demo', '财务部门', '/api/v1/system/tools/gen/columnList?tableId=96', '::1', '内网IP', '{\"tableId\":\"96\"}', '', '2023-11-03 18:31:06'); +INSERT INTO `sys_oper_log` VALUES (8929, '', 0, '/api/v1/system/tools/gen/relationTable', 'GET', 1, 'demo', '财务部门', '/api/v1/system/tools/gen/relationTable', '::1', '内网IP', '{}', '', '2023-11-03 18:31:06'); +INSERT INTO `sys_oper_log` VALUES (8930, '', 0, '/api/v1/system/dict/data/getDictData', 'GET', 1, 'demo', '财务部门', '/api/v1/system/dict/data/getDictData?dictType=sys_show_hide&defaultValue=', '::1', '内网IP', '{\"defaultValue\":\"\",\"dictType\":\"sys_show_hide\"}', '', '2023-11-06 08:57:26'); +INSERT INTO `sys_oper_log` VALUES (8931, '', 0, '/api/v1/system/menu/list', 'GET', 1, 'demo', '财务部门', '/api/v1/system/menu/list?title=&component=', '::1', '内网IP', '{\"component\":\"\",\"title\":\"\"}', '', '2023-11-06 08:57:26'); +INSERT INTO `sys_oper_log` VALUES (8932, '部门管理', 0, '/api/v1/system/dept/list', 'GET', 1, 'demo', '财务部门', '/api/v1/system/dept/list?pageNum=1&pageSize=10&deptName=&status=', '::1', '内网IP', '{\"deptName\":\"\",\"pageNum\":\"1\",\"pageSize\":\"10\",\"status\":\"\"}', '', '2023-11-06 08:57:47'); +INSERT INTO `sys_oper_log` VALUES (8933, '部门管理', 0, '/api/v1/system/dept/list', 'GET', 1, 'demo', '财务部门', '/api/v1/system/dept/list?pageNum=1&pageSize=10&deptName=&status=', '::1', '内网IP', '{\"deptName\":\"\",\"pageNum\":\"1\",\"pageSize\":\"10\",\"status\":\"\"}', '', '2023-11-06 08:57:51'); +INSERT INTO `sys_oper_log` VALUES (8934, '部门管理', 0, '/api/v1/system/dept/list', 'GET', 1, 'demo', '财务部门', '/api/v1/system/dept/list', '::1', '内网IP', '{}', '', '2023-11-06 08:57:54'); +INSERT INTO `sys_oper_log` VALUES (8935, '部门管理', 0, '/api/v1/system/dept/list', 'GET', 1, 'demo', '财务部门', '/api/v1/system/dept/list', '::1', '内网IP', '{}', '', '2023-11-06 08:57:56'); +INSERT INTO `sys_oper_log` VALUES (8936, '部门管理', 0, '/api/v1/system/dept/list', 'GET', 1, 'demo', '财务部门', '/api/v1/system/dept/list', '::1', '内网IP', '{}', '', '2023-11-06 08:58:12'); +INSERT INTO `sys_oper_log` VALUES (8937, '岗位管理', 0, '/api/v1/system/post/list', 'GET', 1, 'demo', '财务部门', '/api/v1/system/post/list?postName=&status=&postCode=&pageNum=1&pageSize=10', '::1', '内网IP', '{\"pageNum\":\"1\",\"pageSize\":\"10\",\"postCode\":\"\",\"postName\":\"\",\"status\":\"\"}', '', '2023-11-06 08:58:24'); +INSERT INTO `sys_oper_log` VALUES (8938, '', 0, '/api/v1/system/dict/data/getDictData', 'GET', 1, 'demo', '财务部门', '/api/v1/system/dict/data/getDictData?dictType=sys_user_sex&defaultValue=', '::1', '内网IP', '{\"defaultValue\":\"\",\"dictType\":\"sys_user_sex\"}', '', '2023-11-06 08:58:26'); +INSERT INTO `sys_oper_log` VALUES (8939, '', 0, '/api/v1/system/dict/data/getDictData', 'GET', 1, 'demo', '财务部门', '/api/v1/system/dict/data/getDictData?dictType=sys_user_sex&defaultValue=', '::1', '内网IP', '{\"defaultValue\":\"\",\"dictType\":\"sys_user_sex\"}', '', '2023-11-06 08:58:26'); +INSERT INTO `sys_oper_log` VALUES (8940, '', 0, '/api/v1/system/user/params', 'GET', 1, 'demo', '财务部门', '/api/v1/system/user/params', '::1', '内网IP', '{}', '', '2023-11-06 08:58:26'); +INSERT INTO `sys_oper_log` VALUES (8941, '', 0, '/api/v1/system/dept/treeSelect', 'GET', 1, 'demo', '财务部门', '/api/v1/system/dept/treeSelect', '::1', '内网IP', '{}', '', '2023-11-06 08:58:26'); +INSERT INTO `sys_oper_log` VALUES (8942, '用户管理', 0, '/api/v1/system/user/list', 'GET', 1, 'demo', '财务部门', '/api/v1/system/user/list?pageNum=1&pageSize=10&deptId=&mobile=&status=&keyWords=', '::1', '内网IP', '{\"deptId\":\"\",\"keyWords\":\"\",\"mobile\":\"\",\"pageNum\":\"1\",\"pageSize\":\"10\",\"status\":\"\"}', '', '2023-11-06 08:58:26'); +INSERT INTO `sys_oper_log` VALUES (8943, '用户管理', 0, '/api/v1/system/user/list', 'GET', 1, 'demo', '财务部门', '/api/v1/system/user/list?pageNum=2&pageSize=10&deptId=&mobile=&status=&keyWords=', '::1', '内网IP', '{\"deptId\":\"\",\"keyWords\":\"\",\"mobile\":\"\",\"pageNum\":\"2\",\"pageSize\":\"10\",\"status\":\"\"}', '', '2023-11-06 08:58:30'); +INSERT INTO `sys_oper_log` VALUES (8944, '用户管理', 0, '/api/v1/system/user/list', 'GET', 1, 'demo', '财务部门', '/api/v1/system/user/list?pageNum=3&pageSize=10&deptId=&mobile=&status=&keyWords=', '::1', '内网IP', '{\"deptId\":\"\",\"keyWords\":\"\",\"mobile\":\"\",\"pageNum\":\"3\",\"pageSize\":\"10\",\"status\":\"\"}', '', '2023-11-06 08:58:31'); +INSERT INTO `sys_oper_log` VALUES (8945, '用户管理', 0, '/api/v1/system/user/list', 'GET', 1, 'demo', '财务部门', '/api/v1/system/user/list?pageNum=1&pageSize=10&deptId=&mobile=&status=&keyWords=', '::1', '内网IP', '{\"deptId\":\"\",\"keyWords\":\"\",\"mobile\":\"\",\"pageNum\":\"1\",\"pageSize\":\"10\",\"status\":\"\"}', '', '2023-11-06 08:58:32'); +INSERT INTO `sys_oper_log` VALUES (8946, '用户管理', 0, '/api/v1/system/user/list', 'GET', 1, 'demo', '财务部门', '/api/v1/system/user/list?pageNum=2&pageSize=10&deptId=&mobile=&status=&keyWords=', '::1', '内网IP', '{\"deptId\":\"\",\"keyWords\":\"\",\"mobile\":\"\",\"pageNum\":\"2\",\"pageSize\":\"10\",\"status\":\"\"}', '', '2023-11-06 08:58:33'); +INSERT INTO `sys_oper_log` VALUES (8947, '用户管理', 0, '/api/v1/system/user/list', 'GET', 1, 'demo', '财务部门', '/api/v1/system/user/list?pageNum=1&pageSize=10&deptId=&mobile=&status=&keyWords=', '::1', '内网IP', '{\"deptId\":\"\",\"keyWords\":\"\",\"mobile\":\"\",\"pageNum\":\"1\",\"pageSize\":\"10\",\"status\":\"\"}', '', '2023-11-06 08:58:34'); +INSERT INTO `sys_oper_log` VALUES (8948, '代码生成', 0, '/api/v1/system/tools/gen/tableList', 'GET', 1, 'demo', '财务部门', '/api/v1/system/tools/gen/tableList?tableName=&tableComment=&pageNum=1&pageSize=10', '::1', '内网IP', '{\"pageNum\":\"1\",\"pageSize\":\"10\",\"tableComment\":\"\",\"tableName\":\"\"}', '', '2023-11-06 08:58:47'); +INSERT INTO `sys_oper_log` VALUES (8949, '代码生成配置', 0, '/api/v1/system/tools/gen/columnList', 'GET', 1, 'demo', '财务部门', '/api/v1/system/tools/gen/columnList?tableId=93', '::1', '内网IP', '{\"tableId\":\"93\"}', '', '2023-11-06 08:58:51'); +INSERT INTO `sys_oper_log` VALUES (8950, '', 0, '/api/v1/system/dict/type/optionSelect', 'GET', 1, 'demo', '财务部门', '/api/v1/system/dict/type/optionSelect', '::1', '内网IP', '{}', '', '2023-11-06 08:58:51'); +INSERT INTO `sys_oper_log` VALUES (8951, '', 0, '/api/v1/system/tools/gen/relationTable', 'GET', 1, 'demo', '财务部门', '/api/v1/system/tools/gen/relationTable', '::1', '内网IP', '{}', '', '2023-11-06 08:58:51'); +INSERT INTO `sys_oper_log` VALUES (8952, '代码生成', 0, '/api/v1/system/tools/gen/tableList', 'GET', 1, 'demo', '财务部门', '/api/v1/system/tools/gen/tableList?tableName=&tableComment=&pageNum=1&pageSize=10', '::1', '内网IP', '{\"pageNum\":\"1\",\"pageSize\":\"10\",\"tableComment\":\"\",\"tableName\":\"\"}', '', '2023-11-06 09:02:00'); +INSERT INTO `sys_oper_log` VALUES (8953, '', 0, '/api/v1/system/dict/data/getDictData', 'GET', 1, 'demo', '财务部门', '/api/v1/system/dict/data/getDictData?dictType=sys_show_hide&defaultValue=', '::1', '内网IP', '{\"defaultValue\":\"\",\"dictType\":\"sys_show_hide\"}', '', '2023-11-06 09:02:03'); +INSERT INTO `sys_oper_log` VALUES (8954, '', 0, '/api/v1/system/menu/list', 'GET', 1, 'demo', '财务部门', '/api/v1/system/menu/list?title=&component=', '::1', '内网IP', '{\"component\":\"\",\"title\":\"\"}', '', '2023-11-06 09:02:03'); +INSERT INTO `sys_oper_log` VALUES (8955, '部门管理', 0, '/api/v1/system/dept/list', 'GET', 1, 'demo', '财务部门', '/api/v1/system/dept/list?pageNum=1&pageSize=10&deptName=&status=', '::1', '内网IP', '{\"deptName\":\"\",\"pageNum\":\"1\",\"pageSize\":\"10\",\"status\":\"\"}', '', '2023-11-06 09:02:13'); +INSERT INTO `sys_oper_log` VALUES (8956, '部门管理', 0, '/api/v1/system/dept/list', 'GET', 1, 'demo', '财务部门', '/api/v1/system/dept/list?pageNum=1&pageSize=10&deptName=&status=', '::1', '内网IP', '{\"deptName\":\"\",\"pageNum\":\"1\",\"pageSize\":\"10\",\"status\":\"\"}', '', '2023-11-06 09:02:20'); +INSERT INTO `sys_oper_log` VALUES (8957, '部门管理', 0, '/api/v1/system/dept/list', 'GET', 1, 'demo', '财务部门', '/api/v1/system/dept/list?pageNum=1&pageSize=10&deptName=&status=', '::1', '内网IP', '{\"deptName\":\"\",\"pageNum\":\"1\",\"pageSize\":\"10\",\"status\":\"\"}', '', '2023-11-06 09:02:47'); +INSERT INTO `sys_oper_log` VALUES (8958, '部门管理', 0, '/api/v1/system/dept/list', 'GET', 1, 'demo', '财务部门', '/api/v1/system/dept/list?pageNum=1&pageSize=10&deptName=&status=', '::1', '内网IP', '{\"deptName\":\"\",\"pageNum\":\"1\",\"pageSize\":\"10\",\"status\":\"\"}', '', '2023-11-06 09:03:03'); -- ---------------------------- -- Table structure for sys_post @@ -15480,7 +15521,7 @@ INSERT INTO `sys_user` VALUES (22, 'yxfmlbb', '15969423326', '大数据部门测 INSERT INTO `sys_user` VALUES (23, 'wangming', '18687460581', '王明', 0, '542a6e44dbac171f260fc4a032cd5522', 'dlqVVBTADg', 1, '', 0, '', 0, '', 1, '', '', '::1', '2023-11-03 16:03:56', '2021-06-22 17:58:00', '2021-06-22 17:58:00', NULL, 'oHUVQ6CKETZ7gvqkHdJqdlw2WXNE'); INSERT INTO `sys_user` VALUES (24, 'zhk', '13699885591', '综合科', 0, '542a6e44dbac171f260fc4a032cd5522', 'dlqVVBTADg', 1, '', 0, '', 0, '', 1, '', '', '192.168.0.146', NULL, '2021-06-22 17:58:00', '2021-06-22 17:58:00', NULL, ''); INSERT INTO `sys_user` VALUES (28, 'demo3', '18699888855', '测试账号1', 0, '542a6e44dbac171f260fc4a032cd5522', 'dlqVVBTADg', 1, '123132@qq.com', 0, '', 109, '', 1, '', '', '192.168.0.229', NULL, '2021-06-22 17:58:00', '2021-06-22 17:58:00', NULL, ''); -INSERT INTO `sys_user` VALUES (31, 'demo', '15334455789', '李四', 0, '6dd68eea81e0fca319add0bd58c3fdf6', '46PvWe1Sl7', 1, '123@qq.com', 2, 'upload_file/2023-11-01/cwn4m6vp1qxkxvfqlx.jpg', 109, '3', 1, '云南省曲靖市22223', '生活变的再糟糕，也不妨碍我变得更好', '::1', '2023-11-03 15:46:59', '2021-06-22 17:58:00', '2023-11-01 10:40:19', NULL, ''); +INSERT INTO `sys_user` VALUES (31, 'demo', '15334455789', '李四', 0, '6dd68eea81e0fca319add0bd58c3fdf6', '46PvWe1Sl7', 1, '123@qq.com', 2, 'upload_file/2023-11-01/cwn4m6vp1qxkxvfqlx.jpg', 109, '3', 1, '云南省曲靖市22223', '生活变的再糟糕，也不妨碍我变得更好', '::1', '2023-11-06 08:57:18', '2021-06-22 17:58:00', '2023-11-01 10:40:19', NULL, ''); INSERT INTO `sys_user` VALUES (32, 'demo100', '18699888859', '测试账号1', 0, '542a6e44dbac171f260fc4a032cd5522', 'dlqVVBTADg', 1, '', 0, '', 0, '', 1, '', '', '[::1]', '2021-11-24 18:01:21', '2021-06-22 17:58:00', '2021-06-22 17:58:00', NULL, ''); INSERT INTO `sys_user` VALUES (33, 'demo110', '18699888853', '测试账号1', 0, '542a6e44dbac171f260fc4a032cd5522', 'dlqVVBTADg', 1, '', 0, '', 0, '', 1, '', '', '', NULL, '2021-06-22 17:58:00', '2021-06-22 17:58:00', NULL, ''); INSERT INTO `sys_user` VALUES (34, 'yxfmlbb2', '15969423327', '研发部门测试', 0, '542a6e44dbac171f260fc4a032cd5522', 'dlqVVBTADg', 1, '1111@qqq.com', 1, '', 103, '', 0, '', '', '127.0.0.1', NULL, '2021-06-22 17:58:00', '2021-06-22 17:58:00', NULL, ''); @@ -15514,7 +15555,7 @@ CREATE TABLE `sys_user_online` ( -- ---------------------------- -- Records of sys_user_online -- ---------------------------- -INSERT INTO `sys_user_online` VALUES (95, 'b83d25b5b4d69d45473d48038b93c544', '7ZUSfVIf2HyYjcv86SKPPs29v003ECPEScsdYsYYqO0OiU00EEIGqI/BsXSMHMj7l8nHeCOGjQR+Ad17Jc6sqlOMG7QJYXc7XIyk7x5vz7NnSWoAkRkm94CVo+5STlkaRYDGHcMmy3ZihNgyhsIX0g==', '2023-11-03 15:46:59', 'demo', '::1', 'Chrome', 'Windows 10'); +INSERT INTO `sys_user_online` VALUES (96, '59d1a58da5c68fe40701cd63ffd2d280', '7ZUSfVIf2HyYjcv86SKPPs29v003ECPEScsdYsYYqO0OiU00EEIGqI/BsXSMHMj7l8nHeCOGjQR+Ad17Jc6sqpyMaYf+LQn/d1lCwmRg6MsxBDfns4cuGLRn4wZQx0eQdam0n5XylY5Y7OOiARUldg==', '2023-11-06 08:57:18', 'demo', '::1', 'Chrome', 'Windows 10'); -- ---------------------------- -- Table structure for sys_user_post diff --git a/resource/template/vm/go/controller.template b/resource/template/vm/go/controller.template index e9a0d36..25a1c0a 100644 --- a/resource/template/vm/go/controller.template +++ b/resource/template/vm/go/controller.template @@ -10,10 +10,7 @@ {{$structName := .table.BusinessName | CaseCamelLower}} {{$businessName := .table.BusinessName | CaseCamelLower}} -{{$plugin:=""}} -{{if ContainsI $.table.PackageName "plugins"}} - {{$plugin = "plugins/"}} -{{end}} + package controller //// {{$hasGmap:=false}} @@ -40,7 +37,7 @@ package controller {{end}} import ( "context" - "{{.goModName}}/api/v1/{{.table.ModuleName}}" + "{{.goModName}}/api/v1/{{.modulePath}}" "{{.goModName}}/{{.table.PackageName}}/service" {{if ne $.table.ModuleName "system"}} systemController "{{.goModName}}/internal/app/system/controller" @@ -280,7 +277,7 @@ func(c *{{$structName}}Controller) Linked{{$.table.ClassName}}DataSearch(ctx con {{if ne $.table.ModuleName "system"}} {{$serviceVal = "systemService"}} {{end}} - if !{{$serviceVal}}.SysUser().AccessRule(ctx, {{$serviceVal}}.Context().GetUserId(ctx), "{{$plugin}}{{.apiVersion}}/{{.table.ModuleName}}/{{$businessName}}/list") { + if !{{$serviceVal}}.SysUser().AccessRule(ctx, {{$serviceVal}}.Context().GetUserId(ctx), "{{.apiVersion}}/{{.table.PackageName}}/{{$businessName}}/list") { err = errors.New("没有访问权限") return } diff --git a/resource/template/vm/go/router.template b/resource/template/vm/go/router.template index c4a7d7e..bef6ed4 100644 --- a/resource/template/vm/go/router.template +++ b/resource/template/vm/go/router.template @@ -8,7 +8,6 @@ // ========================================================================== //// package router - //// import ( "context" @@ -23,7 +22,7 @@ var R = new(Router) type Router struct{} //// func (router *Router) BindController(ctx context.Context, group *ghttp.RouterGroup) { - group.Group("/{{.table.ModuleName}}", func(group *ghttp.RouterGroup) { + group.Group("/{{.modulePath}}", func(group *ghttp.RouterGroup) { //登录验证拦截 service.GfToken().Middleware(group) //context拦截器 diff --git a/resource/template/vm/sql/sql.template b/resource/template/vm/sql/sql.template index 80c7b5f..48274d0 100644 --- a/resource/template/vm/sql/sql.template +++ b/resource/template/vm/sql/sql.template @@ -8,22 +8,18 @@ GFast自动生成菜单SQL */ //// -{{$plugin:=""}} -{{if ContainsI $.table.PackageName "plugins"}} -{{$plugin = "plugins/"}} -{{end}} -- 删除原有数据 -DELETE FROM `sys_auth_rule` WHERE `name` = '{{$plugin}}{{.apiVersion}}/{{.table.ModuleName}}/{{.table.BusinessName | CaseCamelLower}}'; -DELETE FROM `sys_auth_rule` WHERE `name` = '{{$plugin}}{{.apiVersion}}/{{.table.ModuleName}}/{{.table.BusinessName | CaseCamelLower}}/list'; -DELETE FROM `sys_auth_rule` WHERE `name` = '{{$plugin}}{{.apiVersion}}/{{.table.ModuleName}}/{{.table.BusinessName | CaseCamelLower}}/get'; -DELETE FROM `sys_auth_rule` WHERE `name` = '{{$plugin}}{{.apiVersion}}/{{.table.ModuleName}}/{{.table.BusinessName | CaseCamelLower}}/add'; -DELETE FROM `sys_auth_rule` WHERE `name` = '{{$plugin}}{{.apiVersion}}/{{.table.ModuleName}}/{{.table.BusinessName | CaseCamelLower}}/edit'; -DELETE FROM `sys_auth_rule` WHERE `name` = '{{$plugin}}{{.apiVersion}}/{{.table.ModuleName}}/{{.table.BusinessName | CaseCamelLower}}/delete'; -DELETE FROM `sys_auth_rule` WHERE `name` = '{{$plugin}}{{.apiVersion}}/{{.table.ModuleName}}/{{.table.BusinessName | CaseCamelLower}}/export'; +DELETE FROM `sys_auth_rule` WHERE `name` = '{{.apiVersion}}/{{.modulePath}}/{{.table.BusinessName | CaseCamelLower}}'; +DELETE FROM `sys_auth_rule` WHERE `name` = '{{.apiVersion}}/{{.modulePath}}/{{.table.BusinessName | CaseCamelLower}}/list'; +DELETE FROM `sys_auth_rule` WHERE `name` = '{{.apiVersion}}/{{.modulePath}}/{{.table.BusinessName | CaseCamelLower}}/get'; +DELETE FROM `sys_auth_rule` WHERE `name` = '{{.apiVersion}}/{{.modulePath}}/{{.table.BusinessName | CaseCamelLower}}/add'; +DELETE FROM `sys_auth_rule` WHERE `name` = '{{.apiVersion}}/{{.modulePath}}/{{.table.BusinessName | CaseCamelLower}}/edit'; +DELETE FROM `sys_auth_rule` WHERE `name` = '{{.apiVersion}}/{{.modulePath}}/{{.table.BusinessName | CaseCamelLower}}/delete'; +DELETE FROM `sys_auth_rule` WHERE `name` = '{{.apiVersion}}/{{.modulePath}}/{{.table.BusinessName | CaseCamelLower}}/export'; {{range $index,$column:= .table.Columns}} {{if and $column.IsStatus $column.IsList}} -DELETE FROM `sys_auth_rule` WHERE `name` = '{{$plugin}}{{.apiVersion}}/{{$.table.ModuleName}}/{{$.table.BusinessName | CaseCamelLower}}/change{{$column.GoField}}'; +DELETE FROM `sys_auth_rule` WHERE `name` = '{{.apiVersion}}/{{.modulePath}}/{{$.table.BusinessName | CaseCamelLower}}/change{{$column.GoField}}'; {{end}} {{end}} @@ -32,39 +28,39 @@ select @now := now(); -- 目录 SQL INSERT INTO `sys_auth_rule` (`pid`,`name`,`title`,`icon`,`condition`,`remark`,`menu_type`,`weigh`,`is_cached`,`is_hide`,`path`,`link_url`,`component`,`is_iframe`,`module_type`,`model_id`,`created_at`,`updated_at` ) -VALUES(0,'{{$plugin}}{{.apiVersion}}/{{.table.ModuleName}}/{{.table.BusinessName | CaseCamelLower}}','{{.table.FunctionName}}管理','iconfont icon-fuwenbenkuang','','{{.table.FunctionName}}管理',0,0,1,0,'/{{$plugin}}{{.table.ModuleName}}/{{.table.BusinessName | CaseCamelLower}}','','layout/routerView/parent',0,'sys_admin',0,@now,@now); +VALUES(0,'{{.apiVersion}}/{{.modulePath}}/{{.table.BusinessName | CaseCamelLower}}','{{.table.FunctionName}}管理','iconfont icon-fuwenbenkuang','','{{.table.FunctionName}}管理',0,0,1,0,'/{{.modulePath}}/{{.table.BusinessName | CaseCamelLower}}','','layout/routerView/parent',0,'sys_admin',0,@now,@now); -- 菜单父目录ID SELECT @parentId := LAST_INSERT_ID(); -- 菜单 SQL INSERT INTO `sys_auth_rule` (`pid`,`name`,`title`,`icon`,`condition`,`remark`,`menu_type`,`weigh`,`is_cached`,`is_hide`,`path`,`link_url`,`component`,`is_iframe`,`module_type`,`model_id`,`created_at`,`updated_at`) -VALUES(@parentId,'{{$plugin}}{{.apiVersion}}/{{.table.ModuleName}}/{{.table.BusinessName | CaseCamelLower}}/list','{{.table.FunctionName}}列表','ele-Fold','','{{.table.FunctionName}}列表',1,0,1,0,'/{{$plugin}}{{.table.ModuleName}}/{{.table.BusinessName | CaseCamelLower}}/list','','{{$plugin}}{{.table.ModuleName}}/{{.table.BusinessName | CaseCamelLower}}/list/index',0,'sys_admin',0,@now,@now); +VALUES(@parentId,'{{.apiVersion}}/{{.modulePath}}/{{.table.BusinessName | CaseCamelLower}}/list','{{.table.FunctionName}}列表','ele-Fold','','{{.table.FunctionName}}列表',1,0,1,0,'/{{.modulePath}}/{{.table.BusinessName | CaseCamelLower}}/list','','{{.modulePath}}/{{.table.BusinessName | CaseCamelLower}}/list/index',0,'sys_admin',0,@now,@now); -- 按钮父目录ID SELECT @parentId := LAST_INSERT_ID(); -- 按钮 SQL INSERT INTO `sys_auth_rule` (`pid`,`name`,`title`,`icon`,`condition`,`remark`,`menu_type`,`weigh`,`is_cached`,`is_hide`,`path`,`link_url`,`component`,`is_iframe`,`module_type`,`model_id`,`created_at`,`updated_at`) -VALUES(@parentId,'{{$plugin}}{{.apiVersion}}/{{.table.ModuleName}}/{{.table.BusinessName | CaseCamelLower}}/get','{{.table.FunctionName}}查询','','','{{.table.FunctionName}}查询',2,0,1,0,'','','',0,'sys_admin',0,@now,@now); +VALUES(@parentId,'{{.apiVersion}}/{{.modulePath}}/{{.table.BusinessName | CaseCamelLower}}/get','{{.table.FunctionName}}查询','','','{{.table.FunctionName}}查询',2,0,1,0,'','','',0,'sys_admin',0,@now,@now); INSERT INTO `sys_auth_rule` (`pid`,`name`,`title`,`icon`,`condition`,`remark`,`menu_type`,`weigh`,`is_cached`,`is_hide`,`path`,`link_url`,`component`,`is_iframe`,`module_type`,`model_id`,`created_at`,`updated_at`) -VALUES(@parentId,'{{$plugin}}{{.apiVersion}}/{{.table.ModuleName}}/{{.table.BusinessName | CaseCamelLower}}/add','{{.table.FunctionName}}添加','','','{{.table.FunctionName}}添加',2,0,1,0,'','','',0,'sys_admin',0,@now,@now); +VALUES(@parentId,'{{.apiVersion}}/{{.modulePath}}/{{.table.BusinessName | CaseCamelLower}}/add','{{.table.FunctionName}}添加','','','{{.table.FunctionName}}添加',2,0,1,0,'','','',0,'sys_admin',0,@now,@now); INSERT INTO `sys_auth_rule` (`pid`,`name`,`title`,`icon`,`condition`,`remark`,`menu_type`,`weigh`,`is_cached`,`is_hide`,`path`,`link_url`,`component`,`is_iframe`,`module_type`,`model_id`,`created_at`,`updated_at`) -VALUES(@parentId,'{{$plugin}}{{.apiVersion}}/{{.table.ModuleName}}/{{.table.BusinessName | CaseCamelLower}}/edit','{{.table.FunctionName}}修改','','','{{.table.FunctionName}}修改',2,0,1,0,'','','',0,'sys_admin',0,@now,@now); +VALUES(@parentId,'{{.apiVersion}}/{{.modulePath}}/{{.table.BusinessName | CaseCamelLower}}/edit','{{.table.FunctionName}}修改','','','{{.table.FunctionName}}修改',2,0,1,0,'','','',0,'sys_admin',0,@now,@now); INSERT INTO `sys_auth_rule` (`pid`,`name`,`title`,`icon`,`condition`,`remark`,`menu_type`,`weigh`,`is_cached`,`is_hide`,`path`,`link_url`,`component`,`is_iframe`,`module_type`,`model_id`,`created_at`,`updated_at`) -VALUES(@parentId,'{{$plugin}}{{.apiVersion}}/{{.table.ModuleName}}/{{.table.BusinessName | CaseCamelLower}}/delete','{{.table.FunctionName}}删除','','','{{.table.FunctionName}}删除',2,0,1,0,'','','',0,'sys_admin',0,@now,@now); +VALUES(@parentId,'{{.apiVersion}}/{{.modulePath}}/{{.table.BusinessName | CaseCamelLower}}/delete','{{.table.FunctionName}}删除','','','{{.table.FunctionName}}删除',2,0,1,0,'','','',0,'sys_admin',0,@now,@now); {{if .table.ExcelPort}} INSERT INTO `sys_auth_rule` (`pid`,`name`,`title`,`icon`,`condition`,`remark`,`menu_type`,`weigh`,`is_cached`,`is_hide`,`path`,`link_url`,`component`,`is_iframe`,`module_type`,`model_id`,`created_at`,`updated_at`) -VALUES(@parentId,'{{$plugin}}{{.apiVersion}}/{{.table.ModuleName}}/{{.table.BusinessName | CaseCamelLower}}/export','{{.table.FunctionName}}导出','','','{{.table.FunctionName}}导出',2,0,1,0,'','','',0,'sys_admin',0,@now,@now); +VALUES(@parentId,'{{.apiVersion}}/{{.modulePath}}/{{.table.BusinessName | CaseCamelLower}}/export','{{.table.FunctionName}}导出','','','{{.table.FunctionName}}导出',2,0,1,0,'','','',0,'sys_admin',0,@now,@now); {{end}} {{range $index,$column:= .table.Columns}} {{if and $column.IsStatus $column.IsList}} INSERT INTO `sys_auth_rule` (`pid`,`name`,`title`,`icon`,`condition`,`remark`,`menu_type`,`weigh`,`is_cached`,`is_hide`,`path`,`link_url`,`component`,`is_iframe`,`module_type`,`model_id`,`created_at`,`updated_at`) -VALUES(@parentId,'{{$plugin}}{{.apiVersion}}/{{$.table.ModuleName}}/{{$.table.BusinessName | CaseCamelLower}}/change{{$column.GoField}}','{{$.table.FunctionName}}{{$column.ColumnComment}}修改','','','{{$.table.FunctionName}}{{$column.ColumnComment}}修改',2,0,1,0,'','','',0,'sys_admin',0,@now,@now); +VALUES(@parentId,'{{.apiVersion}}/{{.modulePath}}/{{$.table.BusinessName | CaseCamelLower}}/change{{$column.GoField}}','{{$.table.FunctionName}}{{$column.ColumnComment}}修改','','','{{$.table.FunctionName}}{{$column.ColumnComment}}修改',2,0,1,0,'','','',0,'sys_admin',0,@now,@now); {{end}} {{end}} diff --git a/resource/template/vm/ts/api.template b/resource/template/vm/ts/api.template index 571fad4..e25e60b 100644 --- a/resource/template/vm/ts/api.template +++ b/resource/template/vm/ts/api.template @@ -3,16 +3,10 @@ import request from '/@/utils/request' {{$businessName := .table.BusinessName | CaseCamelLower}} -{{$plugin:=""}} -{{if ContainsI $.table.PackageName "plugins"}} -{{$plugin = "plugins/"}} -{{end}} - - // 查询{{.table.FunctionName}}列表 export function list{{.table.ClassName}}(query:object) { return request({ - url: '/{{$plugin}}{{.apiVersion}}/{{.table.ModuleName}}/{{$businessName}}/list', + url: '/{{.apiVersion}}/{{.modulePath}}/{{$businessName}}/list', method: 'get', params: query }) @@ -21,7 +15,7 @@ export function list{{.table.ClassName}}(query:object) { // 查询{{.table.FunctionName}}详细 export function get{{.table.ClassName}}({{.table.PkColumn.HtmlField}}:{{.table.PkColumn.TsType}}) { return request({ - url: '/{{$plugin}}{{.apiVersion}}/{{.table.ModuleName}}/{{$businessName}}/get', + url: '/{{.apiVersion}}/{{.modulePath}}/{{$businessName}}/get', method: 'get', params: { {{.table.PkColumn.HtmlField}}: {{.table.PkColumn.HtmlField}}.toString() @@ -32,7 +26,7 @@ export function get{{.table.ClassName}}({{.table.PkColumn.HtmlField}}:{{.table.P // 新增{{.table.FunctionName}} export function add{{.table.ClassName}}(data:object) { return request({ - url: '/{{$plugin}}{{.apiVersion}}/{{.table.ModuleName}}/{{$businessName}}/add', + url: '/{{.apiVersion}}/{{.modulePath}}/{{$businessName}}/add', method: 'post', data: data }) @@ -41,7 +35,7 @@ export function add{{.table.ClassName}}(data:object) { // 修改{{.table.FunctionName}} export function update{{.table.ClassName}}(data:object) { return request({ - url: '/{{$plugin}}{{.apiVersion}}/{{.table.ModuleName}}/{{$businessName}}/edit', + url: '/{{.apiVersion}}/{{.modulePath}}/{{$businessName}}/edit', method: 'put', data: data }) @@ -50,7 +44,7 @@ export function update{{.table.ClassName}}(data:object) { // 删除{{.table.FunctionName}} export function del{{.table.ClassName}}({{.table.PkColumn.HtmlField}}s:{{.table.PkColumn.TsType}}[]) { return request({ - url: '/{{$plugin}}{{.apiVersion}}/{{.table.ModuleName}}/{{$businessName}}/delete', + url: '/{{.apiVersion}}/{{.modulePath}}/{{$businessName}}/delete', method: 'delete', data:{ {{.table.PkColumn.HtmlField}}s:{{.table.PkColumn.HtmlField}}s @@ -72,7 +66,7 @@ export function change{{$.table.ClassName}}{{$column.GoField}}({{$.table.PkColum {{$column.HtmlField}} } return request({ - url: '/{{$plugin}}{{$.apiVersion}}/{{$.table.ModuleName}}/{{$businessName}}/change{{$column.GoField}}', + url: '/{{$.apiVersion}}/{{$.modulePath}}/{{$businessName}}/change{{$column.GoField}}', method: 'put', data:data }) @@ -88,7 +82,7 @@ export function change{{$.table.ClassName}}{{$column.GoField}}({{$.table.PkColum //相关连表查询数据 export function linkedDataSearch(){ return request({ - url: '/{{$plugin}}{{.apiVersion}}/{{.table.ModuleName}}/{{$businessName}}/linkedData', + url: '/{{.apiVersion}}/{{.modulePath}}/{{$businessName}}/linkedData', method: 'get' }) } diff --git a/resource/template/vm/vue/add-vue.template b/resource/template/vm/vue/add-vue.template deleted file mode 100644 index 3bf69cf..0000000 --- a/resource/template/vm/vue/add-vue.template +++ /dev/null @@ -1,493 +0,0 @@ - - -{{$tokenImp := false}} -{{$imgsImp := false}} -{{$editImp := false }} -{{$fileImp := false}} -{{$getUserList:=false}} - -{{range $index,$column:=.table.Columns}} - {{if eq $column.HtmlType "richtext"}} - {{$editImp = true}} - {{else if eq $column.HtmlType "imagefile"}} - {{$tokenImp = true}} - {{else if eq $column.HtmlType "images"}} - {{$imgsImp = true}} - {{else if eq $column.HtmlType "file" "files"}} - {{$fileImp = true}} - {{end}} - {{if eq $column.HtmlField "createdBy" "updatedBy"}} - {{$getUserList = true}} - {{end}} -{{end}} - -{{$plugin:=""}} -{{if ContainsI $.table.PackageName "plugins"}} - {{$plugin = "plugins/"}} -{{end}} - - - \ No newline at end of file diff --git a/resource/template/vm/vue/detail-vue.template b/resource/template/vm/vue/detail-vue.template index 47ba0c2..9b2b2dd 100644 --- a/resource/template/vm/vue/detail-vue.template +++ b/resource/template/vm/vue/detail-vue.template @@ -139,10 +139,6 @@ {{end}} {{end}} -{{$plugin:=""}} -{{if ContainsI $.table.PackageName "plugins"}} - {{$plugin = "plugins/"}} -{{end}}