优化

.env.example

@@ -5,4 +5,6 @@ PORT=8118
 PORT_CRM=8181
 # 代码目录,含前后端
 CODE_DIR=/home/wh/workplace/code_test
-JAVA_PROFILE=innerdev
\ No newline at end of file
+JAVA_PROFILE=innerdev
+#nacos 客户端轮询间隔
+TICK_TIME=30000
\ No newline at end of file

README.md

@@ -41,7 +41,7 @@ return [
 |:------------------------|:-----------------------------|:---------------------------------------------------------------------------------|:--------------------------------|:-------|:------|:-------------------------------------|:--------------------|
 | BaseMicros              | 无                           | -                                                                                | -                               | 疑似弃用 | -     | -                                    |                     |
 | MarketMicros            | 无                           | -                                                                                | -                               | 疑似弃用 | -     | -                                    |                     |
-| FlowMicros              | Crm重构-流程管理相关的微服务      | http://gitlab.galaxy-immi.com/colnet/bp/FlowMicros.git                           | flowmicros                      | 正常    | php   | $GALAXY_FLOW_MICROS_API_HTTP_PORT    |                     |
+| FlowMicros              | Crm重构-流程管理相关的微服务      | http://gitlab.galaxy-immi.com/colnet/bp/FlowMicros.git                           | flow-micros                      | 正常    | php   | $GALAXY_FLOW_MICROS_API_HTTP_PORT    |                     |
 | UserMicros              | Crm重构-用户管理相关的微服务      | http://gitlab.galaxy-immi.com/colnet/bp/UserMicros.git                           | user-micros                     | 正常    | php   | $GALAXY_USER_MICROS_API_HTTP_PORT    |                     |
 | FlowEngineMicros        | 工作流引擎                     | http://gitlab.galaxy-immi.com/colnet/engine.git                                  | flowengine                      | 正常    | java  | 80 (单独容器服务,内部端口)               |                     |
 | ServerSiteMicros        | 服务端相关的微服务              | http://gitlab.galaxy-immi.com/colnet/mp/ServerSiteMirocs.git                     | server-site                     | 正常     | php  | $GALAXY_SERVER_SITE_API_HTTP_PORT    |                     |
@@ -71,7 +71,7 @@ return [
 | Notice-FRONT            | Notice-Center前端-智能预警/代办 | http://gitlab.galaxy-immi.com/Front-end-group/Manage-Frame/Early-Warning.git     | smartwhale/subapp/early_warning | 正常    | vue   | $VUE_NOTICE_CENTER_HTTP_PORT         |                     |
 | domain-module           | 领域服务                      | http://gitlab.galaxy-immi.com/colnet/domain-module.git                           | domain-module                   | 待定     | php  | -                                    | php8                |
 
-todo : test-doc.galaxy-immi.com 智能写作
+
 
 
 ### php7.4扩展
@@ -162,10 +162,12 @@ docker compose down --rmi all # 销毁并删除镜像
 
 
 ## 执行脚本
-
+docker run --rm
 ## 执行计划任务
 
 ## 常驻进程管理
 
 
 ## 备注
+nacos 配置中心管理.env配置 暂时非侵入;后续可以考虑使用 composer require nacos/nacos-sdk-php
+

docker-compose.yaml

@@ -57,6 +57,7 @@ services:
     ports:
       - "${PORT:-8118}:8081"
       - "${PORT_CRM:-8181}:8181"
+      - "8290:8290" # 老crm 转发
     restart: on-failure
   java-notice:
     image: harbor.galaxy-immi.com/galaxy-open-develop/java:11
@@ -118,6 +119,17 @@ services:
     networks:
       - galaxy-net
     restart: on-failure
+  nacos-client:
+    image: harbor.galaxy-immi.com/galaxy-open-develop/nacos-client:0.1
+    container_name: nacos-client-${ENV:-dev}
+    networks:
+      - galaxy-net
+    environment:
+      - ENV=${ENV:-dev}
+      - NACOS_URL=${NACOS_URL:-http://192.168.11.163:8848}
+      - TICK_TIME=${TICK_TIME:-30000}
+    volumes:
+      - ${CODE_DIR}:/app/code
 networks:
   galaxy-net:
     name: galaxy-net

src/nginx-start.sh

@@ -181,10 +181,12 @@ server {
     }
 
     location ^~ /subapp/userInfo/ {
-        root   /app/www/dwp/subapp/userInfo;
-        index index.html;
         proxy_pass http://$HOST:$VUE_USERINFO_PORT/;
-        try_files \$uri \$uri/ /index.html;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-Ip $remote_addr;
+        proxy_set_header X-Ngnix-Proxy true;
+
     }
 
 
@@ -229,11 +231,12 @@ server {
          proxy_set_header X-Ngnix-Proxy true;
      }
     location ^~ /api/ {
+         proxy_pass http://$HOST:$GALAXY_CRM_API_HTTP_PORT/;
          proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;
          proxy_set_header Host \$host;
          proxy_set_header X-Real-Ip \$remote_addr;
          proxy_set_header X-Ngnix-Proxy true;
-         proxy_pass http://$HOST:$GALAXY_CRM_API_HTTP_PORT/;
+
       }