From b39eb1e43ebdd2c286bf8e0245f7a49e8841eeca Mon Sep 17 00:00:00 2001 From: xuwei-fit2cloud Date: Thu, 8 May 2025 15:20:58 +0800 Subject: [PATCH] refactor: update version vars --- Dockerfile | 22 ++++++++--------- core/core-frontend/src/locales/en.ts | 4 ++-- core/core-frontend/src/locales/tw.ts | 4 ++-- core/core-frontend/src/locales/zh-CN.ts | 4 ++-- installer/dataease/docker-compose-apisix.yml | 18 +++++++------- installer/dataease/docker-compose-mysql.yml | 10 ++++---- .../dataease/docker-compose-selenium.yml | 2 +- installer/dataease/docker-compose-task.yml | 4 ++-- installer/dataease/docker-compose.yml | 24 +++++++++---------- installer/dectl | 4 ++-- installer/install.sh | 20 ++++------------ installer/uninstall.sh | 2 +- .../constant/StaticResourceConstants.java | 4 ++-- .../java/io/dataease/i18n/DeI18nStarter.java | 2 +- .../java/io/dataease/utils/ConfigUtils.java | 2 +- .../plugin/DataEaseDatasourcePlugin.java | 2 +- 16 files changed, 59 insertions(+), 69 deletions(-) diff --git a/Dockerfile b/Dockerfile index 271469a0bd..ca1d718338 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,18 @@ FROM registry.cn-qingdao.aliyuncs.com/dataease/alpine-openjdk21-jre STOPSIGNAL SIGTERM RUN mkdir -p /opt/apps/config \ - /opt/dataease2.0/drivers/ \ - /opt/dataease2.0/cache/ \ - /opt/dataease2.0/data/map \ - /opt/dataease2.0/data/static-resource/ \ - /opt/dataease2.0/data/appearance/ \ - /opt/dataease2.0/data/exportData/ \ - /opt/dataease2.0/data/i8n/ \ - /opt/dataease2.0/data/plugin/ + /opt/dataease3.0/drivers/ \ + /opt/dataease3.0/cache/ \ + /opt/dataease3.0/data/map \ + /opt/dataease3.0/data/static-resource/ \ + /opt/dataease3.0/data/appearance/ \ + /opt/dataease3.0/data/exportData/ \ + /opt/dataease3.0/data/i8n/ \ + /opt/dataease3.0/data/plugin/ -ADD drivers/* /opt/dataease2.0/drivers/ -ADD mapFiles/ /opt/dataease2.0/data/map/ -ADD staticResource/ /opt/dataease2.0/data/static-resource/ +ADD drivers/* /opt/dataease3.0/drivers/ +ADD mapFiles/ /opt/dataease3.0/data/map/ +ADD staticResource/ /opt/dataease3.0/data/static-resource/ WORKDIR /opt/apps diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index 9e795fd8d4..7265ae9491 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -974,7 +974,7 @@ export default { auth_method: 'Authentication Method', passwd: 'Username and Password', kerbers_info: - 'Please make sure krb5.Conf, Keytab Key, have been added to the path: /opt/dataease2.0/conf', + 'Please make sure krb5.Conf, Keytab Key, have been added to the path: /opt/dataease3.0/conf', client_principal: 'Client Principal', keytab_Key_path: 'Keytab Key Path', please_select_left: 'Please select from the left', @@ -3843,7 +3843,7 @@ export default { auth_method: 'Authentication method', passwd: 'Username and password', kerbers_info: - 'Please make sure krb5.Conf and Keytab Key have been added to the path: /opt/dataease2.0/conf', + 'Please make sure krb5.Conf and Keytab Key have been added to the path: /opt/dataease3.0/conf', client_principal: 'Client Principal', keytab_Key_path: 'Keytab Key Path', data_base: 'Database name', diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index 467686c5c4..a8a35dbdc7 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -940,7 +940,7 @@ export default { data_source_table: '資料來源表', auth_method: '認證方式', passwd: '使用者名稱密碼', - kerbers_info: '請確保krb5.Conf、Keytab Key，已新增至路徑：/opt/dataease2.0/conf', + kerbers_info: '請確保krb5.Conf、Keytab Key，已新增至路徑：/opt/dataease3.0/conf', client_principal: 'Client Principal', keytab_Key_path: 'Keytab Key Path', please_select_left: '請從左邊選擇', @@ -3734,7 +3734,7 @@ export default { data_source_table: '資料來源表', auth_method: '認證方式', passwd: '使用者名稱密碼', - kerbers_info: '請確保krb5.Conf、Keytab Key，已新增至路徑：/opt/dataease2.0/conf', + kerbers_info: '請確保krb5.Conf、Keytab Key，已新增至路徑：/opt/dataease3.0/conf', client_principal: 'Client Principal', keytab_Key_path: 'Keytab Key Path', data_base: '資料庫名稱', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 52654cdf27..d05c3a26ae 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -942,7 +942,7 @@ export default { data_source_table: '数据源表', auth_method: '认证方式', passwd: '用户名密码', - kerbers_info: '请确保 krb5.Conf、Keytab Key，已经添加到路径：/opt/dataease2.0/conf', + kerbers_info: '请确保 krb5.Conf、Keytab Key，已经添加到路径：/opt/dataease3.0/conf', client_principal: 'Client Principal', keytab_Key_path: 'Keytab Key Path', please_select_left: '请从左侧选择', @@ -3739,7 +3739,7 @@ export default { data_source_table: '数据源表', auth_method: '认证方式', passwd: '用户名密码', - kerbers_info: '请确保 krb5.Conf、Keytab Key，已经添加到路径：/opt/dataease2.0/conf', + kerbers_info: '请确保 krb5.Conf、Keytab Key，已经添加到路径：/opt/dataease3.0/conf', client_principal: 'Client Principal', keytab_Key_path: 'Keytab Key Path', data_base: '数据库名称', diff --git a/installer/dataease/docker-compose-apisix.yml b/installer/dataease/docker-compose-apisix.yml index 16be147291..cf8483324e 100644 --- a/installer/dataease/docker-compose-apisix.yml +++ b/installer/dataease/docker-compose-apisix.yml @@ -6,11 +6,11 @@ services: container_name: apisix-dashboard restart: always volumes: - - ${DE_BASE}/dataease2.0/apisix/dashboard_conf/conf.yaml:/usr/local/apisix-dashboard/conf/conf.yaml + - ${DE_BASE}/dataease3.0/apisix/dashboard_conf/conf.yaml:/usr/local/apisix-dashboard/conf/conf.yaml ports: - ${DE_APISIX_DASHBOARD_PORT}:9000 networks: - dataease-network: + dataease-network3: apisix: image: registry.cn-qingdao.aliyuncs.com/dataease/apisix:3.6.0-debian @@ -19,26 +19,26 @@ services: - TZ=Asia/Shanghai restart: always volumes: - - ${DE_BASE}/dataease2.0/apisix/apisix_conf/config.yaml:/usr/local/apisix/conf/config.yaml:ro - - ${DE_BASE}/dataease2.0/apisix/logs:/usr/local/apisix/logs - - ${DE_BASE}/dataease2.0/apisix/plugins/cas-auth.lua:/usr/local/apisix/apisix/plugins/cas-auth.lua - - ${DE_BASE}/dataease2.0/apisix/plugins/openid-connect.lua:/usr/local/apisix/apisix/plugins/openid-connect.lua + - ${DE_BASE}/dataease3.0/apisix/apisix_conf/config.yaml:/usr/local/apisix/conf/config.yaml:ro + - ${DE_BASE}/dataease3.0/apisix/logs:/usr/local/apisix/logs + - ${DE_BASE}/dataease3.0/apisix/plugins/cas-auth.lua:/usr/local/apisix/apisix/plugins/cas-auth.lua + - ${DE_BASE}/dataease3.0/apisix/plugins/openid-connect.lua:/usr/local/apisix/apisix/plugins/openid-connect.lua depends_on: - etcd ports: - ${DE_APISIX_PORT}:9080 networks: - dataease-network: + dataease-network3: etcd: image: registry.cn-qingdao.aliyuncs.com/dataease/etcd:3.5.10 container_name: apisix-etcd restart: always volumes: - - ${DE_BASE}/dataease2.0/data/etcd_data:/bitnami/etcd + - ${DE_BASE}/dataease3.0/data/etcd_data:/bitnami/etcd environment: ETCD_ENABLE_V2: "true" ALLOW_NONE_AUTHENTICATION: "yes" ETCD_ADVERTISE_CLIENT_URLS: "http://apisix-etcd:2379" networks: - dataease-network: \ No newline at end of file + dataease-network3: \ No newline at end of file diff --git a/installer/dataease/docker-compose-mysql.yml b/installer/dataease/docker-compose-mysql.yml index 1b458c73ee..7f12d17f87 100644 --- a/installer/dataease/docker-compose-mysql.yml +++ b/installer/dataease/docker-compose-mysql.yml @@ -10,10 +10,10 @@ services: timeout: 3s retries: 10 env_file: - - ${DE_BASE}/dataease2.0/conf/mysql.env + - ${DE_BASE}/dataease3.0/conf/mysql.env volumes: - - ${DE_BASE}/dataease2.0/conf/my.cnf:/etc/mysql/conf.d/my.cnf - - ${DE_BASE}/dataease2.0/bin/mysql:/docker-entrypoint-initdb.d/ - - ${DE_BASE}/dataease2.0/data/mysql:/var/lib/mysql + - ${DE_BASE}/dataease3.0/conf/my.cnf:/etc/mysql/conf.d/my.cnf + - ${DE_BASE}/dataease3.0/bin/mysql:/docker-entrypoint-initdb.d/ + - ${DE_BASE}/dataease3.0/data/mysql:/var/lib/mysql networks: - - dataease-network \ No newline at end of file + - dataease-network3 \ No newline at end of file diff --git a/installer/dataease/docker-compose-selenium.yml b/installer/dataease/docker-compose-selenium.yml index 5f41ec96e1..1a1f64eaa1 100644 --- a/installer/dataease/docker-compose-selenium.yml +++ b/installer/dataease/docker-compose-selenium.yml @@ -16,4 +16,4 @@ services: - SE_NODE_MAX_SESSIONS=5 - TZ=Asia/Shanghai networks: - - dataease-network + - dataease-network3 diff --git a/installer/dataease/docker-compose-task.yml b/installer/dataease/docker-compose-task.yml index 25e4386f1e..4be3807421 100644 --- a/installer/dataease/docker-compose-task.yml +++ b/installer/dataease/docker-compose-task.yml @@ -4,6 +4,6 @@ services: image: registry.cn-qingdao.aliyuncs.com/dataease/dataease-sync-task:DE_TAG container_name: sync-task-actuator volumes: - - ${DE_BASE}/dataease2.0/logs:/opt/dataease2.0/logs + - ${DE_BASE}/dataease3.0/logs:/opt/dataease3.0/logs networks: - - dataease-network \ No newline at end of file + - dataease-network3 \ No newline at end of file diff --git a/installer/dataease/docker-compose.yml b/installer/dataease/docker-compose.yml index a22d779c28..cf5f577995 100644 --- a/installer/dataease/docker-compose.yml +++ b/installer/dataease/docker-compose.yml @@ -9,21 +9,21 @@ services: ports: - ${DE_PORT}:8100 volumes: - - ${DE_BASE}/dataease2.0/conf:/opt/apps/config - - ${DE_BASE}/dataease2.0/logs:/opt/dataease2.0/logs - - ${DE_BASE}/dataease2.0/data/static-resource:/opt/dataease2.0/data/static-resource - - ${DE_BASE}/dataease2.0/cache:/opt/dataease2.0/cache - - ${DE_BASE}/dataease2.0/data/geo:/opt/dataease2.0/data/geo - - ${DE_BASE}/dataease2.0/data/appearance:/opt/dataease2.0/data/appearance - - ${DE_BASE}/dataease2.0/data/exportData:/opt/dataease2.0/data/exportData - - ${DE_BASE}/dataease2.0/data/plugin:/opt/dataease2.0/data/plugin - - ${DE_BASE}/dataease2.0/data/font:/opt/dataease2.0/data/font - - ${DE_BASE}/dataease2.0/data/i18n:/opt/dataease2.0/data/i18n + - ${DE_BASE}/dataease3.0/conf:/opt/apps/config + - ${DE_BASE}/dataease3.0/logs:/opt/dataease3.0/logs + - ${DE_BASE}/dataease3.0/data/static-resource:/opt/dataease3.0/data/static-resource + - ${DE_BASE}/dataease3.0/cache:/opt/dataease3.0/cache + - ${DE_BASE}/dataease3.0/data/geo:/opt/dataease3.0/data/geo + - ${DE_BASE}/dataease3.0/data/appearance:/opt/dataease3.0/data/appearance + - ${DE_BASE}/dataease3.0/data/exportData:/opt/dataease3.0/data/exportData + - ${DE_BASE}/dataease3.0/data/plugin:/opt/dataease3.0/data/plugin + - ${DE_BASE}/dataease3.0/data/font:/opt/dataease3.0/data/font + - ${DE_BASE}/dataease3.0/data/i18n:/opt/dataease3.0/data/i18n depends_on: DE_MYSQL_HOST: condition: service_healthy networks: - - dataease-network + - dataease-network3 networks: - dataease-network: + dataease-network3: diff --git a/installer/dectl b/installer/dectl index d7c5036f25..063aab6d82 100644 --- a/installer/dectl +++ b/installer/dectl @@ -3,7 +3,7 @@ action=$1 target=$2 DE_BASE=/opt -DE_RUNNING_BASE=${DE_BASE}/dataease2.0 +DE_RUNNING_BASE=${DE_BASE}/dataease3.0 need_init_apisix=false compose_files="-f docker-compose.yml" compose_cmd="docker-compose" @@ -153,7 +153,7 @@ import json import re latest_release="" -release_pattern="v2\.\d+\.\d+$" +release_pattern="v3\.\d+\.\d+$" def get_releases(page): try: diff --git a/installer/install.sh b/installer/install.sh index 94d08f5b35..7f450cc27c 100644 --- a/installer/install.sh +++ b/installer/install.sh @@ -32,9 +32,9 @@ function check_and_prepare_env_params() { cd ${CURRENT_DIR} if [ -f /usr/bin/dectl ]; then - v2_version=$(dectl version | head -n 2 | grep "v2.") + v2_version=$(dectl version | head -n 2 | grep "v3.") if [[ -z $v2_version ]];then - echo "系统当前版本不是 DataEase v2 版本系列，不支持升级到 v2，请检查离线包版本。" + echo "系统当前版本不是 DataEase v3 版本系列，不支持升级到 v3，请检查离线包版本。" exit 1; fi # 获取已安装的 DataEase 的运行目录 @@ -59,8 +59,8 @@ function check_and_prepare_env_params() { DE_BASE=$DE_BASE_OLD export DE_BASE=$DE_BASE_OLD fi - if [[ -d $DE_BASE ]] && [[ -f $DE_BASE/dataease2.0/.env ]]; then - source $DE_BASE/dataease2.0/.env + if [[ -d $DE_BASE ]] && [[ -f $DE_BASE/dataease3.0/.env ]]; then + source $DE_BASE/dataease3.0/.env INSTALL_TYPE='upgrade' conf_install_mode=$(prop $CURRENT_DIR/install.conf DE_INSTALL_MODE) @@ -86,7 +86,7 @@ function check_and_prepare_env_params() { function set_run_base_path() { log_title "设置运行目录" - DE_RUN_BASE=$DE_BASE/dataease2.0 + DE_RUN_BASE=$DE_BASE/dataease3.0 CONF_FOLDER=${DE_RUN_BASE}/conf TEMPLATES_FOLDER=${DE_RUN_BASE}/templates log_content "运行目录 $DE_RUN_BASE" @@ -282,16 +282,6 @@ function load_de_images() { function set_de_service() { log_title "配置 DataEase 服务" - if [[ -f /etc/init.d/dataease ]];then - if which chkconfig >/dev/null 2>&1;then - chkconfig dataease >/dev/null - if [ $? -eq 0 ]; then - chkconfig --del dataease - fi - fi - rm -f /etc/init.d/dataease - fi - if [[ ! -f /etc/systemd/system/dataease.service ]];then log_content "配置 dataease Service" cp ${DE_RUN_BASE}/bin/dataease/dataease.service /etc/systemd/system/ diff --git a/installer/uninstall.sh b/installer/uninstall.sh index d27daf96e8..e02f0da48d 100644 --- a/installer/uninstall.sh +++ b/installer/uninstall.sh @@ -55,6 +55,6 @@ if test -n "$(docker images | grep 'registry.cn-qingdao.aliyuncs.com/dataease')" fi # 清理 DataEase 运行目录及命令行工具 dectl -rm -rf ${DE_BASE}/dataease2.0 /usr/bin/dectl +rm -rf ${DE_BASE}/dataease3.0 /usr/bin/dectl echo "DataEase 服务卸载完成" \ No newline at end of file diff --git a/sdk/common/src/main/java/io/dataease/constant/StaticResourceConstants.java b/sdk/common/src/main/java/io/dataease/constant/StaticResourceConstants.java index 343be5e317..f91fa3c575 100644 --- a/sdk/common/src/main/java/io/dataease/constant/StaticResourceConstants.java +++ b/sdk/common/src/main/java/io/dataease/constant/StaticResourceConstants.java @@ -41,9 +41,9 @@ public class StaticResourceConstants { public static String getHomeData() { if (ModelUtils.isDesktop()) { - return ConfigUtils.getConfig("dataease.path.data", "/opt/dataease2.0/data"); + return ConfigUtils.getConfig("dataease.path.data", "/opt/dataease3.0/data"); } else { - return "/opt/dataease2.0/data"; + return "/opt/dataease3.0/data"; } } } diff --git a/sdk/common/src/main/java/io/dataease/i18n/DeI18nStarter.java b/sdk/common/src/main/java/io/dataease/i18n/DeI18nStarter.java index f521babaff..cebe003681 100644 --- a/sdk/common/src/main/java/io/dataease/i18n/DeI18nStarter.java +++ b/sdk/common/src/main/java/io/dataease/i18n/DeI18nStarter.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Component; @Order(1000) public class DeI18nStarter implements ApplicationRunner { - @Value("${dataease.path.i18n:file:/opt/dataease2.0/data/i18n/custom}") + @Value("${dataease.path.i18n:file:/opt/dataease3.0/data/i18n/custom}") private String i18nPath; @Override diff --git a/sdk/common/src/main/java/io/dataease/utils/ConfigUtils.java b/sdk/common/src/main/java/io/dataease/utils/ConfigUtils.java index 1729fabbfd..da7b48c5dc 100644 --- a/sdk/common/src/main/java/io/dataease/utils/ConfigUtils.java +++ b/sdk/common/src/main/java/io/dataease/utils/ConfigUtils.java @@ -12,7 +12,7 @@ import java.util.Objects; */ public class ConfigUtils { - public static String configPath = "opt" + File.separator + "dataease2.0" + File.separator + "config" + File.separator + "application.yml"; + public static String configPath = "opt" + File.separator + "dataease3.0" + File.separator + "config" + File.separator + "application.yml"; public static String getConfig(String key, String defaultValue) { try { diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/plugin/DataEaseDatasourcePlugin.java b/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/plugin/DataEaseDatasourcePlugin.java index 4278a91321..72d3e46e53 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/plugin/DataEaseDatasourcePlugin.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/plugin/DataEaseDatasourcePlugin.java @@ -26,7 +26,7 @@ import java.util.jar.JarFile; * @Author Junjun */ public abstract class DataEaseDatasourcePlugin extends Provider implements DataEasePlugin { - private final String DEFAULT_FILE_PATH = "/opt/dataease2.0/drivers/plugin"; + private final String DEFAULT_FILE_PATH = "/opt/dataease3.0/drivers/plugin"; @Override