修改docker-compose

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

@@ -1,10 +1,8 @@
 #compose版本
-version: '2.24.6-desktop.1'
+version: '2.33.0'
 #服务列表
 services:
   mysql:
-    env_file:
-      - .env
     build:
       context: .
       dockerfile: ./mysql/Dockerfile
@@ -26,7 +24,7 @@ services:
     restart: on-failure
 
   redis:
-    image: redis
+    image: redis:latest
     container_name: energy-redis
     environment:
       - REDIS_PASSWORD=${REDIS_PASSWORD}
@@ -35,90 +33,92 @@ services:
       - ${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/conf/redis.conf:/usr/local/etc/redis/redis.conf
       - ${PARENT_WORK_DIR}/redis-data/logs:/logs
     restart: on-failure
-
-
-  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_PORT=${MYSQL_SERVICE_PORT}
-      - MYSQL_SERVICE_DB_NAME=${MYSQL_SERVICE_DB_NAME}
-      - MYSQL_SERVICE_DB_PARAM=${MYSQL_SERVICE_DB_PARAM}
-      - MYSQL_SERVICE_USER=${MYSQL_SERVICE_USER}
-      - MYSQL_SERVICE_PASSWORD=${MYSQL_ROOT_PASSWORD}
-      - MODE=${MODE}
-      - NACOS_AUTH_TOKEN=SecretKey012345678901234567890123456789012345678901234567890123456789
-    ports:
-      - "8849:8848"
+#
+#
+#  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_PORT=${MYSQL_SERVICE_PORT}
+#      - MYSQL_SERVICE_DB_NAME=${MYSQL_SERVICE_DB_NAME}
+#      - MYSQL_SERVICE_DB_PARAM=${MYSQL_SERVICE_DB_PARAM}
+#      - MYSQL_SERVICE_USER=${MYSQL_SERVICE_USER}
+#      - MYSQL_SERVICE_PASSWORD=${MYSQL_ROOT_PASSWORD}
+#      - MODE=${MODE}
+#      - NACOS_AUTH_TOKEN=SecretKey012345678901234567890123456789012345678901234567890123456789
+#    ports:
+#      - "8849:8848"
+##    volumes:
+##      - ${PARENT_WORK_DIR}/nacos:/data/nacos/conf
+#    restart: on-failure
+#    depends_on:
+#      - mysql
+#
+#  xxl_job:
+#    build:
+#      context: .
+#      dockerfile: ./xxl-job/Dockerfile
+#      container_name: energy-xxl-job
+#      ports:
+#        - "16900:16900"
+#      environment:
+#        - TZ=Asia/Shanghai
+##      volumes:
+##        - ${PARENT_WORK_DIR}/xxl-job/conf:/data/applogs/xxl-job/conf
+#      dependson:
+#        - mysql
+#      restart: on-failure
+#
+#  minio:
+#
+#
+#  energy-admin:
+#    # 指定构建文件
+#    build:
+#      context: .
+#      # dockerfile文件所在路径
+#      dockerfile: app/Dockerfile
+##    #或者指定镜像都可以
+##    image: timo-service:1.0.3
+#    container_name: energy-admin
+#    environment:
+#      - TZ=Asia/Shanghai
+#    #端口映射
+#    ports:
+#      - "16200:16200"
 #    volumes:
-#      - ${PARENT_WORK_DIR}/nacos:/data/nacos/conf
-    restart: on-failure
-    depends_on:
-      - mysql
-
-  xxl_job:
-    build:
-      context: .
-      dockerfile: ./xxl-job/Dockerfile
-      container_name: energy-xxl-job
-      ports:
-        - "16900:16900"
-      environment:
-        - TZ=Asia/Shanghai
-#      volumes:
-#        - ${PARENT_WORK_DIR}/xxl-job/conf:/data/applogs/xxl-job/conf
-      dependson:
-        - mysql
-      restart: on-failure
-
-  minio:
-
-
-  energy-admin:
-    # 指定构建文件
-    build:
-      context: .
-      # dockerfile文件所在路径
-      dockerfile: ./Dockerfile
-#    #或者指定镜像都可以
-#    image: timo-service:1.0.3
-    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
-
-  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
+#      - ${PARENT_WORK_DIR}/energy/logs:/data/app/logs
+#    restart: on-failure
+#    depends_on:
+#      - mysql
+#      - redis
+#      - nacos
+#      - xxl_job
+#      - minio
+#
+#  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
 
 

energy-manage-service/docker-compose/mysql/docker-entrypoint.sh

@@ -1,16 +1,15 @@
 #!/bin/bash
+export WORK_BASE=/usr/local
 #export MYSQL_PWD=chen1989
 #mysql -u root -p "$MYSQL_PWD" <<EOF
 mysql -uroot -padmin123456 <<EOF
 create database energy;
 use energy;
-source /usr/local/energy.sql;
+source "$WORK_BASE"/energy.sql;
 create database nacos;
 use nacos;
-source /usr/local/nacos.sql;
+source "$WORK_BASE"/nacos.sql;
 create database xxl_job;
 use xxl_job;
-source /usr/local/xxl_job.sql;
-#use mysql;
-#delete from user where Host='localhost' and User = 'root';
+source "$WORK_BASE"/xxl_job.sql;
 EOF

energy-manage-service/docker-compose/xxl-job/Dockerfile

@@ -0,0 +1,27 @@
+# 该镜像需要依赖的基础镜像
+FROM openjdk:24-ea-slim
+
+# 设置自定义标签
+LABEL version="1.0.0" maintainer="znzn"
+
+ENV WORKDIR="/data/xxl-job"
+
+# 创建工作目录
+WORKDIR $WORKDIR
+
+# 将当前目录下的jar包复制到docker容器的工作目录下
+COPY ./xxl-job.jar ./xxl-job.jar
+
+#设置时区
+RUN mkdir ./logs
+
+#设置环境变量
+#ENV LANG = "zh_CN.UTF-8" \
+#    JAVA_OPTS=" -Duser.timezone=Asia/Shanghai -server -Xmx2048m -Xms2048m -Xss512k " \
+#    JAVA_USER=" -XX:+UseFastAccessorMethods -XX:MaxMetaspaceSize=512m -XX:MetaspaceSize=512m  -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=92 -XX:+UseCMSCompactAtFullCollection -XX:CMSFullGCsBeforeCompaction=0 " \
+#    JAVA_OOM=" -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=java_heapdump.hprof "
+
+
+# 指定docker容器启动时运行jar包
+ENTRYPOINT ["sh", "-c", "java $JAVA_OPTS $JAVA_USER $JAVA_OOM -Dfile.encoding=utf-8  -jar $WORKDIR/xxl-job.jar "]
+