fix client

comm

@@ -1 +1 @@
-Subproject commit 91d45d091156ee309276aa62c244c97850f670a9
+Subproject commit f4266e04a734dc123c65dd48e8fc30a51a92b9e0

pack-cmf/config-service.yaml

@@ -1,35 +0,0 @@
-log:
-  fileName: cmf-bus.log
-  level: 1
-  serviceName: cmf-bus
-  
-configer:
-  -
-    name: cmf-mongo
-    value: mongodb://root:cmfxxx@cmf-mongo:27017/cmf?authSource=admin
-    # devValue: mongodb://root:cmf@192.168.110.180:37037/website?authSource=admin
-    devValue: mongodb://root:cmfxxx@124.71.139.24:17019/cmf?authSource=admin
-
-
-
-  # -
-  #   name: cmf-user-mongo
-  #   value: mongodb://root:cmf@cmf-mongo:27017/usercenter?authSource=admin
-  #   # devValue: mongodb://root:cmf@192.168.110.180:37037/usercenter?authSource=admin
-  #   # devValue: mongodb://root:cmf@124.71.139.24:37037/usercenter?authSource=admin
-
-  # -
-  #   name: cmf-redis
-  #   value: cmf-redis6379#0#default#cmf
-  #   devValue: 124.71.139.24:16394#0#default#cmf
-  #   # devValue: 192.168.110.180:16394#0#default#cmf
-
-
-startLocalNats: true
-startNatsShellParams: "-p 4222 -m 8222 -js"
-startNatsPort: 4222
-
-nats:
-  url: nats://cmf-bus:4222
-  maxReconnect: 10000
-  reconnDelaySecond: 5

pack-cmf/docker-compose.yaml

@@ -1,87 +0,0 @@
-version: '3.8'
-
-# 网络
-networks:
-  default:
-    name: default-network
-    external: true
-
-services:
-  #nginx反向代理
-  cmf-nginx:
-    image: "registry.cn-chengdu.aliyuncs.com/infish/pack-comm-nginx:1.23.1"
-    restart: always
-    ports:
-      - 8087:80
-    volumes:
-      - ./nginx/conf.d:/etc/nginx/conf.d
-      - ./nginx/www:/usr/share/nginx/html
-
-    depends_on:
-      - cmf-srv
-    #   - cmf-tree
-      
-  #bus消息中间件
-  cmf-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:
-      - cmf-mongo
-      # - cmf-redis  
-    ports:
-      - 14226:4222
-
-  # cmf-redis:
-  #   image: "redis:alpine"
-  #   restart: always
-  #   command:
-  #     --requirepass "cmf" #这一行是设置密码
-  #   privileged: true
-  #   ports:
-  #     - 16394:6379
-
-  cmf-mongo:
-    image: mongo:4.4.1
-    restart: always
-    environment:
-      MONGO_INITDB_ROOT_USERNAME: root
-      MONGO_INITDB_ROOT_PASSWORD: cmfxxx
-    volumes:
-      - ~/data/packs-cmf/mongo/db:/data/db
-      - ~/data/packs-cmf/mongo/log:/var/log/mongodb
-    ports: 
-      - 17019:27017
-
-  # user服务
-  # cmf-user:
-  #   image: registry.cn-chengdu.aliyuncs.com/infish/pack-comm-usercenter:v1.0.1
-  #   restart: always
-  #   depends_on:
-  #     - cmf-bus
-  #   environment: 
-  #     NATS: nats://cmf-bus:4222
-  #     CONFIGER_MONGO: cmf-user-mongo
-  #     CONFIGER_REDIS: cmf-redis
-  #     CONFIGER_JWT: cmf#cmfkeyvvv#168
-
-  # user服务
-  # cmf-tree:
-  #   image: registry.cn-chengdu.aliyuncs.com/infish/pack-queentree-cmf:v1.0.0
-  #   restart: always
-  #   depends_on:
-  #     - cmf-bus
-  #   environment: 
-  #     NATS: nats://cmf-bus:4222
-  #     CONFIGER_MONGO: tree-mongo
-  #     CONFIGER_REDIS: cmf-redis
-
-  cmf-srv:
-    image: registry.cn-chengdu.aliyuncs.com/infish/pack-cmf:v1.0.1
-    restart: always
-    depends_on:
-      - cmf-bus
-    environment: 
-      NATS: nats://cmf-bus:4222

pack-cmf/nginx/conf.d/default.conf

@@ -1,54 +0,0 @@
-server {
-    listen       80;
-    listen  [::]:80;
-    server_name  localhost;
-    #access_log  /var/log/nginx/host.access.log  main;
-    location / {
-        root   /usr/share/nginx/html;
-        index  index.html index.htm;
-    }
-    #error_page  404              /404.html;
-
-    # redirect server error pages to the static page /50x.html
-    #
-    error_page   500 502 503 504  /50x.html;
-    location = /50x.html {
-        root   /usr/share/nginx/html;
-    }
-
-    # proxy the PHP scripts to Apache listening on 127.0.0.1:80
-    #
-    #location ~ \.php$ {
-    #    proxy_pass   http://127.0.0.1;
-    #}
-
-    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
-    #
-    #location ~ \.php$ {
-    #    root           html;
-    #    fastcgi_pass   127.0.0.1:9000;
-    #    fastcgi_index  index.php;
-    #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
-    #    include        fastcgi_params;
-    #}
-
-    # deny access to .htaccess files, if Apache's document root
-    # concurs with nginx's one
-    #
-    #location ~ /\.ht {
-    #    deny  all;
-    #}
-
-   #  location /website/ {
-   #     proxy_pass  http://3dshow-supplier-dev:8888/supplier/;
-   #  }  
-    location /cmf/ {
-       proxy_pass  http://cmf-srv:3001/cmf/;
-    }
-
-
-    #nats-exporter
-    # location /natsexporter/ {
-    #    proxy_pass  http://nats-exporter:7777/;
-    # }
-}

pack-cmf/nginx/www/index.html

@@ -1 +0,0 @@
-hello world~!!!

pack-cmf/readme.md

@@ -1,2 +0,0 @@
-# 说明
-

pack-cmf/start.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-docker-compose up -d --remove-orphans
-docker-compose ps

src/app.yaml

@@ -35,8 +35,8 @@ adapter:
     nats: nats://124.71.139.24:14219
 Auth:
   endpoint: https://auth.3dqueen.cloud
-  clientId:	d372dce9cd00805db7e0
-  clientSecret: e02fc4931375d2dfa134fe970c454717409ed4bc
+  clientId:	3f735c315f942316c578
+  clientSecret: 27f7b3cab0ef2a7b8185faff20618030e18ef5a8
   certificate: token_jwt_key.pem
   organizationName:	cmf
-  applicationName: cmf-editor-admin
+  applicationName: cmf-editor-client

src/build.sh

@@ -5,8 +5,8 @@ echo "building..."
 go build -o cmf
 
 # 命名镜像
-local_imge="pack-cmf:v1.0.1"
-repository_image="registry.cn-chengdu.aliyuncs.com/infish/pack-cmf:v1.0.1"
+local_imge="cmf-client:v1.0.0"
+repository_image="registry.cn-chengdu.aliyuncs.com/infish/cmf-client:v1.0.0"
 
 # 删除本地已存在的镜像
 docker rmi $repository_image

src/readme.md

@@ -1,5 +1,5 @@
 # cmf
 
-local dev
+cmf client
 
 http://192.168.110.131:8087/