From 36a8178ec30c0fbc6e060c19f0ebd6c5c3bde950 Mon Sep 17 00:00:00 2001
From: Aaron3S <chenyang@fit2cloud.com>
Date: Mon, 19 Jun 2023 20:21:08 +0800
Subject: [PATCH 01/11] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=20chen=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6,=20=E5=BA=9F=E9=99=A4=20omnidb?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 compose/docker-compose-app.yml   | 23 +++++++++++++++++++++++
 compose/docker-compose-xpack.yml | 25 ++-----------------------
 scripts/3_load_images.sh         |  2 +-
 scripts/utils.sh                 |  4 ++--
 4 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/compose/docker-compose-app.yml b/compose/docker-compose-app.yml
index ce2caedf..e5623400 100644
--- a/compose/docker-compose-app.yml
+++ b/compose/docker-compose-app.yml
@@ -101,6 +101,29 @@ services:
     networks:
       - net
 
+  chen:
+    image: jumpserver/chen:${VERSION}
+    container_name: jms_chen
+    ulimits:
+      core: 0
+    restart: always
+    tty: true
+    env_file:
+      - ${CONFIG_FILE}
+    volumes:
+      - ${VOLUME_DIR}/chen/data:/opt/chen/data
+    depends_on:
+      core:
+        condition: service_healthy
+    healthcheck:
+      test: "curl -f 127.0.0.1:8082/chen"
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 10s
+    networks:
+      - net
+
   web:
     image: jumpserver/web:${VERSION}
     container_name: jms_web
diff --git a/compose/docker-compose-xpack.yml b/compose/docker-compose-xpack.yml
index 5e4b0ff7..8282ddb8 100644
--- a/compose/docker-compose-xpack.yml
+++ b/compose/docker-compose-xpack.yml
@@ -18,33 +18,12 @@ services:
     ports:
       - ${MAGNUS_POSTGRESQL_PORT:-54320}:54320
       - ${MAGNUS_ORACLE_PORTS:-30000-30030}:${MAGNUS_ORACLE_PORTS:-30000-30030}
+  chen:
+    image: registry.fit2cloud.com/jumpserver/chen:${VERSION}
 
   web:
     image: registry.fit2cloud.com/jumpserver/web:${VERSION}
 
-  omnidb:
-    image: registry.fit2cloud.com/jumpserver/omnidb:${VERSION}
-    container_name: jms_omnidb
-    ulimits:
-      core: 0
-    restart: always
-    tty: true
-    env_file:
-      - ${CONFIG_FILE}
-    volumes:
-      - ${VOLUME_DIR}/omnidb/data:/opt/omnidb/data
-    depends_on:
-      core:
-        condition: service_healthy
-    healthcheck:
-      test: "ps axu | grep -v 'grep' | grep 'omnidb'"
-      interval: 10s
-      timeout: 5s
-      retries: 3
-      start_period: 10s
-    networks:
-      - net
-
   razor:
     image: registry.fit2cloud.com/jumpserver/razor:${VERSION}
     container_name: jms_razor
