update services config

docker/conf/dsBaseWeb/Config/Config.docker.ini

@@ -8,19 +8,19 @@ localPath = E:/Work/dsMin/dsBaseWeb
 
 
 [mysql]
-ip = server.dsmin.com
+ip = mariadb
-port = 22066
+port = 3306
 db_name = base_db_dev
 
 [redis]
-ip = server.dsmin.com
+ip = redis
-port = 18890
+port = 6379
 db = 0
 expireTime = 86400
 
 # 注册rpc server
 [rpcServer]
-ip = 127.0.0.1
+ip = dsbaserpc
 port = 8001
 
 #gin服务器的端口
@@ -32,7 +32,7 @@ port = 8002
 project_name = dsBaseWeb
 
 [kafka]
-brokers = 10.10.14.238:9092,
+brokers = kafka:9092,
 partition = 20
 replication = 1
 KafkaAccessLogTopic = log_baseweb

docker/conf/dsBigData/Config/Config.docker.ini

@@ -1,67 +1,24 @@
 [distribute]    #发布功能的配置
-ip = 10.10.14.187
+ip = 10.10.14.211
 port = 22
 user = root
 pwd = dsideal
-remotePath = /usr/local/dsMin/dsBaseWeb/
+remotePath = /usr/local/dsMin/dsBigData/
-localPath = E:/Work/dsMin/dsBaseWeb
+localPath = E:/Work/dsMin/dsBigData
-
-
-[mysql]
-ip = server.dsmin.com
-port = 22066
-db_name = base_db_dev
 
 [redis]
-ip = server.dsmin.com
+ip = redis
-port = 18890
+port = 6379
 db = 0
 expireTime = 86400
 
-# 注册rpc server
-[rpcServer]
-ip = 127.0.0.1
-port = 8001
-
 #gin服务器的端口
 [server]
-port = 8002
+port = 8004
 
 # 本项目名称，用于记录日志
 [project]
-project_name = dsBaseWeb
+project_name = dsBigData
-
-[kafka]
-brokers = 10.10.14.238:9092,
-partition = 20
-replication = 1
-KafkaAccessLogTopic = log_baseweb
-
-[sso]
-ssoServerNw = http://10.10.14.187
-#ssoServerNw = http://10.10.24.116:8000
-ssoServerWw = http://fort.edusoa.com:7777
-authCodeURI = /oauth2/authorize
-authTokenURI = /oauth2/access_token
-authLogoutURI = /oauth2/logout
-clientIdNw = br888ra563ugbm2ov77g
-clientSecretNw = 01e9f8ak57e3j03vrjq34zg6ws
-#clientIdNw = bu3pcf7cl45ug8dup8og
-#clientSecretNw = 01emmt5qdyszh9ndbpbg4zk4tn
-clientIdWw = bpomac2563uj213q1g2g
-clientSecretWw = 01e3nf6hnr2eysdxhc2n80w9ca
-responseType = code
-grantType = authorization_code
-redirectURINw = http://10.10.14.187/base/sso/CheckSsoCode
-#redirectURINw = http://127.0.0.1:8002/base/sso/CheckSsoCode
-redirectURIWw = http://fort.edusoa.com:7777/base/sso/CheckSsoCode
-accessTokenKey = ds_access_token
-
-[deleteXlsx]
-#删除7天前无用的模板文件
-diffTime = 7
-
 
-# 内部IP段起始
+[elasticsearch]
-[IP]
+url = http://10.10.14.212:9200
-intranetIP=192,172,10,127

docker/conf/dsSso/Config/Config.docker.ini

@@ -1,6 +1,6 @@
 [mysql]     #   mysql1的配置项
-ip = 10.10.14.187
+ip = mariadb
-port = 22066
+port = 3306
 database = base_db_dev
 user = root
 pwd = DsideaL147258369
@@ -14,8 +14,8 @@ remotePath = /usr/local/dsMin/dsSso/
 localPath = E:\Work\dsMin\dsSso\build
 
 [redis]
-ip = 10.10.14.187
+ip = redis
-port = 18890
+port = 6379
 db = 0
 
 [kafka]

docker/conf/dsSupport/Config/Config.docker.ini

@@ -12,8 +12,8 @@ localPath = E:/Work/dsMin/dsSupport
 ;database = base_db_zhangjun
 ;user = root
 ;pwd = DsideaL147258369
-ip = 10.10.14.187
+ip = mariadb
-port = 22066
+port = 3306
 database = base_db_dev
 user = root
 pwd = DsideaL147258369
@@ -23,8 +23,8 @@ pwd = DsideaL147258369
 ;port = 6379
 ;db = 1
 ;expireTime = 86400
-ip = 10.10.14.187
+ip = redis
-port = 18890
+port = 6379
 db = 1
 expireTime = 86400
 

docker/docker-compose.pro.yml

@@ -2,46 +2,53 @@ version: "3.8"
 services:
     dsbaserpc:
         image: debian:buster-20210511
+        restart: always
         ports:
             - 8001:8001
         volumes:
             - ./app/dsBaseRpc:/app
-            - ./conf/dsBaseRpc/Config/Config.docker.ini:/app/Config.ini
+            - ./conf/dsBaseRpc/Config/Config.docker.ini:/app/Config/Config.ini
         working_dir: /app
         command: bash -c "./dsBaseRpc"
     dsbaseweb:
         image: debian:buster-20210511
+        restart: always
         ports:
             - 8002:8002
         volumes:
             - ./app/dsBaseWeb:/app
-            - ./conf/dsBaseWeb/Config/Config.docker.ini.docker:/app/Config.ini
+            - ./conf/dsBaseWeb/Config/Config.docker.ini:/app/Config/Config.ini
         working_dir: /app
         command: bash -c "./dsBaseWeb"
+        depends_on: 
+            - kafka
     dsbigdata:
         image: debian:buster-20210511
+        restart: always
         ports:
-            - 8003:8003
+            - 8004:8004
         volumes:
             - ./app/dsBigData:/app
-            - ./conf/dsBigData/Config/Config.docker.ini.docker:/app/Config.ini
+            - ./conf/dsBigData/Config/Config.docker.ini:/app/Config/Config.ini
         working_dir: /app
         command: bash -c "./dsBigData"
     dssso:
         image: debian:buster-20210511
+        restart: always
         ports:
             - 8000:8000
         volumes:
             - ./app/dsSso:/app
-            - ./conf/dsSso/Config/Config.docker.ini.docker:/app/Config.ini
+            - ./conf/dsSso/Config/Config.docker.ini:/app/Config/Config.ini
         working_dir: /app
         command: bash -c "./dsSso"
     dssupport:
         image: debian:buster-20210511
+        restart: always
         ports:
             - 8005:8005
         volumes:
             - ./app/dsSupport:/app
-            - ./conf/dsSupport/Config/Config.docker.ini.docker:/app/Config.ini
+            - ./conf/dsSupport/Config/Config.docker.ini:/app/Config/Config.ini
         working_dir: /app
         command: bash -c "./dsSupport"