animeic преди 2 години
родител
ревизия
d0a280c7e4
променени са 3 файла, в които са добавени 42 реда и са изтрити 42 реда
  1. 10 10
      config-service.yaml
  2. 28 28
      docker-compose.yaml
  3. 4 4
      nginx/conf.d/default.conf

+ 10 - 10
config-service.yaml

@@ -6,24 +6,24 @@ log:
 configer:
   -
     name: 3dshow-mongo
-    value: mongodb://root:3dshow@3dshow-mongo-dev:27017/3dshow?authSource=admin
-    devValue: mongodb://root:3dshow@124.71.139.24:37036/3dshow?authSource=admin
+    value: mongodb://root:3dshow@3dshow-mongo-alpha:27017/3dshow?authSource=admin
+    devValue: mongodb://root:3dshow@124.71.139.24:37037/3dshow?authSource=admin
   -
     name: 3dshow-supply-user-mongo
-    value: mongodb://root:3dshow@3dshow-mongo-dev:27017/supply-user?authSource=admin
-    devValue: mongodb://root:3dshow@124.71.139.24:37036/supply-user?authSource=admin
+    value: mongodb://root:3dshow@3dshow-mongo-alpha:27017/supply-user?authSource=admin
+    devValue: mongodb://root:3dshow@124.71.139.24:37037/supply-user?authSource=admin
   -
     name: 3dshow-customer-user-mongo
-    value: mongodb://root:3dshow@3dshow-mongo-dev:27017/customer-user?authSource=admin
-    devValue: mongodb://root:3dshow@124.71.139.24:37036/customer-user?authSource=admin
+    value: mongodb://root:3dshow@3dshow-mongo-alpha:27017/customer-user?authSource=admin
+    devValue: mongodb://root:3dshow@124.71.139.24:37037/customer-user?authSource=admin
 
   -
     name: 3dshow-redis
-    value: 3dshow-redis-dev:6379#0#default#3dshow
-    devValue: 124.71.139.24:16393#0#default#3dshow
+    value: 3dshow-redis-alpha:6379#0#default#3dshow
+    devValue: 124.71.139.24:16394#0#default#3dshow
 
   - name: bus-network
-    value: nats://124.71.139.24:14305
+    value: nats://124.71.139.24:14306
 
 # adapter:
 #   -
@@ -35,6 +35,6 @@ startNatsShellParams: "-p 4222 -m 8222 -js"
 startNatsPort: 4222
 
 nats:
-  url: nats://3dshow-bus-dev:4222
+  url: nats://3dshow-bus-alpha:4222
   maxReconnect: 10000
   reconnDelaySecond: 5

+ 28 - 28
docker-compose.yaml

@@ -8,93 +8,93 @@ networks:
 
 services:
   #nginx反向代理
-  3dshow-nginx-dev:
+  3dshow-nginx-alpha:
     image: "registry.cn-chengdu.aliyuncs.com/infish/pack-comm-nginx:1.23.1"
     restart: always
     ports:
-      - 18094:80
+      - 18095:80
     volumes:
       - ./nginx/conf.d:/etc/nginx/conf.d
       - ./nginx/www:/usr/share/nginx/html
 
     depends_on:
-      - 3dshow-customer-dev
-      - 3dshow-supplier-dev
-      - 3dshow-supply-user-dev
-      - 3dshow-customer-user-dev
+      - 3dshow-customer-alpha
+      - 3dshow-supplier-alpha
+      - 3dshow-supply-user-alpha
+      - 3dshow-customer-user-alpha
       
   #bus消息中间件
-  3dshow-bus-dev:
+  3dshow-bus-alpha:
     restart: always
     image: registry.cn-chengdu.aliyuncs.com/infish/pack-comm-bus:v1.0.0
     volumes:
       - ./config-service.yaml:/root/bus/app.yaml
 
     depends_on:
-      - 3dshow-mongo-dev
-      - 3dshow-redis-dev    
+      - 3dshow-mongo-alpha
+      - 3dshow-redis-alpha    
     ports:
-      - 14305:4222
+      - 14306:4222
 
   #redis缓存
