v1.10.0

smart-admin-service/smart-admin-api/doc/readme.txt

@@ -1,19 +1,13 @@
-1 更新密码
-EmployeeController.updatePwd
-
-2 更新功能点
-PrivilegeController functionSaveOrUpdate和menuBatchSave、batchSaveFunctionList
-
-3 超管默认账号
+1 超管默认账号
 sa/123456
 
-4 执行脚本：
+2 执行脚本：
 先执行：src/main/resources/sql/smart-admin.sql
 再执行：src/main/resources/sql/quartz_mysql_2.3.0.sql
 
-5 除dev之外文件
+3 除dev之外文件
 
-6 刷新页面，获取权限是否走缓存
+4 刷新页面，获取权限是否走缓存
 LoginService.getSession
 
-7 test类中去掉代码生成run
+5 test类中去掉代码生成run

smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/service/QuartzTask.java

@@ -47,7 +47,11 @@ public class QuartzTask extends QuartzJobBean {
         QuartzTaskLogEntity taskLogEntity = new QuartzTaskLogEntity();
         taskLogEntity.setTaskId(taskId);
         taskLogEntity.setIpAddress(SmartIPUtil.getLocalHostIP());
-        taskLogEntity.setTaskName(quartzTaskEntity.getTaskName());
+        try {
+            taskLogEntity.setTaskName(quartzTaskEntity.getTaskName());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         String paramsStr = null;
         if (params != null) {
             paramsStr = params.toString();

smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/EmployeeController.java

@@ -86,7 +86,6 @@ public class EmployeeController {
     public ResponseDTO<String> updatePwd(@Valid @RequestBody EmployeeUpdatePwdDTO updatePwdDTO) {
         RequestTokenBO requestToken = SmartRequestTokenUtil.getRequestUser();
         return employeeService.updatePwd(updatePwdDTO, requestToken);
-//        return ResponseDTO.succ();
     }
 
     @ApiOperation(value = "通过部门id获取当前部门的人员&没有部门的人", notes = "@author yandanyang")

smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/controller/PrivilegeController.java

@@ -42,7 +42,6 @@ public class PrivilegeController {
     @PostMapping("/privilege/menu/batchSaveMenu")
     public ResponseDTO<String> menuBatchSave(@Valid @RequestBody ValidateList<PrivilegeMenuDTO> menuList) {
         return privilegeService.menuBatchSave(menuList);
-//        return ResponseDTO.succ();
     }
 
 
@@ -57,14 +56,12 @@ public class PrivilegeController {
     @PostMapping("/privilege/function/saveOrUpdate")
     public ResponseDTO<String> functionSaveOrUpdate(@Valid @RequestBody PrivilegeFunctionDTO privilegeFunctionDTO) {
         return privilegeService.functionSaveOrUpdate(privilegeFunctionDTO);
-//        return ResponseDTO.succ();
     }
 
     @ApiOperation(value = "批量保存功能点")
     @PostMapping("/privilege/function/batchSave")
     public ResponseDTO<String>  batchSaveFunctionList(@Valid @RequestBody ValidateList<PrivilegeFunctionDTO> functionList) {
         return privilegeService.batchSaveFunctionList(functionList);
-//        return ResponseDTO.succ();
     }
 
 

smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties

@@ -44,7 +44,7 @@ spring.redis.host=127.0.0.1
 spring.redis.port=6379
 spring.redis.timeout=10000ms
 spring.redis.password=
-spring.redis.lettuce..pool.max-active=10
+spring.redis.lettuce.pool.max-active=10
 spring.redis.lettuce.pool.min-idle=5
 spring.redis.lettuce.pool.max-idle=10
 spring.redis.lettuce.pool.max-wait=30000ms

smart-admin-service/smart-admin-api/src/main/resources/pre/application.properties

@@ -44,7 +44,7 @@ spring.redis.host=127.0.0.1
 spring.redis.port=6379
 spring.redis.timeout=10000ms
 spring.redis.password=
-spring.redis.lettuce..pool.max-active=10
+spring.redis.lettuce.pool.max-active=10
 spring.redis.lettuce.pool.min-idle=5
 spring.redis.lettuce.pool.max-idle=10
 spring.redis.lettuce.pool.max-wait=30000ms

smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties

@@ -44,7 +44,7 @@ spring.redis.host=127.0.0.1
 spring.redis.port=6379
 spring.redis.timeout=10000ms
 spring.redis.password=Gq123456@
-spring.redis.lettuce..pool.max-active=10
+spring.redis.lettuce.pool.max-active=10
 spring.redis.lettuce.pool.min-idle=5
 spring.redis.lettuce.pool.max-idle=10
 spring.redis.lettuce.pool.max-wait=30000ms

smart-admin-service/smart-admin-api/src/main/resources/sit/application.properties

@@ -44,7 +44,7 @@ spring.redis.host=127.0.0.1
 spring.redis.port=6379
 spring.redis.timeout=10000ms
 spring.redis.password=
-spring.redis.lettuce..pool.max-active=10
+spring.redis.lettuce.pool.max-active=10
 spring.redis.lettuce.pool.min-idle=5
 spring.redis.lettuce.pool.max-idle=10
 spring.redis.lettuce.pool.max-wait=30000ms