diff --git a/scripts/pipeline.sh b/scripts/pipeline.sh index 9ff96e0..5012676 100644 --- a/scripts/pipeline.sh +++ b/scripts/pipeline.sh @@ -5,7 +5,7 @@ pipeline { JAVA_HOME = '/usr/lib/jvm/jdk1.8.0_381' JOBNAME="${JOB_NAME}" JENKINS_NODE_COOKIE = "dontKillMe" - SPRING_PROFILES_ACTIVE = "sgzb_cloud_dev_cq" + SPRING_PROFILES_ACTIVE = "sgzb_dev_cq" } stages { stage('Check out') { diff --git a/sgzb-auth/src/main/resources/bootstrap-sgzb_dev_cq.yml b/sgzb-auth/src/main/resources/bootstrap-sgzb_dev_cq.yml index eccf663..0db1302 100644 --- a/sgzb-auth/src/main/resources/bootstrap-sgzb_dev_cq.yml +++ b/sgzb-auth/src/main/resources/bootstrap-sgzb_dev_cq.yml @@ -5,11 +5,11 @@ spring: discovery: # 服务注册地址 server-addr: 192.168.0.56:8848 - namespace: sgzb_cloud_dev_cqjj + namespace: sgzb_cqjj config: # 配置中心地址 server-addr: 192.168.0.56:8848 - namespace: sgzb_cloud_dev_cqjj + namespace: sgzb_cqjj # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sgzb-auth/src/main/resources/bootstrap-sgzb_dev_gz.yml b/sgzb-auth/src/main/resources/bootstrap-sgzb_dev_gz.yml index d03afdc..d719eee 100644 --- a/sgzb-auth/src/main/resources/bootstrap-sgzb_dev_gz.yml +++ b/sgzb-auth/src/main/resources/bootstrap-sgzb_dev_gz.yml @@ -5,11 +5,11 @@ spring: discovery: # 服务注册地址 server-addr: 192.168.0.62:8848 - namespace: sgzb_cloud_dev_nw + namespace: sgzb_gzjj config: # 配置中心地址 server-addr: 192.168.0.62:8848 - namespace: sgzb_cloud_dev_nw + namespace: sgzb_gzjj # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sgzb-auth/src/main/resources/bootstrap-sgzb_local_cq.yml b/sgzb-auth/src/main/resources/bootstrap-sgzb_local_cq.yml index caf4abf..82f64e9 100644 --- a/sgzb-auth/src/main/resources/bootstrap-sgzb_local_cq.yml +++ b/sgzb-auth/src/main/resources/bootstrap-sgzb_local_cq.yml @@ -5,11 +5,11 @@ spring: discovery: # 服务注册地址 server-addr: 127.0.0.1:8848 - namespace: sgzb_cloud_dev_cqjj + namespace: sgzb_cqjj config: # 配置中心地址 server-addr: 127.0.0.1:8848 - namespace: sgzb_cloud_dev_cqjj + namespace: sgzb_cqjj # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sgzb-auth/src/main/resources/bootstrap-sgzb_local_gz.yml b/sgzb-auth/src/main/resources/bootstrap-sgzb_local_gz.yml index ad49311..e7f1f96 100644 --- a/sgzb-auth/src/main/resources/bootstrap-sgzb_local_gz.yml +++ b/sgzb-auth/src/main/resources/bootstrap-sgzb_local_gz.yml @@ -5,11 +5,11 @@ spring: discovery: # 服务注册地址 server-addr: 127.0.0.1:8848 - namespace: sgzb_cloud_dev_nw + namespace: sgzb_gzjj config: # 配置中心地址 server-addr: 127.0.0.1:8848 - namespace: sgzb_cloud_dev_nw + namespace: sgzb_gzjj # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sgzb-gateway/src/main/resources/bootstrap-sgzb_dev_cq.yml b/sgzb-gateway/src/main/resources/bootstrap-sgzb_dev_cq.yml index 06dcb25..d4efd45 100644 --- a/sgzb-gateway/src/main/resources/bootstrap-sgzb_dev_cq.yml +++ b/sgzb-gateway/src/main/resources/bootstrap-sgzb_dev_cq.yml @@ -18,11 +18,11 @@ spring: discovery: # 服务注册地址 server-addr: 192.168.0.56:8848 - namespace: sgzb_cloud_dev_cqjj + namespace: sgzb_cqjj config: # 配置中心地址 server-addr: 192.168.0.56:8848 - namespace: sgzb_cloud_dev_cqjj + namespace: sgzb_cqjj # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sgzb-gateway/src/main/resources/bootstrap-sgzb_dev_gz.yml b/sgzb-gateway/src/main/resources/bootstrap-sgzb_dev_gz.yml index 49ff408..5270a08 100644 --- a/sgzb-gateway/src/main/resources/bootstrap-sgzb_dev_gz.yml +++ b/sgzb-gateway/src/main/resources/bootstrap-sgzb_dev_gz.yml @@ -12,11 +12,11 @@ spring: discovery: # 服务注册地址 server-addr: 192.168.0.62:8848 - namespace: sgzb_cloud_dev_nw + namespace: sgzb_gzjj config: # 配置中心地址 server-addr: 192.168.0.62:8848 - namespace: sgzb_cloud_dev_nw + namespace: sgzb_gzjj # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sgzb-gateway/src/main/resources/bootstrap-sgzb_local_cq.yml b/sgzb-gateway/src/main/resources/bootstrap-sgzb_local_cq.yml index 1c81051..aaecddf 100644 --- a/sgzb-gateway/src/main/resources/bootstrap-sgzb_local_cq.yml +++ b/sgzb-gateway/src/main/resources/bootstrap-sgzb_local_cq.yml @@ -18,11 +18,11 @@ spring: discovery: # 服务注册地址 server-addr: 127.0.0.1:8848 - namespace: sgzb_cloud_dev_cqjj + namespace: sgzb_cqjj config: # 配置中心地址 server-addr: 127.0.0.1:8848 - namespace: sgzb_cloud_dev_cqjj + namespace: sgzb_cqjj # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sgzb-gateway/src/main/resources/bootstrap-sgzb_local_gz.yml b/sgzb-gateway/src/main/resources/bootstrap-sgzb_local_gz.yml index fc77248..547a22e 100644 --- a/sgzb-gateway/src/main/resources/bootstrap-sgzb_local_gz.yml +++ b/sgzb-gateway/src/main/resources/bootstrap-sgzb_local_gz.yml @@ -12,11 +12,11 @@ spring: discovery: # 服务注册地址 server-addr: 127.0.0.1:8848 - namespace: sgzb_cloud_dev_nw + namespace: sgzb_gzjj config: # 配置中心地址 server-addr: 127.0.0.1:8848 - namespace: sgzb_cloud_dev_nw + namespace: sgzb_gzjj # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml index d3dcf93..5335a3c 100644 --- a/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml @@ -37,11 +37,11 @@ spring: discovery: # 服务注册地址 server-addr: 127.0.0.1:8848 - namespace: sgzb_cloud_dev_cqjj + namespace: sgzb_cqjj config: # 配置中心地址 server-addr: 127.0.0.1:8848 - namespace: sgzb_cloud_dev_cqjj + namespace: sgzb_cqjj # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sgzb-modules/sgzb-gen/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-gen/src/main/resources/bootstrap.yml index ce7cd6f..2a48dfa 100644 --- a/sgzb-modules/sgzb-gen/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-gen/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 127.0.0.1:8848 - namespace: sgzb_cloud_dev_cqjj + namespace: sgzb_cqjj config: # 配置中心地址 server-addr: 127.0.0.1:8848 - namespace: sgzb_cloud_dev_cqjj + namespace: sgzb_cqjj # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sgzb-modules/sgzb-job/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-job/src/main/resources/bootstrap.yml index 6b1be11..bb91a1e 100644 --- a/sgzb-modules/sgzb-job/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-job/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 127.0.0.1:8848 - namespace: sgzb_cloud_dev_cqjj + namespace: sgzb_cqjj config: # 配置中心地址 server-addr: 127.0.0.1:8848 - namespace: sgzb_cloud_dev_cqjj + namespace: sgzb_cqjj # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_dev_cq.yml b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_dev_cq.yml index dd20d0f..02e5aa4 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_dev_cq.yml +++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_dev_cq.yml @@ -12,11 +12,11 @@ spring: discovery: # 服务注册地址 server-addr: 192.168.0.56:8848 - namespace: sgzb_cloud_dev_cqjj + namespace: sgzb_cqjj config: # 配置中心地址 server-addr: 192.168.0.56:8848 - namespace: sgzb_cloud_dev_cqjj + namespace: sgzb_cqjj # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_dev_gz.yml b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_dev_gz.yml index 3af8f6a..31bade0 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_dev_gz.yml +++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_dev_gz.yml @@ -12,11 +12,11 @@ spring: discovery: # 服务注册地址 server-addr: 192.168.0.62:8848 - namespace: sgzb_cloud_dev_nw + namespace: sgzb_gzjj config: # 配置中心地址 server-addr: 192.168.0.62:8848 - namespace: sgzb_cloud_dev_nw + namespace: sgzb_gzjj # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_local_cq.yml b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_local_cq.yml index c28547c..bc922c8 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_local_cq.yml +++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_local_cq.yml @@ -12,11 +12,11 @@ spring: discovery: # 服务注册地址 server-addr: 127.0.0.1:8848 - namespace: sgzb_cloud_dev_cqjj + namespace: sgzb_cqjj config: # 配置中心地址 server-addr: 127.0.0.1:8848 - namespace: sgzb_cloud_dev_cqjj + namespace: sgzb_cqjj # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_local_gz.yml b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_local_gz.yml index 144cf51..edfe166 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_local_gz.yml +++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_local_gz.yml @@ -12,11 +12,11 @@ spring: discovery: # 服务注册地址 server-addr: 127.0.0.1:8848 - namespace: sgzb_cloud_dev_nw + namespace: sgzb_gzjj config: # 配置中心地址 server-addr: 127.0.0.1:8848 - namespace: sgzb_cloud_dev_nw + namespace: sgzb_gzjj # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_dev_cq.yml b/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_dev_cq.yml index a69aee2..4d903e6 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_dev_cq.yml +++ b/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_dev_cq.yml @@ -16,11 +16,11 @@ spring: discovery: # 服务注册地址 server-addr: 192.168.0.56:8848 - namespace: sgzb_cloud_dev_cqjj + namespace: sgzb_cqjj config: # 配置中心地址 server-addr: 192.168.0.56:8848 - namespace: sgzb_cloud_dev_cqjj + namespace: sgzb_cqjj # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_dev_gz.yml b/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_dev_gz.yml index 689f8a3..8899f1f 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_dev_gz.yml +++ b/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_dev_gz.yml @@ -16,11 +16,11 @@ spring: discovery: # 服务注册地址 server-addr: 192.168.0.62:8848 - namespace: sgzb_cloud_dev_nw + namespace: sgzb_gzjj config: # 配置中心地址 server-addr: 192.168.0.62:8848 - namespace: sgzb_cloud_dev_nw + namespace: sgzb_gzjj # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_local_cq.yml b/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_local_cq.yml index 0544be2..634335f 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_local_cq.yml +++ b/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_local_cq.yml @@ -16,11 +16,11 @@ spring: discovery: # 服务注册地址 server-addr: 127.0.0.1:8848 - namespace: sgzb_cloud_dev_cqjj + namespace: sgzb_cqjj config: # 配置中心地址 server-addr: 127.0.0.1:8848 - namespace: sgzb_cloud_dev_cqjj + namespace: sgzb_cqjj # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_local_gz.yml b/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_local_gz.yml index 37d012a..7d13626 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_local_gz.yml +++ b/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_local_gz.yml @@ -16,11 +16,11 @@ spring: discovery: # 服务注册地址 server-addr: 127.0.0.1:8848 - namespace: sgzb_cloud_dev_nw + namespace: sgzb_gzjj config: # 配置中心地址 server-addr: 127.0.0.1:8848 - namespace: sgzb_cloud_dev_nw + namespace: sgzb_gzjj # 配置文件格式 file-extension: yml # 共享配置