diff --git a/pom.xml b/pom.xml index b613ba96..44815201 100644 --- a/pom.xml +++ b/pom.xml @@ -255,8 +255,36 @@ + + + src/main/resources + + **/* + + true + + + + + + + dev + + dev + localhost:8848 + 66076b31-9cbd-476b-8fea-6143fc9df04d + nacos + nacos + + + true + + + + + public diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml index f456b03c..466da0be 100644 --- a/ruoyi-auth/src/main/resources/bootstrap.yml +++ b/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 # 共享配置 diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml index b6dc98ae..7f56af7d 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/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 diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml index 55ff4112..784f7615 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml +++ b/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 # 共享配置 diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml index 0ef5a457..dffd9ead 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml +++ b/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 # 共享配置 diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml index b86f8c9e..1c5e1cf6 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml +++ b/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 # 共享配置 diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml index 40ab7816..c8fa918e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml +++ b/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 # 共享配置 diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml index 13d90cd7..97092682 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml +++ b/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 # 共享配置 diff --git a/rylink-test/pom.xml b/rylink-test/pom.xml new file mode 100644 index 00000000..87ba1fc4 --- /dev/null +++ b/rylink-test/pom.xml @@ -0,0 +1,116 @@ + + + 4.0.0 + + com.ruoyi + ruoyi + 3.6.2 + + + org.example + rylink-test + + ruoyi-测试模块 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + com.alibaba.cloud + spring-cloud-alibaba-sentinel-gateway + + + + + com.alibaba.csp + sentinel-datasource-nacos + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + org.springframework.cloud + spring-cloud-loadbalancer + + + + + pro.fessional + kaptcha + + + + + com.ruoyi + ruoyi-common-redis + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + io.springfox + springfox-swagger2 + ${swagger.fox.version} + + + + org.projectlombok + lombok + + + + + com.ruoyi + ruoyi-common-datasource + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + + \ No newline at end of file diff --git a/rylink-test/src/main/java/org/link/example/RyLinkTestApplication.java b/rylink-test/src/main/java/org/link/example/RyLinkTestApplication.java new file mode 100644 index 00000000..492621a5 --- /dev/null +++ b/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" + + " ''-' `'-' `-..-' "); + } +} diff --git a/rylink-test/src/main/java/org/link/example/controller/Test01Controller.java b/rylink-test/src/main/java/org/link/example/controller/Test01Controller.java new file mode 100644 index 00000000..fc755d12 --- /dev/null +++ b/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 { + +} diff --git a/rylink-test/src/main/resources/bootstrap.yml b/rylink-test/src/main/resources/bootstrap.yml new file mode 100644 index 00000000..bb4fddca --- /dev/null +++ b/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: + +