docker-compose部署修改

energy-manage-service/docker-compose/conf/nginx.conf

@@ -1,60 +0,0 @@
-
-user  root;
-worker_processes  4;
-
-events {
-    worker_connections  1024;
-}
-
-
-http {
-    include       mime.types;
-    default_type  application/octet-stream;
-    sendfile        on;
-    keepalive_timeout  65;
-    client_max_body_size 500M;
-    server {
-        listen       8000;
-        server_name  energyService;
-
-        location / {
-            root   html/dist/;
-            index  index.html;
-	        try_files $uri $uri/ /index.html =404;
-	        client_max_body_size 500M;
-        }
-
-	location /api/{
-	        proxy_pass http://192.168.50.235:16300/;
-            #客户端真实ip
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
-	}
-
-	 location /tiles {
-          alias /usr/share/nginx/static/roadmap;
-          autoindex on;
-          expires 30d;
-          access_log off;
-          add_header Cache-Control "public";
-        }
-
-
-	 error_page   500 502 503 504  /50x.html;
-            location = /50x.html {
-            root   html;
-        }
-
-	 location /transDataWeb/ {
-                proxy_pass http://192.168.50.241:9002/;
-                proxy_set_header Host $host:$server_port;
-                proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-                proxy_set_header X-Forwarded-Proto $scheme;
-                proxy_set_header X-Forwarded-Host $host;  # 传递原始请求的主机头
-        }
-
-    }
-
-}

energy-manage-service/docker-compose/docker-compose.yml

@@ -1,5 +1,5 @@
 #compose版本
-version: '2.33.0'
+version: '1.22.0'
 #服务列表
 services:
   mysql:
@@ -24,152 +24,156 @@ services:
       - ${PARENT_WORK_DIR}/mysql-data/data:/var/lib/mysql
     restart: on-failure
     networks:
-      phm_net:
+      energy_net:
         ipv4_address: 172.40.0.20
 
