From f5c985aa4e921de64c49f2977f530a56ccf5fcc4 Mon Sep 17 00:00:00 2001
From: Github_lizhw <171332584@qq.com>
Date: Fri, 27 Sep 2024 21:25:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=BA=94=E7=94=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-dev.yml       |  0
 ruoyi-admin/src/main/resources/application.yml   |  2 --
 ruoyi-admin/src/main/resources/bootstrap.yml     | 16 ++++++++--------
 .../common/security/config/SecurityConfig.java   |  6 ++++++
 4 files changed, 14 insertions(+), 10 deletions(-)
 delete mode 100644 ruoyi-admin/src/main/resources/application-dev.yml

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));
     }