Update 更新docker运行配置;新增linux的docker-compose;redis升级到7.2.8

SERVER/VberAdminPlusV3/.script/docker/docker-compose.yml

@@ -30,7 +30,7 @@ services:
       - vap3-net
 
   vber_redis:
-    image: redis:6.2.6
+    image: redis:7.2.8
     container_name: vber_redis
     ports:
       - "6389:6379"

SERVER/VberAdminPlusV3/.script/docker/docker-compose_liunx.yml

@@ -0,0 +1,196 @@
+services:
+  vber_mysql:
+    image: mysql:8.0.42
+    container_name: vber_mysql
+    environment:
+      # 时区上海
+      TZ: Asia/Shanghai
+      # root 密码
+      MYSQL_ROOT_PASSWORD: root
+      # 初始化数据库(后续的初始化sql会在这个库执行)
+      MYSQL_DATABASE: VberAdminPlusV3DB
+      # 添加字符集设置
+      MYSQL_CHARSET: utf8
+      MYSQL_COLLATION: utf8_general_ci
+    ports:
+      - "3326:3306"
+    volumes:
+      # 数据挂载
+      - /home/docker/vap3/data/mysql/data/:/var/lib/mysql/
+      - /home/docker/vap3/sql/init.sql:/docker-entrypoint-initdb.d/init.sql # 挂载 init.sql 文件
+    command:
+      # 将mysql8.0默认密码策略 修改为 原先 策略 (mysql8.0对其默认策略做了更改 会导致密码无法匹配)
+      --default-authentication-plugin=mysql_native_password
+      --character-set-server=utf8mb4
+      --collation-server=utf8mb4_general_ci
+      --explicit_defaults_for_timestamp=true
+      --lower_case_table_names=1
+    privileged: true
+    networks:
+      - vap3-net
+
+  vber_redis:
+    image: redis:7.2.8
+    container_name: vber_redis
+    ports:
+      - "6389:6379"
+    environment:
+      # 时区上海
+      TZ: Asia/Shanghai
+    volumes:
+      # 配置文件
+      - /home/docker/vap3/redis/conf/redis.conf:/redis/config/redis.conf:rw
+      # 数据文件
+      - /home/docker/vap3/data/redis/data/:/redis/data/:rw
+    command: "redis-server /redis/config/redis.conf"
+    privileged: true
+    networks:
+      - vap3-net
+
+  #  minio:
+  #    # minio 最后一个未阉割版本 不能再进行升级 在往上的版本功能被阉割
+  #    image: minio/minio:RELEASE.2025-04-22T22-12-26Z
+  #    container_name: minio
+  #    ports:
+  #      # api 端口
+  #      - "9000:9000"
+  #      # 控制台端口
+  #      - "9001:9001"
+  #    environment:
+  #      # 时区上海
+  #      TZ: Asia/Shanghai
+  #      # 管理后台用户名
+  #      MINIO_ROOT_USER: vber
+  #      # 管理后台密码，最小8个字符
+  #      MINIO_ROOT_PASSWORD: vber123
+  #      # https需要指定域名
+  #      #MINIO_SERVER_URL: "https://xxx.com:9000"
+  #      #MINIO_BROWSER_REDIRECT_URL: "https://xxx.com:9001"
+  #      # 开启压缩 on 开启 off 关闭
+  #      MINIO_COMPRESS: "off"
+  #      # 扩展名 .pdf,.doc 为空 所有类型均压缩
+  #      MINIO_COMPRESS_EXTENSIONS: ""
+  #      # mime 类型 application/pdf 为空 所有类型均压缩
+  #      MINIO_COMPRESS_MIME_TYPES: ""
+  #    volumes:
+  #      # 映射当前目录下的data目录至容器内/data目录
+  #      - /home/docker/vap3/data/minio/data:/data
+  #      # 映射配置目录
+  #      - /home/docker/vap3/minio/config:/root/.minio/
+  #    command: server --address ':9000' --console-address ':9001' /data  # 指定容器中的目录 /data
+  #    privileged: true
+  #    networks:
+  #      - vap3-net
+  #
+
+  vber_ui-web:
+    image: vber/vber_ui:3.0.0
+    container_name: vber_ui-web
+    environment:
+      # 时区上海
+      TZ: Asia/Shanghai
+    ports:
+      - "8010:80"
+      - "4430:443"
+    volumes:
+      # 证书映射
+      - /home/docker/vap3/nginx/cert:/etc/nginx/cert
+      - /home/docker/vap3/nginx/conf:/etc/nginx/conf.d
+      # 页面目录
+      - /home/docker/vap3/ui:/usr/share/nginx/html
+      # 日志目录
+      - /home/docker/vap3/logs/nginx:/var/log/nginx
+    privileged: true
+    networks:
+      - vap3-net
+
+  vber_server-1:
+    image: vber/vber_server:3.0.0
+    container_name: vber_server-1
+    environment:
+      # 时区上海
+      TZ: Asia/Shanghai
+      #      SERVER_PORT: 6080
+      JAVA_OPTS: >-
+        --spring.datasource.dynamic.datasource.master.url=jdbc:mysql://vber_mysql:3306/VberAdminPlusV3DB?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+        --spring.datasource.dynamic.datasource.master.username=root
+        --spring.datasource.dynamic.datasource.master.password=root
+        --spring.data.redis.host=vber_redis
+        --spring.data.redis.port=6379
+        --spring.data.redis.password=123456vb
+    ports:
+      - "6080:8080"
+    volumes:
+      # 配置文件
+      - /home/docker/vap3/logs/server/:/vber/server/logs/
+      # skywalking 探针
+    #      - /docker/skywalking/agent/:/vber/skywalking/agent
+    depends_on:
+      - vber_redis
+      - vber_mysql
+    privileged: true
+    networks:
+      - vap3-net
+
+  vber_server-2:
+    image: vber/vber_server:3.0.0
+    container_name: vber_server-2
+    environment:
+      # 时区上海
+      TZ: Asia/Shanghai
+      JAVA_OPTS: >-
+        --spring.datasource.dynamic.datasource.master.url=jdbc:mysql://vber_mysql:3306/VberAdminPlusV3DB?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+        --spring.datasource.dynamic.datasource.master.username=root
+        --spring.datasource.dynamic.datasource.master.password=root
+        --spring.data.redis.host=vber_redis
+        --spring.data.redis.port=6379
+        --spring.data.redis.password=123456vb
+    ports:
+      - "6081:8080"
+    volumes:
+      # 配置文件
+      - /home/docker/vap3/logs/server2/:/vber/server/logs/
+      # skywalking 探针
+    #      - /docker/skywalking/agent/:/vber/skywalking/agent
+    depends_on:
+      - vber_redis
+      - vber_mysql
+    privileged: true
+    networks:
+      - vap3-net
+
+
+#  vber_monitor-admin:
+#    image: vber/vber_monitor-admin:3.0.0
+#    container_name: vber_monitor-admin
+#    environment:
+#      # 时区上海
+#      TZ: Asia/Shanghai
+#    ports:
+#      - "6075:6075"
+#    volumes:
+#      # 配置文件
+#      - /home/docker/vap3/logs/monitor/:/vber/monitor/logs
+#    privileged: true
+#    networks:
+#      - vap3-net
+#
+#  vber_job-server:
+#    image: vber/vber_job-server:3.0.0
+#    container_name: vber_job-server
+#    environment:
+#      # 时区上海
+#      TZ: Asia/Shanghai
+#    ports:
+#      - "6076:6076"
+#      - "10086:10086"
+#      - "10010:10010"
+#    volumes:
+#      - /home/docker/vap3/logs/job/:/vber/job/logs
+#    privileged: true
+#    networks:
+#      - vap3-net
+
+networks:
+  vap3-net:
+    external: false

