添加开发环境

config-service.yaml

@@ -6,21 +6,21 @@ log:
 configer:
   -
     name: 3dshow-mongo
-    value: mongodb://root:3dshow@3dshow-mongo:27017/3dshow?authSource=admin
-    devValue: mongodb://root:3dshow@124.71.139.24:37031/3dshow?authSource=admin
+    value: mongodb://root:3dshow@3dshow-mongo-dev:27017/3dshow?authSource=admin
+    devValue: mongodb://root:3dshow@124.71.139.24:37036/3dshow?authSource=admin
   -
     name: 3dshow-supply-user-mongo
-    value: mongodb://root:3dshow@3dshow-mongo:27017/supply-user?authSource=admin
-    devValue: mongodb://root:3dshow@124.71.139.24:37031/supply-user?authSource=admin
+    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
   -
     name: 3dshow-customer-user-mongo
-    value: mongodb://root:3dshow@3dshow-mongo:27017/customer-user?authSource=admin
-    devValue: mongodb://root:3dshow@124.71.139.24:37031/customer-user?authSource=admin
+    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
 
   -
     name: 3dshow-redis
-    value: 3dshow-redis:6379#0#default#3dshow
-    devValue: 124.71.139.24:16391#0#default#3dshow
+    value: 3dshow-redis-dev:6379#0#default#3dshow
+    devValue: 124.71.139.24:16392#0#default#3dshow
 
 # adapter:
 #   -
@@ -32,6 +32,6 @@ startNatsShellParams: "-p 4222 -m 8222 -js"
 startNatsPort: 4222
 
 nats:
-  url: nats://comm-bus:4222
+  url: nats://3dshow-bus-dev:4222
   maxReconnect: 10000
   reconnDelaySecond: 5

docker-compose.yaml

@@ -4,7 +4,7 @@ version: '3.8'
 networks:
   default:
     external:
-      name: network-3dshow
+      name: network-3dshow-dev
 
 services:
   #nginx反向代理
@@ -12,42 +12,43 @@ services:
     image: "registry.cn-chengdu.aliyuncs.com/infish/pack-comm-nginx:1.23.1"
     restart: always
     ports:
-      - 18089:80
+      - 18094:80
     volumes:
       - ./nginx/conf.d:/etc/nginx/conf.d
       - ./nginx/www:/usr/share/nginx/html
 
     depends_on:
-      - 3dshow-customer
-      - 3dshow-supplier
-      - 3dshow-supply-user
-      - 3dshow-customer-user
+      - 3dshow-dev
+      - 3dshow-customer-dev
+      - 3dshow-supplier-dev
+      - 3dshow-supply-user-dev
+      - 3dshow-customer-user-dev
       
   #bus消息中间件
-  3dshow-bus:
+  3dshow-bus-dev:
     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
-      - 3dshow-redis    
+      - 3dshow-mongo-dev
+      - 3dshow-redis-dev    
     ports:
-      - 14301:4222
+      - 14305:4222
 
   #redis缓存
-  3dshow-redis:
+  3dshow-redis-dev:
     image: "redis:alpine"
     restart: always
     command:
       --requirepass "3dshow" #这一行是设置密码
     privileged: true
     ports:
-      - 16391:6379
+      - 16392:6379
 
   #mongo 数据库 3dshow customer-user supply-user
-  3dshow-mongo:
+  3dshow-mongo-dev:
     image: mongo:4.4.1
     restart: always
     environment:
@@ -57,53 +58,53 @@ services:
       - ~/data/packs-3dshow/mongo/db:/data/db
       - ~/data/packs-3dshow/mongo/log:/var/log/mongodb
     ports: 
-      - 37031:27017
+      - 37036:27017
 
   # 3dshow old
-  3dshow:
+  3dshow-dev:
     image: registry.cn-chengdu.aliyuncs.com/infish/pack-3dshow:v1.0.0
     restart: always
     depends_on:
-      - 3dshow-bus
+      - 3dshow-bus-dev
     environment: 
-      NATS: nats://3dshow-bus:4222
+      NATS: nats://3dshow-bus-dev:4222
 
   # 3dshow customer
-  3dshow-customer:
+  3dshow-customer-dev:
     image: registry.cn-chengdu.aliyuncs.com/infish/pack-3dshow-customer:v1.0.0
     restart: always
     depends_on:
-      - 3dshow-bus
+      - 3dshow-bus-dev
     environment: 
-      NATS: nats://3dshow-bus:4222
+      NATS: nats://3dshow-bus-dev:4222
 
   # 3dshow supplier
-  3dshow-supplier:
+  3dshow-supplier-dev:
     image: registry.cn-chengdu.aliyuncs.com/infish/pack-3dshow-supplier:v1.0.0
     restart: always
     depends_on:
-      - 3dshow-bus
+      - 3dshow-bus-dev
     environment: 
-      NATS: nats://3dshow-bus:4222
+      NATS: nats://3dshow-bus-dev:4222
 
   # user服务
-  3dshow-supply-user:
+  3dshow-supply-user-dev:
     image: registry.cn-chengdu.aliyuncs.com/infish/pack-comm-usercenter:v1.0.0
     restart: always
     depends_on:
-      - 3dshow-bus
+      - 3dshow-bus-dev
     environment: 
-      NATS: nats://3dshow-bus:4222
+      NATS: nats://3dshow-bus-dev:4222
       CONFIGER_MONGO: 3dshow-supply-user-mongo
       CONFIGER_REDIS: 3dshow-redis
   
   # c端用户
-  3dshow-customer-user:
+  3dshow-customer-user-dev:
     image: registry.cn-chengdu.aliyuncs.com/infish/pack-comm-usercenter:v1.0.0
     restart: always
     depends_on:
-      - 3dshow-bus
+      - 3dshow-bus-dev
     environment: 
-      NATS: nats://3dshow-bus:4222
+      NATS: nats://3dshow-bus-dev:4222
       CONFIGER_MONGO: 3dshow-customer-user-mongo
       CONFIGER_REDIS: 3dshow-redis

nginx/conf.d/default.conf

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