v1.10.0

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

@@ -1,19 +1,13 @@
-1 更新密码
+1 超管默认账号
-EmployeeController.updatePwd
-
-2 更新功能点
-PrivilegeController functionSaveOrUpdate和menuBatchSave、batchSaveFunctionList
-
-3 超管默认账号
 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());
+        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

smart-admin-web/package.json

@@ -23,6 +23,7 @@
     "cropperjs": "^1.2.2",
     "dayjs": "^1.7.7",
     "decimal.js": "^10.1.1",
+    "e-guide-layer": "^0.1.1",
     "echarts": "^4.0.4",
     "gq-plus": "^2.1.5",
     "html2canvas": "^1.0.0-alpha.12",

smart-admin-web/src/components/main/components/header-bar/header-bar.less

@@ -12,3 +12,8 @@
     }
   }
 }
+
+
+.step-bottom-btn{
+  width: 380px !important;
+}

smart-admin-web/src/components/main/components/header-bar/header-bar.vue

@@ -6,7 +6,7 @@
       icon="icon iconfont icondaohangzhedie"
     />
 
-    <div class="custom-bread-crumb" style="margin-left: 30px;">
+    <div class="custom-bread-crumb" style="margin-left: 30px;" id="topMenuSelectDiv">
       <div class="ivu-breadcrumb" >
          <Dropdown @on-click="changeTopMenu">
           <a href="javascript:void(0)" style="font-size:15px;font-weight:600">
@@ -35,6 +35,11 @@
     <div class="custom-content-con">
       <slot></slot>
     </div>
+
+    <e-guide-layer
+      :current-index.sync="guideActiveIndex"
+      :guide-list="guideList"
+    />
   </div>
 </template>
 <script>
@@ -64,6 +69,27 @@ export default {
       required:true
     }
   },
+  data(){
+    return {
+      guideActiveIndex: 0,
+      guideList: [
+        {
+          confirmBtnText: '第一步：选择顶级菜单（SmartAdmin是支持四级菜单的哦）',
+          targetDom: '#topMenuSelectDiv',
+          clickHandle: () => {
+            this.guideActiveIndex = 1
+          },
+        },
+        {
+          confirmBtnText: '第二步：选择顶级下单下的三级菜单',
+          targetDom: '.side-menu-wrapper',
+          clickHandle: () => {
+            this.guideActiveIndex = 2
+          }
+        }
+      ],
+    }
+  },
   computed: {
     // 面包屑集合
     breadCrumbList() {
@@ -80,3 +106,5 @@ export default {
   }
 };
 </script>
+
+

smart-admin-web/src/main.js

@@ -26,6 +26,10 @@ import tableAction from './lib/table-action';
 // 时间
 import moment from 'moment';
 
+import 'e-guide-layer/dist/e-guide-layer.css'
+import eGuideLayer from 'e-guide-layer'
+
+Vue.use(eGuideLayer);
 
 Vue.prototype.$tableAction = tableAction;
 Vue.use(Enum, { enumInfo });