Pre Merge pull request !330 from 李小白/dev

pom.xml

@@ -255,8 +255,36 @@
                 </plugin>
             </plugins>
         </pluginManagement>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*</include>
+                </includes>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
     </build>
 
+<!--    全局变量的配置-->
+    <profiles>
+        <profile>
+            <!--开发环境-->
+            <id>dev</id>
+            <properties>
+                <profiles.active>dev</profiles.active>
+                <nacosAddress>localhost:8848</nacosAddress>
+                <nacosNameSpace>66076b31-9cbd-476b-8fea-6143fc9df04d</nacosNameSpace>
+                <nacosUser>nacos</nacosUser>
+                <nacosPassword>nacos</nacosPassword>
+            </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+
+    </profiles>
+
     <repositories>
         <repository>
             <id>public</id>

ruoyi-auth/src/main/resources/bootstrap.yml

@@ -9,15 +9,20 @@ spring:
     name: ruoyi-auth
   profiles:
     # 环境配置
-    active: dev
+    active: '@profiles.active@'
   cloud:
     nacos:
+      username: @nacosUser@
+      password: @nacosPassword@
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @nacosAddress@
+        namespace: @nacosNameSpace@
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @nacosAddress@
+        namespace: @nacosNameSpace@
+        name: ${spring.application.name}-${spring.profiles.active}.yml
         # 配置文件格式
         file-extension: yml
         # 共享配置

ruoyi-gateway/src/main/resources/bootstrap.yml

@@ -9,15 +9,20 @@ spring:
     name: ruoyi-gateway
   profiles:
     # 环境配置
-    active: dev
+    active: '@profiles.active@'
   cloud:
     nacos:
+      username: @nacosUser@
+      password: @nacosPassword@
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @nacosAddress@
+        namespace: @nacosNameSpace@
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @nacosAddress@
+        namespace: @nacosNameSpace@
+        name: ${spring.application.name}-${spring.profiles.active}.yml
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -33,7 +38,7 @@ spring:
       datasource:
         ds1:
           nacos:
-            server-addr: 127.0.0.1:8848
+            server-addr: @nacosAddress@
             dataId: sentinel-ruoyi-gateway
             groupId: DEFAULT_GROUP
             data-type: json

ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml

@@ -9,15 +9,20 @@ spring:
     name: ruoyi-file
   profiles:
     # 环境配置
-    active: dev
+    active: '@profiles.active@'
   cloud:
     nacos:
+      username: @nacosUser@
+      password: @nacosPassword@
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @nacosAddress@
+        namespace: @nacosNameSpace@
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @nacosAddress@
+        namespace: @nacosNameSpace@
+        name: ${spring.application.name}-${spring.profiles.active}.yml
         # 配置文件格式
         file-extension: yml
         # 共享配置

ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml

@@ -9,15 +9,20 @@ spring:
     name: ruoyi-gen
   profiles:
     # 环境配置
-    active: dev
+    active: '@profiles.active@'
   cloud:
     nacos:
+      username: @nacosUser@
+      password: @nacosPassword@
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @nacosAddress@
+        namespace: @nacosNameSpace@
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @nacosAddress@
+        namespace: @nacosNameSpace@
+        name: ${spring.application.name}-${spring.profiles.active}.yml
         # 配置文件格式
         file-extension: yml
         # 共享配置

ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml

@@ -9,15 +9,20 @@ spring:
     name: ruoyi-job
   profiles:
     # 环境配置
-    active: dev
+    active: '@profiles.active@'
   cloud:
     nacos:
+      username: @nacosUser@
+      password: @nacosPassword@
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @nacosAddress@
+        namespace: @nacosNameSpace@
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @nacosAddress@
+        namespace: @nacosNameSpace@
+        name: ${spring.application.name}-${spring.profiles.active}.yml
         # 配置文件格式
         file-extension: yml
         # 共享配置

ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml

@@ -9,15 +9,20 @@ spring:
     name: ruoyi-system
   profiles:
     # 环境配置
-    active: dev
+    active: '@profiles.active@'
   cloud:
     nacos:
+      username: @nacosUser@
+      password: @nacosPassword@
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @nacosAddress@
+        namespace: @nacosNameSpace@
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @nacosAddress@
+        namespace: @nacosNameSpace@
+        name: ${spring.application.name}-${spring.profiles.active}.yml
         # 配置文件格式
         file-extension: yml
         # 共享配置

ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml

@@ -9,15 +9,20 @@ spring:
     name: ruoyi-monitor
   profiles:
     # 环境配置
-    active: dev
+    active: '@profiles.active@'
   cloud:
     nacos:
+      username: @nacosUser@
+      password: @nacosPassword@
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @nacosAddress@
+        namespace: @nacosNameSpace@
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @nacosAddress@
+        namespace: @nacosNameSpace@
+        name: ${spring.application.name}-${spring.profiles.active}.yml
         # 配置文件格式
         file-extension: yml
         # 共享配置