-  redis:
-    image: redis
-    container_name: energy-redis
-    environment:
-      - REDIS_PASSWORD=${REDIS_PASSWORD}
-      - TZ=Asia/Shanghai
-    ports:
-      - ${REDIS_HOST_PORT}:6379
-    volumes:
-      - ${PARENT_WORK_DIR}/redis-data/data:/data
-      - ${PARENT_WORK_DIR}/redis-data/conf/redis.conf:/usr/local/etc/redis/redis.conf
-      - ${PARENT_WORK_DIR}/redis-data/logs:/logs
-    restart: on-failure
-    networks:
-      phm_net:
-        ipv4_address: 172.40.0.21
-
-  nacos:
-    image: nacos/nacos-server
-    container_name: energy-nacos
-    #如果挂载卷中指定nacos application.properties文件，则不需要指定以下环境变量
-    environment:
-      - SPRING_DATASOURCE_PLATFORM=${SPRING_DATASOURCE_PLATFORM}
-      - MYSQL_SERVICE_HOST=${MYSQL_SERVICE_HOST}
-      - MYSQL_SERVICE_DB_NAME=${MYSQL_SERVICE_DB_NAME}
-      - MYSQL_SERVICE_DB_PARAM=${MYSQL_SERVICE_DB_PARAM}
-      - MYSQL_SERVICE_USER=${MYSQL_ROOT_USER}
-      - MYSQL_SERVICE_PASSWORD=${MYSQL_ROOT_PASSWORD}
-      - MODE=${MODE}
-#      - NACOS_AUTH_TOKEN=SecretKey012345678901234567890123456789012345678901234567890123456789
-    ports:
-      - "8849:8848"
-    volumes:
-      - ${PARENT_WORK_DIR}/nacos/logs:/home/nacos/logs
-    restart: on-failure
-    depends_on:
-      - mysql
-    networks:
-      phm_net:
-        ipv4_address: 172.40.0.22
-
-  xxl_job:
-    build:
-      context: .
-      dockerfile: ./xxl-job/Dockerfile
-    container_name: energy-xxl-job
-    ports:
-      - "16800:16900"
-    environment:
-      - TZ=Asia/Shanghai
-#      volumes:
-#        - ${PARENT_WORK_DIR}/xxl-job/conf:/data/applogs/xxl-job/conf
-    depends_on:
-      - mysql
-    restart: on-failure
-    networks:
-      phm_net:
-        ipv4_address: 172.40.0.23
-
-  minio:
-    image: minio/minio:latest
-    container_name: energy-minio
-    ports:
-      - "9000:9000"
-      - "9001:9001"
-    environment:
-      - MINIO_ROOT_USER=zgh-zn-nacos
-      - MINIO_ROOT_PASSWORD=zgh-zn-nacos-password
-    volumes:
-      - ${PARENT_WORK_DIR}/minio-data/data:/data
-    command: server  /data --console-address ":9001"
-    healthcheck:
-      test: [ "CMD", "curl", "-f", "http://localhost:9000/minio/health/live" ]
-      interval: 30s
-      timeout: 20s
-      retries: 3
-    networks:
-      phm_net:
-        ipv4_address: 172.40.0.24
-
-  #自动创建bucket
-  mc:
-    image: minio/mc:latest
-    container_name: mc
-    depends_on:
-      minio:
-        condition: service_healthy
-    entrypoint: >
-      /bin/sh -c "
-      /usr/bin/mc alias set theminio http://172.40.0.24:9000 zgh-zn-nacos zgh-zn-nacos-password;
-      /usr/bin/mc mb theminio/bucket-zhzn;
-      /usr/bin/mc policy set public theminio/bucket-zhzn;
-      exit 0;
-      "
-      EOF
-    networks:
-      - phm_net
-
-  energy-admin:
-    # 指定构建文件
-    build:
-      context: .
-      # dockerfile文件所在路径
-      dockerfile: ./app/Dockerfile
-    container_name: energy-admin
-    environment:
-      - TZ=Asia/Shanghai
-    #端口映射
-    ports:
-      - "16200:16200"
-    volumes:
-      - ${PARENT_WORK_DIR}/energy/logs:/data/app/logs
-    restart: on-failure
-    depends_on:
-      - mysql
-      - redis
-      - nacos
-      - minio
-    networks:
-      phm_net:
-        ipv4_address: 172.40.0.25
-
-  nginx:
-    image: nginx:stable-perl
-    ports:
-      - "80:80"
-      - "443:443"
-    environment:
-      - TZ=Asia/Shanghai
-    #挂载卷
-    volumes:
-      - ${PARENT_WORK_DIR}/nginx/nginx.conf:/etc/nginx/nginx.conf
-      - ${PARENT_WORK_DIR}/nginx/conf.d:/etc/nginx/conf.d
-      - ${PARENT_WORK_DIR}/nginx/logs:/etc/nginx/logs
-      - ${PARENT_WORK_DIR}/nginx/html:/usr/share/nginx/html
-      - ${PARENT_WORK_DIR}/nginx/static:/usr/share/nginx/static
-    #启动时执行的命令
-    command: /bin/sh -c "nginx -g 'daemon off;'"
-    #重启方式
-    restart: on-failure
+#  redis:
+#    image: redis
+#    container_name: energy-redis
+#    environment:
+#      - REDIS_PASSWORD=${REDIS_PASSWORD}
+#      - TZ=Asia/Shanghai
+#    ports:
+#      - ${REDIS_HOST_PORT}:6379
+#    volumes:
+#      - ${PARENT_WORK_DIR}/redis-data/data:/data
+#      - ${PARENT_WORK_DIR}/redis-data/conf/redis.conf:/usr/local/etc/redis/redis.conf
+#      - ${PARENT_WORK_DIR}/redis-data/logs:/logs
+#    restart: on-failure
+#    networks:
+#      energy_net:
+#        ipv4_address: 172.40.0.21
+#
+#  nacos:
+#    image: nacos/nacos-server
+#    container_name: energy-nacos
+#    #如果挂载卷中指定nacos application.properties文件，则不需要指定以下环境变量
+#    environment:
+#      - SPRING_DATASOURCE_PLATFORM=${SPRING_DATASOURCE_PLATFORM}
+#      - MYSQL_SERVICE_HOST=${MYSQL_SERVICE_HOST}
+#      - MYSQL_SERVICE_DB_NAME=${MYSQL_SERVICE_DB_NAME}
+#      - MYSQL_SERVICE_DB_PARAM=${MYSQL_SERVICE_DB_PARAM}
+#      - MYSQL_SERVICE_USER=${MYSQL_ROOT_USER}
+#      - MYSQL_SERVICE_PASSWORD=${MYSQL_ROOT_PASSWORD}
+#      - MODE=${MODE}
+##      - NACOS_AUTH_TOKEN=SecretKey012345678901234567890123456789012345678901234567890123456789
+#    ports:
+#      - "8849:8848"
+#    volumes:
+#      - ${PARENT_WORK_DIR}/nacos/logs:/home/nacos/logs
+#    restart: on-failure
+#    depends_on:
+#      - mysql
+#    networks:
+#      energy_net:
+#        ipv4_address: 172.40.0.22
+#
+#  xxl_job:
+#    build:
+#      context: .
+#      dockerfile: ./xxl-job/Dockerfile
+#    container_name: energy-xxl-job
+#    ports:
+#      - "16800:16900"
+#    environment:
+#      - TZ=Asia/Shanghai
+##      volumes:
+##        - ${PARENT_WORK_DIR}/xxl-job/conf:/data/applogs/xxl-job/conf
+#    depends_on:
+#      - mysql
+#    restart: on-failure
+#    networks:
+#      energy_net:
+#        ipv4_address: 172.40.0.23
+#
+#  minio:
+#    image: minio/minio:latest
+#    container_name: energy-minio
+#    ports:
+#      - "9000:9000"
+#      - "9001:9001"
+#    environment:
+#      - MINIO_ROOT_USER=zgh-zn-nacos
+#      - MINIO_ROOT_PASSWORD=zgh-zn-nacos-password
+#    volumes:
+#      - ${PARENT_WORK_DIR}/minio-data/data:/data
+#    command: server  /data --console-address ":9001"
+#    healthcheck:
+#      test: [ "CMD", "curl", "-f", "http://localhost:9000/minio/health/live" ]
+#      interval: 30s
+#      timeout: 20s
+#      retries: 3
+#    networks:
+#      energy_net:
+#        ipv4_address: 172.40.0.24
+#
+#  #自动创建bucket
+#  mc:
+#    image: minio/mc:latest
+#    container_name: energy-mc
+#    depends_on:
+#      minio:
+#        condition: service_healthy
+#    entrypoint: >
+#      /bin/sh -c "
+#      /usr/bin/mc alias set theminio http://172.40.0.24:9000 zgh-zn-nacos zgh-zn-nacos-password;
+#      /usr/bin/mc mb theminio/bucket-zhzn;
+#      /usr/bin/mc policy set public theminio/bucket-zhzn;
+#      exit 0;
+#      "
+#      EOF
+#    networks:
+#      - energy_net
+#
+#  energy-admin:
+#    # 指定构建文件
+#    build:
+#      context: .
+#      # dockerfile文件所在路径
+#      dockerfile: ./app/Dockerfile
+#    container_name: energy-admin
+#    environment:
+#      - TZ=Asia/Shanghai
+#    #端口映射
+#    ports:
+#      - "16200:16200"
+#    volumes:
+#      - ${PARENT_WORK_DIR}/energy/logs:/data/app/logs
+#    restart: on-failure
+#    depends_on:
+#      - mysql
+#      - redis
+#      - nacos
+#      - minio
+#    networks:
+#      energy_net:
+#        ipv4_address: 172.40.0.25
+#
+#  nginx:
+#    build:
+#      context: .
+#      dockerfile: ./nginx/Dockerfile
+##    image: nginx:stable-perl
+#    container_name: energy-nginx
+#    ports:
+#      - "80:80"
+#    environment:
+#      - TZ=Asia/Shanghai
+#    #挂载卷
+#    volumes:
+#      - ${PARENT_WORK_DIR}/nginx/nginx.conf:/etc/nginx/nginx.conf
+#      - ${PARENT_WORK_DIR}/nginx/conf.d:/etc/nginx/conf.d
+#      - ${PARENT_WORK_DIR}/nginx/logs:/etc/nginx/logs
+#      - ${PARENT_WORK_DIR}/nginx/html:/usr/share/nginx/html
+#      - ${PARENT_WORK_DIR}/nginx/static:/usr/share/nginx/static
+#    #重启方式
+#    restart: on-failure
+#    networks:
+#      energy_net:
+#        ipv4_address: 172.40.0.26
 
 networks:
