【v3.3.0】 1、uniapp 首页菜单功能区多平台适配;2、菜单组件路径说明;3、长时间不在线自动返回登录页;4、标签页 tab 为圆角;5、升级 sa token 到 1.37.0;6、代码生成表单弹窗 关闭事件;7、接口操作日志@OperateLogAspect 对文件的处理;

Author: zhuoda

smart-admin-api/pom.xml

@@ -47,7 +47,7 @@
         <jjwt.version>0.9.1</jjwt.version>
         <jwks-rsa.version>0.9.0</jwks-rsa.version>
         <velocity-tools.version>3.1</velocity-tools.version>
-        <sa-token.version>1.35.0.RC</sa-token.version>
+        <sa-token.version>1.37.0</sa-token.version>
         <ip2region.version>2.7.0</ip2region.version>
         <bcprov.version>1.59</bcprov.version>
         <jackson-datatype-jsr310.version>2.13.4</jackson-datatype-jsr310.version>

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java

@@ -159,8 +159,8 @@ public ResponseDTO<LoginResultVO> login(LoginForm loginForm, String ip, String u
 
             // 对于万能密码：受限制sa token 要求loginId唯一，万能密码只能插入一段uuid
             String saTokenLoginId = SUPER_PASSWORD_LOGIN_ID_PREFIX + StringConst.COLON + UUID.randomUUID().toString().replace("-", "") + StringConst.COLON + employeeEntity.getEmployeeId();
-            // 万能密码登录只能登录15分钟
-            StpUtil.login(saTokenLoginId, 900);
+            // 万能密码登录只能登录30分钟
+            StpUtil.login(saTokenLoginId, 1800);
 
         } else {
 

smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/core/OperateLogAspect.java

@@ -27,6 +27,7 @@
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
+import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.annotation.Resource;
@@ -238,6 +239,7 @@ private String buildParamString(Object[] args) {
             if (arg instanceof HttpServletRequest
                     || arg instanceof HttpServletResponse
                     || arg instanceof ModelAndView
+                    || arg instanceof MultipartFile
                     || arg instanceof BindResult) {
                 continue;
             }

smart-admin-api/sa-base/src/main/resources/code-generator-template/js/form.vue.vm

@@ -3,7 +3,7 @@ spring:
   datasource:
     url: jdbc:mysql://127.0.0.1:3306/smart_admin_v3?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
     username: root
-    password: Zhuoda#1024lab
+    password: Zhuoda1024lab
     initial-size: 10
     min-idle: 10
     max-active: 100

smart-admin-api/sa-base/src/main/resources/prod/sa-base.yaml

@@ -3,7 +3,7 @@ spring:
   datasource:
     url: jdbc:p6spy:mysql://127.0.0.1:3306/smart_admin_v3?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
     username: root
-    password: Java@1024
+    password: Zhuoda1024lab
     initial-size: 2
     min-idle: 2
     max-active: 10

smart-admin-api/sa-base/src/main/resources/test/sa-base.yaml

@@ -1,11 +1,11 @@
 <!---
   * 字段 下拉选择框
-  * 
+  *
   * @Author:    1024创新实验室：罗伊
-  * @Date:      2022-09-12 22:06:45 
-  * @Wechat:    zhuda1024 
-  * @Email:     [email protected] 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  * @Date:      2022-09-12 22:06:45
+  * @Wechat:    zhuda1024
+  * @Email:     [email protected]
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
   *
 -->
 <template>
@@ -108,7 +108,7 @@
       emit('update:value', valueList);
       emit('change', valueList);
     } else {
-      let findValue = dictValueList.value.find((e) => e.valueCode == value);
+      let findValue = dictValueList.value.find((e) => e.valueCode === value);
       emit('update:value', findValue.valueCode);
       emit('change', findValue.valueCode);
     }

smart-admin-web/javascript-ant-design-vue3/src/components/support/dict-select/index.vue

@@ -1,11 +1,11 @@
 <!--
   * 标签页
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-06 20:29:12 
-  * @Wechat:    zhuda1024 
-  * @Email:     [email protected] 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-06 20:29:12
+  * @Wechat:    zhuda1024
+  * @Email:     [email protected]
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
   <!-- 标签页，共两部分：1、标签 ；2、标签操作区 -->
@@ -130,6 +130,7 @@
 
   const { useToken } = theme;
   const { token } = useToken();
+  const borderRadius = token.value.borderRadius + 'px';
 </script>
 
 <style scoped lang="less">
@@ -199,6 +200,7 @@
 
     :deep(.ant-tabs-small > .ant-tabs-nav .ant-tabs-tab) {
       padding: 5px 8px 3px 10px;
+      border-radius: v-bind(borderRadius);
     }
 
     :deep(.ant-tabs-tab-active) {

smart-admin-web/javascript-ant-design-vue3/src/layout/components/page-tag/index.vue

@@ -47,7 +47,7 @@
           <a-form-item v-if="form.frameFlag" label="外链地址" name="frameUrl">
             <a-input v-model:value="form.frameUrl" placeholder="请输入外链地址" />
           </a-form-item>
-          <a-form-item v-else label="组件地址" name="component">
+          <a-form-item v-else label="组件地址" name="component" help="比如 商品列表：/business/erp/goods/goods-list.vue">
             <a-input v-model:value="form.component" placeholder="请输入组件地址 默认带有开头/@/views" />
           </a-form-item>
         </template>
@@ -91,9 +91,8 @@
         </a-form-item>
       </template>
       <!--      按钮 end   -->
-      <a-form-item label="排序" name="sort">
+      <a-form-item label="排序" name="sort" help="值越小越靠前">
         <a-input-number v-model:value="form.sort" :min="0" placeholder="请输入排序" style="width: 100px" />
-        <h6 style="color: #ababab">值越小越靠前</h6>
       </a-form-item>
     </a-form>
     <div class="footer">

smart-admin-web/javascript-ant-design-vue3/src/views/system/menu/components/menu-operate-modal.vue

@@ -0,0 +1,2 @@
+### **敬请期待，2024年5月开干**
+