From c1cbfc2b93678bf47baf02b116a7aaa81f3473cf Mon Sep 17 00:00:00 2001
From: ageerle <ageerle@163.com>
Date: 星期五, 07 二月 2025 10:34:31 +0800
Subject: [PATCH] 2.0版本

---
 script/docker/docker-compose.yml |   49 +++++++++----------------------------------------
 1 files changed, 9 insertions(+), 40 deletions(-)

diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml
index 14b1d47..0e1d01d 100644
--- a/script/docker/docker-compose.yml
+++ b/script/docker/docker-compose.yml
@@ -1,9 +1,5 @@
 version: '3'
 
-networks:
-  mynetwork:
-    driver: bridge
-
 services:
   mysql:
     image: mysql:8.0.33
@@ -22,23 +18,6 @@
       --collation-server=utf8mb4_general_ci
       --explicit_defaults_for_timestamp=true
       --lower_case_table_names=1
-    privileged: true
-    networks:
-      - mynetwork
-
-  redis:
-    image: redis:6.2.12
-    container_name: redis
-    ports:
-      - "6379:6379"
-    environment:
-      TZ: Asia/Shanghai
-    volumes:
-      - /docker/redis/conf:/redis/config:rw
-      - /docker/redis/data/:/redis/data/:rw
-    privileged: true
-    networks:
-      - mynetwork
 
   ruoyi-server:
     image: registry.cn-shanghai.aliyuncs.com/ruoyi-ai/ai:1.2.1
@@ -49,16 +28,6 @@
       TZ: Asia/Shanghai
       # 杩愯绔彛鍙�
       SERVER_PORT: 6039
-      # 涓浆key
-      CHAT_API_KEY: ${CHAT_API_KEY}
-      # 涓浆鍦板潃
-      CHAT_API_HOST: ${CHAT_API_HOST}
-      # 閭鎺堟潈鐮�
-      MAIL_PASS: ${MAIL_PASS}
-      # 鏄撴敮浠樺晢鎴稩D
-      PAY_PID: ${PAY_PID}
-      # 鏄撴敮浠樺晢鎴峰瘑閽�
-      PAY_KEY: ${PAY_KEY}
       # 鏁版嵁搴撹繛鎺ュ湴鍧�
       DB_URL: jdbc:mysql://mysql:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
       # 鏁版嵁搴撶敤鎴峰悕
@@ -69,27 +38,27 @@
       REDIS_HOST: redis
       # Redis绔彛
       REDIS_PORT: 6379
+      # 鏁版嵁搴撶储寮�
+      REDIS_DATABASE: 0
+      # Redis瀵嗙爜
+      REDIS_PASSWORD:
+      # 杩炴帴瓒呮椂鏃堕棿
+      REDIS_TIMEOUT: 10s
     volumes:
       - /docker/server2/logs/:/ruoyi/server/logs/
-    privileged: true
-    networks:
-      - mynetwork
 
   ruoyi-web:
     image: registry.cn-shanghai.aliyuncs.com/ruoyi-ai/web:1.2.1
     ports:
       - "8081:8081"
     container_name: ruoyi-web
-    privileged: true
-    networks:
-      - mynetwork
+
 
   ruoyi-admin:
     image: registry.cn-shanghai.aliyuncs.com/ruoyi-ai/admin:1.2.1
     ports:
       - "8082:8082"
     container_name: ruoyi-admin
-    privileged: true
-    networks:
-      - mynetwork
+
+
 

--
Gitblit v1.9.3