SERVER/VberAdminPlusV3/.script/docker/redis/data/README.md

@@ -1 +0,0 @@
-数据目录 请执行 `chmod 777 /docker/redis/data` 赋予读写权限 否则将无法写入数据

SERVER/VberAdminPlusV3/.script/run/DC_Vap3.run.xml

@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="DC_Vap3" type="docker-deploy" factoryName="docker-compose.yml" folderName="DockerRun" server-name="Docker">
+    <deployment type="docker-compose.yml">
+      <settings>
+        <option name="composeProjectName" value="vap3" />
+        <option name="envFilePath" value="" />
+        <option name="sourceFilePath" value=".script/docker/docker-compose.yml" />
+      </settings>
+    </deployment>
+    <method v="2" />
+  </configuration>
+</component>

SERVER/VberAdminPlusV3/.script/run/DC_Vap3_remote.run.xml

@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="DC_Vap3_remote" type="docker-deploy" factoryName="docker-compose.yml" folderName="DockerRun" server-name="Docker">
+    <deployment type="docker-compose.yml">
+      <settings>
+        <option name="composeProjectName" value="vap3" />
+        <option name="envFilePath" value="" />
+        <option name="sourceFilePath" value=".script/docker/docker-compose_liunx.yml" />
+      </settings>
+    </deployment>
+    <method v="2" />
+  </configuration>
+</component>

SERVER/VberAdminPlusV3/.script/run/DF_UI.run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="DF_UI" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
+  <configuration default="false" name="DF_UI" type="docker-deploy" factoryName="dockerfile" folderName="DockerfileBuild" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
         <option name="imageTag" value="vber/vber_ui:3.0.0" />

SERVER/VberAdminPlusV3/.script/run/DF_VberJob.run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="DF_VberJob" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
+  <configuration default="false" name="DF_VberJob" type="docker-deploy" factoryName="dockerfile" folderName="DockerfileBuild">
     <deployment type="dockerfile">
       <settings>
         <option name="imageTag" value="vber/vber_job-server:3.0.0" />

SERVER/VberAdminPlusV3/.script/run/DF_VberMonitor.run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="DF_VberMonitor" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
+  <configuration default="false" name="DF_VberMonitor" type="docker-deploy" factoryName="dockerfile" folderName="DockerfileBuild">
     <deployment type="dockerfile">
       <settings>
         <option name="imageTag" value="vber/vber_monitor-admin:3.0.0" />

SERVER/VberAdminPlusV3/.script/run/DF_VberServer.run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="DF_VberServer" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
+  <configuration default="false" name="DF_VberServer" type="docker-deploy" factoryName="dockerfile" folderName="DockerfileBuild" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
         <option name="imageTag" value="vber/vber_server:3.0.0" />