diff --git a/scripts/3_load_images.sh b/scripts/3_load_images.sh
index d92ef519..6b71c5f6 100755
--- a/scripts/3_load_images.sh
+++ b/scripts/3_load_images.sh
@@ -16,7 +16,7 @@ function load_image_files() {
       filename=${filename_windows}
     fi
     if [[ ! -f ${IMAGE_DIR}/${filename} ]]; then
-      if [[ ! ${filename} =~ xpack* && ! ${filename} =~ omnidb* && ! ${filename} =~ razor* ]]; then
+      if [[ ! ${filename} =~ xpack* && ! ${filename} =~ chen* && ! ${filename} =~ razor* ]]; then
         echo_red "$(gettext 'Docker image not found'): ${IMAGE_DIR}/${filename}"
       fi
       continue
diff --git a/scripts/utils.sh b/scripts/utils.sh
index 89807911..58e9cf1f 100644
--- a/scripts/utils.sh
+++ b/scripts/utils.sh
@@ -138,7 +138,7 @@ function get_images() {
     echo "registry.fit2cloud.com/jumpserver/koko:${VERSION}"
     echo "registry.fit2cloud.com/jumpserver/lion:${VERSION}"
     echo "registry.fit2cloud.com/jumpserver/magnus:${VERSION}"
-    echo "registry.fit2cloud.com/jumpserver/omnidb:${VERSION}"
+    echo "registry.fit2cloud.com/jumpserver/chen:${VERSION}"
     echo "registry.fit2cloud.com/jumpserver/razor:${VERSION}"
     echo "registry.fit2cloud.com/jumpserver/web:${VERSION}"
     echo "registry.fit2cloud.com/jumpserver/video-worker:${VERSION}"
@@ -267,7 +267,7 @@ function get_docker_compose_services() {
   fi
   use_xpack=$(get_config_or_env USE_XPACK)
   if [[ "${use_xpack}" == "1" ]]; then
-    services+=" omnidb razor"
+    services+=" chen razor"
   fi
   use_video=$(get_config USE_VIDEO)
   if [[ "${use_xpack}" == "1" && "${use_video}" == "1" ]]; then

From 1ccf08c21da99b9c1a9f77db66d50517863ffc11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com>
Date: Mon, 26 Jun 2023 18:53:24 +0800
Subject: [PATCH 02/11] =?UTF-8?q?perf:=20=E7=A7=BB=E9=99=A4=E4=B8=8D?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E7=9A=84=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/7_upgrade.sh | 4 ++++
 scripts/utils.sh     | 1 +
 2 files changed, 5 insertions(+)

diff --git a/scripts/7_upgrade.sh b/scripts/7_upgrade.sh
index 91addbb4..96d2027e 100644
--- a/scripts/7_upgrade.sh
+++ b/scripts/7_upgrade.sh
@@ -38,6 +38,10 @@ function upgrade_config() {
     docker stop jms_lb &>/dev/null
     docker rm jms_lb &>/dev/null
   fi
+  if docker ps -a | grep jms_omnidb &>/dev/null; then
+    docker stop jms_omnidb &>/dev/null
+    docker rm jms_omnidb &>/dev/null
+  fi
   current_version=$(get_config CURRENT_VERSION)
   if [ -z "${current_version}" ]; then
     set_config CURRENT_VERSION "${VERSION}"
diff --git a/scripts/utils.sh b/scripts/utils.sh
index 58e9cf1f..30f6217d 100644
--- a/scripts/utils.sh
+++ b/scripts/utils.sh
@@ -147,6 +147,7 @@ function get_images() {
     echo "jumpserver/koko:${VERSION}"
     echo "jumpserver/lion:${VERSION}"
     echo "jumpserver/magnus:${VERSION}"
+    echo "jumpserver/chen:${VERSION}"
     echo "jumpserver/web:${VERSION}"
   fi
 }

From 5f2e0bb33766ed23315f9082a7a9d2c06fa8688c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com>
Date: Thu, 29 Jun 2023 16:30:44 +0800
Subject: [PATCH 03/11] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=20xrdp=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 compose/docker-compose-xpack.yml | 26 ++++++++++++++++++++++++++
 scripts/3_load_images.sh         |  4 +---
 scripts/utils.sh                 |  3 ++-
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/compose/docker-compose-xpack.yml b/compose/docker-compose-xpack.yml
index 8282ddb8..6fd2d5fc 100644
--- a/compose/docker-compose-xpack.yml
+++ b/compose/docker-compose-xpack.yml
@@ -49,3 +49,29 @@ services:
       start_period: 10s
     networks:
       - net
+
+  xrdp:
+    image: registry.fit2cloud.com/jumpserver/xrdp:${VERSION}
+    container_name: jms_xrdp
+    ulimits:
+      core: 0
+    restart: always
+    tty: true
+    env_file:
+      - ${CONFIG_FILE}
+    ports:
+      - ${XRDP_PORT}:3390
+    volumes:
+      - ${VOLUME_DIR}/xrdp/data:/opt/xrdp/data
+      - ${CONFIG_DIR}/nginx/cert:/opt/xrdp/cert
+    depends_on:
+      core:
+        condition: service_healthy
+    healthcheck:
+      test: "nc -z 127.0.0.1 3390 || exit 1"
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 10s
+    networks:
+      - net
diff --git a/scripts/3_load_images.sh b/scripts/3_load_images.sh
index 6b71c5f6..276a8854 100755
--- a/scripts/3_load_images.sh
+++ b/scripts/3_load_images.sh
@@ -16,9 +16,7 @@ function load_image_files() {
       filename=${filename_windows}
     fi
     if [[ ! -f ${IMAGE_DIR}/${filename} ]]; then
-      if [[ ! ${filename} =~ xpack* && ! ${filename} =~ chen* && ! ${filename} =~ razor* ]]; then
-        echo_red "$(gettext 'Docker image not found'): ${IMAGE_DIR}/${filename}"
-      fi
+      echo_red "$(gettext 'Docker image not found'): ${IMAGE_DIR}/${filename}"
       continue
     fi
 
diff --git a/scripts/utils.sh b/scripts/utils.sh
index 30f6217d..ddf27afa 100644
--- a/scripts/utils.sh
+++ b/scripts/utils.sh
@@ -142,6 +142,7 @@ function get_images() {
     echo "registry.fit2cloud.com/jumpserver/razor:${VERSION}"
     echo "registry.fit2cloud.com/jumpserver/web:${VERSION}"
     echo "registry.fit2cloud.com/jumpserver/video-worker:${VERSION}"
+    echo "registry.fit2cloud.com/jumpserver/xrdp:${VERSION}"
   else
     echo "jumpserver/core:${VERSION}"
     echo "jumpserver/koko:${VERSION}"
@@ -268,7 +269,7 @@ function get_docker_compose_services() {
   fi
   use_xpack=$(get_config_or_env USE_XPACK)
   if [[ "${use_xpack}" == "1" ]]; then
-    services+=" chen razor"
+    services+=" chen razor xrdp"
   fi
   use_video=$(get_config USE_VIDEO)
   if [[ "${use_xpack}" == "1" && "${use_video}" == "1" ]]; then

From 74a4989082fb02acce8f3513f1253e1901d16ec4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com>
Date: Fri, 30 Jun 2023 10:32:42 +0800
Subject: [PATCH 04/11] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=20compose=20v2?=
 =?UTF-8?q?.18.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/const.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/const.sh b/scripts/const.sh
index 1f3cd421..ea2509d3 100644
--- a/scripts/const.sh
+++ b/scripts/const.sh
@@ -40,16 +40,16 @@ if [[ "$(uname -m)" == "loongarch64" ]]; then
 fi
 export DOCKER_MD5
 
-export DOCKER_COMPOSE_VERSION=v2.17.3
+export DOCKER_COMPOSE_VERSION=v2.18.1
 export DOCKER_COMPOSE_MIRROR="https://download.jumpserver.org/docker/compose/releases/download"
 export DOCKER_COMPOSE_BIN_URL="${DOCKER_COMPOSE_MIRROR}/${DOCKER_COMPOSE_VERSION}/docker-compose-linux-$(uname -m)"
 if [[ "$(uname -m)" == "x86_64" ]]; then
-  DOCKER_COMPOSE_MD5=18de31bb2d442cc76a0baa8e5eb4a34f
+  DOCKER_COMPOSE_MD5=a9c8563a7098bb0e990a87c508d24904
 fi
 if [[ "$(uname -m)" == "aarch64" ]]; then
-  DOCKER_COMPOSE_MD5=21e8dd3557573d8367357ba3238ca506
+  DOCKER_COMPOSE_MD5=fa6347d502f052152db5342425b17b1b
 fi
 if [[ "$(uname -m)" == "loongarch64" ]]; then
-  DOCKER_COMPOSE_MD5=45c275eb50bf7eb022b28a5cce86eb19
+  DOCKER_COMPOSE_MD5=eead09acde58a9b2cfb59dbd871dcde9
 fi
 export DOCKER_COMPOSE_MD5

From b73895126f3d00b510c1a1262a1985a2eb6dc4ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com>
Date: Fri, 30 Jun 2023 15:07:07 +0800
Subject: [PATCH 05/11] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E6=97=B6=20xrdp=20=E7=AB=AF=E5=8F=A3=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 compose/docker-compose-xpack.yml | 2 +-
 config-example.txt               | 1 +
 scripts/7_upgrade.sh             | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/compose/docker-compose-xpack.yml b/compose/docker-compose-xpack.yml
index 6fd2d5fc..982bdb84 100644
--- a/compose/docker-compose-xpack.yml
+++ b/compose/docker-compose-xpack.yml
@@ -60,7 +60,7 @@ services:
     env_file:
       - ${CONFIG_FILE}
     ports:
-      - ${XRDP_PORT}:3390
+      - ${XRDP_PORT:-3390}:3390
     volumes:
       - ${VOLUME_DIR}/xrdp/data:/opt/xrdp/data
       - ${CONFIG_DIR}/nginx/cert:/opt/xrdp/cert
diff --git a/config-example.txt b/config-example.txt
index 20aa2b17..9cd5e783 100644
--- a/config-example.txt
+++ b/config-example.txt
@@ -120,6 +120,7 @@ JUMPSERVER_ENABLE_FONT_SMOOTHING=true
 # XPack 包, 开源版本设置无效
 #
 RDP_PORT=3389
+XRDP_PORT=3390
 
 ################################## 其他配置 ##################################
 # 终端使用宿主 HOSTNAME 标识, 首次安装自动生成
diff --git a/scripts/7_upgrade.sh b/scripts/7_upgrade.sh
index 96d2027e..6f36618a 100644
--- a/scripts/7_upgrade.sh
+++ b/scripts/7_upgrade.sh
@@ -105,6 +105,11 @@ function upgrade_config() {
       MAGNUS_ORACLE_PORTS=30000-30030
       set_config MAGNUS_ORACLE_PORTS "${MAGNUS_ORACLE_PORTS}"
     fi
+    xrdp_port=$(get_config XRDP_PORT)
+    if [ -z "${xrdp_port}" ]; then
+      XRDP_PORT=3390
+      set_config XRDP_PORT "${XRDP_PORT}"
+    fi
   fi
 }
 

From 380a59e850e283a62469bd402b6cabdb41868afb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com>
Date: Thu, 6 Jul 2023 16:21:45 +0800
Subject: [PATCH 06/11] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E5=8D=B8?=
 =?UTF-8?q?=E8=BD=BD=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/8_uninstall.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/8_uninstall.sh b/scripts/8_uninstall.sh
index a4ae44df..e34246c3 100644
--- a/scripts/8_uninstall.sh
+++ b/scripts/8_uninstall.sh
@@ -52,7 +52,7 @@ function remove_jumpserver() {
     fi
     echo
   fi
-  if [ -f "/usr/local/bin/docker-compose"]; then
+  if [ -f "/usr/local/bin/docker-compose" ]; then
     echo -e "$(gettext 'Cleaning up') /usr/local/bin/docker-compose"
     rm -f /usr/local/bin/docker-compose
   fi

From 547993d5dd57747272316f88fed11b8935fb8c6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com>
Date: Fri, 7 Jul 2023 20:10:06 +0800
Subject: [PATCH 07/11] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=20kael=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 compose/docker-compose-app.yml   | 23 +++++++++++++++++++++++
 compose/docker-compose-xpack.yml |  3 +++
 scripts/utils.sh                 |  6 ++++--
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/compose/docker-compose-app.yml b/compose/docker-compose-app.yml
index e5623400..7f5faf42 100644
--- a/compose/docker-compose-app.yml
+++ b/compose/docker-compose-app.yml
@@ -124,6 +124,29 @@ services:
     networks:
       - net
 
+  kael:
+    image: jumpserver/kael:${VERSION}
+    container_name: jms_kael
+    ulimits:
+      core: 0
+    restart: always
+    tty: true
+    env_file:
+      - ${CONFIG_FILE}
+    volumes:
+      - ${VOLUME_DIR}/kael/data:/opt/kael/data
+    depends_on:
+      core:
+        condition: service_healthy
+    healthcheck:
+      test: "curl -fsL http://localhost:8083/kael/health/ > /dev/null"
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 90s
+    networks:
+      - net
+
   web:
     image: jumpserver/web:${VERSION}
     container_name: jms_web
diff --git a/compose/docker-compose-xpack.yml b/compose/docker-compose-xpack.yml
index 982bdb84..64ea28e3 100644
--- a/compose/docker-compose-xpack.yml
+++ b/compose/docker-compose-xpack.yml
@@ -21,6 +21,9 @@ services:
   chen:
     image: registry.fit2cloud.com/jumpserver/chen:${VERSION}
 
+  kael:
+    image: registry.fit2cloud.com/jumpserver/kael:${VERSION}
+
   web:
     image: registry.fit2cloud.com/jumpserver/web:${VERSION}
 
diff --git a/scripts/utils.sh b/scripts/utils.sh
index ddf27afa..5f5beada 100644
--- a/scripts/utils.sh
+++ b/scripts/utils.sh
@@ -139,6 +139,7 @@ function get_images() {
     echo "registry.fit2cloud.com/jumpserver/lion:${VERSION}"
     echo "registry.fit2cloud.com/jumpserver/magnus:${VERSION}"
     echo "registry.fit2cloud.com/jumpserver/chen:${VERSION}"
+    echo "registry.fit2cloud.com/jumpserver/kael:${VERSION}"
     echo "registry.fit2cloud.com/jumpserver/razor:${VERSION}"
     echo "registry.fit2cloud.com/jumpserver/web:${VERSION}"
     echo "registry.fit2cloud.com/jumpserver/video-worker:${VERSION}"
@@ -149,6 +150,7 @@ function get_images() {
     echo "jumpserver/lion:${VERSION}"
     echo "jumpserver/magnus:${VERSION}"
     echo "jumpserver/chen:${VERSION}"
+    echo "jumpserver/kael:${VERSION}"
     echo "jumpserver/web:${VERSION}"
   fi
 }
@@ -241,7 +243,7 @@ function log_error() {
 
 function get_docker_compose_services() {
   ignore_db="$1"
-  services="core koko lion magnus web"
+  services="core koko lion magnus chen kael web"
   use_task=$(get_config USE_TASK)
   if [[ "${use_task}" != "0" ]]; then
     services+=" celery"
@@ -269,7 +271,7 @@ function get_docker_compose_services() {
   fi
   use_xpack=$(get_config_or_env USE_XPACK)
   if [[ "${use_xpack}" == "1" ]]; then
-    services+=" chen razor xrdp"
+    services+=" razor xrdp"
   fi
   use_video=$(get_config USE_VIDEO)
   if [[ "${use_xpack}" == "1" && "${use_video}" == "1" ]]; then

From 73a0bb30a1eb0b13e7125396775be2ef23fddb51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com>
Date: Mon, 10 Jul 2023 14:55:23 +0800
Subject: [PATCH 08/11] =?UTF-8?q?perf:=20=E7=A7=BB=E9=99=A4=E4=B8=8D?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E7=9A=84=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 compose/docker-compose-app.yml | 1 -
 config_init/koko/config.yml    | 0
 2 files changed, 1 deletion(-)
 delete mode 100644 config_init/koko/config.yml

diff --git a/compose/docker-compose-app.yml b/compose/docker-compose-app.yml
index 7f5faf42..e37f4029 100644
--- a/compose/docker-compose-app.yml
+++ b/compose/docker-compose-app.yml
@@ -36,7 +36,6 @@ services:
     ports:
       - ${SSH_PORT}:2222
     volumes:
-      - ${CONFIG_DIR}/koko/config.yml:/opt/koko/config.yml
       - ${VOLUME_DIR}/koko/data:/opt/koko/data
     depends_on:
       core:
diff --git a/config_init/koko/config.yml b/config_init/koko/config.yml
deleted file mode 100644
index e69de29b..00000000

From 629358349b11bb51ea23cdb6030261d0e43347bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com>
Date: Wed, 12 Jul 2023 10:12:13 +0800
Subject: [PATCH 09/11] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=20compose=20v2?=
 =?UTF-8?q?.19.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/const.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/const.sh b/scripts/const.sh
index ea2509d3..4cf1488a 100644
--- a/scripts/const.sh
+++ b/scripts/const.sh
@@ -40,16 +40,16 @@ if [[ "$(uname -m)" == "loongarch64" ]]; then
 fi
 export DOCKER_MD5
 
-export DOCKER_COMPOSE_VERSION=v2.18.1
+export DOCKER_COMPOSE_VERSION=v2.19.1
 export DOCKER_COMPOSE_MIRROR="https://download.jumpserver.org/docker/compose/releases/download"
 export DOCKER_COMPOSE_BIN_URL="${DOCKER_COMPOSE_MIRROR}/${DOCKER_COMPOSE_VERSION}/docker-compose-linux-$(uname -m)"
 if [[ "$(uname -m)" == "x86_64" ]]; then
-  DOCKER_COMPOSE_MD5=a9c8563a7098bb0e990a87c508d24904
+  DOCKER_COMPOSE_MD5=43b50098b28c13232a9191760cbae5df
 fi
 if [[ "$(uname -m)" == "aarch64" ]]; then
-  DOCKER_COMPOSE_MD5=fa6347d502f052152db5342425b17b1b
+  DOCKER_COMPOSE_MD5=bbe2efeaa423fab01f8d193e97903e59
 fi
 if [[ "$(uname -m)" == "loongarch64" ]]; then
-  DOCKER_COMPOSE_MD5=eead09acde58a9b2cfb59dbd871dcde9
+  DOCKER_COMPOSE_MD5=ce9e4ebbe578f7bbae979eabdd69d014
 fi
 export DOCKER_COMPOSE_MD5

From 88d73629a95e2a8c8d4faf7c5b3590b3d52bd161 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com>
Date: Mon, 17 Jul 2023 11:08:58 +0800
Subject: [PATCH 10/11] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=20core=20?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 compose/docker-compose-app.yml     | 1 -
 compose/docker-compose-init-db.yml | 1 -
 compose/docker-compose-task.yml    | 1 -
 3 files changed, 3 deletions(-)

diff --git a/compose/docker-compose-app.yml b/compose/docker-compose-app.yml
index e37f4029..a0b43f33 100644
--- a/compose/docker-compose-app.yml
+++ b/compose/docker-compose-app.yml
@@ -14,7 +14,6 @@ services:
     volumes:
       - ${CONFIG_DIR}/core/config.yml:/opt/jumpserver/config.yml
       - ${VOLUME_DIR}/core/data:/opt/jumpserver/data
-      - ${VOLUME_DIR}/core/logs:/opt/jumpserver/logs
     healthcheck:
       test: "curl -fsL http://localhost:8080/api/health/ > /dev/null"
       interval: 10s
diff --git a/compose/docker-compose-init-db.yml b/compose/docker-compose-init-db.yml
index c2d8d0a0..84ddcb80 100644
--- a/compose/docker-compose-init-db.yml
+++ b/compose/docker-compose-init-db.yml
@@ -11,6 +11,5 @@ services:
     volumes:
       - ${CONFIG_DIR}/core/config.yml:/opt/jumpserver/config.yml
       - ${VOLUME_DIR}/core/data:/opt/jumpserver/data
-      - ${VOLUME_DIR}/core/logs:/opt/jumpserver/logs
     networks:
       - net
diff --git a/compose/docker-compose-task.yml b/compose/docker-compose-task.yml
index 1373432a..d37dab74 100644
--- a/compose/docker-compose-task.yml
+++ b/compose/docker-compose-task.yml
@@ -22,6 +22,5 @@ services:
       start_period: 30s
     volumes:
       - ${VOLUME_DIR}/core/data:/opt/jumpserver/data
-      - ${VOLUME_DIR}/core/logs:/opt/jumpserver/logs
     networks:
       - net

From 774834b0b924a591a913f88ac9f12e577d721f58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com>
Date: Thu, 20 Jul 2023 10:59:53 +0800
Subject: [PATCH 11/11] =?UTF-8?q?perf:=20core=20=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/7_upgrade.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/scripts/7_upgrade.sh b/scripts/7_upgrade.sh
index 6f36618a..e8b7f625 100644
--- a/scripts/7_upgrade.sh
+++ b/scripts/7_upgrade.sh
@@ -146,6 +146,13 @@ function migrate_config_v1_5_to_v2_0() {
   fi
 }
 
+function migrate_data_folder() {
+  volume_dir=$(get_config VOLUME_DIR)
+  if [[ -d "${volume_dir}/core/logs" ]] && [[ ! -d "${volume_dir}/core/data/logs" ]]; then
+    mv "${volume_dir}/core/logs" "${volume_dir}/core/data/logs"
+  fi
+}
+
 function migrate_config() {
   prepare_config
 }
@@ -198,6 +205,7 @@ function db_migrations() {
       exit 1
     fi
   fi
+  migrate_data_folder
   if ! perform_db_migrations; then
     log_error "$(gettext 'Failed to change the table structure')!"
     confirm="n"