rylink-test/pom.xml

@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.ruoyi</groupId>
+        <artifactId>ruoyi</artifactId>
+        <version>3.6.2</version>
+    </parent>
+
+    <groupId>org.example</groupId>
+    <artifactId>rylink-test</artifactId>
+    <description>
+        ruoyi-测试模块
+    </description>
+
+    <dependencies>
+
+        <!-- SpringCloud Alibaba Nacos -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Nacos Config -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Sentinel -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Sentinel Gateway -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-alibaba-sentinel-gateway</artifactId>
+        </dependency>
+
+        <!-- Sentinel Datasource Nacos -->
+        <dependency>
+            <groupId>com.alibaba.csp</groupId>
+            <artifactId>sentinel-datasource-nacos</artifactId>
+        </dependency>
+
+        <!-- SpringBoot Actuator -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Loadbalancer -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-loadbalancer</artifactId>
+        </dependency>
+
+        <!--验证码 -->
+        <dependency>
+            <groupId>pro.fessional</groupId>
+            <artifactId>kaptcha</artifactId>
+        </dependency>
+
+        <!-- RuoYi Common Redis-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common-redis</artifactId>
+        </dependency>
+
+        <!-- Swagger -->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>${swagger.fox.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>${swagger.fox.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <!-- 多数据源 -->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common-datasource</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

rylink-test/src/main/java/org/link/example/RyLinkTestApplication.java

@@ -0,0 +1,32 @@
+package org.link.example;
+
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+
+/***
+ * @Description LinkTest启动成功
+ * @Param
+ * @Return
+ * @Date 2023/5/31 18:22
+ * @Author Link
+ **/
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
+public class RyLinkTestApplication
+{
+    public static void main(String[] args)
+    {
+        SpringApplication.run(RyLinkTestApplication.class, args);
+        System.out.println("(♥◠‿◠)ﾉﾞ  LinkTest启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
+                " .-------.       ____     __        \n" +
+                " |  _ _   \\      \\   \\   /  /    \n" +
+                " | ( ' )  |       \\  _. /  '       \n" +
+                " |(_ o _) /        _( )_ .'         \n" +
+                " | (_,_).' __  ___(_ o _)'          \n" +
+                " |  |\\ \\  |  ||   |(_,_)'         \n" +
+                " |  | \\ `'   /|   `-'  /           \n" +
+                " |  |  \\    /  \\      /           \n" +
+                " ''-'   `'-'    `-..-'              ");
+    }
+}

rylink-test/src/main/java/org/link/example/controller/Test01Controller.java

@@ -0,0 +1,14 @@
+package org.link.example.controller;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@Tag(name = "管理后台 - 测试类")
+@RestController
+@RequestMapping( "/test01")
+public class Test01Controller {
+
+}

rylink-test/src/main/resources/bootstrap.yml

@@ -0,0 +1,83 @@
+# Tomcat
+server:
+  port: 8080
+
+# Spring
+spring: 
+  application:
+    # 应用名称
+    name: rylink-test
+  profiles:
+    # 环境配置
+    active: '@profiles.active@'
+  cloud:
+    nacos:
+      username: @nacosUser@
+      password: @nacosPassword@
+      discovery:
+        # 服务注册地址
+        server-addr: @nacosAddress@
+        namespace: @nacosNameSpace@
+      config:
+        # 配置中心地址
+        server-addr: @nacosAddress@
+        namespace: @nacosNameSpace@
+        name: ${spring.application.name}-${spring.profiles.active}.yml
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+    sentinel:
+      # 取消控制台懒加载
+      eager: true
+      transport:
+        # 控制台地址
+        dashboard: 127.0.0.1:8718
+      # nacos配置持久化
+      datasource:
+        ds1:
+          nacos:
+            server-addr: @nacosAddress@
+            dataId: sentinel-ruoyi-gateway
+            groupId: DEFAULT_GROUP
+            data-type: json
+            rule-type: gw-flow
+
+  #数据源配置
+  datasource:
+    druid:
+      stat-view-servlet:
+        enabled: true
+        loginUsername: admin
+        loginPassword: 123456
+    dynamic:
+      druid:
+        initial-size: 5
+        min-idle: 5
+        maxActive: 20
+        maxWait: 60000
+        timeBetweenEvictionRunsMillis: 60000
+        minEvictableIdleTimeMillis: 300000
+        validationQuery: SELECT 1 FROM DUAL
+        testWhileIdle: true
+        testOnBorrow: false
+        testOnReturn: false
+        poolPreparedStatements: true
+        maxPoolPreparedStatementPerConnectionSize: 20
+        filters: stat,wall,slf4j
+      datasource:
+        # 主库数据源
+        master:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          username: root
+          password: 1qaz!QAZ
+          # 从库数据源
+          # slave:
+          # url:
+          # username:
+          # password:
+          # driver-class-name:
+
+