From bd19a58852f5c14a4113461b6702d6c2424e5451 Mon Sep 17 00:00:00 2001
From: yuyang <2265829957@qq.com>
Date: Fri, 30 Jul 2021 16:39:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9nacos=20ip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 562 +++++++++---------
ruoyi-auth/src/main/resources/bootstrap.yml | 50 +-
.../src/main/resources/bootstrap.yml | 84 +--
.../src/main/resources/bootstrap.yml | 50 +-
4 files changed, 373 insertions(+), 373 deletions(-)
diff --git a/pom.xml b/pom.xml
index a257ed0f..ca3a6444 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,281 +1,281 @@
-
-
- 4.0.0
-
- com.ruoyi
- ruoyi
- 3.0.0
-
- ruoyi
- http://www.ruoyi.vip
- 若依微服务系统
-
-
- 3.0.0
- UTF-8
- UTF-8
- 1.8
- 2.5.1
- 2020.0.3
- 2021.1
- 2.0.2
- 2.4.1
- 2.1.4
- 3.0.0
- 1.6.2
- 1.26.5
- 2.3.2
- 1.3.1
- 1.2.6
- 3.4.0
- 2.10.0
- 1.4
- 1.7
- 1.2.76
- 8.2.1
- 4.1.2
- 2.6.2
- 3.2.2
- 4.15.14.ALL
- 1.9.3
-
-
-
-
-
-
-
-
- org.springframework.cloud
- spring-cloud-dependencies
- ${spring-cloud.version}
- pom
- import
-
-
-
-
- com.alibaba.cloud
- spring-cloud-alibaba-dependencies
- ${spring-cloud-alibaba.version}
- pom
- import
-
-
-
-
- com.alibaba.nacos
- nacos-client
- ${alibaba.nacos.version}
-
-
-
-
- org.springframework.boot
- spring-boot-dependencies
- ${spring-boot.version}
- pom
- import
-
-
-
-
- de.codecentric
- spring-boot-admin-starter-client
- ${spring-boot-admin.version}
-
-
-
-
- com.github.tobato
- fastdfs-client
- ${tobato.version}
-
-
-
-
- org.mybatis.spring.boot
- mybatis-spring-boot-starter
- ${spring-boot.mybatis}
-
-
-
-
- io.swagger
- swagger-models
- ${swagger.core.version}
-
-
- io.swagger
- swagger-annotations
- ${swagger.core.version}
-
-
-
-
- com.github.penggle
- kaptcha
- ${kaptcha.version}
-
-
-
-
- com.github.pagehelper
- pagehelper-spring-boot-starter
- ${pagehelper.boot.version}
-
-
-
-
- commons-io
- commons-io
- ${commons.io.version}
-
-
-
-
- org.apache.poi
- poi-ooxml
- ${poi.version}
-
-
-
-
- commons-fileupload
- commons-fileupload
- ${commons.fileupload.version}
-
-
-
-
- org.apache.velocity
- velocity
- ${velocity.version}
-
-
- commons-collections
- commons-collections
-
-
-
-
-
-
- commons-collections
- commons-collections
- ${commons-collections.version}
-
-
-
-
- com.alibaba
- fastjson
- ${fastjson.version}
-
-
-
-
- org.apache.commons
- commons-pool2
- ${common-pool.version}
-
-
-
-
- com.ruoyi
- ruoyi-common-core
- ${ruoyi.version}
-
-
-
-
- com.ruoyi
- ruoyi-common-swagger
- ${ruoyi.version}
-
-
-
-
- com.ruoyi
- ruoyi-common-security
- ${ruoyi.version}
-
-
-
-
- com.ruoyi
- ruoyi-common-datascope
- ${ruoyi.version}
-
-
-
-
- com.ruoyi
- ruoyi-common-datasource
- ${ruoyi.version}
-
-
-
-
- com.ruoyi
- ruoyi-common-log
- ${ruoyi.version}
-
-
-
-
- com.ruoyi
- ruoyi-common-redis
- ${ruoyi.version}
-
-
-
-
- com.ruoyi
- ruoyi-api-system
- ${ruoyi.version}
-
-
- commons-beanutils
- commons-beanutils
- ${commons-beanutils.sdk}
-
-
-
-
-
- ruoyi-auth
- ruoyi-gateway
- ruoyi-visual
- ruoyi-modules
- ruoyi-api
- ruoyi-common
- xhpc-modules
-
- pom
-
-
-
-
- org.springframework.cloud
- spring-cloud-starter-bootstrap
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
- ${java.version}
- ${java.version}
- ${project.build.sourceEncoding}
-
-
-
-
-
-
+
+
+ 4.0.0
+
+ com.ruoyi
+ ruoyi
+ 3.0.0
+
+ ruoyi
+ http://www.ruoyi.vip
+ 若依微服务系统
+
+
+ 3.0.0
+ UTF-8
+ UTF-8
+ 1.8
+ 2.5.1
+ 2020.0.3
+ 2021.1
+ 2.0.2
+ 2.4.1
+ 2.1.4
+ 3.0.0
+ 1.6.2
+ 1.26.5
+ 2.3.2
+ 1.3.1
+ 1.2.6
+ 3.4.0
+ 2.10.0
+ 1.4
+ 1.7
+ 1.2.76
+ 8.2.1
+ 4.1.2
+ 2.6.2
+ 3.2.2
+ 4.15.14.ALL
+ 1.9.3
+
+
+
+
+
+
+
+
+ org.springframework.cloud
+ spring-cloud-dependencies
+ ${spring-cloud.version}
+ pom
+ import
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-alibaba-dependencies
+ ${spring-cloud-alibaba.version}
+ pom
+ import
+
+
+
+
+ com.alibaba.nacos
+ nacos-client
+ ${alibaba.nacos.version}
+
+
+
+
+ org.springframework.boot
+ spring-boot-dependencies
+ ${spring-boot.version}
+ pom
+ import
+
+
+
+
+
+
+
+
+
+
+
+ com.github.tobato
+ fastdfs-client
+ ${tobato.version}
+
+
+
+
+ org.mybatis.spring.boot
+ mybatis-spring-boot-starter
+ ${spring-boot.mybatis}
+
+
+
+
+ io.swagger
+ swagger-models
+ ${swagger.core.version}
+
+
+ io.swagger
+ swagger-annotations
+ ${swagger.core.version}
+
+
+
+
+ com.github.penggle
+ kaptcha
+ ${kaptcha.version}
+
+
+
+
+ com.github.pagehelper
+ pagehelper-spring-boot-starter
+ ${pagehelper.boot.version}
+
+
+
+
+ commons-io
+ commons-io
+ ${commons.io.version}
+
+
+
+
+ org.apache.poi
+ poi-ooxml
+ ${poi.version}
+
+
+
+
+ commons-fileupload
+ commons-fileupload
+ ${commons.fileupload.version}
+
+
+
+
+ org.apache.velocity
+ velocity
+ ${velocity.version}
+
+
+ commons-collections
+ commons-collections
+
+
+
+
+
+
+ commons-collections
+ commons-collections
+ ${commons-collections.version}
+
+
+
+
+ com.alibaba
+ fastjson
+ ${fastjson.version}
+
+
+
+
+ org.apache.commons
+ commons-pool2
+ ${common-pool.version}
+
+
+
+
+ com.ruoyi
+ ruoyi-common-core
+ ${ruoyi.version}
+
+
+
+
+ com.ruoyi
+ ruoyi-common-swagger
+ ${ruoyi.version}
+
+
+
+
+ com.ruoyi
+ ruoyi-common-security
+ ${ruoyi.version}
+
+
+
+
+ com.ruoyi
+ ruoyi-common-datascope
+ ${ruoyi.version}
+
+
+
+
+ com.ruoyi
+ ruoyi-common-datasource
+ ${ruoyi.version}
+
+
+
+
+ com.ruoyi
+ ruoyi-common-log
+ ${ruoyi.version}
+
+
+
+
+ com.ruoyi
+ ruoyi-common-redis
+ ${ruoyi.version}
+
+
+
+
+ com.ruoyi
+ ruoyi-api-system
+ ${ruoyi.version}
+
+
+ commons-beanutils
+ commons-beanutils
+ ${commons-beanutils.sdk}
+
+
+
+
+
+ ruoyi-auth
+ ruoyi-gateway
+ ruoyi-visual
+ ruoyi-modules
+ ruoyi-api
+ ruoyi-common
+ xhpc-modules
+
+ pom
+
+
+
+
+ org.springframework.cloud
+ spring-cloud-starter-bootstrap
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml
index 50188915..af3d806a 100644
--- a/ruoyi-auth/src/main/resources/bootstrap.yml
+++ b/ruoyi-auth/src/main/resources/bootstrap.yml
@@ -1,25 +1,25 @@
-# Tomcat
-server:
- port: 9200
-
-# Spring
-spring:
- application:
- # 应用名称
- name: ruoyi-auth
- profiles:
- # 环境配置
- active: dev
- cloud:
- nacos:
- discovery:
- # 服务注册地址
- server-addr: 127.0.0.1:8848
- config:
- # 配置中心地址
- server-addr: 127.0.0.1:8848
- # 配置文件格式
- file-extension: yml
- # 共享配置
- shared-configs:
- - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+# Tomcat
+server:
+ port: 9200
+
+# Spring
+spring:
+ application:
+ # 应用名称
+ name: ruoyi-auth
+ profiles:
+ # 环境配置
+ active: dev
+ cloud:
+ nacos:
+ discovery:
+ # 服务注册地址
+ server-addr: 118.24.137.203:8848
+ config:
+ # 配置中心地址
+ server-addr: 118.24.137.203:8848
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml
index 8f10bbd4..ce407c63 100644
--- a/ruoyi-gateway/src/main/resources/bootstrap.yml
+++ b/ruoyi-gateway/src/main/resources/bootstrap.yml
@@ -1,42 +1,42 @@
-# Tomcat
-server:
- port: 8080
-
-# Spring
-spring:
- application:
- # 应用名称
- name: ruoyi-gateway
- profiles:
- # 环境配置
- active: dev
- main:
- allow-bean-definition-overriding: true
- cloud:
- nacos:
- discovery:
- # 服务注册地址
- server-addr: 127.0.0.1:8848
- config:
- # 配置中心地址
- server-addr: 127.0.0.1:8848
- # 配置文件格式
- 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: 127.0.0.1:8848
- dataId: sentinel-ruoyi-gateway
- groupId: DEFAULT_GROUP
- data-type: json
- rule-type: flow
+# Tomcat
+server:
+ port: 8080
+
+# Spring
+spring:
+ application:
+ # 应用名称
+ name: ruoyi-gateway
+ profiles:
+ # 环境配置
+ active: dev
+ main:
+ allow-bean-definition-overriding: true
+ cloud:
+ nacos:
+ discovery:
+ # 服务注册地址
+ server-addr: 118.24.137.203:8848
+ config:
+ # 配置中心地址
+ server-addr: 118.24.137.203:8848
+ # 配置文件格式
+ 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: 118.24.137.203:8848
+ dataId: sentinel-ruoyi-gateway
+ groupId: DEFAULT_GROUP
+ data-type: json
+ rule-type: flow
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
index dc192777..7dfa1916 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
@@ -1,25 +1,25 @@
-# Tomcat
-server:
- port: 9201
-
-# Spring
-spring:
- application:
- # 应用名称
- name: ruoyi-system
- profiles:
- # 环境配置
- active: dev
- cloud:
- nacos:
- discovery:
- # 服务注册地址
- server-addr: 127.0.0.1:8848
- config:
- # 配置中心地址
- server-addr: 127.0.0.1:8848
- # 配置文件格式
- file-extension: yml
- # 共享配置
- shared-configs:
- - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+# Tomcat
+server:
+ port: 9201
+
+# Spring
+spring:
+ application:
+ # 应用名称
+ name: ruoyi-system
+ profiles:
+ # 环境配置
+ active: dev
+ cloud:
+ nacos:
+ discovery:
+ # 服务注册地址
+ server-addr: 118.24.137.203:8848
+ config:
+ # 配置中心地址
+ server-addr: 118.24.137.203:8848
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}