-  phm_net:
+  energy_net:
     driver: bridge
     ipam:
       config:

energy-manage-service/docker-compose/mysql/Dockerfile

@@ -1,4 +1,4 @@
-FROM mysql
+FROM mysql:5.7.43
 
 #mysql的工作位置
 ENV WORK_PATH /usr/local

energy-manage-service/docker-compose/nginx/Dockerfile

@@ -0,0 +1,13 @@
+# 使用官方 Nginx 镜像
+FROM nginx:stable-perl
+
+ENV CONTAINER_DIR="/etc/nginx"
+
+# 将自定义的 nginx.conf 文件复制到容器的 /etc/nginx 目录下
+COPY ./nginx/nginx.conf $CONTAINER_DIR/nginx.conf
+
+# 暴露 80 端口
+EXPOSE 80
+
+# 启动 Nginx
+CMD ["nginx", "-g", "daemon off;"]

energy-manage-service/docker-compose/nginx/nginx.conf

@@ -0,0 +1,139 @@
+
+user  root;
+worker_processes  4;
+
+#error_log  logs/error.log;
+#error_log  logs/error.log  notice;
+#error_log  logs/error.log  info;
+
+#pid        logs/nginx.pid;
+
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+
+    #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+    #                  '$status $body_bytes_sent "$http_referer" '
+    #                  '"$http_user_agent" "$http_x_forwarded_for"';
+
+    #access_log  logs/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    #keepalive_timeout  0;
+    keepalive_timeout  65;
+   client_max_body_size 500M;
+
+
+    #gzip  on;
+
+    # ##################HTTP server app show environment  START ######################################
+    #
+    server {
+        listen       8999;
+        server_name  energyService;
+
+        location / {
+            root   html/dist-show/;
+            index  index.html;
+            try_files $uri $uri/ /index.html =404;
+            client_max_body_size 500M;
+        }
+
+        location /api/{
+            proxy_pass http://192.168.50.235:16500/;
+            #客户端真实ip
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+        }
+
+       location /tiles {
+            alias /data/roadmap;
+            autoindex on;
+            expires 30d;
+            access_log off;
+            add_header Cache-Control "public";
+        }
+
+  location /transDataWeb/ {
+            proxy_pass http://192.168.50.241:9002/;
+            proxy_set_header Host $host:$server_port;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Host $host;  # 传递原始请求的主机头
+        }
+
+   location /ETLapi/ {
+            proxy_pass http://192.168.50.241:9002/;
+            proxy_set_header Host $host:$server_port;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Host $host;  # 传递原始请求的主机头
+        }
+
+
+        location /WZLapi/ {
+            proxy_pass http://192.168.50.241:9002/; # 将请求代理到后端服务
+            rewrite ^/WZLapi/(.*)$ /$1 break;  # 将 /sAlgorithm 重写为后端接受的路径
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        }
+
+
+        location /WJapi/ {
+            proxy_pass http://192.168.50.235:8888/; # 将请求代理到新的目标地址
+           # rewrite ^/WJapi/(.*)$ /$1 break;  # 将 /WJapi 重写为后端接受的路径
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        }
+
+
+       location /ImportData/ {
+            proxy_pass http://192.168.50.241:8001/;
+            proxy_set_header Host $host:$server_port;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Host $host;  # 传递原始请求的主机头
+
+       }
+
+     #自定义分析前端弄nodejs
+        location /databaseApi/ {
+            proxy_pass http://192.168.50.234:3000/; # 假设后端服务也是监听80端口
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+        }
+
+        #自定义分析算法服务
+        location /sAlgorithm/ {
+            proxy_pass http://192.168.50.235:8666/; # 将请求代理到后端服务
+            rewrite ^/sAlgorithm/(.*)$ /$1 break;  # 将 /sAlgorithm 重写为后端接受的路径
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        }
+        error_page   500 502 503 504  /50x.html;
+            location = /50x.html {
+            root   html;
+        }
+
+    }
+
+    # ##################HTTP server app show environment  END   ######################################
+
+}

pom.xml

@@ -354,6 +354,12 @@
                 <profiles.active>tidb</profiles.active>
             </properties>
         </profile>
+        <profile>
+            <id>zgh</id>
+            <properties>
+                <profiles.active>zgh</profiles.active>
+            </properties>
+        </profile>
     </profiles>
 
 </project>