From 7a48102b882a75ba3293dd55c2e13e25e1f49dfe Mon Sep 17 00:00:00 2001 From: pooneyy <85266337+pooneyy@users.noreply.github.com> Date: Mon, 23 Feb 2026 12:25:08 +0800 Subject: [PATCH] refactor(udyk): migrate from community to pro edition and restructure app directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - delete old community edition docker-compose.yml for version 6.0 - create new pro edition docker-compose.yml for version 6.2.668 with updated service architecture - rename directory from `udyk-ce` to `udyk` and update file paths accordingly - rename and update sample environment file and data configuration file - update application display name in data.yml from "友得云客房产系统（社区版)" to "友得云客房产系统" - update service images to pro edition tags (e.g., nginx-6.2.668, server-6.2.668, www-6.2.668) - restructure services: replace `panel` service with separate `nginx` and `www` services - update container names to remove `-ce` suffix (e.g., udyk-server instead of udyk-ce-server) - adjust volume mounts and paths for new service structure - preserve and relocate README.md and logo.png files --- apps/udyk-ce/6.0/docker-compose.yml | 63 ---------------- .../{udyk-ce/6.0 => udyk/6.2.668}/.env.sample | 0 apps/{udyk-ce/6.0 => udyk/6.2.668}/data.yml | 0 apps/udyk/6.2.668/docker-compose.yml | 71 ++++++++++++++++++ apps/{udyk-ce => udyk}/README.md | 0 apps/{udyk-ce => udyk}/data.yml | 2 +- apps/{udyk-ce => udyk}/logo.png | Bin 7 files changed, 72 insertions(+), 64 deletions(-) delete mode 100644 apps/udyk-ce/6.0/docker-compose.yml rename apps/{udyk-ce/6.0 => udyk/6.2.668}/.env.sample (100%) rename apps/{udyk-ce/6.0 => udyk/6.2.668}/data.yml (100%) create mode 100644 apps/udyk/6.2.668/docker-compose.yml rename apps/{udyk-ce => udyk}/README.md (100%) rename apps/{udyk-ce => udyk}/data.yml (93%) rename apps/{udyk-ce => udyk}/logo.png (100%) diff --git a/apps/udyk-ce/6.0/docker-compose.yml b/apps/udyk-ce/6.0/docker-compose.yml deleted file mode 100644 index b9bf79f9d..000000000 --- a/apps/udyk-ce/6.0/docker-compose.yml +++ /dev/null @@ -1,63 +0,0 @@ -services: - panel: - container_name: udyk-ce-panel - image: registry.cn-shanghai.aliyuncs.com/youdeyunke/ce:panel - restart: on-failure:3 - expose: - - 80 - ports: - - ${PANEL_APP_PORT_HTTP}:80 - environment: - TZ: "Asia/Shanghai" - LANG: "C.UTF-8" - depends_on: - - server - volumes: - - "./data/tmp:/tmp" - - "./data/upload:/app/filestore" - - server: - container_name: udyk-ce-server - image: registry.cn-shanghai.aliyuncs.com/youdeyunke/ce:server - platform: "linux/x86_64" # 如果是m芯片必须加这个 - privileged: true - restart: always - expose: - - 8080 - environment: - TZ: "Asia/Shanghai" - LANG: "C.UTF-8" - depends_on: - - redis - - db - volumes: - - "./data/tmp:/tmp" - - "./data/upload:/app/upload/" - - - redis: - container_name: udyk-ce-redis - restart: "always" - image: registry.cn-shanghai.aliyuncs.com/youdeyunke/common:redis-4.0 - command: redis-server --bind 0.0.0.0 --appendonly yes - environment: - TZ: "Asia/Shanghai" - LANG: "C.UTF-8" - volumes: - - ./data/redis:/data - expose: - - 6379 - - db: - container_name: udyk-ce-db - restart: "always" - image: registry.cn-shanghai.aliyuncs.com/youdeyunke/common:mysql-8.0.3 - expose: - - 3306 - volumes: - - ./data/mysql:/var/lib/mysql - environment: - MYSQL_DATABASE: udyk_community - LANG: "C.UTF-8" - TZ: "Asia/Shanghai" - MYSQL_ROOT_PASSWORD: "udyk@2023" diff --git a/apps/udyk-ce/6.0/.env.sample b/apps/udyk/6.2.668/.env.sample similarity index 100% rename from apps/udyk-ce/6.0/.env.sample rename to apps/udyk/6.2.668/.env.sample diff --git a/apps/udyk-ce/6.0/data.yml b/apps/udyk/6.2.668/data.yml similarity index 100% rename from apps/udyk-ce/6.0/data.yml rename to apps/udyk/6.2.668/data.yml diff --git a/apps/udyk/6.2.668/docker-compose.yml b/apps/udyk/6.2.668/docker-compose.yml new file mode 100644 index 000000000..84ab2e542 --- /dev/null +++ b/apps/udyk/6.2.668/docker-compose.yml @@ -0,0 +1,71 @@ +services: + nginx: + container_name: udyk-nginx + image: registry.cn-shanghai.aliyuncs.com/youdeyunke/pro:nginx-6.2.668 + restart: always + volumes: + - ./data/upload:/app/filestore + environment: + TZ: Asia/Shanghai + LANG: C.UTF-8 + ports: + - ${PANEL_APP_PORT_HTTP}:80 + depends_on: + - server + - www + + server: + container_name: udyk-server + image: registry.cn-shanghai.aliyuncs.com/youdeyunke/pro:server-6.2.668 + privileged: true # 注意，不能去掉 + restart: on-failure:5 + expose: + - 8080 + environment: + TZ: Asia/Shanghai + LANG: C.UTF-8 + depends_on: + - redis + - db + volumes: + - ./data/app:/app + + www: + container_name: udyk-www + image: registry.cn-shanghai.aliyuncs.com/youdeyunke/pro:www-6.2.668 + restart: always + user: root + expose: + - 3000 + environment: + TZ: Asia/Shanghai + LANG: C.UTF-8 + depends_on: + - server + - db + + redis: + container_name: udyk-redis + restart: always + image: registry.cn-shanghai.aliyuncs.com/youdeyunke/common:redis-4.0 + command: redis-server --bind 0.0.0.0 --appendonly yes + environment: + TZ: Asia/Shanghai + LANG: C.UTF-8 + volumes: + - ./data/redis:/data + expose: + - 6379 + + db: + container_name: udyk-db + image: registry.cn-shanghai.aliyuncs.com/youdeyunke/common:mysql-8.0.3 + expose: + - 3306 + volumes: + - ./data/mysql:/var/lib/mysql + environment: + LANG: C.UTF-8 + TZ: Asia/Shanghai + MYSQL_ROOT_PASSWORD: udyk@2023 + restart: always diff --git a/apps/udyk-ce/README.md b/apps/udyk/README.md similarity index 100% rename from apps/udyk-ce/README.md rename to apps/udyk/README.md diff --git a/apps/udyk-ce/data.yml b/apps/udyk/data.yml similarity index 93% rename from apps/udyk-ce/data.yml rename to apps/udyk/data.yml index 825a1b0a7..b1fb0c6ac 100644 --- a/apps/udyk-ce/data.yml +++ b/apps/udyk/data.yml @@ -1,6 +1,6 @@ additionalProperties: key: udyk-ce - name: 友得云客房产系统（社区版) + name: 友得云客房产系统 tags: - Website shortDescZh: 为房产行业打造的开源的线上营销获客系统 diff --git a/apps/udyk-ce/logo.png b/apps/udyk/logo.png similarity index 100% rename from apps/udyk-ce/logo.png rename to apps/udyk/logo.png