Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

README.md

@@ -175,26 +175,22 @@
 | saas_file | mysql | 10.10.100.18:3306 |  saas  | select111*** |  文件系统  |
 | saas_mail | mysql | 10.10.100.18:3306 |  saas  | select111*** |  邮件系统  |
 | saas_biz | mysql | 10.10.100.18:3306 |  saas  | select111*** |  业务系统  |
-| saas_ui | mongo | 10.10.100.123:27017 |    |  |  UI配置  |
+| saas_ui | mongo | 10.10.100.40:27017 |    |  |  UI配置  |
 
 > 中间件
 
 | 类型 | 地址 | 账号 | 密码 | 说明 |
 | ---- | :----: | :----: | :----: | ---- |
-| rabbitmq | 10.10.100.103:5672 | saas | select123*** | 消息中间件 [控制台](http://10.10.100.103:15672)|
-| redis | 10.10.100.173:6379 | | | 内存数据库 |
+| rabbitmq | 10.10.100.40:5672 | saas | select123*** | 消息中间件 [控制台](http://10.10.100.40:15672)|
+| redis | 10.10.100.23:6379 | | | 内存数据库 |
 
 
 > 服务器
 
 | IP      |  账号  |  密码  |  环境  |  资源  |
 | --------   | :----:  | :----: | :------:  | :------:  |
-| 10.10.100.103 |  centos  | mykey.key |  CentOS6, RabbitMQ  | Cpu: 4, Mem: 8G, Disk: 35G |
-| 10.10.100.123 |  centos  | mykey.key |  CentOS6, MongoDB  | Cpu: 8, Mem: 8G, Disk: 60G |
-| 10.10.100.127 |  centos  | mykey.key |  CentOS6, Nginx  | Cpu: 4, Mem: 8G, Disk: 35G |
-| 10.10.100.160 |  centos  | mykey.key |  CentOS6, ELK  | Cpu: 8, Mem: 8G, Disk: 60G |
-| 10.10.100.173 |  centos  | mykey.key |  CentOS6, Redis  | Cpu: 4, Mem: 8G, Disk: 35G |
-| 10.10.100.23 |  root  | 62cddbcc624b1b072d84117cc0e5a4db |  CentOS7, Docker  | Cpu: 40, Mem: 128G, Disk: 800G |
+| 10.10.100.40 |  centos  | mykey.key |  CentOS6, RabbitMQ, ELK, MongoDB, Nginx  | Cpu: 40, Mem: 128G, Disk: 600G |
+| 10.10.100.23 |  root  | 62cddbcc624b1b072d84117cc0e5a4db |  CentOS7, Docker, Redis  | Cpu: 40, Mem: 128G, Disk: 800G |
 | 10.10.100.24 |  root  | 4fd19c28ee472ef9ebc3c06de9277c1b |  CentOS7, Docker  | Cpu: 40, Mem: 128G, Disk: 800G |
 | 10.10.100.25 |  root  | 61a12a65cd42ef77a52dfef8e436bacc |  CentOS7, Docker  | Cpu: 40, Mem: 128G, Disk: 800G |
 | 10.10.100.26 |  root  | 8743e445c7a308edf4588b7997b21c73 |  CentOS7, Docker  | Cpu: 40, Mem: 128G, Disk: 800G |
@@ -205,9 +201,9 @@
 
 > 日志
 
-* [kibana](http://10.10.100.160:5601)
-* [logstash](tcp://10.10.100.160:5000)
-* [elasticsearch](http://10.10.100.160:9200/_search?pretty)
+* [kibana](http://10.10.100.40:5601)
+* [logstash](tcp://10.10.100.40:5000)
+* [elasticsearch](http://10.10.100.40:9200/_search?pretty)
 
 > 服务
 

applications/commons/commons-server/src/main/resources/config/application-docker-prod.yml

@@ -7,7 +7,7 @@ eureka:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/
 spring:
   rabbitmq:
-    host: 10.10.100.103
+    host: 10.10.100.40
     port: 5672
     virtual-host: docker
     username: saas
@@ -17,10 +17,10 @@ spring:
     username: saas
     password: select111***
   redis:
-    host: 10.10.100.173
+    host: 10.10.100.23
     port: 6379
 logging:
-  destination: 10.10.100.160:5000
+  destination: 10.10.100.40:5000
 b2b:
   baseUrl:
     inquiry: https://api-inquiry.usoftchina.com

applications/document/document-server/src/main/resources/config/application-docker-prod.yml

@@ -7,7 +7,7 @@ eureka:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/
 spring:
   rabbitmq:
-    host: 10.10.100.103
+    host: 10.10.100.40
     port: 5672
     virtual-host: docker
     username: saas
@@ -17,10 +17,10 @@ spring:
     username: saas
     password: select111***
   redis:
-    host: 10.10.100.173
+    host: 10.10.100.23
     port: 6379
 logging:
-  destination: 10.10.100.160:5000
+  destination: 10.10.100.40:5000
 b2b:
   baseUrl:
     inquiry: https://api-inquiry.usoftchina.com

applications/money/money-server/src/main/resources/config/application-docker-prod.yml

@@ -7,7 +7,7 @@ eureka:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/
 spring:
   rabbitmq:
-    host: 10.10.100.103
+    host: 10.10.100.40
     port: 5672
     virtual-host: docker
     username: saas
@@ -17,10 +17,10 @@ spring:
     username: saas
     password: select111***
   redis:
-    host: 10.10.100.173
+    host: 10.10.100.23
     port: 6379
 logging:
-  destination: 10.10.100.160:5000
+  destination: 10.10.100.40:5000
 b2b:
   baseUrl:
     inquiry: https://api-inquiry.usoftchina.com

applications/operation/operation-auth-server/src/main/resources/config/application-docker-prod.yml

@@ -7,7 +7,7 @@ eureka:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/
 spring:
   rabbitmq:
-    host: 10.10.100.103
+    host: 10.10.100.40
     port: 5672
     virtual-host: docker
     username: saas
@@ -17,10 +17,10 @@ spring:
     username: saas
     password: select111***
   redis:
-    host: 10.10.100.173
+    host: 10.10.100.23
     port: 6379
 logging:
-  destination: 10.10.100.160:5000
+  destination: 10.10.100.40:5000
 auth:
   companies:
     - 71

applications/operation/operation-server/src/main/resources/config/application-docker-prod.yml

@@ -7,7 +7,7 @@ eureka:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/
 spring:
   rabbitmq:
-    host: 10.10.100.103
+    host: 10.10.100.40
     port: 5672
     virtual-host: docker
     username: saas
@@ -17,7 +17,7 @@ spring:
     username: saas
     password: select111***
   redis:
-    host: 10.10.100.173
+    host: 10.10.100.23
     port: 6379
 logging:
-  destination: 10.10.100.160:5000
+  destination: 10.10.100.40:5000

applications/purchase/purchase-server/src/main/resources/config/application-docker-prod.yml

@@ -7,7 +7,7 @@ eureka:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/
 spring:
   rabbitmq:
-    host: 10.10.100.103
+    host: 10.10.100.40
     port: 5672
     virtual-host: docker
     username: saas
@@ -17,10 +17,10 @@ spring:
     username: saas
     password: select111***
   redis:
-    host: 10.10.100.173
+    host: 10.10.100.23
     port: 6379
 logging:
-  destination: 10.10.100.160:5000
+  destination: 10.10.100.40:5000
 b2b:
   baseUrl:
     inquiry: https://api-inquiry.usoftchina.com

applications/sale/sale-server/src/main/resources/config/application-docker-prod.yml

@@ -7,7 +7,7 @@ eureka:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/
 spring:
   rabbitmq:
-    host: 10.10.100.103
+    host: 10.10.100.40
     port: 5672
     virtual-host: docker
     username: saas
@@ -17,10 +17,10 @@ spring:
     username: saas
     password: select111***
   redis:
-    host: 10.10.100.173
+    host: 10.10.100.23
     port: 6379
 logging:
-  destination: 10.10.100.160:5000
+  destination: 10.10.100.40:5000
 b2b:
   baseUrl:
     inquiry: https://api-inquiry.usoftchina.com

applications/storage/storage-server/src/main/resources/config/application-docker-prod.yml

@@ -7,7 +7,7 @@ eureka:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/
 spring:
   rabbitmq:
-    host: 10.10.100.103
+    host: 10.10.100.40
     port: 5672
     virtual-host: docker
     username: saas
@@ -17,7 +17,7 @@ spring:
     username: saas
     password: select111***
   redis:
-    host: 10.10.100.173
+    host: 10.10.100.23
     port: 6379
 logging:
-  destination: 10.10.100.160:5000
+  destination: 10.10.100.40:5000

applications/transfers/transfers-server/src/main/resources/config/application-docker-prod.yml

@@ -7,7 +7,7 @@ eureka:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/
 spring:
   rabbitmq:
-    host: 10.10.100.103
+    host: 10.10.100.40
     port: 5672
     virtual-host: docker
     username: saas
@@ -17,10 +17,10 @@ spring:
     username: saas
     password: select111***
   redis:
-    host: 10.10.100.173
+    host: 10.10.100.23
     port: 6379
 logging:
-  destination: 10.10.100.160:5000
+  destination: 10.10.100.40:5000
 b2b:
   baseUrl:
     inquiry: https://api-inquiry.usoftchina.com

base-servers/account/account-server/src/main/resources/config/application-docker-prod.yml

@@ -7,7 +7,7 @@ eureka:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/
 spring:
   rabbitmq:
-    host: 10.10.100.103
+    host: 10.10.100.40
     port: 5672
     virtual-host: docker
     username: saas
@@ -17,9 +17,9 @@ spring:
     username: saas
     password: select111***
   redis:
-    host: 10.10.100.173
+    host: 10.10.100.23
     port: 6379
 logging:
-  destination: 10.10.100.160:5000
+  destination: 10.10.100.40:5000
 sso:
   base-url: https://sso.ubtob.com

base-servers/admin-server/src/main/resources/config/application-docker-prod.yml

@@ -6,4 +6,4 @@ eureka:
     serviceUrl:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/
 logging:
-  destination: 10.10.100.160:5000
+  destination: 10.10.100.40:5000

base-servers/auth/auth-server/src/main/resources/config/application-docker-prod.yml

@@ -7,7 +7,7 @@ eureka:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/
 spring:
   rabbitmq:
-    host: 10.10.100.103
+    host: 10.10.100.40
     port: 5672
     virtual-host: docker
     username: saas
@@ -17,7 +17,7 @@ spring:
     username: saas
     password: select111***
   redis:
-    host: 10.10.100.173
+    host: 10.10.100.23
     port: 6379
 logging:
-  destination: 10.10.100.160:5000
+  destination: 10.10.100.40:5000

base-servers/datacenter/datacenter-server/src/main/resources/config/application-docker-prod.yml

@@ -7,7 +7,7 @@ eureka:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/
 spring:
   rabbitmq:
-    host: 10.10.100.103
+    host: 10.10.100.40
     port: 5672
     virtual-host: docker
     username: saas
@@ -17,10 +17,10 @@ spring:
     username: saas
     password: select111***
   redis:
-    host: 10.10.100.173
+    host: 10.10.100.23
     port: 6379
   data:
     mongodb:
-      uri: mongodb://10.10.100.123:27017/saas_data
+      uri: mongodb://10.10.100.40:27017/saas_data
 logging:
-  destination: 10.10.100.160:5000
+  destination: 10.10.100.40:5000

base-servers/eureka-server/src/main/resources/config/application-docker-prod.yml

@@ -4,4 +4,4 @@ eureka:
 server:
   port: 8500
 logging:
-  destination: 10.10.100.160:5000
+  destination: 10.10.100.40:5000

base-servers/file/file-server/src/main/resources/config/application-docker-prod.yml

@@ -7,7 +7,7 @@ eureka:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/
 spring:
   rabbitmq:
-    host: 10.10.100.103
+    host: 10.10.100.40
     port: 5672
     virtual-host: docker
     username: saas
@@ -17,10 +17,10 @@ spring:
     username: saas
     password: select111***
   redis:
-    host: 10.10.100.173
+    host: 10.10.100.23
     port: 6379
 fdfs:
   tracker-list:
     - 10.10.100.200:22122
 logging:
-  destination: 10.10.100.160:5000
+  destination: 10.10.100.40:5000

base-servers/gateway-server/src/main/resources/config/application-docker-prod.yml

@@ -7,13 +7,13 @@ eureka:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/
 spring:
   rabbitmq:
-    host: 10.10.100.103
+    host: 10.10.100.40
     port: 5672
     virtual-host: docker
     username: saas
     password: select123***
   redis:
-    host: 10.10.100.173
+    host: 10.10.100.23
     port: 6379
 logging:
-  destination: 10.10.100.160:5000
+  destination: 10.10.100.40:5000

base-servers/mail/mail-server/src/main/resources/config/application-docker-prod.yml

@@ -7,7 +7,7 @@ eureka:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/
 spring:
   rabbitmq:
-    host: 10.10.100.103
+    host: 10.10.100.40
     port: 5672
     virtual-host: docker
     username: saas
@@ -17,7 +17,7 @@ spring:
     username: saas
     password: select111***
   redis:
-    host: 10.10.100.173
+    host: 10.10.100.23
     port: 6379
 logging:
-  destination: 10.10.100.160:5000
+  destination: 10.10.100.40:5000

base-servers/sms/sms-server/src/main/resources/config/application-docker-prod.yml

@@ -7,7 +7,7 @@ eureka:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/
 spring:
   rabbitmq:
-    host: 10.10.100.103
+    host: 10.10.100.40
     port: 5672
     virtual-host: docker
     username: saas
@@ -17,7 +17,7 @@ spring:
     username: saas
     password: select111***
   redis:
-    host: 10.10.100.173
+    host: 10.10.100.23
     port: 6379
 logging:
-  destination: 10.10.100.160:5000
+  destination: 10.10.100.40:5000

base-servers/socket/socket-server/src/main/resources/config/application-docker-prod.yml

@@ -7,13 +7,13 @@ eureka:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/
 spring:
   rabbitmq:
-    host: 10.10.100.103
+    host: 10.10.100.40
     port: 5672
     virtual-host: docker
     username: saas
     password: select123***
   redis:
-    host: 10.10.100.173
+    host: 10.10.100.23
     port: 6379
 logging:
-  destination: 10.10.100.160:5000
+  destination: 10.10.100.40:5000

base-servers/ui-server/src/main/resources/config/application-docker-prod.yml

@@ -7,13 +7,13 @@ eureka:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/
 spring:
   rabbitmq:
-    host: 10.10.100.103
+    host: 10.10.100.40
     port: 5672
     virtual-host: docker
     username: saas
     password: select123***
   data:
     mongodb:
-      uri: mongodb://10.10.100.123:27017/saas_ui
+      uri: mongodb://10.10.100.40:27017/saas_ui
 logging:
-  destination: 10.10.100.160:5000
+  destination: 10.10.100.40:5000

base-servers/zipkin-server/src/main/resources/config/application-docker-prod.yml

@@ -8,14 +8,14 @@ eureka:
 zipkin:
   collector:
     rabbitmq:
-      uri: amqp://saas:select123***@10.10.100.103:5672/docker
+      uri: amqp://saas:select123***@10.10.100.40:5672/docker
   storage:
     type: elasticsearch
     elasticsearch:
-      hosts: 10.10.100.160:9200
+      hosts: 10.10.100.40:9200
       index: zipkin
       index-shards: 5
       index-replicas: 1
       max-requests: 64
 logging:
-  destination: 10.10.100.160:5000
+  destination: 10.10.100.40:5000