update

config-service.yaml

@@ -1,29 +1,25 @@
 log:
-  fileName: box-bus.log
+  fileName: 3dshow2.0-bus.log
   level: 1
-  serviceName: box-bus
+  serviceName: 3dshow2-bus
   
 configer:
   -
-    name: 3dshow-mongo
-    value: mongodb://root:3dshow@3dshow-mongo-alpha:27017/3dshow?authSource=admin
-    devValue: mongodb://root:3dshow@124.71.139.24:37038/3dshow?authSource=admin
+    name: 3dshow2-mongo
+    value: mongodb://root:3dshowzzz_x@3dshow2-mongo:27017/3dshow?authSource=admin
+    devValue: mongodb://root:3dshowzzz_x@124.71.139.24:37039/3dshow?authSource=admin
   -
-    name: 3dshow-supply-user-mongo
-    value: mongodb://root:3dshow@3dshow-mongo-alpha:27017/supply-user?authSource=admin
-    devValue: mongodb://root:3dshow@124.71.139.24:37038/supply-user?authSource=admin
-  -
-    name: 3dshow-customer-user-mongo
-    value: mongodb://root:3dshow@3dshow-mongo-alpha:27017/customer-user?authSource=admin
-    devValue: mongodb://root:3dshow@124.71.139.24:37038/customer-user?authSource=admin
+    name: 3dshow2-user-mongo
+    value: mongodb://root:3dshowzzz_x@3dshow2-mongo:27017/user?authSource=admin
+    devValue: mongodb://root:3dshowzzz_x@124.71.139.24:37039/user?authSource=admin
 
   -
-    name: 3dshow-redis
-    value: 3dshow-redis-alpha:6379#0#default#3dshow
-    devValue: 124.71.139.24:16395#0#default#3dshow
+    name: 3dshow2-redis
+    value: 3dshow2-redis:6379#0#default#3dshowzzz_x
+    devValue: 124.71.139.24:16396#0#default#3dshowzzz_x
 
   - name: bus-network
-    value: nats://124.71.139.24:14306
+    value: nats://124.71.139.24:14307
 
 # adapter:
 #   -
@@ -35,6 +31,6 @@ startNatsShellParams: "-p 4222 -m 8222 -js"
 startNatsPort: 4222
 
 nats:
-  url: nats://3dshow-bus-alpha:4222
+  url: nats://3dshow2-bus:4222
   maxReconnect: 10000
   reconnDelaySecond: 5

docker-compose.yaml

@@ -8,106 +8,80 @@ networks:
 
 services:
   #nginx反向代理
-  3dshow-nginx-alpha:
+  3dshow2-nginx:
     image: "registry.cn-chengdu.aliyuncs.com/infish/pack-comm-nginx:1.23.1"
     restart: always
     ports:
-      - 18095:80
+      - 18096:80
     volumes:
       - ./nginx/conf.d:/etc/nginx/conf.d
       - ./nginx/www:/usr/share/nginx/html
 
     depends_on:
-      - 3dshow-customer-alpha
-      - 3dshow-supplier-alpha
-      - 3dshow-supply-user-alpha
-      - 3dshow-customer-user-alpha
+      - 3dshow2
+      - 3dshow2-user
       
   #bus消息中间件
-  3dshow-bus-alpha:
+  3dshow2-bus:
     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-alpha
-      - 3dshow-redis-alpha    
+      - 3dshow2-mongo
+      - 3dshow2-redis
     ports:
-      - 14306:4222
+      - 14307:4222
 
   #redis缓存
-  3dshow-redis-alpha:
+  3dshow2-redis:
     image: "redis:alpine"
     restart: always
     command:
-      --requirepass "3dshow" #这一行是设置密码
+      --requirepass "3dshow2zzz_x" #这一行是设置密码
     privileged: true
     ports:
-      - 16395:6379
+      - 16396:6379
 
   #mongo 数据库 3dshow customer-user supply-user
-  3dshow-mongo-alpha:
+  3dshow2-mongo:
     image: mongo:4.4.1
     restart: always
     environment:
       MONGO_INITDB_ROOT_USERNAME: root
-      MONGO_INITDB_ROOT_PASSWORD: 3dshow
+      MONGO_INITDB_ROOT_PASSWORD: 3dshowzzz_x
     volumes:
-      - ~/data/packs-3dshow-alpha/mongo/db:/data/db
-      - ~/data/packs-3dshow-alpha/mongo/log:/var/log/mongodb
+      - ~/data/packs-3dshow2.0/mongo/db:/data/db
+      - ~/data/packs-3dshow2.0/mongo/log:/var/log/mongodb
     ports: 
-      - 37038:27017
+      - 37039:27017
 
-  # 3dshow customer
-  3dshow-customer-alpha:
-    image: registry.cn-chengdu.aliyuncs.com/infish/pack-3dshow-customer:v1.0.0
+  # 3dshow
+  3dshow2:
+    image: registry.cn-chengdu.aliyuncs.com/infish/pack-3dshow:v2.0.0
     restart: always
     depends_on:
-      - 3dshow-bus-alpha
+      - 3dshow2-bus
     environment: 
