From 5252d1396e21a16774be699a5ba1c8d39c14a22e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 29 Jun 2021 14:21:24 +0800
Subject: [PATCH] modify
---
gc-shop/src/main/resources/application-xc.yml | 35 ++++++++
gc-core/src/main/resources/application.properties | 2
gc-order/src/main/resources/application-xc.yml | 35 ++++++++
gc-pay/src/main/resources/application-xc.yml | 37 +++++++++
gc-user/src/main/resources/application-xc.yml | 35 ++++++++
gc-sys/src/main/resources/application-xc.yml | 35 ++++++++
gc-core/src/main/java/com/xzx/gc/common/utils/SpringUtil.java | 4 +
gc-role/src/main/resources/application-xcXcx.yml | 35 ++++++++
gc-core/src/main/java/com/xzx/gc/common/utils/BusinessUtil.java | 4
9 files changed, 220 insertions(+), 2 deletions(-)
diff --git a/gc-core/src/main/java/com/xzx/gc/common/utils/BusinessUtil.java b/gc-core/src/main/java/com/xzx/gc/common/utils/BusinessUtil.java
index 294b428..62613eb 100644
--- a/gc-core/src/main/java/com/xzx/gc/common/utils/BusinessUtil.java
+++ b/gc-core/src/main/java/com/xzx/gc/common/utils/BusinessUtil.java
@@ -211,7 +211,9 @@
urlPrefix="http://192.168.0.100/resource/static/upload";
}else if(SpringUtil.isCheck()){
urlPrefix="https://wxtest.cnxzx.com/resource/static/upload";
- } else{
+ } else if (SpringUtil.isXc()) {
+ urlPrefix="https://xcfiletest.cnxzx.com/static/upload";
+ }else{
// urlPrefix="http://192.168.0.18/static/upload";
urlPrefix="http://120.27.238.55:8002/static/upload";
}
diff --git a/gc-core/src/main/java/com/xzx/gc/common/utils/SpringUtil.java b/gc-core/src/main/java/com/xzx/gc/common/utils/SpringUtil.java
index 2c3b699..b878a27 100644
--- a/gc-core/src/main/java/com/xzx/gc/common/utils/SpringUtil.java
+++ b/gc-core/src/main/java/com/xzx/gc/common/utils/SpringUtil.java
@@ -93,6 +93,10 @@
return applicationContext.getEnvironment().getActiveProfiles()[0].equals("check");
}
+ public static boolean isXc(){
+ return applicationContext.getEnvironment().getActiveProfiles()[0].equals("xc");
+ }
+
public HttpServletRequest getCurrentRequest(){
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if(attributes!=null) {
diff --git a/gc-core/src/main/resources/application.properties b/gc-core/src/main/resources/application.properties
index b09f250..832738b 100644
--- a/gc-core/src/main/resources/application.properties
+++ b/gc-core/src/main/resources/application.properties
@@ -11,7 +11,7 @@
#log
-project.log.path=xzx/logs
+project.log.path=/xzx/logs
logstash.server.url=localhost:4560
#spring
diff --git a/gc-order/src/main/resources/application-xc.yml b/gc-order/src/main/resources/application-xc.yml
new file mode 100644
index 0000000..f5befb2
--- /dev/null
+++ b/gc-order/src/main/resources/application-xc.yml
@@ -0,0 +1,35 @@
+spring:
+ rabbitmq:
+ host: 120.27.238.55
+ port: 5672
+ username: ct_rabbit
+ password: 123456
+ virtual-host: /
+ datasource:
+ url: jdbc:mysql://120.27.238.55:3306/db_xzx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useAffectedRows=true
+ username: ct_test
+ password: 123456
+ redis:
+ database: 5
+ host: 121.37.162.173
+ password: d32ncxe@i3#!dV
+ port: 6379
+# cluster:
+# nodes: 127.0.0.1:6379
+ lettuce:
+ pool:
+ max-active: 200
+ max-idle: 10
+ max-wait: -1ms
+ min-idle: 5
+ timeout: 5000ms
+
+#机器ID编号用于生成分布式ID
+workerId: 0
+
+#极光推送
+jg:
+ appkey: 2a733c0c2aad9be329d5be04
+ secret: ec70e5f8db9324b27cb8f0df
+
+
diff --git a/gc-pay/src/main/resources/application-xc.yml b/gc-pay/src/main/resources/application-xc.yml
new file mode 100644
index 0000000..96b087e
--- /dev/null
+++ b/gc-pay/src/main/resources/application-xc.yml
@@ -0,0 +1,37 @@
+spring:
+ rabbitmq:
+ host: 120.27.238.55
+ port: 5672
+ username: ct_rabbit
+ password: 123456
+ virtual-host: /
+ datasource:
+ url: jdbc:mysql://120.27.238.55:3306/db_xzx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useAffectedRows=true
+ username: ct_test
+ password: 123456
+ redis:
+ database: 5
+ host: 121.37.162.173
+ password: d32ncxe@i3#!dV
+ port: 6379
+# cluster:
+# nodes: 127.0.0.1:6379
+ lettuce:
+ pool:
+ max-active: 200
+ max-idle: 10
+ max-wait: -1ms
+ min-idle: 5
+ timeout: 5000ms
+
+#机器ID编号用于生成分布式ID
+workerId: 0
+
+noticeUrl: https://app.cnxzx.com/gc-pay/pay/new/wxProPayNotify/anon
+
+#极光推送
+jg:
+ appkey: 2a733c0c2aad9be329d5be04
+ secret: ec70e5f8db9324b27cb8f0df
+
+
diff --git a/gc-role/src/main/resources/application-xcXcx.yml b/gc-role/src/main/resources/application-xcXcx.yml
new file mode 100644
index 0000000..f5befb2
--- /dev/null
+++ b/gc-role/src/main/resources/application-xcXcx.yml
@@ -0,0 +1,35 @@
+spring:
+ rabbitmq:
+ host: 120.27.238.55
+ port: 5672
+ username: ct_rabbit
+ password: 123456
+ virtual-host: /
+ datasource:
+ url: jdbc:mysql://120.27.238.55:3306/db_xzx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useAffectedRows=true
+ username: ct_test
+ password: 123456
+ redis:
+ database: 5
+ host: 121.37.162.173
+ password: d32ncxe@i3#!dV
+ port: 6379
+# cluster:
+# nodes: 127.0.0.1:6379
+ lettuce:
+ pool:
+ max-active: 200
+ max-idle: 10
+ max-wait: -1ms
+ min-idle: 5
+ timeout: 5000ms
+
+#机器ID编号用于生成分布式ID
+workerId: 0
+
+#极光推送
+jg:
+ appkey: 2a733c0c2aad9be329d5be04
+ secret: ec70e5f8db9324b27cb8f0df
+
+
diff --git a/gc-shop/src/main/resources/application-xc.yml b/gc-shop/src/main/resources/application-xc.yml
new file mode 100644
index 0000000..f5befb2
--- /dev/null
+++ b/gc-shop/src/main/resources/application-xc.yml
@@ -0,0 +1,35 @@
+spring:
+ rabbitmq:
+ host: 120.27.238.55
+ port: 5672
+ username: ct_rabbit
+ password: 123456
+ virtual-host: /
+ datasource:
+ url: jdbc:mysql://120.27.238.55:3306/db_xzx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useAffectedRows=true
+ username: ct_test
+ password: 123456
+ redis:
+ database: 5
+ host: 121.37.162.173
+ password: d32ncxe@i3#!dV
+ port: 6379
+# cluster:
+# nodes: 127.0.0.1:6379
+ lettuce:
+ pool:
+ max-active: 200
+ max-idle: 10
+ max-wait: -1ms
+ min-idle: 5
+ timeout: 5000ms
+
+#机器ID编号用于生成分布式ID
+workerId: 0
+
+#极光推送
+jg:
+ appkey: 2a733c0c2aad9be329d5be04
+ secret: ec70e5f8db9324b27cb8f0df
+
+
diff --git a/gc-sys/src/main/resources/application-xc.yml b/gc-sys/src/main/resources/application-xc.yml
new file mode 100644
index 0000000..f5befb2
--- /dev/null
+++ b/gc-sys/src/main/resources/application-xc.yml
@@ -0,0 +1,35 @@
+spring:
+ rabbitmq:
+ host: 120.27.238.55
+ port: 5672
+ username: ct_rabbit
+ password: 123456
+ virtual-host: /
+ datasource:
+ url: jdbc:mysql://120.27.238.55:3306/db_xzx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useAffectedRows=true
+ username: ct_test
+ password: 123456
+ redis:
+ database: 5
+ host: 121.37.162.173
+ password: d32ncxe@i3#!dV
+ port: 6379
+# cluster:
+# nodes: 127.0.0.1:6379
+ lettuce:
+ pool:
+ max-active: 200
+ max-idle: 10
+ max-wait: -1ms
+ min-idle: 5
+ timeout: 5000ms
+
+#机器ID编号用于生成分布式ID
+workerId: 0
+
+#极光推送
+jg:
+ appkey: 2a733c0c2aad9be329d5be04
+ secret: ec70e5f8db9324b27cb8f0df
+
+
diff --git a/gc-user/src/main/resources/application-xc.yml b/gc-user/src/main/resources/application-xc.yml
new file mode 100644
index 0000000..f5befb2
--- /dev/null
+++ b/gc-user/src/main/resources/application-xc.yml
@@ -0,0 +1,35 @@
+spring:
+ rabbitmq:
+ host: 120.27.238.55
+ port: 5672
+ username: ct_rabbit
+ password: 123456
+ virtual-host: /
+ datasource:
+ url: jdbc:mysql://120.27.238.55:3306/db_xzx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useAffectedRows=true
+ username: ct_test
+ password: 123456
+ redis:
+ database: 5
+ host: 121.37.162.173
+ password: d32ncxe@i3#!dV
+ port: 6379
+# cluster:
+# nodes: 127.0.0.1:6379
+ lettuce:
+ pool:
+ max-active: 200
+ max-idle: 10
+ max-wait: -1ms
+ min-idle: 5
+ timeout: 5000ms
+
+#机器ID编号用于生成分布式ID
+workerId: 0
+
+#极光推送
+jg:
+ appkey: 2a733c0c2aad9be329d5be04
+ secret: ec70e5f8db9324b27cb8f0df
+
+
--
Gitblit v1.9.1