From 526557e22e747bcf3852674319b2dc917b53f2b3 Mon Sep 17 00:00:00 2001 From: zhuoda Date: Mon, 18 Mar 2024 22:43:08 +0800 Subject: [PATCH] v3.0.1 --- .../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 6d72d4613..1de8e7210 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 boolean preHandle(HttpServletRequest request, HttpServletResponse respons 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 bb2448111..513091a78 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 44cb0e203..c72f69041 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 void download(@PathVariable String tableName, HttpServletResponse respons 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 af403c646..465460c08 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 Object around(ProceedingJoinPoint point) throws Throwable { 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 Object around(ProceedingJoinPoint point) throws Throwable { } 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 77c40338d..923e6e06e 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 29d3c1d7d..b563a4d1b 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 4542a65fb..ee6cb4592 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 811a29827..3307563c8 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 a3c1008b7..9021ea9be 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 45e9d8c7b..5cab76773 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创新实验室 -->