【v3.3.0】 1、uniapp 首页菜单功能区多平台适配;2、菜单组件路径说明;3、长时间不在线自动返回登录页;4、标签页 tab 为…

…圆角;5、升级 sa token 到 1.37.0;6、代码生成表单弹窗关闭事件;7、接口操作日志@OperateLogAspect 对文件的处理;
1024-lab · Apr 28, 2024 · 9b354b2 · 9b354b2
1 parent fd27cd6
commit 9b354b2
Show file tree

Hide file tree

Showing 49 changed files with 321 additions and 312 deletions.
diff --git a/smart-admin-api/pom.xml b/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>

diff --git a/...sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java b/...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 {
 

diff --git a/...se/src/main/java/net/lab1024/sa/base/module/support/operatelog/core/OperateLogAspect.java b/...se/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;
             }

diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/form.vue.vm b/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/form.vue.vm
diff --git a/smart-admin-api/sa-base/src/main/resources/prod/sa-base.yaml b/smart-admin-api/sa-base/src/main/resources/prod/sa-base.yaml
@@ -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

diff --git a/smart-admin-api/sa-base/src/main/resources/test/sa-base.yaml b/smart-admin-api/sa-base/src/main/resources/test/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

diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/support/dict-select/index.vue b/smart-admin-web/javascript-ant-design-vue3/src/components/support/dict-select/index.vue
@@ -1,11 +1,11 @@
 <!---
   * 字段 下拉选择框
-  * 
+  *
   * @Author:    1024创新实验室：罗伊
-  * @Date:      2022-09-12 22:06:45 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  * @Date:      2022-09-12 22:06:45
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @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);
     }

diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/page-tag/index.vue b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/page-tag/index.vue
@@ -1,11 +1,11 @@
 <!--
   * 标签页
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-06 20:29:12 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-06 20:29:12
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @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) {

diff --git a/...in-web/javascript-ant-design-vue3/src/views/system/menu/components/menu-operate-modal.vue b/...in-web/javascript-ant-design-vue3/src/views/system/menu/components/menu-operate-modal.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">

diff --git a/smart-admin-web/typescript-ant-design-vue3/README.md b/smart-admin-web/typescript-ant-design-vue3/README.md
@@ -0,0 +1,2 @@
+### **敬请期待，2024年5月开干**
+
diff --git a/smart-app/.env.development b/smart-app/.env.development
@@ -1,3 +1,3 @@
 NODE_ENV=development
 VITE_APP_TITLE='SmartAdmin 开发环境(Dev)'
-VITE_APP_API_URL='http://127.0.0.1:1024'
+VITE_APP_API_URL='https://app.smartadmin.vip/smart-app-api'
diff --git a/smart-app/src/App.vue b/smart-app/src/App.vue
@@ -1,5 +1,5 @@
 <script>
-  import { useUserStore } from '/@/store/modules/system/user';
+  import { useUserStore } from '@/store/modules/system/user';
   export default {
     onLaunch: function () {
       useUserStore().getLoginInfo();

diff --git a/smart-app/src/api/business/goods/goods-api.js b/smart-app/src/api/business/goods/goods-api.js
@@ -5,7 +5,7 @@
  * @LastEditTime: 2022-06-23
  * @LastEditors: zhuoda
  */
-import { postRequest, getRequest } from '/@/lib/smart-request';
+import { postRequest, getRequest } from '@/lib/smart-request';
 
 export const goodsApi = {
   // 添加商品 @author zhuoda

diff --git a/smart-app/src/api/business/oa/enterprise-api.js b/smart-app/src/api/business/oa/enterprise-api.js
@@ -7,7 +7,7 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import { postRequest, getRequest } from '/@/lib/smart-request';
+import { postRequest, getRequest } from '@/lib/smart-request';
 
 export const enterpriseApi = {
   // 新建企业 @author 开云

diff --git a/smart-app/src/api/business/oa/notice-api.js b/smart-app/src/api/business/oa/notice-api.js
@@ -4,7 +4,7 @@
  * @Author: zhuoda
  * @Date: 2022-08-16 20:34:36
  */
-import { postRequest, getRequest } from '/@/lib/smart-request';
+import { postRequest, getRequest } from '@/lib/smart-request';
 
 export const noticeApi = {
   // ---------------- 通知公告类型 -----------------------

diff --git a/smart-app/src/api/support/change-log-api.js b/smart-app/src/api/support/change-log-api.js
@@ -5,7 +5,7 @@
  * @Date:      2022-09-26 14:53:50
  * @Copyright  1024创新实验室
  */
-import { postRequest, getRequest } from '/@/lib/smart-request';
+import { postRequest, getRequest } from '@/lib/smart-request';
 
 export const changeLogApi = {
   /**

diff --git a/smart-app/src/api/support/dict-api.js b/smart-app/src/api/support/dict-api.js
@@ -7,7 +7,7 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import { postRequest, getRequest } from '/@/lib/smart-request';
+import { postRequest, getRequest } from '@/lib/smart-request';
 
 export const dictApi = {
   // 分页查询数据字典KEY - @author 卓大

diff --git a/smart-app/src/api/support/file-api.js b/smart-app/src/api/support/file-api.js
@@ -5,7 +5,7 @@
  * @Date:      2022-09-26 14:53:50
  * @Copyright  1024创新实验室
  */
-import { uploadRequest } from '/@/lib/smart-request';
+import { uploadRequest } from '@/lib/smart-request';
 
 export const fileApi = {
   upload: (file, folder) => {

diff --git a/smart-app/src/api/system/login-api.js b/smart-app/src/api/system/login-api.js
@@ -7,7 +7,7 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import { getRequest, postRequest } from '/@/lib/smart-request';
+import { getRequest, postRequest } from '@/lib/smart-request';
 
 export const loginApi = {
   /**

diff --git a/smart-app/src/components/dict-select/index.vue b/smart-app/src/components/dict-select/index.vue
@@ -16,7 +16,7 @@
 
 <script setup>
   import { onMounted, ref, watch } from 'vue';
-  import { dictApi } from '/@/api/support/dict-api';
+  import { dictApi } from '@/api/support/dict-api';
 
   const props = defineProps({
     keyCode: String,

diff --git a/smart-app/src/lib/smart-request.js b/smart-app/src/lib/smart-request.js
@@ -7,10 +7,10 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import { USER_TOKEN } from '/@/constants/local-storage-key-const';
-import { DATA_TYPE_ENUM } from '/@/constants/common-const';
+import { USER_TOKEN } from '@/constants/local-storage-key-const';
+import { DATA_TYPE_ENUM } from '@/constants/common-const';
 import { decryptData, encryptData } from './encrypt';
-import { useUserStore } from '/@/store/modules/system/user';
+import { useUserStore } from '@/store/modules/system/user';
 
 const baseUrl = import.meta.env.VITE_APP_API_URL;
 

diff --git a/smart-app/src/main.js b/smart-app/src/main.js
@@ -6,8 +6,8 @@ import { store } from './store/index';
 import './theme/index.scss';
 
 // 枚举管理
-import smartEnumPlugin from '/@/plugins/smart-enums-plugin';
-import constantsInfo from '/@/constants/index';
+import smartEnumPlugin from '@/plugins/smart-enums-plugin';
+import constantsInfo from '@/constants/index';
 import lodash from 'lodash';
 
 export function createApp() {

diff --git a/smart-app/src/manifest.json b/smart-app/src/manifest.json
@@ -1,5 +1,5 @@
 {
-    "name" : "",
+    "name" : "smart-app",
     "appid" : "",
     "description" : "",
     "versionName" : "1.0.0",
@@ -50,7 +50,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "",
+        "appid" : "wx2f5032ef5c4adae4",
         "setting" : {
             "urlCheck" : false
         },

diff --git a/smart-app/src/pages/enterprise/enterprise-detail.vue b/smart-app/src/pages/enterprise/enterprise-detail.vue
@@ -83,12 +83,12 @@
 </template>
 
 <script setup>
-  import SmartDetailTabs from '/@/components/smart-detail-tabs/index.vue';
+  import SmartDetailTabs from '@/components/smart-detail-tabs/index.vue';
   import { ref, reactive } from 'vue';
-  import { enterpriseApi } from '/@/api/business/oa/enterprise-api';
+  import { enterpriseApi } from '@/api/business/oa/enterprise-api';
   import { onShow, onLoad } from '@dcloudio/uni-app';
-  import { smartSentry } from '/@/lib/smart-sentry';
-  import { SmartLoading, SmartToast } from '/@/lib/smart-support';
+  import { smartSentry } from '@/lib/smart-sentry';
+  import { SmartLoading, SmartToast } from '@/lib/smart-support';
 
   // ----------------------- tab -----------------------
 

diff --git a/smart-app/src/pages/enterprise/enterprise-form.vue b/smart-app/src/pages/enterprise/enterprise-form.vue
@@ -48,11 +48,11 @@
 
 <script setup>
   import { reactive, ref } from 'vue';
-  import { enterpriseApi } from '/@/api/business/oa/enterprise-api';
-  import { regular } from '/@/constants/regular-const';
-  import SmartEnumRadio from '/@/components/smart-enum-radio/index.vue';
-  import { smartSentry } from '/@/lib/smart-sentry';
-  import { SmartLoading, SmartToast } from '/@/lib/smart-support';
+  import { enterpriseApi } from '@/api/business/oa/enterprise-api';
+  import { regular } from '@/constants/regular-const';
+  import SmartEnumRadio from '@/components/smart-enum-radio/index.vue';
+  import { smartSentry } from '@/lib/smart-sentry';
+  import { SmartLoading, SmartToast } from '@/lib/smart-support';
   import { onLoad, onReady, onShow } from '@dcloudio/uni-app';
 
   // --------------------- 表单 ---------------------

diff --git a/smart-app/src/pages/enterprise/enterprise-list.vue b/smart-app/src/pages/enterprise/enterprise-list.vue
@@ -55,10 +55,10 @@
 
 <script setup>
   import { reactive, ref } from 'vue';
-  import { enterpriseApi } from '/@/api/business/oa/enterprise-api';
+  import { enterpriseApi } from '@/api/business/oa/enterprise-api';
   import { onPageScroll, onReachBottom, onShow } from '@dcloudio/uni-app';
   import useMescroll from '@/uni_modules/uni-mescroll/hooks/useMescroll';
-  import { smartSentry } from '/@/lib/smart-sentry';
+  import { smartSentry } from '@/lib/smart-sentry';
   import _ from 'lodash';
 
   // --------------------------- 查询 ---------------------------------

diff --git a/smart-app/src/pages/goods/components/goods-query-form-popup.vue b/smart-app/src/pages/goods/components/goods-query-form-popup.vue
@@ -30,8 +30,8 @@
 
 <script setup>
   import { reactive, ref, toRaw } from 'vue';
-  import DictSelect from '/@/components/dict-select/index.vue';
-  import SmartEnumSelect from '/@/components/smart-enum-select/index.vue';
+  import DictSelect from '@/components/dict-select/index.vue';
+  import SmartEnumSelect from '@/components/smart-enum-select/index.vue';
 
   const emits = defineEmits(['close']);
   defineExpose({ show });

diff --git a/smart-app/src/pages/goods/goods-index.vue b/smart-app/src/pages/goods/goods-index.vue
@@ -46,10 +46,10 @@
 <script setup>
   import { reactive, ref } from 'vue';
   import QueryFormPopUp from './components/goods-query-form-popup.vue';
-  import { goodsApi } from '/@/api/business/goods/goods-api';
+  import { goodsApi } from '@/api/business/goods/goods-api';
   import { onPageScroll, onReachBottom } from '@dcloudio/uni-app';
   import useMescroll from '@/uni_modules/uni-mescroll/hooks/useMescroll';
-  import { smartSentry } from '/@/lib/smart-sentry';
+  import { smartSentry } from '@/lib/smart-sentry';
   import NoticeList from './components/goods-list.vue';
   import _ from 'lodash';
 

diff --git a/smart-app/src/pages/home/components/goods.vue b/smart-app/src/pages/home/components/goods.vue
@@ -26,9 +26,9 @@
 
 <script setup>
   import { ref } from 'vue';
-  import { smartSentry } from '/@/lib/smart-sentry';
+  import { smartSentry } from '@/lib/smart-sentry';
   import { onShow } from '@dcloudio/uni-app';
-  import { goodsApi } from '/@/api/business/goods/goods-api';
+  import { goodsApi } from '@/api/business/goods/goods-api';
 
   const queryForm = {
     pageNum: 1,