From 53a5a33fa1caefa60082fb668dc5006b8650799f Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Fri, 18 Aug 2023 16:47:01 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=9B=B4=E6=96=B0=E5=AE=B9?=
 =?UTF-8?q?=E5=99=A8=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index af8bab4ef..d3db085be 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -149,7 +149,7 @@ services:
 
   approve:
     container_name: "dootask-approve-${APP_ID}"
-    image: "hitosea2020/go-approve:0.1.4"
+    image: "kuaifan/dooapprove:0.0.1"
     environment:
       TZ: "${TIMEZONE:-PRC}"
       MYSQL_HOST: "${DB_HOST}"
@@ -165,25 +165,6 @@ services:
       - mariadb
     restart: unless-stopped
 
-  okr:
-    container_name: "dootask-okr-${APP_ID}"
-    image: "hitosea2020/okr:0.0.3"
-    environment:
-      TZ: "Asia/Shanghai"
-      DOO_TASK_URL: "http://${APP_IPPR}.3"
-      MYSQL_HOST: "${DB_HOST}"
-      MYSQL_PORT: "${DB_PORT}"
-      MYSQL_DBNAME: "${DB_DATABASE}"
-      MYSQL_USERNAME: "${DB_USERNAME}"
-      MYSQL_PASSWORD: "${DB_PASSWORD}"
-      MYSQL_EnableSqlLog: true 
-    networks:
-      extnetwork:
-        ipv4_address: "${APP_IPPR}.13"
-    depends_on:
-      - mariadb
-    restart: unless-stopped
-
   ai:
     container_name: "dootask-ai-${APP_ID}"
     image: "kuaifan/dooai:0.0.4"
@@ -191,6 +172,24 @@ services:
       extnetwork:
         ipv4_address: "${APP_IPPR}.12"
     restart: unless-stopped
+  
+  okr:
+    container_name: "dootask-okr-${APP_ID}"
+    image: "hitosea2020/okr:0.0.3"
+    environment:
+      TZ: "${TIMEZONE:-PRC}"
+      DOO_TASK_URL: "http://${APP_IPPR}.3"
+      MYSQL_HOST: "${DB_HOST}"
+      MYSQL_PORT: "${DB_PORT}"
+      MYSQL_DBNAME: "${DB_DATABASE}"
+      MYSQL_USERNAME: "${DB_USERNAME}"
+      MYSQL_PASSWORD: "${DB_PASSWORD}"
+    networks:
+      extnetwork:
+        ipv4_address: "${APP_IPPR}.13"
+    depends_on:
+      - mariadb
+    restart: unless-stopped
 
 networks:
   extnetwork: