diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 84ac958..7ae7707 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -13,7 +13,7 @@ ruoyi: # 获取ip地址开关 addressEnabled: false # 验证码类型 math 数组计算 char 字符验证 - captchaType: char + captchaType: math # 前端请求的 跟踪 header name traceIdName: x-web-trace-id diff --git a/ruoyi-generator/src/test/java/com/ruoyi/generator/ApplicationTest.java b/ruoyi-generator/src/test/java/com/ruoyi/generator/ApplicationTest.java index 7985b5f..d3f893e 100644 --- a/ruoyi-generator/src/test/java/com/ruoyi/generator/ApplicationTest.java +++ b/ruoyi-generator/src/test/java/com/ruoyi/generator/ApplicationTest.java @@ -25,10 +25,10 @@ public class ApplicationTest { @Test public void test2() { List tableNames = Arrays.asList( - "mall_pms_brand", - "mall_pms_product_category" , - "mall_pms_product", - "mall_pms_sku" + "pms_brand", + "pms_product_category" , + "pms_product", + "pms_sku" ); // 查询表信息 List tableList = genTableService.selectGenTableByName(tableNames); diff --git a/ruoyi-generator/src/test/resources/application.yml b/ruoyi-generator/src/test/resources/application.yml index 4479d98..2e152f0 100644 --- a/ruoyi-generator/src/test/resources/application.yml +++ b/ruoyi-generator/src/test/resources/application.yml @@ -27,11 +27,11 @@ gen: # 作者 author: zcc # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool - packageName: com.cyl.mall + packageName: com.cyl.pms # 自动去除表前缀,默认是false autoRemovePre: true # 表前缀(生成类名不会包含表前缀,多个用逗号分隔) - tablePrefix: mall_ + tablePrefix: pms_ # 一级权限名 rootPermission: mall # 模板根路径 @@ -47,9 +47,9 @@ gen: # 前端根目录 frontPath: C:\Users\zccbbg\ichengle\ruoyi-mall-vue\ # 前端 api 目录 - frontApiPath: src/api/mall + frontApiPath: src/api/pms # 前端 view 目录 - frontViewPath: src/views/mall + frontViewPath: src/views/pms # sql 目录 sql: sql # 环境变量 @@ -70,8 +70,8 @@ gen: "dto.java.vm": "${backPath}/${serviceModule}/${MAIN_JAVA}/${packageName}/pojo/dto/${ClassName}DTO.java" "vo.java.vm": "${backPath}/${serviceModule}/${MAIN_JAVA}/${packageName}/pojo/vo/${ClassName}VO.java" "domain.java.vm": "${backPath}/${apiModule}/${MAIN_JAVA}/${packageName}/domain/${ClassName}.java" - "mapper.xml.vm": "${backPath}/${serviceModule}/${MAIN_RESOURCES}/mapper/${ClassName}Mapper.xml" - "sql.vm": "${backPath}/sql/${className}.sql" + "mapper.xml.vm": "${backPath}/${serviceModule}/${MAIN_RESOURCES}/mapper/${moduleName}/${ClassName}Mapper.xml" + "sql.vm": "${backPath}/sql/${moduleName}/${className}.sql" "h2.sql.vm": "${backPath}/${serviceModule}/${MAIN_JAVA}/db/${tableName}-h2.sql" "add.vue.vm": "${frontPath}/${frontViewPath}/Add${ClassName}.vue" "index.vue.vm": "${frontPath}/${frontViewPath}/${className}/index.vue" @@ -88,11 +88,10 @@ gen: - vm2/java/vo.java.vm - vm2/java/domain.java.vm - vm2/xml/mapper.xml.vm - # - vm2/sql/sql.vm + - vm2/sql/sql.vm testTemplates: # - vm2/sql/h2.sql.vm crudTemplates: - # - vm2/vue/add.vue.vm - vm2/vue/index.vue.vm treeTemplates: # - vm2/vue/index-tree.vue.vm diff --git a/ruoyi-generator/src/test/resources/vm2/sql/sql.vm b/ruoyi-generator/src/test/resources/vm2/sql/sql.vm index 60f8d3e..1e10188 100644 --- a/ruoyi-generator/src/test/resources/vm2/sql/sql.vm +++ b/ruoyi-generator/src/test/resources/vm2/sql/sql.vm @@ -1,6 +1,6 @@ -- 菜单 SQL insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}', '${parentMenuId}', '1', '${className}', '${rootPermission}/${moduleName}/${className}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 1, sysdate(), '', null, '${functionName}菜单'); +values('${functionName}', '${parentMenuId}', '1', '${className}', '${moduleName}/${className}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 1, sysdate(), '', null, '${functionName}菜单'); -- 按钮父菜单ID SELECT @parentId := LAST_INSERT_ID(); diff --git a/ruoyi-generator/src/test/resources/vm2/vue/index.vue.vm b/ruoyi-generator/src/test/resources/vm2/vue/index.vue.vm index 222c280..249570a 100644 --- a/ruoyi-generator/src/test/resources/vm2/vue/index.vue.vm +++ b/ruoyi-generator/src/test/resources/vm2/vue/index.vue.vm @@ -354,7 +354,7 @@