Merge branch 'master' into dev

config-service.yaml

@@ -22,6 +22,9 @@ configer:
     value: 3dshow-redis-dev:6379#0#default#3dshow
     devValue: 124.71.139.24:16392#0#default#3dshow
 
+  - name: bus-network
+    value: nats://124.71.139.24:14305
+
 # adapter:
 #   -
 #     busName: comm

docker-compose.yaml

@@ -3,8 +3,8 @@ version: '3.8'
 # 网络
 networks:
   default:
-    external:
-      name: network-3dshow-dev
+    name: default-network
+    external: true
 
 services:
   #nginx反向代理
@@ -18,7 +18,6 @@ services:
       - ./nginx/www:/usr/share/nginx/html
 
     depends_on:
-      - 3dshow-dev
       - 3dshow-customer-dev
       - 3dshow-supplier-dev
       - 3dshow-supply-user-dev
@@ -60,15 +59,6 @@ services:
     ports: 
       - 37036:27017
 
-  # 3dshow old
-  3dshow-dev:
-    image: registry.cn-chengdu.aliyuncs.com/infish/pack-3dshow:v1.0.0
-    restart: always
-    depends_on:
-      - 3dshow-bus-dev
-    environment: 
-      NATS: nats://3dshow-bus-dev:4222
-
   # 3dshow customer
   3dshow-customer-dev:
     image: registry.cn-chengdu.aliyuncs.com/infish/pack-3dshow-customer:v1.0.0

nginx/conf.d/default.conf

@@ -39,11 +39,6 @@ server {
     #    deny  all;
     #}
 
-    # 3dshow old
-    location /3dshow/ {
-       proxy_pass  http://3dshow-dev:8888/3dshow/;
-    }   
-
     location /supplier/ {
        proxy_pass  http://3dshow-supplier-dev:8888/supplier/;
     }