1

agileboot-common/pom.xml

@@ -18,6 +18,7 @@
         <module>wol-common-redis</module>
         <module>wol-common-json</module>
         <module>wol-common-satoken</module>
+        <module>wol-common-naocs</module>
     </modules>
     <packaging>pom</packaging>
 

agileboot-common/wol-common-naocs/pom.xml

@@ -0,0 +1,39 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.agileboot</groupId>
+        <artifactId>agileboot-common</artifactId>
+        <version>1.0.0</version>
+    </parent>
+
+    <artifactId>wol-common-naocs</artifactId>
+
+    <name>wol-common-naocs</name>
+    <url>http://maven.apache.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bootstrap</artifactId>
+        </dependency>
+
+        <!-- 服务发现 -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+
+
+
+    </dependencies>
+</project>

agileboot-common/wol-common-naocs/src/main/resources/nacos.yaml

@@ -0,0 +1,14 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        server-addr: http://192.168.12.168:8848 # 指定 Nacos 配置中心的服务器地址
+        group: DEFAULT_GROUP # 所属组
+        namespace: public # 命名空间
+        file-extension: yaml # 配置文件格式
+        refresh-enabled: true # 是否开启动态刷新
+      discovery:
+        enabled: true # 启用服务发现
+        group: DEFAULT_GROUP # 所属组
+        namespace: public # 命名空间
+        server-addr: http://192.168.12.168:8848 # 指定 Nacos 配置中心的服务器地址

agileboot-common/wol-common-satoken/src/main/java/com/agileboot/common/satoken/config/SaTokenMvcConfiguration.java

@@ -9,6 +9,7 @@ import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.util.SaResult;
 import com.agileboot.common.core.constant.HttpStatus;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.context.annotation.Bean;
@@ -21,6 +22,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
  * @author Lion Li
  */
 @AutoConfiguration
+@ConditionalOnClass(WebMvcConfigurer.class)
 public class SaTokenMvcConfiguration implements WebMvcConfigurer {
 
     /**

agileboot-system/wol-gateway/pom.xml

@@ -38,5 +38,14 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-loadbalancer</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.agileboot</groupId>
+            <artifactId>wol-common-naocs</artifactId>
+        </dependency>
     </dependencies>
 </project>

agileboot-system/wol-gateway/src/main/resources/application.yml

@@ -1,8 +1,5 @@
-# Tomcat
 server:
   port: 8080
-  servlet:
-    context-path: /
 
 spring:
   application:

agileboot-system/wol-gateway/src/main/resources/bootstrap.yaml

@@ -0,0 +1,3 @@
+spring:
+  config:
+    import: classpath:nacos.yml

pom.xml

@@ -22,6 +22,7 @@
         <module>wol-domain</module>
         <module>wol-api</module>
         <module>wol-modules</module>
+        <module>agileboot-common/wol-common-naocs</module>
     </modules>
     <packaging>pom</packaging>
 
@@ -30,8 +31,10 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>17</java.version>
-        <spring.boot.version>3.5.4</spring.boot.version>
+        <spring.boot.version>3.4.5</spring.boot.version>
         <spring-cloud.version>2024.0.0</spring-cloud.version>
+        <!--SpringCloudAlibaba-->
+        <spring-cloud-alibaba.version>2023.0.0.0-RC1</spring-cloud-alibaba.version>
         <mybatis.version>3.5.16</mybatis.version>
         <mybatis-plus.version>3.5.12</mybatis-plus.version>
         <dynamic-ds.version>4.3.1</dynamic-ds.version>
@@ -50,7 +53,6 @@
         <satoken.version>1.44.0</satoken.version>
         <oshi.version>6.4.0</oshi.version>
 
-
         <!-- 插件版本 -->
         <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
         <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
@@ -72,6 +74,14 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <!-- Spring Cloud Alibaba依赖管理 -->
+            <dependency>
+                <groupId>com.alibaba.cloud</groupId>
+                <artifactId>spring-cloud-alibaba-dependencies</artifactId>
+                <version>${spring-cloud-alibaba.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <!-- SpringBoot的依赖配置-->
             <dependency>
                 <groupId>org.springframework.boot</groupId>
@@ -293,6 +303,17 @@
                 <artifactId>fastjson2</artifactId>
                 <version>${fastjson2.version}</version>
             </dependency>
+            <!-- Nacos 配置中心 -->
+<!--            <dependency>-->
+<!--                <groupId>com.alibaba.boot</groupId>-->
+<!--                <artifactId>nacos-config-spring-boot-starter</artifactId>-->
+<!--                <version>${nacos-config.version}</version>-->
+<!--            </dependency>-->
+            <dependency>
+                <groupId>com.agileboot</groupId>
+                <artifactId>wol-common-naocs</artifactId>
+                <version>1.0.0</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>