-      NATS: nats://3dshow-bus-alpha:4222
-
-  # 3dshow supplier
-  3dshow-supplier-alpha:
-    image: registry.cn-chengdu.aliyuncs.com/infish/pack-3dshow-supplier:v1.0.0
-    restart: always
-    depends_on:
-      - 3dshow-bus-alpha
-    environment: 
-      NATS: nats://3dshow-bus-alpha:4222
+      NATS: nats://3dshow2-bus:4222
 
   # user服务
-  3dshow-supply-user-alpha:
-    image: registry.cn-chengdu.aliyuncs.com/infish/pack-comm-usercenter:v1.0.0
+  3dshow2-user:
+    image: registry.cn-chengdu.aliyuncs.com/infish/pack-comm-usercenter:v1.0.1
     restart: always
     depends_on:
-      - 3dshow-bus-alpha
+      - 3dshow2-bus
     environment: 
-      NATS: nats://3dshow-bus-alpha:4222
-      CONFIGER_MONGO: 3dshow-supply-user-mongo
-      CONFIGER_REDIS: 3dshow-redis
+      NATS: nats://3dshow2-bus:4222
+      CONFIGER_MONGO: 3dshow2-user-mongo
+      CONFIGER_REDIS: 3dshow2-redis
       CONFIGER_JWT: spu3d#spu3d secret#168
+      IGNORE_USERTYPE: "true"
       # MONGO_MIGRATIONS: /data/migrations==mongodb://root:3dshow@3dshow-mongo-alpha:27017/supply-user?authSource=admin&&/data/migrations==mongodb://user:password@host:port/dbname?query
-      MONGO_MIGRATIONS: /data/migrations==mongodb://root:3dshow@3dshow-mongo-alpha:27017/supply-user?authSource=admin
+      MONGO_MIGRATIONS: /data/migrations==mongodb://root:3dshowzzz_x@3dshow2-mongo:27017/user?authSource=admin
     
     volumes:
-      - ./mongo-migrations/supplier:/data/migrations
-
+      - ./mongo-migrations:/data/migrations
 
-  # c端用户
-  3dshow-customer-user-alpha:
-    image: registry.cn-chengdu.aliyuncs.com/infish/pack-comm-usercenter:v1.0.0
-    restart: always
-    depends_on:
-      - 3dshow-bus-alpha
-    environment: 
-      NATS: nats://3dshow-bus-alpha:4222
-      CONFIGER_MONGO: 3dshow-customer-user-mongo
-      CONFIGER_REDIS: 3dshow-redis
-      CONFIGER_JWT: spu3d#spu3d secret#168
-      MONGO_MIGRATIONS: /data/migrations==mongodb://root:3dshow@3dshow-mongo-alpha:27017/customer-user?authSource=admin
-    
-    volumes:
-      - ./mongo-migrations/customer:/data/migrations
 

mongo-migrations/customer/1_apps.up.json → mongo-migrations/1_apps.up.json

@@ -5,8 +5,8 @@
             "_id": {
                 "$oid": "637dde15ad5446a2050456f1"
             },
-            "name": "3dshow客户端",
-            "key": "3dshow-customer",
+            "name": "3dshow2.0",
+            "key": "3dshow2.0",
             "restrict": false
         }]
      }

mongo-migrations/supplier/1_apps.down.json

@@ -1,15 +0,0 @@
-[
-    {
-        "delete": "apps",
-        "deletes": [
-           {
-             "q" : {
-                "_id": {
-                    "$oid": "637df4b4ad5446a2050456f3"
-                }
-             },
-             "limit" : 1
-           }
-        ]
-     }
-]

mongo-migrations/supplier/1_apps.up.json

@@ -1,13 +0,0 @@
-[
-    {
-        "insert": "apps",
-        "documents": [ {
-            "_id": {
-                "$oid": "637df4b4ad5446a2050456f3"
-            },
-            "name": "3dshow供应链",
-            "key": "3dshow-supplier",
-            "restrict": false
-        }]
-     }
-]

nginx/conf.d/default.conf

@@ -37,28 +37,13 @@ server {
     #
     #location ~ /\.ht {
     #    deny  all;
-    #}
-
-    location /supplier/ {
-       proxy_pass  http://3dshow-supplier-alpha:8888/supplier/;
-    }  
-
-    location /customer/ {
-       proxy_pass  http://3dshow-customer-alpha:8888/customer/;
-    }   
+    #}  
 
-    location /supplyUser/ {
-       proxy_pass  http://3dshow-supply-user-alpha:8908/usercenter/;
-    }   
+   # 3dshow2.0 用户
+   location /user/ {
+      proxy_pass  http://3dshow2-user:8908/usercenter/;
+   }  
 
-    location /customerUser/ {
-       proxy_pass  http://3dshow-customer-user-alpha:8908/usercenter/;
-    }   
-
-    # 用户接口
-    # location /usercenter/ {
-    #    proxy_pass  http://box-usercenter:8908/usercenter/;
-    # }
 
     #nats-exporter
     # location /natsexporter/ {

readme.md

@@ -2,18 +2,18 @@
 
 ## api路径
 
-`https://3dqueen.cloud/3dshow/v1/3dshow/`
+`https://3dqueen.cloud/3dshow/v2/3dshow/`
 
 ## 包含服务
 
-3dshow-nginx
-18089
+3dshow2-nginx
+18096
 
-3dshow-mongo
-37031
+3dshow2-mongo
+37039
 
-3dshow-redis
-16391
+3dshow2-redis
+16396
 
-3dshow-bus
-14301
+3dshow2-bus
+14307