From ccb8a178cb8878c100b657c550d73759088af62c Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Sat, 7 Oct 2023 11:17:54 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- op-auth/src/main/resources/bootstrap.yml | 8 +++--- op-gateway/src/main/resources/bootstrap.yml | 10 +++---- .../src/main/resources/bootstrap.yml | 8 +++--- .../src/main/resources/bootstrap.yml | 8 +++--- .../op-file/src/main/resources/bootstrap.yml | 8 +++--- .../op-gen/src/main/resources/bootstrap.yml | 8 +++--- .../op-job/src/main/resources/bootstrap.yml | 8 +++--- .../op-mes/src/main/resources/bootstrap.yml | 8 +++--- .../op-plan/src/main/resources/bootstrap.yml | 8 +++--- .../src/main/resources/bootstrap.yml | 8 +++--- op-modules/op-sap/pom.xml | 26 +++++++++---------- .../op-sap/src/main/resources/bootstrap.yml | 8 +++--- .../op-scada/src/main/resources/bootstrap.yml | 8 +++--- .../src/main/resources/bootstrap.yml | 8 +++--- .../src/main/resources/bootstrap.yml | 8 +++--- .../src/main/resources/bootstrap.yml | 8 +++--- .../op-wms/src/main/resources/bootstrap.yml | 8 +++--- 17 files changed, 78 insertions(+), 78 deletions(-) diff --git a/op-auth/src/main/resources/bootstrap.yml b/op-auth/src/main/resources/bootstrap.yml index b455d9dd..6351f46a 100644 --- a/op-auth/src/main/resources/bootstrap.yml +++ b/op-auth/src/main/resources/bootstrap.yml @@ -17,14 +17,14 @@ spring: # 服务注册地址 #--spring.cloud.nacos.discovery.namespace=chj --spring.cloud.nacos.config.namespace=chj namespace: lanju-op - group: zxl - server-addr: 140.249.53.142:8848 + group: prod-new + server-addr: 192.168.202.20:8848 config: #命名空间 namespace: lanju-op - group: zxl + group: prod-new # 配置中心地址 - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-gateway/src/main/resources/bootstrap.yml b/op-gateway/src/main/resources/bootstrap.yml index a6f945f4..d4d43645 100644 --- a/op-gateway/src/main/resources/bootstrap.yml +++ b/op-gateway/src/main/resources/bootstrap.yml @@ -17,15 +17,15 @@ spring: # password: sfnacos2023 # namespace: lanju-op namespace: lanju-op - group: zxl + group: prod-new # 服务注册地址 - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 config: #命名空间 namespace: lanju-op - group: zxl + group: prod-new # 配置中心地址 - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置 @@ -41,7 +41,7 @@ spring: datasource: ds1: nacos: - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 dataId: sentinel-op-gateway groupId: DEFAULT_GROUP data-type: json diff --git a/op-modules/op-device/src/main/resources/bootstrap.yml b/op-modules/op-device/src/main/resources/bootstrap.yml index ef6af865..6bba74e3 100644 --- a/op-modules/op-device/src/main/resources/bootstrap.yml +++ b/op-modules/op-device/src/main/resources/bootstrap.yml @@ -14,16 +14,16 @@ spring: nacos: discovery: namespace: lanju-op - group: zxl + group: prod-new # 服务注册地址 - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 config: namespace: lanju-op - group: zxl + group: prod-new #命名空间 #group: local # 配置中心地址 - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-energy/src/main/resources/bootstrap.yml b/op-modules/op-energy/src/main/resources/bootstrap.yml index e1009be0..ed4d7271 100644 --- a/op-modules/op-energy/src/main/resources/bootstrap.yml +++ b/op-modules/op-energy/src/main/resources/bootstrap.yml @@ -14,16 +14,16 @@ spring: nacos: discovery: namespace: lanju-op - group: zxl + group: prod-new # 服务注册地址 - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 config: namespace: lanju-op - group: zxl + group: prod-new #命名空间 #group: local # 配置中心地址 - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-file/src/main/resources/bootstrap.yml b/op-modules/op-file/src/main/resources/bootstrap.yml index 3cc00fca..369a2898 100644 --- a/op-modules/op-file/src/main/resources/bootstrap.yml +++ b/op-modules/op-file/src/main/resources/bootstrap.yml @@ -15,15 +15,15 @@ spring: discovery: # 服务注册地址 namespace: lanju-op - group: zxl + group: prod-new # 服务注册地址 - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 config: # 配置中心地址 namespace: lanju-op - group: zxl + group: prod-new # 服务注册地址 - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-gen/src/main/resources/bootstrap.yml b/op-modules/op-gen/src/main/resources/bootstrap.yml index 1eaccce2..4f13e72e 100644 --- a/op-modules/op-gen/src/main/resources/bootstrap.yml +++ b/op-modules/op-gen/src/main/resources/bootstrap.yml @@ -14,15 +14,15 @@ spring: nacos: discovery: namespace: lanju-op - group: zxl + group: prod-new # 服务注册地址 - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 config: #命名空间 namespace: lanju-op - group: zxl + group: prod-new # 配置中心地址 - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-job/src/main/resources/bootstrap.yml b/op-modules/op-job/src/main/resources/bootstrap.yml index efda0fba..0ed33d8e 100644 --- a/op-modules/op-job/src/main/resources/bootstrap.yml +++ b/op-modules/op-job/src/main/resources/bootstrap.yml @@ -14,16 +14,16 @@ spring: nacos: discovery: namespace: lanju-op - group: zxl + group: prod-new # 服务注册地址 - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 config: namespace: lanju-op - group: zxl + group: prod-new #命名空间 #group: local # 配置中心地址 - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-mes/src/main/resources/bootstrap.yml b/op-modules/op-mes/src/main/resources/bootstrap.yml index 44e0b278..3ef1b48c 100644 --- a/op-modules/op-mes/src/main/resources/bootstrap.yml +++ b/op-modules/op-mes/src/main/resources/bootstrap.yml @@ -14,16 +14,16 @@ spring: nacos: discovery: namespace: lanju-op - group: zxl + group: prod-new # 服务注册地址 - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 config: namespace: lanju-op - group: zxl + group: prod-new #命名空间 #group: local # 配置中心地址 - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-plan/src/main/resources/bootstrap.yml b/op-modules/op-plan/src/main/resources/bootstrap.yml index 11a15277..9c9530ab 100644 --- a/op-modules/op-plan/src/main/resources/bootstrap.yml +++ b/op-modules/op-plan/src/main/resources/bootstrap.yml @@ -14,16 +14,16 @@ spring: nacos: discovery: namespace: lanju-op - group: zxl + group: prod-new # 服务注册地址 - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 config: namespace: lanju-op - group: zxl + group: prod-new #命名空间 #group: local # 配置中心地址 - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-quality/src/main/resources/bootstrap.yml b/op-modules/op-quality/src/main/resources/bootstrap.yml index 61ed7291..0792027a 100644 --- a/op-modules/op-quality/src/main/resources/bootstrap.yml +++ b/op-modules/op-quality/src/main/resources/bootstrap.yml @@ -14,16 +14,16 @@ spring: nacos: discovery: namespace: lanju-op - group: zxl + group: prod-new # 服务注册地址 - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 config: namespace: lanju-op - group: zxl + group: prod-new #命名空间 #group: local # 配置中心地址 - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-sap/pom.xml b/op-modules/op-sap/pom.xml index 3e487546..cec3f9b6 100644 --- a/op-modules/op-sap/pom.xml +++ b/op-modules/op-sap/pom.xml @@ -91,8 +91,8 @@ com.sap - sapjco - 3.0.8 + sapjco3 + 1.0.0 @@ -117,17 +117,17 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/op-modules/op-sap/src/main/resources/bootstrap.yml b/op-modules/op-sap/src/main/resources/bootstrap.yml index 14dae316..bb47aca5 100644 --- a/op-modules/op-sap/src/main/resources/bootstrap.yml +++ b/op-modules/op-sap/src/main/resources/bootstrap.yml @@ -14,16 +14,16 @@ spring: nacos: discovery: namespace: lanju-op - group: zxl + group: prod-new # 服务注册地址 - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 config: namespace: lanju-op - group: zxl + group: prod-new #命名空间 #group: local # 配置中心地址 - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-scada/src/main/resources/bootstrap.yml b/op-modules/op-scada/src/main/resources/bootstrap.yml index 7083f55f..72888f58 100644 --- a/op-modules/op-scada/src/main/resources/bootstrap.yml +++ b/op-modules/op-scada/src/main/resources/bootstrap.yml @@ -14,16 +14,16 @@ spring: nacos: discovery: namespace: lanju-op - group: zxl + group: prod-new # 服务注册地址 - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 config: namespace: lanju-op - group: zxl + group: prod-new #命名空间 #group: local # 配置中心地址 - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-security/src/main/resources/bootstrap.yml b/op-modules/op-security/src/main/resources/bootstrap.yml index 88ceff7d..08141564 100644 --- a/op-modules/op-security/src/main/resources/bootstrap.yml +++ b/op-modules/op-security/src/main/resources/bootstrap.yml @@ -14,16 +14,16 @@ spring: nacos: discovery: namespace: lanju-op - group: zxl + group: prod-new # 服务注册地址 - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 config: namespace: lanju-op - group: zxl + group: prod-new #命名空间 #group: local # 配置中心地址 - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-system/src/main/resources/bootstrap.yml b/op-modules/op-system/src/main/resources/bootstrap.yml index fee75e91..f053da00 100644 --- a/op-modules/op-system/src/main/resources/bootstrap.yml +++ b/op-modules/op-system/src/main/resources/bootstrap.yml @@ -14,16 +14,16 @@ spring: nacos: discovery: namespace: lanju-op - group: zxl + group: prod-new # 服务注册地址 - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 config: namespace: lanju-op - group: zxl + group: prod-new #命名空间 #group: local # 配置中心地址 - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-technology/src/main/resources/bootstrap.yml b/op-modules/op-technology/src/main/resources/bootstrap.yml index e4200998..6c3ec90a 100644 --- a/op-modules/op-technology/src/main/resources/bootstrap.yml +++ b/op-modules/op-technology/src/main/resources/bootstrap.yml @@ -14,16 +14,16 @@ spring: nacos: discovery: namespace: lanju-op - group: zxl + group: prod-new # 服务注册地址 - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 config: namespace: lanju-op - group: zxl + group: prod-new #命名空间 #group: local # 配置中心地址 - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-wms/src/main/resources/bootstrap.yml b/op-modules/op-wms/src/main/resources/bootstrap.yml index 01b12e10..2ef866d1 100644 --- a/op-modules/op-wms/src/main/resources/bootstrap.yml +++ b/op-modules/op-wms/src/main/resources/bootstrap.yml @@ -14,16 +14,16 @@ spring: nacos: discovery: namespace: lanju-op - group: zxl + group: prod-new # 服务注册地址 - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 config: namespace: lanju-op - group: zxl + group: prod-new #命名空间 #group: local # 配置中心地址 - server-addr: 140.249.53.142:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置