Merge remote-tracking branch 'origin/dev' into dev

jeecg-boot/jeecg-server-cloud/jflow-cloud-start/src/main/resources/application.yml

@@ -19,6 +19,4 @@ spring:
         password: @config.password@
   config:
     import:
-      - optional:nacos:jflow-@profile.name@.yaml
-server:
-  port: 7100
+      - optional:nacos:jflow-@profile.name@.yaml

jeecgboot-vue3/.env.production

@@ -22,6 +22,6 @@ VITE_GLOB_DOMAIN_URL=http://jeecg-boot-gateway:9999
 VITE_GLOB_API_URL_PREFIX=
 
 # jflow-vue-core 包运行地址
-VITE_APP_JFLOW_CORE_ADDR = http://localhost:3000
+VITE_APP_JFLOW_CORE_ADDR = http://10.200.1.115:3000
 # jflow加密秘钥
 VITE_APP_JFLOW_KEY =DiG2uaDiGua,acBPM

jeecgboot-vue3/jeecg-config/jflow-config/Dockerfile

@@ -0,0 +1,30 @@
+FROM registry.cn-hangzhou.aliyuncs.com/dockerhub_mirror/nginx
+MAINTAINER jeecgos@163.com
+VOLUME /tmp
+ENV LANG en_US.UTF-8
+RUN echo "server {  \
+                      listen       80; \
+                      location   /jeecgboot/ { \
+                      proxy_pass             http://jeecg-boot-gateway:9999/; \
+                      proxy_redirect          off; \
+                      proxy_set_header        Host jeecg-boot-gateway; \
+                      proxy_set_header        X-Real-IP \$remote_addr; \
+                      proxy_set_header        X-Forwarded-For \$proxy_add_x_forwarded_for; \
+                  } \
+                  #解决Router(mode: 'history')模式下，刷新路由地址不能找到页面的问题 \
+                  location / { \
+                     root   /var/www/html/; \
+                      index  index.html index.htm; \
+                      if (!-e \$request_filename) { \
+                          rewrite ^(.*)\$ /index.html?s=\$1 last; \
+                          break; \
+                      } \
+                  } \
+                  access_log  /var/log/nginx/access.log ; \
+              } " > /etc/nginx/conf.d/default.conf \
+    &&  mkdir  -p  /var/www \
+    &&  mkdir -p /var/www/html
+
+ADD ../../jflow-vue-core /var/www/html/
+EXPOSE 80
+EXPOSE 443

jeecgboot-vue3/jeecg-config/jflow-config/docker-compose.yml

@@ -0,0 +1,18 @@
+version: '3.8'
+
+services:
+  jeecgboot-vue3-nginx-jflow:
+    image: jeecgboot-vue3-jflow
+    build:
+      context: ../..  # 指向 jeecgboot-vue3
+      dockerfile: jeecg-config/jflow-config/Dockerfile
+    container_name: jeecgboot-vue3-nginx-jflow
+    networks:
+      - jeecg_boot
+    ports:
+      - "3000:80"
+    restart: always
+
+networks:
+  jeecg_boot:
+    external: true

jeecgboot-vue3/jflow-vue-core/_app.config.js

@@ -1 +1 @@
-window.__PRODUCTION__CCFLOW__CONF__={"VITE_GLOB_APP_TITLE":"驰骋软件","VITE_GLOB_APP_SHORT_NAME":"ccflow","VITE_GLOB_PLATFORM":"JFlow","VITE_GLOB_SSO":"false","VITE_GLOB_API_URL":"http://localhost:9999","VITE_GLOB_CCFLOW_HANDLER":"WF/Comm/Handler.ashx","VITE_GLOB_JFLOW_HANDLER":"WF/Comm/ProcessRequest","VITE_GLOB_CCFLOW_UPLOAD_URL":"/api/WF/Comm/ProcessRequest","VITE_GLOB_JFLOW_UPLOAD_URL":"/WF/Ath/AttachmentUploadS","VITE_GLOB_IS_THIRDPART_SYSTEM":"1","VITE_GLOB_THIRDPART_TOKEN_KEY":"Admin-Token","VITE_GLOB_UPLOAD_URL":"/upload","VITE_GLOB_API_URL_PREFIX":""};Object.freeze(window.__PRODUCTION__CCFLOW__CONF__);Object.defineProperty(window,"__PRODUCTION__CCFLOW__CONF__",{configurable:false,writable:false,});
+window.__PRODUCTION__CCFLOW__CONF__={"VITE_GLOB_APP_TITLE":"驰骋软件","VITE_GLOB_APP_SHORT_NAME":"ccflow","VITE_GLOB_PLATFORM":"JFlow","VITE_GLOB_SSO":"false","VITE_GLOB_API_URL":"http://jeecg-boot-gateway:9999","VITE_GLOB_CCFLOW_HANDLER":"WF/Comm/Handler.ashx","VITE_GLOB_JFLOW_HANDLER":"WF/Comm/ProcessRequest","VITE_GLOB_CCFLOW_UPLOAD_URL":"/api/WF/Comm/ProcessRequest","VITE_GLOB_JFLOW_UPLOAD_URL":"/WF/Ath/AttachmentUploadS","VITE_GLOB_IS_THIRDPART_SYSTEM":"1","VITE_GLOB_THIRDPART_TOKEN_KEY":"Admin-Token","VITE_GLOB_UPLOAD_URL":"/upload","VITE_GLOB_API_URL_PREFIX":""};Object.freeze(window.__PRODUCTION__CCFLOW__CONF__);Object.defineProperty(window,"__PRODUCTION__CCFLOW__CONF__",{configurable:false,writable:false,});