From 833ab277a79cd39874bbd7d17755a47395095004 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 10 Oct 2018 21:56:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...bController.java => SysJobController.java} | 2 +- ...ntroller.java => SysJobLogController.java} | 2 +- ...ller.java => SysLogininforController.java} | 2 +- ...troller.java => SysOperlogController.java} | 2 +- ...ller.java => SysUserOnlineController.java} | 2 +- ...troller.java => SysCaptchaController.java} | 2 +- ...ntroller.java => SysConfigController.java} | 2 +- ...Controller.java => SysDeptController.java} | 2 +- ...roller.java => SysDictDataController.java} | 2 +- ...roller.java => SysDictTypeController.java} | 2 +- ...ontroller.java => SysIndexController.java} | 2 +- ...ontroller.java => SysLoginController.java} | 2 +- ...Controller.java => SysMenuController.java} | 2 +- ...ntroller.java => SysNoticeController.java} | 2 +- ...Controller.java => SysPostController.java} | 2 +- ...troller.java => SysProfileController.java} | 4 +-- ...Controller.java => SysRoleController.java} | 2 +- ...Controller.java => SysUserController.java} | 2 +- .../src/main/resources/application.yml | 2 +- .../main/resources/static/ruoyi/js/ry-ui.js | 6 +++- .../java/com/ruoyi/common/config/Global.java | 3 +- .../com/ruoyi/generator/util/GenUtils.java | 31 ++++++++----------- .../src/main/resources}/vm/html/add.html.vm | 0 .../src/main/resources}/vm/html/edit.html.vm | 0 .../src/main/resources}/vm/html/list.html.vm | 0 .../resources}/vm/java/Controller.java.vm | 10 +++--- .../main/resources}/vm/java/Mapper.java.vm | 0 .../main/resources}/vm/java/Service.java.vm | 0 .../resources}/vm/java/ServiceImpl.java.vm | 0 .../main/resources}/vm/java/domain.java.vm | 2 +- .../src/main/resources}/vm/sql/sql.vm | 0 .../src/main/resources}/vm/xml/Mapper.xml.vm | 0 32 files changed, 45 insertions(+), 47 deletions(-) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/{JobController.java => SysJobController.java} (95%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/{JobLogController.java => SysJobLogController.java} (94%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/{LogininforController.java => SysLogininforController.java} (94%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/{OperlogController.java => SysOperlogController.java} (95%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/{UserOnlineController.java => SysUserOnlineController.java} (95%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/{CaptchaController.java => SysCaptchaController.java} (95%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/{ConfigController.java => SysConfigController.java} (95%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/{DeptController.java => SysDeptController.java} (95%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/{DictDataController.java => SysDictDataController.java} (95%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/{DictTypeController.java => SysDictTypeController.java} (95%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/{IndexController.java => SysIndexController.java} (92%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/{LoginController.java => SysLoginController.java} (94%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/{MenuController.java => SysMenuController.java} (95%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/{NoticeController.java => SysNoticeController.java} (94%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/{PostController.java => SysPostController.java} (95%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/{ProfileController.java => SysProfileController.java} (93%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/{RoleController.java => SysRoleController.java} (95%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/{UserController.java => SysUserController.java} (96%) rename {ruoyi-admin/src/main/resources/templates => ruoyi-generator/src/main/resources}/vm/html/add.html.vm (100%) rename {ruoyi-admin/src/main/resources/templates => ruoyi-generator/src/main/resources}/vm/html/edit.html.vm (100%) rename {ruoyi-admin/src/main/resources/templates => ruoyi-generator/src/main/resources}/vm/html/list.html.vm (100%) rename {ruoyi-admin/src/main/resources/templates => ruoyi-generator/src/main/resources}/vm/java/Controller.java.vm (89%) rename {ruoyi-admin/src/main/resources/templates => ruoyi-generator/src/main/resources}/vm/java/Mapper.java.vm (100%) rename {ruoyi-admin/src/main/resources/templates => ruoyi-generator/src/main/resources}/vm/java/Service.java.vm (100%) rename {ruoyi-admin/src/main/resources/templates => ruoyi-generator/src/main/resources}/vm/java/ServiceImpl.java.vm (100%) rename {ruoyi-admin/src/main/resources/templates => ruoyi-generator/src/main/resources}/vm/java/domain.java.vm (91%) rename {ruoyi-admin/src/main/resources/templates => ruoyi-generator/src/main/resources}/vm/sql/sql.vm (100%) rename {ruoyi-admin/src/main/resources/templates => ruoyi-generator/src/main/resources}/vm/xml/Mapper.xml.vm (100%) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/JobController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobController.java similarity index 95% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/JobController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobController.java index ad527c59..14e676ef 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/JobController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobController.java @@ -27,7 +27,7 @@ import com.ruoyi.web.core.base.BaseController; */ @Controller @RequestMapping("/monitor/job") -public class JobController extends BaseController +public class SysJobController extends BaseController { private String prefix = "monitor/job"; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/JobLogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobLogController.java similarity index 94% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/JobLogController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobLogController.java index 106413a0..7f9b8a84 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/JobLogController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobLogController.java @@ -24,7 +24,7 @@ import com.ruoyi.web.core.base.BaseController; */ @Controller @RequestMapping("/monitor/jobLog") -public class JobLogController extends BaseController +public class SysJobLogController extends BaseController { private String prefix = "monitor/job"; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/LogininforController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java similarity index 94% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/LogininforController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java index d31a68f3..6395a56c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/LogininforController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java @@ -24,7 +24,7 @@ import com.ruoyi.web.core.base.BaseController; */ @Controller @RequestMapping("/monitor/logininfor") -public class LogininforController extends BaseController +public class SysLogininforController extends BaseController { private String prefix = "monitor/logininfor"; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/OperlogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java similarity index 95% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/OperlogController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java index 62b91f61..a417037b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/OperlogController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java @@ -26,7 +26,7 @@ import com.ruoyi.web.core.base.BaseController; */ @Controller @RequestMapping("/monitor/operlog") -public class OperlogController extends BaseController +public class SysOperlogController extends BaseController { private String prefix = "monitor/operlog"; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/UserOnlineController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java similarity index 95% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/UserOnlineController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java index 06938823..ce714483 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/UserOnlineController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java @@ -28,7 +28,7 @@ import com.ruoyi.web.core.base.BaseController; */ @Controller @RequestMapping("/monitor/online") -public class UserOnlineController extends BaseController +public class SysUserOnlineController extends BaseController { private String prefix = "monitor/online"; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CaptchaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysCaptchaController.java similarity index 95% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CaptchaController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysCaptchaController.java index fca2a5ae..53ad9bca 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CaptchaController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysCaptchaController.java @@ -23,7 +23,7 @@ import com.ruoyi.web.core.base.BaseController; */ @Controller @RequestMapping("/captcha") -public class CaptchaController extends BaseController +public class SysCaptchaController extends BaseController { @Resource(name = "captchaProducer") private Producer captchaProducer; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java similarity index 95% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ConfigController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java index 8b4d2b29..b3c5d70e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ConfigController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java @@ -27,7 +27,7 @@ import com.ruoyi.web.core.base.BaseController; */ @Controller @RequestMapping("/system/config") -public class ConfigController extends BaseController +public class SysConfigController extends BaseController { private String prefix = "system/config"; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/DeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java similarity index 95% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/DeptController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java index 3f88016a..2caffa97 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/DeptController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java @@ -28,7 +28,7 @@ import com.ruoyi.web.core.base.BaseController; */ @Controller @RequestMapping("/system/dept") -public class DeptController extends BaseController +public class SysDeptController extends BaseController { private String prefix = "system/dept"; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/DictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java similarity index 95% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/DictDataController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java index b9097503..507d1af1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/DictDataController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java @@ -27,7 +27,7 @@ import com.ruoyi.web.core.base.BaseController; */ @Controller @RequestMapping("/system/dict/data") -public class DictDataController extends BaseController +public class SysDictDataController extends BaseController { private String prefix = "system/dict/data"; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/DictTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java similarity index 95% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/DictTypeController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java index 1ffc1fc8..b78be6c7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/DictTypeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java @@ -27,7 +27,7 @@ import com.ruoyi.web.core.base.BaseController; */ @Controller @RequestMapping("/system/dict") -public class DictTypeController extends BaseController +public class SysDictTypeController extends BaseController { private String prefix = "system/dict/type"; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/IndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java similarity index 92% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/IndexController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java index 982d6e1f..8277a4ea 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/IndexController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java @@ -17,7 +17,7 @@ import com.ruoyi.web.core.base.BaseController; * @author ruoyi */ @Controller -public class IndexController extends BaseController +public class SysIndexController extends BaseController { @Autowired private ISysMenuService menuService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/LoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java similarity index 94% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/LoginController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java index 5161a5ee..bee5738d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/LoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java @@ -21,7 +21,7 @@ import com.ruoyi.web.core.base.BaseController; * @author ruoyi */ @Controller -public class LoginController extends BaseController +public class SysLoginController extends BaseController { @GetMapping("/login") public String login(HttpServletRequest request, HttpServletResponse response) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/MenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java similarity index 95% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/MenuController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java index e952ec3a..815785fb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/MenuController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java @@ -27,7 +27,7 @@ import com.ruoyi.web.core.base.BaseController; */ @Controller @RequestMapping("/system/menu") -public class MenuController extends BaseController +public class SysMenuController extends BaseController { private String prefix = "system/menu"; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/NoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java similarity index 94% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/NoticeController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java index 070d94bf..b96941fe 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/NoticeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java @@ -26,7 +26,7 @@ import com.ruoyi.web.core.base.BaseController; */ @Controller @RequestMapping("/system/notice") -public class NoticeController extends BaseController +public class SysNoticeController extends BaseController { private String prefix = "system/notice"; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/PostController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java similarity index 95% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/PostController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java index 0207b182..5842b9f1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/PostController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java @@ -27,7 +27,7 @@ import com.ruoyi.web.core.base.BaseController; */ @Controller @RequestMapping("/system/post") -public class PostController extends BaseController +public class SysPostController extends BaseController { private String prefix = "system/post"; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ProfileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java similarity index 93% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ProfileController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java index 80bc6f18..8730d245 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ProfileController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java @@ -30,9 +30,9 @@ import com.ruoyi.web.core.base.BaseController; */ @Controller @RequestMapping("/system/user/profile") -public class ProfileController extends BaseController +public class SysProfileController extends BaseController { - private static final Logger log = LoggerFactory.getLogger(ProfileController.class); + private static final Logger log = LoggerFactory.getLogger(SysProfileController.class); private String prefix = "system/user/profile"; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/RoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java similarity index 95% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/RoleController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java index 03daf1f9..8e8d24c8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/RoleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java @@ -28,7 +28,7 @@ import com.ruoyi.web.core.base.BaseController; */ @Controller @RequestMapping("/system/role") -public class RoleController extends BaseController +public class SysRoleController extends BaseController { private String prefix = "system/role"; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java similarity index 96% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index 3be871b4..54a82b10 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -32,7 +32,7 @@ import com.ruoyi.web.core.base.BaseController; */ @Controller @RequestMapping("/system/user") -public class UserController extends BaseController +public class SysUserController extends BaseController { private String prefix = "system/user"; diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 571f66d4..3ec6911a 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -127,7 +127,7 @@ gen: # 作者 author: ruoyi # 默认生成包路径 module 需改成自己的模块名称 如 system monitor tool - packageName: com.ruoyi.project.module + packageName: com.ruoyi.module # 自动去除表前缀，默认是true autoRemovePre: true # 表前缀(类名不会包含表前缀) diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js index b2156cbe..c2cd7acd 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -468,6 +468,10 @@ url = $.table._option.updateUrl.replace("{id}", id); } else { var id = $.common.isEmpty($.table._option.id) ? $.table.selectFirstColumns() : $.table.selectColumns($.table._option.id); + if (id.length == 0) { + $.modal.alertWarning("请至少选择一条记录"); + return; + } url = $.table._option.updateUrl.replace("{id}", id); } $.modal.open("修改" + $.table._option.modalName, url); @@ -475,7 +479,7 @@ // 工具栏表格树修改 editTree: function() { var row = $('#bootstrap-table').bootstrapTreeTable('getSelections')[0]; - if ($.common.isEmpty(row)) { + if ($.common.isEmpty(row)) { $.modal.alertWarning("请至少选择一条记录"); return; } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/Global.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/Global.java index 5a23bd92..ecd8e292 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/config/Global.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/config/Global.java @@ -102,8 +102,7 @@ public class Global */ public static Boolean isAddressEnabled() { - String value = getConfig("ruoyi.addressEnabled"); - return Boolean.TRUE.equals(value); + return Boolean.valueOf(getConfig("ruoyi.addressEnabled")); } /** diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java index 40979af6..26fa726e 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java @@ -20,7 +20,7 @@ import com.ruoyi.generator.domain.TableInfo; public class GenUtils { /** 项目空间路径 */ - private static final String PROJECT_PATH = "main/java/com/ruoyi/project"; + private static final String PROJECT_PATH = "main/java/com/ruoyi"; /** mybatis空间路径 */ private static final String MYBATIS_PATH = "main/resources/mybatis"; @@ -71,7 +71,7 @@ public class GenUtils velocityContext.put("classname", table.getClassname()); velocityContext.put("moduleName", GenUtils.getModuleName(packageName)); velocityContext.put("columns", table.getColumns()); - velocityContext.put("package", packageName + "." + table.getClassname()); + velocityContext.put("package", packageName); velocityContext.put("author", Global.getAuthor()); velocityContext.put("datetime", DateUtils.getDate()); return velocityContext; @@ -85,16 +85,16 @@ public class GenUtils public static List getTemplates() { List templates = new ArrayList(); - templates.add("templates/vm/java/domain.java.vm"); - templates.add("templates/vm/java/Mapper.java.vm"); - templates.add("templates/vm/java/Service.java.vm"); - templates.add("templates/vm/java/ServiceImpl.java.vm"); - templates.add("templates/vm/java/Controller.java.vm"); - templates.add("templates/vm/xml/Mapper.xml.vm"); - templates.add("templates/vm/html/list.html.vm"); - templates.add("templates/vm/html/add.html.vm"); - templates.add("templates/vm/html/edit.html.vm"); - templates.add("templates/vm/sql/sql.vm"); + templates.add("vm/java/domain.java.vm"); + templates.add("vm/java/Mapper.java.vm"); + templates.add("vm/java/Service.java.vm"); + templates.add("vm/java/ServiceImpl.java.vm"); + templates.add("vm/java/Controller.java.vm"); + templates.add("vm/xml/Mapper.xml.vm"); + templates.add("vm/html/list.html.vm"); + templates.add("vm/html/add.html.vm"); + templates.add("vm/html/edit.html.vm"); + templates.add("vm/sql/sql.vm"); return templates; } @@ -127,11 +127,6 @@ public class GenUtils String mybatisPath = MYBATIS_PATH + "/" + moduleName + "/" + className; String htmlPath = TEMPLATES_PATH + "/" + moduleName + "/" + classname; - if (StringUtils.isNotEmpty(classname)) - { - javaPath += classname.replace(".", "/") + "/"; - } - if (template.contains("domain.java.vm")) { return javaPath + "domain" + "/" + className + ".java"; @@ -229,6 +224,6 @@ public class GenUtils { System.out.println(StringUtils.convertToCamelCase("user_name")); System.out.println(replaceKeyword("岗位信息表")); - System.out.println(getModuleName("com.ruoyi.project.system")); + System.out.println(getModuleName("com.ruoyi.system")); } } diff --git a/ruoyi-admin/src/main/resources/templates/vm/html/add.html.vm b/ruoyi-generator/src/main/resources/vm/html/add.html.vm similarity index 100% rename from ruoyi-admin/src/main/resources/templates/vm/html/add.html.vm rename to ruoyi-generator/src/main/resources/vm/html/add.html.vm diff --git a/ruoyi-admin/src/main/resources/templates/vm/html/edit.html.vm b/ruoyi-generator/src/main/resources/vm/html/edit.html.vm similarity index 100% rename from ruoyi-admin/src/main/resources/templates/vm/html/edit.html.vm rename to ruoyi-generator/src/main/resources/vm/html/edit.html.vm diff --git a/ruoyi-admin/src/main/resources/templates/vm/html/list.html.vm b/ruoyi-generator/src/main/resources/vm/html/list.html.vm similarity index 100% rename from ruoyi-admin/src/main/resources/templates/vm/html/list.html.vm rename to ruoyi-generator/src/main/resources/vm/html/list.html.vm diff --git a/ruoyi-admin/src/main/resources/templates/vm/java/Controller.java.vm b/ruoyi-generator/src/main/resources/vm/java/Controller.java.vm similarity index 89% rename from ruoyi-admin/src/main/resources/templates/vm/java/Controller.java.vm rename to ruoyi-generator/src/main/resources/vm/java/Controller.java.vm index ac8fe2c6..f086aef4 100644 --- a/ruoyi-admin/src/main/resources/templates/vm/java/Controller.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/Controller.java.vm @@ -1,4 +1,4 @@ -package ${package}.controller; +package ${package}.web.controller; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -10,13 +10,13 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.framework.aspectj.lang.annotation.Log; -import com.ruoyi.framework.aspectj.lang.enums.BusinessType; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; import ${package}.domain.${className}; import ${package}.service.I${className}Service; -import com.ruoyi.framework.web.controller.BaseController; +import com.ruoyi.web.core.base.BaseController; import com.ruoyi.framework.web.page.TableDataInfo; -import com.ruoyi.framework.web.domain.AjaxResult; +import com.ruoyi.common.base.AjaxResult; /** * ${tableComment} 信息操作处理 diff --git a/ruoyi-admin/src/main/resources/templates/vm/java/Mapper.java.vm b/ruoyi-generator/src/main/resources/vm/java/Mapper.java.vm similarity index 100% rename from ruoyi-admin/src/main/resources/templates/vm/java/Mapper.java.vm rename to ruoyi-generator/src/main/resources/vm/java/Mapper.java.vm diff --git a/ruoyi-admin/src/main/resources/templates/vm/java/Service.java.vm b/ruoyi-generator/src/main/resources/vm/java/Service.java.vm similarity index 100% rename from ruoyi-admin/src/main/resources/templates/vm/java/Service.java.vm rename to ruoyi-generator/src/main/resources/vm/java/Service.java.vm diff --git a/ruoyi-admin/src/main/resources/templates/vm/java/ServiceImpl.java.vm b/ruoyi-generator/src/main/resources/vm/java/ServiceImpl.java.vm similarity index 100% rename from ruoyi-admin/src/main/resources/templates/vm/java/ServiceImpl.java.vm rename to ruoyi-generator/src/main/resources/vm/java/ServiceImpl.java.vm diff --git a/ruoyi-admin/src/main/resources/templates/vm/java/domain.java.vm b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm similarity index 91% rename from ruoyi-admin/src/main/resources/templates/vm/java/domain.java.vm rename to ruoyi-generator/src/main/resources/vm/java/domain.java.vm index b5cb541e..ed74b335 100644 --- a/ruoyi-admin/src/main/resources/templates/vm/java/domain.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm @@ -2,7 +2,7 @@ package ${package}.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.framework.web.domain.BaseEntity; +import com.ruoyi.common.base.BaseEntity; #foreach ($column in $columns) #if($column.attrType == 'Date') import java.util.Date; diff --git a/ruoyi-admin/src/main/resources/templates/vm/sql/sql.vm b/ruoyi-generator/src/main/resources/vm/sql/sql.vm similarity index 100% rename from ruoyi-admin/src/main/resources/templates/vm/sql/sql.vm rename to ruoyi-generator/src/main/resources/vm/sql/sql.vm diff --git a/ruoyi-admin/src/main/resources/templates/vm/xml/Mapper.xml.vm b/ruoyi-generator/src/main/resources/vm/xml/Mapper.xml.vm similarity index 100% rename from ruoyi-admin/src/main/resources/templates/vm/xml/Mapper.xml.vm rename to ruoyi-generator/src/main/resources/vm/xml/Mapper.xml.vm