diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml deleted file mode 100644 index e69de29bb..000000000 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index b31345856..16b245fb4 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -58,8 +58,6 @@ spring: messages: # 国际化资源文件路径 basename: i18n/messages - profiles: - active: @profiles.active@ # 文件上传 servlet: multipart: diff --git a/ruoyi-admin/src/main/resources/bootstrap.yml b/ruoyi-admin/src/main/resources/bootstrap.yml index b1c6dbd6a..29cf3ffaf 100644 --- a/ruoyi-admin/src/main/resources/bootstrap.yml +++ b/ruoyi-admin/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ spring: profiles: - active: local + active: dev application: name: saas-tenant-admin config: @@ -19,7 +19,7 @@ spring: spring: config: activate: - on-profile: local + on-profile: dev cloud: nacos: discovery: @@ -33,20 +33,20 @@ spring: group: dev --- -# dev +# prod spring: config: activate: - on-profile: dev + on-profile: prod cloud: nacos: discovery: server-addr: http://nacos:8848 - namespace: c5c00044-93e6-4e66-8060-3f39aa7ab82b - group: dev + namespace: rrrrrrrrr + group: prod config: server-addr: http://nacos:8848 file-extension: yaml - namespace: c5c00044-93e6-4e66-8060-3f39aa7ab82b - group: dev + namespace: rrrrrrrrr + group: prod diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java b/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java index 5fd49d133..62a5f9b5d 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java @@ -1,10 +1,12 @@ package org.dromara.common.security.config; +import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.filter.SaServletFilter; import cn.dev33.satoken.httpauth.basic.SaHttpBasicUtil; import cn.dev33.satoken.interceptor.SaInterceptor; import cn.dev33.satoken.router.SaRouter; +import cn.dev33.satoken.same.SaSameUtil; import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.util.SaResult; import lombok.RequiredArgsConstructor; @@ -87,6 +89,10 @@ public class SecurityConfig implements WebMvcConfigurer { .addInclude("/actuator", "/actuator/**") .setAuth(obj -> { SaHttpBasicUtil.check(username + ":" + password); + + // 校验 Same-Token 身份凭证 —— 以下两句代码可简化为:SaSameUtil.checkCurrentRequestToken(); + String token = SaHolder.getRequest().getHeader(SaSameUtil.SAME_TOKEN); + SaSameUtil.checkToken(token); }) .setError(e -> SaResult.error(e.getMessage()).setCode(HttpStatus.UNAUTHORIZED)); }