diff --git a/README.md b/README.md index 2ebf87099..8fb27541e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ ## 平台简介 + 本项目FORK自 [若依/RuoYi](https://gitee.com/y_project/RuoYi) 暂时花了几分钟时间把自己整合过的功能传上来： ###### 多数据源切面 @@ -32,7 +33,9 @@ ## 在线体验 > admin/admin123 -地址：http://www.ruoyi.vip +演示地址：http://ruoyi.vip + +文档地址：http://doc.ruoyi.vip ## 演示图 diff --git a/bin/clean.bat b/bin/clean.bat new file mode 100644 index 000000000..4462a0110 --- /dev/null +++ b/bin/clean.bat @@ -0,0 +1,14 @@ +@echo off +echo. +echo [Ϣ] · +echo. +pause +echo. + +cd %~dp0 +cd.. + +call mvn clean + +cd bin +pause \ No newline at end of file diff --git a/package.bat b/bin/package.bat similarity index 96% rename from package.bat rename to bin/package.bat index 7879e80d3..dc756fbd3 100644 --- a/package.bat +++ b/bin/package.bat @@ -6,6 +6,7 @@ pause echo. cd %~dp0 +cd.. call mvn clean package -Dmaven.test.skip=true diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobLogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobLogController.java index a8669985a..1e98551cc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobLogController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobLogController.java @@ -4,7 +4,9 @@ import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.GetMapping; +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; @@ -12,10 +14,10 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.base.AjaxResult; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.ExcelUtil; +import com.ruoyi.framework.web.base.BaseController; import com.ruoyi.framework.web.page.TableDataInfo; import com.ruoyi.quartz.domain.SysJobLog; import com.ruoyi.quartz.service.ISysJobLogService; -import com.ruoyi.framework.web.base.BaseController; /** * 调度日志操作处理 @@ -68,6 +70,14 @@ public class SysJobLogController extends BaseController return toAjax(jobLogService.deleteJobLogByIds(ids)); } + @RequiresPermissions("monitor:job:detail") + @GetMapping("/detail/{jobLogId}") + public String detail(@PathVariable("jobLogId") Long jobLogId, ModelMap mmap) + { + mmap.put("jobLog", jobLogService.selectJobLogById(jobLogId)); + return prefix + "/detail"; + } + @Log(title = "调度日志", businessType = BusinessType.CLEAN) @RequiresPermissions("monitor:job:remove") @PostMapping("/clean") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java index 5420cb503..f0d072245 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java @@ -27,7 +27,7 @@ public class SysIndexController extends BaseController public String index(ModelMap mmap) { // 取身份信息 - SysUser user = getUser(); + SysUser user = getSysUser(); // 根据用户id取出菜单 List menus = menuService.selectMenusByUser(user); mmap.put("menus", menus); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java index 810e35d08..f0031743b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java @@ -17,7 +17,7 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.base.AjaxResult; import com.ruoyi.common.config.Global; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.framework.shiro.service.PasswordService; +import com.ruoyi.framework.shiro.service.SysPasswordService; import com.ruoyi.framework.util.FileUploadUtils; import com.ruoyi.framework.util.ShiroUtils; import com.ruoyi.system.domain.SysUser; @@ -42,7 +42,7 @@ public class SysProfileController extends BaseController private ISysUserService userService; @Autowired - private PasswordService passwordService; + private SysPasswordService passwordService; @Autowired private ISysDictDataService dictDataService; @@ -53,7 +53,7 @@ public class SysProfileController extends BaseController @GetMapping() public String profile(ModelMap mmap) { - SysUser user = getUser(); + SysUser user = getSysUser(); user.setSex(dictDataService.selectDictLabel("sys_user_sex", user.getSex())); mmap.put("user", user); mmap.put("roleGroup", userService.selectUserRoleGroup(user.getUserId())); @@ -65,7 +65,7 @@ public class SysProfileController extends BaseController @ResponseBody public boolean checkPassword(String password) { - SysUser user = getUser(); + SysUser user = getSysUser(); String encrypt = new Md5Hash(user.getLoginName() + password + user.getSalt()).toHex().toString(); if (user.getPassword().equals(encrypt)) { @@ -91,7 +91,7 @@ public class SysProfileController extends BaseController int rows = userService.resetUserPwd(user); if (rows > 0) { - setUser(userService.selectUserById(user.getUserId())); + setSysUser(userService.selectUserById(user.getUserId())); return success(); } return error(); @@ -127,7 +127,7 @@ public class SysProfileController extends BaseController { if (userService.updateUserInfo(user) > 0) { - setUser(userService.selectUserById(user.getUserId())); + setSysUser(userService.selectUserById(user.getUserId())); return success(); } return error(); @@ -149,7 +149,7 @@ public class SysProfileController extends BaseController user.setAvatar(avatar); if (userService.updateUserInfo(user) > 0) { - setUser(userService.selectUserById(user.getUserId())); + setSysUser(userService.selectUserById(user.getUserId())); return success(); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index 938bb7c08..c00f7439b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -16,7 +16,7 @@ import com.ruoyi.common.base.AjaxResult; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.ExcelUtil; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.shiro.service.PasswordService; +import com.ruoyi.framework.shiro.service.SysPasswordService; import com.ruoyi.framework.util.ShiroUtils; import com.ruoyi.framework.web.page.TableDataInfo; import com.ruoyi.system.domain.SysUser; @@ -46,7 +46,7 @@ public class SysUserController extends BaseController private ISysPostService postService; @Autowired - private PasswordService passwordService; + private SysPasswordService passwordService; @RequiresPermissions("system:user:view") @GetMapping() diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 07dda1ac4..9d13d6aab 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -131,8 +131,8 @@ xss: gen: # 作者 author: ruoyi - # 默认生成包路径 module 需改成自己的模块名称 如 system monitor tool - packageName: com.ruoyi.module + # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool + packageName: com.ruoyi.system # 自动去除表前缀，默认是true autoRemovePre: true # 表前缀(类名不会包含表前缀) diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js index 64b2a8347..61dacd9d3 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js @@ -68,6 +68,22 @@ $(function() { }); }); } + // laydate time-input 时间控件绑定 + if ($(".time-input").length > 0) { + layui.use('laydate', function() { + var laydate = layui.laydate; + var times = $(".time-input"); + for (var i = 0; i < times.length; i++) { + var time = times[i]; + laydate.render({ + elem: time, + theme: 'molv', + trigger: 'click', + done: function(value, date) {} + }); + } + }); + } // tree 关键字搜索绑定 if ($("#keyword").length > 0) { $("#keyword").bind("focus", function focusKey(e) { @@ -91,9 +107,9 @@ $(function() { var expandFlag = false; $("#expandAllBtn").click(function() { if (expandFlag) { - $('#bootstrap-table').bootstrapTreeTable('expandAll'); + $('#bootstrap-tree-table').bootstrapTreeTable('expandAll'); } else { - $('#bootstrap-table').bootstrapTreeTable('collapseAll'); + $('#bootstrap-tree-table').bootstrapTreeTable('collapseAll'); } expandFlag = expandFlag ? false: 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 b6846d12d..f015f1a83 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 @@ -99,7 +99,6 @@ // 刷新表格 refresh: function() { $("#bootstrap-table").bootstrapTable('refresh', { - url: $.table._option.url, silent: true }); }, @@ -135,7 +134,7 @@ $.table._option = options; _striped = $.common.isEmpty(options.striped) ? false : options.striped; _expandColumn = $.common.isEmpty(options.expandColumn) ? '1' : options.expandColumn; - var treeTable = $('#bootstrap-table').bootstrapTreeTable({ + var treeTable = $('#bootstrap-tree-table').bootstrapTreeTable({ code: options.code, // 用于设置父子关系 parentCode: options.parentCode, // 用于设置父子关系 type: 'get', // 请求方式（*） @@ -528,7 +527,7 @@ dataType: "json", data: data, success: function(result) { - $.operate.saveSuccess(result); + $.operate.successCallback(result); } }; $.ajax(config) @@ -543,7 +542,7 @@ } $.modal.closeLoading(); }, - // 保存结果提示msg + // 成功结果提示msg（父窗体全局更新） saveSuccess: function (result) { if (result.code == web_status.SUCCESS) { $.modal.msgReload("保存成功,正在刷新数据请稍后……", modal_status.SUCCESS); @@ -551,6 +550,25 @@ $.modal.alertError(result.msg); } $.modal.closeLoading(); + }, + // 成功回调执行事件（父窗体静默更新） + successCallback: function(result) { + if (result.code == web_status.SUCCESS) { + if (window.parent.$("#bootstrap-table").length > 0) { + $.modal.close(); + window.parent.$.modal.msgSuccess(result.msg); + window.parent.$.table.refresh(); + } else if (window.parent.$("#bootstrap-tree-table").length > 0) { + $.modal.close(); + window.parent.$.modal.msgSuccess(result.msg); + window.parent.$.treeTable.refresh(); + } else { + $.modal.msgReload("保存成功,正在刷新数据请稍后……", modal_status.SUCCESS); + } + } else { + $.modal.alertError(result.msg); + } + $.modal.closeLoading(); } }, // 校验封装处理 diff --git a/ruoyi-admin/src/main/resources/templates/monitor/job/detail.html b/ruoyi-admin/src/main/resources/templates/monitor/job/detail.html new file mode 100644 index 000000000..ec9c71248 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/monitor/job/detail.html @@ -0,0 +1,49 @@ + + + + + +
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+ + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/monitor/job/jobLog.html b/ruoyi-admin/src/main/resources/templates/monitor/job/jobLog.html index 1fc415d3e..cce505c44 100644 --- a/ruoyi-admin/src/main/resources/templates/monitor/job/jobLog.html +++ b/ruoyi-admin/src/main/resources/templates/monitor/job/jobLog.html @@ -57,7 +57,7 @@