From 9ad5a5a5b550f34cbc0c6f4ef123dcf1349915c4 Mon Sep 17 00:00:00 2001 From: zhuoda Date: Sun, 28 Apr 2024 21:59:11 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90v3.3.0=E3=80=91=201=E3=80=81uniapp=20?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=8F=9C=E5=8D=95=E5=8A=9F=E8=83=BD=E5=8C=BA?= =?UTF-8?q?=E5=A4=9A=E5=B9=B3=E5=8F=B0=E9=80=82=E9=85=8D;2=E3=80=81?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=BB=84=E4=BB=B6=E8=B7=AF=E5=BE=84=E8=AF=B4?= =?UTF-8?q?=E6=98=8E;3=E3=80=81=E9=95=BF=E6=97=B6=E9=97=B4=E4=B8=8D?= =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E8=87=AA=E5=8A=A8=E8=BF=94=E5=9B=9E=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E9=A1=B5;4=E3=80=81=E6=A0=87=E7=AD=BE=E9=A1=B5=20tab?= =?UTF-8?q?=20=E4=B8=BA=E5=9C=86=E8=A7=92;5=E3=80=81=E5=8D=87=E7=BA=A7=20s?= =?UTF-8?q?a=20token=20=E5=88=B0=201.37.0;6=E3=80=81=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E8=A1=A8=E5=8D=95=E5=BC=B9=E7=AA=97=20?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E4=BA=8B=E4=BB=B6;7=E3=80=81=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97@OperateLogAspect?= =?UTF-8?q?=20=E5=AF=B9=E6=96=87=E4=BB=B6=E7=9A=84=E5=A4=84=E7=90=86;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/login/service/LoginService.java | 4 +- .../operatelog/core/OperateLogAspect.java | 2 + .../code-generator-template/js/form.vue.vm | 376 +++++++++--------- .../src/main/resources/prod/sa-base.yaml | 2 +- .../src/main/resources/test/sa-base.yaml | 2 +- .../components/support/dict-select/index.vue | 12 +- .../src/layout/components/page-tag/index.vue | 14 +- .../menu/components/menu-operate-modal.vue | 5 +- .../typescript-ant-design-vue3/README.md | 2 + smart-app/.env.development | 2 +- smart-app/src/App.vue | 2 +- smart-app/src/api/business/goods/goods-api.js | 2 +- .../src/api/business/oa/enterprise-api.js | 2 +- smart-app/src/api/business/oa/notice-api.js | 2 +- smart-app/src/api/support/change-log-api.js | 2 +- smart-app/src/api/support/dict-api.js | 2 +- smart-app/src/api/support/file-api.js | 2 +- smart-app/src/api/system/login-api.js | 2 +- .../src/components/dict-select/index.vue | 2 +- smart-app/src/lib/smart-request.js | 6 +- smart-app/src/main.js | 4 +- smart-app/src/manifest.json | 4 +- .../pages/enterprise/enterprise-detail.vue | 8 +- .../src/pages/enterprise/enterprise-form.vue | 10 +- .../src/pages/enterprise/enterprise-list.vue | 4 +- .../components/goods-query-form-popup.vue | 4 +- smart-app/src/pages/goods/goods-index.vue | 4 +- smart-app/src/pages/home/components/goods.vue | 4 +- smart-app/src/pages/home/components/menu.vue | 44 +- .../src/pages/home/components/notice.vue | 4 +- smart-app/src/pages/home/index.vue | 4 +- .../login/components/login-check-box.vue | 4 +- .../pages/login/components/other-way-box.vue | 8 +- smart-app/src/pages/login/login.vue | 34 +- .../src/pages/mine/components/mine-menu.vue | 2 +- .../pages/mine/components/mine-user-blue.vue | 4 +- .../pages/mine/components/mine-user-white.vue | 4 +- smart-app/src/pages/mine/mine.vue | 6 +- .../components/notice-query-form-popup.vue | 2 +- smart-app/src/pages/notice/notice-detail.vue | 4 +- smart-app/src/pages/notice/notice-index.vue | 4 +- .../src/pages/order-detail/order-detail.vue | 2 +- .../support/change-log/change-log-detail.vue | 4 +- .../support/change-log/change-log-list.vue | 4 +- .../pages/support/feedback/feedback-form.vue | 12 +- smart-app/src/plugins/smart-enums-plugin.js | 2 +- .../src/store/modules/system/app-config.js | 8 +- smart-app/src/store/modules/system/user.js | 4 +- 48 files changed, 326 insertions(+), 321 deletions(-) create mode 100644 smart-admin-web/typescript-ant-design-vue3/README.md diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java index f2dfc46a..c2cf7346 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java @@ -159,8 +159,8 @@ public class LoginService implements StpInterface { // 对于万能密码:受限制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/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/core/OperateLogAspect.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/core/OperateLogAspect.java index 101f2019..4618fcf7 100644 --- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/core/OperateLogAspect.java +++ b/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.core.annotation.AnnotationUtils; 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 @@ public abstract class OperateLogAspect { 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 index b8e542ed..1de462cd 100644 --- 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 @@ -6,7 +6,7 @@ * @Copyright ${basic.copyright} --> 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 index 4ae563f4..0122533b 100644 --- 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 index f1c8d04a..27de1c00 100644 --- 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 index 8e68a8a1..004aadcb 100644 --- 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 @@