From 1723f2514f2b529f0cb2c51acf6a1d294645528b Mon Sep 17 00:00:00 2001 From: zhuoda Date: Mon, 18 Mar 2024 22:35:07 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90v3.0.1=E3=80=911=E3=80=81=E3=80=90?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=91tomcat=E8=AE=BF=E9=97=AE=E6=97=A5?= =?UTF-8?q?=E5=BF=97accessslog=20=E6=9C=80=E5=A4=A7=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E5=A4=A9=E6=95=B0;2=E3=80=81=E3=80=90=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E3=80=91=E8=8E=B7=E5=8F=96=E7=99=BB=E5=BD=95=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=20Token;?= =?UTF-8?q?3=E3=80=81=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E5=88=97=E8=A1=A8=E3=80=81=E8=A1=A8=E5=8D=95=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E6=A0=87=E8=AF=86;4=E3=80=81=E3=80=90=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=91=E7=A7=BB=E9=99=A4dev=E7=8E=AF=E5=A2=83swagger?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E5=92=8C=E5=AF=86=E7=A0=81;5?= =?UTF-8?q?=E3=80=81=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=B6=88=E6=81=AF=E5=86=85=E5=AE=B9=E6=94=B9?= =?UTF-8?q?=E4=B8=BA"=E6=93=8D=E4=BD=9C=E6=88=90=E5=8A=9F";6=E3=80=81?= =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E4=BB=A3=E7=A0=81=E4=B8=8B?= =?UTF-8?q?=E8=BD=BDzip=E6=96=87=E4=BB=B6=E5=90=8D=E6=94=B9=E4=B8=BA=20?= =?UTF-8?q?=E4=B8=8B=E5=88=92=E7=BA=BF=EF=BC=8Ceg:t=5Fapply=5Fcode.zip;7?= =?UTF-8?q?=E3=80=81=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91Service=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E8=87=AA=E5=8A=A8Import;8=E3=80=81?= =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91AdminInterpter=20=E6=8B=A6?= =?UTF-8?q?=E6=88=AA=E5=99=A8=E4=B8=AD=E5=AF=B9=E8=B6=85=E7=BA=A7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=91=98=E6=94=BE=E8=A1=8C;9=E3=80=81=E3=80=90?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=91=E4=BC=98=E5=8C=96=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=8F=90=E4=BA=A4RepeatSubmitAspect;10=E3=80=81=E3=80=90?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=91=E4=BF=AE=E6=94=B9=E5=85=B6=E4=BB=96?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/interceptor/AdminInterceptor.java | 5 + .../sa/base/common/domain/ResponseDTO.java | 2 +- .../controller/CodeGeneratorController.java | 2 +- .../repeatsubmit/RepeatSubmitAspect.java | 15 +- .../java/service/Service.java.vm | 1 + .../src/main/resources/dev/sa-base.yaml | 5 +- .../src/main/resources/pre/sa-base.yaml | 1 + .../src/main/resources/prod/sa-base.yaml | 1 + .../src/main/resources/test/sa-base.yaml | 1 + .../support/change-log/change-log-modal.vue | 8 +- .../components/employee-form-modal/index.vue | 4 +- .../components/employee-list/index.vue | 8 + .../role/components/role-data-scope/index.vue | 4 +- smart-app/.env.pre | 2 +- smart-app/package-lock.json | 22463 ---------------- smart-app/src/App.vue | 4 + .../src/pages/home/components/notice.vue | 8 +- .../src/pages/mine/components/mine-menu.vue | 11 +- .../pages/mine/components/mine-user-blue.vue | 34 +- .../pages/mine/components/mine-user-white.vue | 32 +- smart-app/src/uni.scss | 2 - 21 files changed, 85 insertions(+), 22528 deletions(-) delete mode 100644 smart-app/package-lock.json diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java index 6d72d461..1de8e721 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java @@ -109,6 +109,11 @@ public class AdminInterceptor implements HandlerInterceptor { return true; } + // 如果是超级管理员的话,不需要校验权限 + if(requestEmployee.getAdministratorFlag()){ + return true; + } + SaStrategy.instance.checkMethodAnnotation.accept(method); } catch (SaTokenException e) { diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/domain/ResponseDTO.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/domain/ResponseDTO.java index bb244811..513091a7 100644 --- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/domain/ResponseDTO.java +++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/domain/ResponseDTO.java @@ -24,7 +24,7 @@ public class ResponseDTO { public static final int OK_CODE = 0; - public static final String OK_MSG = "success"; + public static final String OK_MSG = "操作成功"; @Schema(description = "返回码") private Integer code; diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/controller/CodeGeneratorController.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/controller/CodeGeneratorController.java index 44cb0e20..c72f6904 100644 --- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/controller/CodeGeneratorController.java +++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/controller/CodeGeneratorController.java @@ -87,7 +87,7 @@ public class CodeGeneratorController extends SupportBaseController { ResponseDTO download = codeGeneratorService.download(tableName); if (download.getOk()) { - SmartResponseUtil.setDownloadFileHeader(response, tableName + "-code.zip", (long) download.getData().length); + SmartResponseUtil.setDownloadFileHeader(response, tableName + "_code.zip", (long) download.getData().length); response.getOutputStream().write(download.getData()); } else { SmartResponseUtil.write(response, download); diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/RepeatSubmitAspect.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/RepeatSubmitAspect.java index af403c64..465460c0 100644 --- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/RepeatSubmitAspect.java +++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/RepeatSubmitAspect.java @@ -55,22 +55,15 @@ public class RepeatSubmitAspect { if (StringUtils.isEmpty(ticket)) { return point.proceed(); } - Long timeStamp = this.repeatSubmitTicket.getTicketTimestamp(ticket); - if (timeStamp != null) { + Long lastRequestTime = this.repeatSubmitTicket.getTicketTimestamp(ticket); + if (lastRequestTime != null) { Method method = ((MethodSignature) point.getSignature()).getMethod(); RepeatSubmit annotation = method.getAnnotation(RepeatSubmit.class); - - // 说明注解去掉了 - if (annotation != null) { - return point.proceed(); - } - int interval = Math.min(annotation.value(), RepeatSubmit.MAX_INTERVAL); - if (System.currentTimeMillis() < timeStamp + interval) { + if (System.currentTimeMillis() < lastRequestTime + interval) { // 提交频繁 return ResponseDTO.error(UserErrorCode.REPEAT_SUBMIT); } - } Object obj = null; try { @@ -80,8 +73,6 @@ public class RepeatSubmitAspect { } catch (Throwable throwable) { log.error("", throwable); throw throwable; - } finally { - this.repeatSubmitTicket.removeTicket(ticket); } return obj; } diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/service/Service.java.vm b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/service/Service.java.vm index 77c40338..923e6e06 100644 --- a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/service/Service.java.vm +++ b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/service/Service.java.vm @@ -9,6 +9,7 @@ import net.lab1024.sa.base.common.domain.ResponseDTO; import net.lab1024.sa.base.common.domain.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/smart-admin-api/sa-base/src/main/resources/dev/sa-base.yaml b/smart-admin-api/sa-base/src/main/resources/dev/sa-base.yaml index 29d3c1d7..b563a4d1 100644 --- a/smart-admin-api/sa-base/src/main/resources/dev/sa-base.yaml +++ b/smart-admin-api/sa-base/src/main/resources/dev/sa-base.yaml @@ -62,9 +62,9 @@ server: basedir: ${project.log-directory}/tomcat-logs accesslog: enabled: true + max-days: 7 pattern: "%t %{X-Forwarded-For}i %a %r %s (%D ms) %I (%B byte)" - # 文件上传 配置 file: storage: @@ -81,7 +81,6 @@ file: url-prefix: https://${file.storage.cloud.bucket-name}.${file.storage.cloud.endpoint}/ private-url-expire-seconds: 3600 - # open api配置 springdoc: swagger-ui: @@ -93,7 +92,7 @@ springdoc: knife4j: enable: true basic: - enable: true + enable: false username: api # Basic认证用户名 password: 1024 # Basic认证密码 diff --git a/smart-admin-api/sa-base/src/main/resources/pre/sa-base.yaml b/smart-admin-api/sa-base/src/main/resources/pre/sa-base.yaml index 4542a65f..ee6cb459 100644 --- a/smart-admin-api/sa-base/src/main/resources/pre/sa-base.yaml +++ b/smart-admin-api/sa-base/src/main/resources/pre/sa-base.yaml @@ -62,6 +62,7 @@ server: basedir: ${project.log-directory}/tomcat-logs accesslog: enabled: true + max-days: 7 pattern: "%t %{X-Forwarded-For}i %a %r %s (%D ms) %I (%B byte)" 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 811a2982..3307563c 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 @@ -62,6 +62,7 @@ server: basedir: ${project.log-directory}/tomcat-logs accesslog: enabled: true + max-days: 30 pattern: "%t %{X-Forwarded-For}i %a %r %s (%D ms) %I (%B byte)" 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 a3c1008b..9021ea9b 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 @@ -62,6 +62,7 @@ server: basedir: ${project.log-directory}/tomcat-logs accesslog: enabled: true + max-days: 7 pattern: "%t %{X-Forwarded-For}i %a %r %s (%D ms) %I (%B byte)" diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/change-log/change-log-modal.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/support/change-log/change-log-modal.vue index 45e9d8c7..5cab7677 100644 --- a/smart-admin-web/javascript-ant-design-vue3/src/views/support/change-log/change-log-modal.vue +++ b/smart-admin-web/javascript-ant-design-vue3/src/views/support/change-log/change-log-modal.vue @@ -6,11 +6,12 @@ * @Copyright 1024创新实验室 -->