-  3dshow-redis-dev:
+  3dshow-redis-alpha:
     image: "redis:alpine"
     restart: always
     command:
       --requirepass "3dshow" #这一行是设置密码
     privileged: true
     ports:
-      - 16393:6379
+      - 16394:6379
 
   #mongo 数据库 3dshow customer-user supply-user
-  3dshow-mongo-dev:
+  3dshow-mongo-alpha:
     image: mongo:4.4.1
     restart: always
     environment:
       MONGO_INITDB_ROOT_USERNAME: root
       MONGO_INITDB_ROOT_PASSWORD: 3dshow
     volumes:
-      - ~/data/packs-3dshow-dev/mongo/db:/data/db
-      - ~/data/packs-3dshow-dev/mongo/log:/var/log/mongodb
+      - ~/data/packs-3dshow-alpha/mongo/db:/data/db
+      - ~/data/packs-3dshow-alpha/mongo/log:/var/log/mongodb
     ports: 
-      - 37036:27017
+      - 37037:27017
 
   # 3dshow customer
-  3dshow-customer-dev:
+  3dshow-customer-alpha:
     image: registry.cn-chengdu.aliyuncs.com/infish/pack-3dshow-customer:v1.0.0
     restart: always
     depends_on:
-      - 3dshow-bus-dev
+      - 3dshow-bus-alpha
     environment: 
-      NATS: nats://3dshow-bus-dev:4222
+      NATS: nats://3dshow-bus-alpha:4222
 
   # 3dshow supplier
-  3dshow-supplier-dev:
+  3dshow-supplier-alpha:
     image: registry.cn-chengdu.aliyuncs.com/infish/pack-3dshow-supplier:v1.0.0
     restart: always
     depends_on:
-      - 3dshow-bus-dev
+      - 3dshow-bus-alpha
     environment: 
-      NATS: nats://3dshow-bus-dev:4222
+      NATS: nats://3dshow-bus-alpha:4222
 
   # user服务
-  3dshow-supply-user-dev:
+  3dshow-supply-user-alpha:
     image: registry.cn-chengdu.aliyuncs.com/infish/pack-comm-usercenter:v1.0.0
     restart: always
     depends_on:
-      - 3dshow-bus-dev
+      - 3dshow-bus-alpha
     environment: 
-      NATS: nats://3dshow-bus-dev:4222
+      NATS: nats://3dshow-bus-alpha:4222
       CONFIGER_MONGO: 3dshow-supply-user-mongo
       CONFIGER_REDIS: 3dshow-redis
   
   # c端用户
-  3dshow-customer-user-dev:
+  3dshow-customer-user-alpha:
     image: registry.cn-chengdu.aliyuncs.com/infish/pack-comm-usercenter:v1.0.0
     restart: always
     depends_on:
-      - 3dshow-bus-dev
+      - 3dshow-bus-alpha
     environment: 
-      NATS: nats://3dshow-bus-dev:4222
+      NATS: nats://3dshow-bus-alpha:4222
       CONFIGER_MONGO: 3dshow-customer-user-mongo
       CONFIGER_REDIS: 3dshow-redis

+ 4 - 4
nginx/conf.d/default.conf

@@ -40,19 +40,19 @@ server {
     #}
 
     location /supplier/ {
-       proxy_pass  http://3dshow-supplier-dev:8888/supplier/;
+       proxy_pass  http://3dshow-supplier-alpha:8888/supplier/;
     }  
 
     location /customer/ {
-       proxy_pass  http://3dshow-customer-dev:8888/customer/;
+       proxy_pass  http://3dshow-customer-alpha:8888/customer/;
     }   
 
     location /supplyUser/ {
-       proxy_pass  http://3dshow-supply-user-dev:8908/usercenter/;
+       proxy_pass  http://3dshow-supply-user-alpha:8908/usercenter/;
     }   
 
     location /customerUser/ {
-       proxy_pass  http://3dshow-customer-user-dev:8908/usercenter/;
+       proxy_pass  http://3dshow-customer-user-alpha:8908/usercenter/;
     }   
 
     # 用户接口