From 2c5ac82ec00e4dcba92ae237da0735c4c23886c0 Mon Sep 17 00:00:00 2001
From: pooneyy <85266337+pooneyy@users.noreply.github.com>
Date: Thu, 2 Oct 2025 11:55:18 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=F0=9F=93=9D=20docs(docker-lxc):=20restore?=
 =?UTF-8?q?=20data.yml=20from=20backup=20file?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- rename data.yml.bak to data.yml with minimal content changes
- preserve existing application metadata and descriptions
---
 apps/docker-lxc/{data.yml.bak => data.yml} | 40 +++++++++++-----------
 1 file changed, 20 insertions(+), 20 deletions(-)
 rename apps/docker-lxc/{data.yml.bak => data.yml} (96%)

diff --git a/apps/docker-lxc/data.yml.bak b/apps/docker-lxc/data.yml
similarity index 96%
rename from apps/docker-lxc/data.yml.bak
rename to apps/docker-lxc/data.yml
index 5979c9534..d413ebd3d 100644
--- a/apps/docker-lxc/data.yml.bak
+++ b/apps/docker-lxc/data.yml
@@ -1,20 +1,20 @@
-name: docker-lxc
-tags:
-    - 工具
-title: 运行由 docker 管理的有状态 lxc 容器
-type: 工具
-description: 运行由 docker 管理的有状态 lxc 容器
-additionalProperties:
-    key: docker-lxc
-    name: docker-lxc
-    tags:
-        - Tool
-    shortDescZh: 运行由 docker 管理的有状态 lxc 容器
-    shortDescEn: Run stateful lxc containers managed by docker
-    type: tool
-    crossVersionUpdate: true
-    limit: 0
-    recommend: 0
-    website: https://hub.docker.com/r/micwy/lxc
-    github: https://github.com/micw/docker-lxc
-    document: https://github.com/micw/docker-lxc
+name: docker-lxc
+tags:
+    - 工具
+title: 运行由 docker 管理的有状态 lxc 容器
+type: 工具
+description: 运行由 docker 管理的有状态 lxc 容器
+additionalProperties:
+    key: docker-lxc
+    name: docker-lxc
+    tags:
+        - Tool
+    shortDescZh: 运行由 docker 管理的有状态 lxc 容器
+    shortDescEn: Run stateful lxc containers managed by docker
+    type: tool
+    crossVersionUpdate: true
+    limit: 0
+    recommend: 0
+    website: https://hub.docker.com/r/micwy/lxc
+    github: https://github.com/micw/docker-lxc
+    document: https://github.com/micw/docker-lxc

From 833dcbd3cfbb55c76a6568b2466a0aa1445a30c4 Mon Sep 17 00:00:00 2001
From: pooneyy <85266337+pooneyy@users.noreply.github.com>
Date: Thu, 2 Oct 2025 22:30:29 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E2=9C=A8=20feat(php-unofficial):=20update?=
 =?UTF-8?q?=20php=20versions=20and=20switch=20to=20pre-built=20images?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- update php 8.1.32 to 8.1.33 with bookworm base image
- update php 8.4.8 to 8.4.13 with bookworm base image
- switch from local docker builds to pre-built ghcr.io images for all versions
- maintain existing configuration files and environment samples
---
 .../7.4.33-alpine/docker-compose.yml          |  4 +-
 apps/php-unofficial/7.4.33/docker-compose.yml |  4 +-
 .../{8.1.32 => 8.1.33}/.env.sample            |  0
 .../{8.1.32 => 8.1.33}/Dockerfile             |  4 +-
 .../{8.1.32 => 8.1.33}/data.yml               |  0
 .../{8.1.32 => 8.1.33}/data/php-fpm.conf      |  0
 .../{8.1.32 => 8.1.33}/data/php.ini           |  0
 .../{8.1.32 => 8.1.33}/docker-compose.yml     |  4 +-
 .../{8.4.8 => 8.4.13}/.env.sample             |  0
 .../{8.4.8 => 8.4.13}/Dockerfile              | 24 +++++------
 .../php-unofficial/{8.4.8 => 8.4.13}/data.yml |  0
 .../{8.4.8 => 8.4.13}/data/php-fpm.conf       |  0
 .../{8.4.8 => 8.4.13}/data/php.ini            |  0
 .../{8.4.8 => 8.4.13}/docker-compose.yml      |  6 +--
 .../php-unofficial/{data.yml.bak => data.yml} | 40 +++++++++----------
 15 files changed, 37 insertions(+), 49 deletions(-)
 rename apps/php-unofficial/{8.1.32 => 8.1.33}/.env.sample (100%)
 rename apps/php-unofficial/{8.1.32 => 8.1.33}/Dockerfile (98%)
 rename apps/php-unofficial/{8.1.32 => 8.1.33}/data.yml (100%)
 rename apps/php-unofficial/{8.1.32 => 8.1.33}/data/php-fpm.conf (100%)
 rename apps/php-unofficial/{8.1.32 => 8.1.33}/data/php.ini (100%)
 rename apps/php-unofficial/{8.1.32 => 8.1.33}/docker-compose.yml (86%)
 rename apps/php-unofficial/{8.4.8 => 8.4.13}/.env.sample (100%)
 rename apps/php-unofficial/{8.4.8 => 8.4.13}/Dockerfile (86%)
 rename apps/php-unofficial/{8.4.8 => 8.4.13}/data.yml (100%)
 rename apps/php-unofficial/{8.4.8 => 8.4.13}/data/php-fpm.conf (100%)
 rename apps/php-unofficial/{8.4.8 => 8.4.13}/data/php.ini (100%)
 rename apps/php-unofficial/{8.4.8 => 8.4.13}/docker-compose.yml (84%)
 rename apps/php-unofficial/{data.yml.bak => data.yml} (96%)

diff --git a/apps/php-unofficial/7.4.33-alpine/docker-compose.yml b/apps/php-unofficial/7.4.33-alpine/docker-compose.yml
index db58ed7c9..00827b22f 100644
--- a/apps/php-unofficial/7.4.33-alpine/docker-compose.yml
+++ b/apps/php-unofficial/7.4.33-alpine/docker-compose.yml
@@ -1,8 +1,6 @@
 services:
   php74a:
-    build:
-      context: .
-      dockerfile: Dockerfile
+    image: ghcr.io/pooneyy/php:7.4.33-fpm-alpine-php-unofficial
     container_name: ${CONTAINER_NAME}
     restart: always
     networks:
diff --git a/apps/php-unofficial/7.4.33/docker-compose.yml b/apps/php-unofficial/7.4.33/docker-compose.yml
index ec22ad653..dd8a5dd41 100644
--- a/apps/php-unofficial/7.4.33/docker-compose.yml
+++ b/apps/php-unofficial/7.4.33/docker-compose.yml
@@ -1,8 +1,6 @@
 services:
   php74:
-    build:
-      context: .
-      dockerfile: Dockerfile
+    image: ghcr.io/pooneyy/php:7.4.33-fpm-php-unofficial
     container_name: ${CONTAINER_NAME}
     restart: always
     networks:
diff --git a/apps/php-unofficial/8.1.32/.env.sample b/apps/php-unofficial/8.1.33/.env.sample
similarity index 100%
rename from apps/php-unofficial/8.1.32/.env.sample
rename to apps/php-unofficial/8.1.33/.env.sample
diff --git a/apps/php-unofficial/8.1.32/Dockerfile b/apps/php-unofficial/8.1.33/Dockerfile
similarity index 98%
rename from apps/php-unofficial/8.1.32/Dockerfile
rename to apps/php-unofficial/8.1.33/Dockerfile
index 49a67bf4e..ff19fed61 100644
--- a/apps/php-unofficial/8.1.32/Dockerfile
+++ b/apps/php-unofficial/8.1.33/Dockerfile
@@ -1,6 +1,6 @@
 #Reference Links ：https://github.com/docker-library/php/issues/926#issuecomment-567230723
 
-FROM php:8.1.33-fpm
+FROM php:8.1.33-fpm-bookworm
 
 ARG UNAME=www-data
 ARG UGROUP=www-data
@@ -91,5 +91,3 @@ RUN docker-php-ext-enable imagick
 RUN echo "extension=redis.so" >> /usr/local/etc/php/php.ini
 
 WORKDIR /www
-
-
diff --git a/apps/php-unofficial/8.1.32/data.yml b/apps/php-unofficial/8.1.33/data.yml
similarity index 100%
rename from apps/php-unofficial/8.1.32/data.yml
rename to apps/php-unofficial/8.1.33/data.yml
diff --git a/apps/php-unofficial/8.1.32/data/php-fpm.conf b/apps/php-unofficial/8.1.33/data/php-fpm.conf
similarity index 100%
rename from apps/php-unofficial/8.1.32/data/php-fpm.conf
rename to apps/php-unofficial/8.1.33/data/php-fpm.conf
diff --git a/apps/php-unofficial/8.1.32/data/php.ini b/apps/php-unofficial/8.1.33/data/php.ini
similarity index 100%
rename from apps/php-unofficial/8.1.32/data/php.ini
rename to apps/php-unofficial/8.1.33/data/php.ini
diff --git a/apps/php-unofficial/8.1.32/docker-compose.yml b/apps/php-unofficial/8.1.33/docker-compose.yml
similarity index 86%
rename from apps/php-unofficial/8.1.32/docker-compose.yml
rename to apps/php-unofficial/8.1.33/docker-compose.yml
index 33bb0afc4..f437d1d3b 100644
--- a/apps/php-unofficial/8.1.32/docker-compose.yml
+++ b/apps/php-unofficial/8.1.33/docker-compose.yml
@@ -1,8 +1,6 @@
 services:
   php81:
-    build:
-      context: .
-      dockerfile: Dockerfile
+    image: ghcr.io/pooneyy/php:8.1.33-fpm-bookworm-php-unofficial
     container_name: ${CONTAINER_NAME}
     restart: always
     networks:
diff --git a/apps/php-unofficial/8.4.8/.env.sample b/apps/php-unofficial/8.4.13/.env.sample
similarity index 100%
rename from apps/php-unofficial/8.4.8/.env.sample
rename to apps/php-unofficial/8.4.13/.env.sample
diff --git a/apps/php-unofficial/8.4.8/Dockerfile b/apps/php-unofficial/8.4.13/Dockerfile
similarity index 86%
rename from apps/php-unofficial/8.4.8/Dockerfile
rename to apps/php-unofficial/8.4.13/Dockerfile
index 2d42c3e37..bbc8d6194 100644
--- a/apps/php-unofficial/8.4.8/Dockerfile
+++ b/apps/php-unofficial/8.4.13/Dockerfile
@@ -1,6 +1,6 @@
 #Reference Links ：https://github.com/docker-library/php/issues/926#issuecomment-567230723
 
-FROM php:8.4.13-fpm
+FROM php:8.4.13-fpm-bookworm
 
 ARG UNAME=www-data
 ARG UGROUP=www-data
@@ -42,19 +42,21 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     libicu-dev && \
     rm -rf /var/lib/apt/lists/*
 
-
-
 # memcached
-RUN pecl install memcached
-RUN docker-php-ext-enable memcached
+RUN pecl install memcached && \
+    docker-php-ext-enable memcached
 
 # mcrypt
-RUN pecl install mcrypt
-RUN docker-php-ext-enable mcrypt
+RUN pecl install mcrypt && \
+    docker-php-ext-enable mcrypt
 
 # redis
-RUN pecl install redis
-RUN docker-php-ext-enable redis
+RUN pecl install redis && \
+    docker-php-ext-enable redis
+
+# imap
+RUN pecl install imap && \
+    docker-php-ext-enable imap
 
 #pecl temporarily does not support PHP8.1 api installation rar
 #Reference Links ：https://stackoverflow.com/questions/73564424/error-while-installing-php-rar-extension-on-ubuntu-server
@@ -68,14 +70,12 @@ RUN docker-php-ext-configure gd --enable-gd --with-freetype --with-jpeg --with-w
 && docker-php-ext-configure mysqli --with-mysqli=mysqlnd \
 && docker-php-ext-configure pdo_mysql --with-pdo-mysql=mysqlnd \
 && docker-php-ext-configure zip \
-&& docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
 && docker-php-ext-install -j "$(nproc)" \
     gd \
     intl \
     mysqli \
     pdo_mysql \
     zip \
-    imap \
     fileinfo \
     xsl \
     bcmath \
@@ -91,5 +91,3 @@ RUN docker-php-ext-enable imagick
 RUN echo "extension=redis.so" >> /usr/local/etc/php/php.ini
 
 WORKDIR /www
-
-
diff --git a/apps/php-unofficial/8.4.8/data.yml b/apps/php-unofficial/8.4.13/data.yml
similarity index 100%
rename from apps/php-unofficial/8.4.8/data.yml
rename to apps/php-unofficial/8.4.13/data.yml
diff --git a/apps/php-unofficial/8.4.8/data/php-fpm.conf b/apps/php-unofficial/8.4.13/data/php-fpm.conf
similarity index 100%
rename from apps/php-unofficial/8.4.8/data/php-fpm.conf
rename to apps/php-unofficial/8.4.13/data/php-fpm.conf
diff --git a/apps/php-unofficial/8.4.8/data/php.ini b/apps/php-unofficial/8.4.13/data/php.ini
similarity index 100%
rename from apps/php-unofficial/8.4.8/data/php.ini
rename to apps/php-unofficial/8.4.13/data/php.ini
diff --git a/apps/php-unofficial/8.4.8/docker-compose.yml b/apps/php-unofficial/8.4.13/docker-compose.yml
similarity index 84%
rename from apps/php-unofficial/8.4.8/docker-compose.yml
rename to apps/php-unofficial/8.4.13/docker-compose.yml
index 33bb0afc4..9f4afd686 100644
--- a/apps/php-unofficial/8.4.8/docker-compose.yml
+++ b/apps/php-unofficial/8.4.13/docker-compose.yml
@@ -1,8 +1,6 @@
 services:
-  php81:
-    build:
-      context: .
-      dockerfile: Dockerfile
+  php84:
+    image: ghcr.io/pooneyy/php:8.4.13-fpm-bookworm-php-unofficial
     container_name: ${CONTAINER_NAME}
     restart: always
     networks:
diff --git a/apps/php-unofficial/data.yml.bak b/apps/php-unofficial/data.yml
similarity index 96%
rename from apps/php-unofficial/data.yml.bak
rename to apps/php-unofficial/data.yml
index c5d115d94..e6e7a4d99 100644
--- a/apps/php-unofficial/data.yml.bak
+++ b/apps/php-unofficial/data.yml
@@ -1,20 +1,20 @@
-name: PHP-Unofficial
-tags:
-    - 工具
-title: PHP是一种流行的服务器端脚本语言
-type: 工具
-description: PHP是一种流行的服务器端脚本语言
-additionalProperties:
-    key: php-unofficial
-    name: PHP-Unofficial
-    tags:
-        - Tool
-    shortDescZh: PHP是一种流行的服务器端脚本语言
-    shortDescEn: PHP is a popular server-side scripting language
-    type: tool
-    crossVersionUpdate: false
-    limit: 0
-    recommend: 0
-    website: https://www.php.net/
-    github: https://github.com/php/php-src
-    document: https://www.php.net/docs.php
+name: PHP-Unofficial
+tags:
+    - 工具
+title: PHP是一种流行的服务器端脚本语言
+type: 工具
+description: PHP是一种流行的服务器端脚本语言
+additionalProperties:
+    key: php-unofficial
+    name: PHP-Unofficial
+    tags:
+        - Tool
+    shortDescZh: PHP是一种流行的服务器端脚本语言
+    shortDescEn: PHP is a popular server-side scripting language
+    type: tool
+    crossVersionUpdate: false
+    limit: 0
+    recommend: 0
+    website: https://www.php.net/
+    github: https://github.com/php/php-src
+    document: https://www.php.net/docs.php

From 3c1aab7b4712238ff3bf996b690835f450ca8381 Mon Sep 17 00:00:00 2001
From: pooneyy <85266337+pooneyy@users.noreply.github.com>
Date: Thu, 2 Oct 2025 22:07:26 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=F0=9F=93=A6=20build(picx):=20optimize=20do?=
 =?UTF-8?q?cker=20deployment?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- switch from local build to pre-built ghcr.io images
- simplify docker-compose configuration by removing build context
- fix entrypoint.sh copy path in latest Dockerfile
- add multi-architecture support to data.yml
---
 apps/picx/data.yml                  | 10 ++++++++++
 apps/picx/latest/Dockerfile         |  2 +-
 apps/picx/latest/docker-compose.yml |  5 +----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/apps/picx/data.yml b/apps/picx/data.yml
index 54614d2c0..5c296503f 100644
--- a/apps/picx/data.yml
+++ b/apps/picx/data.yml
@@ -17,3 +17,13 @@ additionalProperties:
   website: https://picx.xpoet.cn
   github: https://github.com/XPoet/picx
   document: https://picx-docs.xpoet.cn
+  architecture: 
+    - linux/amd64
+    - linux/arm64
+    - linux/ppc64le
+    - linux/riscv64
+    - linux/s390x
+    - linux/arm/v7
+    - linux/arm/v6
+    - linux/386
+
diff --git a/apps/picx/latest/Dockerfile b/apps/picx/latest/Dockerfile
index 2482f9dad..9140e3ac2 100644
--- a/apps/picx/latest/Dockerfile
+++ b/apps/picx/latest/Dockerfile
@@ -12,7 +12,7 @@ RUN apk update && \
 RUN git clone -b gh-pages https://github.com/XPoet/picx
 
 # 将entrypoint.sh脚本文件复制到工作目录/app/
-COPY entrypoint.sh /app/
+COPY apps/picx/latest/entrypoint.sh /app/
 # 赋予entrypoint.sh脚本文件可执行权限
 RUN chmod +x /app/entrypoint.sh
 
diff --git a/apps/picx/latest/docker-compose.yml b/apps/picx/latest/docker-compose.yml
index 55a56ef9f..eb5e34e1d 100644
--- a/apps/picx/latest/docker-compose.yml
+++ b/apps/picx/latest/docker-compose.yml
@@ -1,9 +1,6 @@
 services:
   picx:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    image: picx:latest
+    image: ghcr.io/pooneyy/picx:latest
     container_name: ${CONTAINER_NAME}
     restart: always
     networks:

From 320810d0ff90e67fd48e6fa2e453443a41f1aabb Mon Sep 17 00:00:00 2001
From: pooneyy <85266337+pooneyy@users.noreply.github.com>
Date: Thu, 2 Oct 2025 22:24:06 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E2=9C=A8=20feat(picx):=20add=20version=203?=
 =?UTF-8?q?.0.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/picx/3.0.2/.env.sample        |  3 +++
 apps/picx/3.0.2/data.yml           | 17 +++++++++++++++++
 apps/picx/3.0.2/docker-compose.yml | 17 +++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 apps/picx/3.0.2/.env.sample
 create mode 100644 apps/picx/3.0.2/data.yml
 create mode 100644 apps/picx/3.0.2/docker-compose.yml

diff --git a/apps/picx/3.0.2/.env.sample b/apps/picx/3.0.2/.env.sample
new file mode 100644
index 000000000..62beff7c6
--- /dev/null
+++ b/apps/picx/3.0.2/.env.sample
@@ -0,0 +1,3 @@
+CONTAINER_NAME="picx"
+PANEL_APP_PORT_HTTP="40131"
+DATA_PATH="./data"
diff --git a/apps/picx/3.0.2/data.yml b/apps/picx/3.0.2/data.yml
new file mode 100644
index 000000000..83d6a4238
--- /dev/null
+++ b/apps/picx/3.0.2/data.yml
@@ -0,0 +1,17 @@
+additionalProperties:
+  formFields:
+    - default: 40131
+      edit: true
+      envKey: PANEL_APP_PORT_HTTP
+      labelEn: Port
+      labelZh: 端口
+      required: true
+      rule: paramPort
+      type: number
+    - default: ./data
+      edit: true
+      envKey: DATA_PATH
+      labelEn: Data folder path
+      labelZh: 数据文件夹路径
+      required: true
+      type: text
diff --git a/apps/picx/3.0.2/docker-compose.yml b/apps/picx/3.0.2/docker-compose.yml
new file mode 100644
index 000000000..aa4fb5bec
--- /dev/null
+++ b/apps/picx/3.0.2/docker-compose.yml
@@ -0,0 +1,17 @@
+services:
+  picx:
+    image: ghcr.io/pooneyy/picx:3.0.2
+    container_name: ${CONTAINER_NAME}
+    restart: always
+    networks:
+      - 1panel-network
+    ports:
+      - "${PANEL_APP_PORT_HTTP}:80"
+    volumes:
+      - ${DATA_PATH}:/usr/share/nginx/html
+    labels:  
+      createdBy: "Apps" 
+
+networks:  
+  1panel-network:  
+    external: true

From db967876768321ecb25bf26475f37d00cc4049cd Mon Sep 17 00:00:00 2001
From: pooneyy <85266337+pooneyy@users.noreply.github.com>
Date: Fri, 3 Oct 2025 01:32:42 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(port-forward)?=
 =?UTF-8?q?:=20restructure=20application=20organization=20and=20optimize?=
 =?UTF-8?q?=20docker=20setup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- consolidate port-forward-agent and port-forward-server into single port-forward directory
- remove old dockerfiles and implement multi-stage docker build for both agent and server
- update docker-compose files to use pre-built images from ghcr.io instead of local builds
- normalize configuration file formatting and line endings
- update data.yml descriptions to remove redundant client/server specifications
- maintain all existing functionality while improving project structure
---
 apps/port-forward-agent/1.3.7/Dockerfile      |  18 -----
 apps/port-forward-agent/data.yml              |  19 -----
 apps/port-forward-server/1.3.7/Dockerfile     |  19 -----
 apps/port-forward-server/README.md            |  74 ------------------
 apps/port-forward-server/logo.png             | Bin 4768 -> 0 bytes
 .../1.3.7-agent}/.env.sample                  |   0
 .../1.3.7-agent}/data.yml                     |   0
 .../1.3.7-agent}/data/app.conf                |   0
 .../1.3.7-agent}/docker-compose.yml           |   8 +-
 .../1.3.7-server}/.env.sample                 |   0
 .../1.3.7-server}/data.yml                    |   0
 .../1.3.7-server}/data/conf/app.conf          |  40 +++++-----
 .../1.3.7-server}/data/conf/data.conf         |  10 +--
 .../1.3.7-server}/data/data/data.db           | Bin
 .../1.3.7-server}/docker-compose.yml          |   6 +-
 apps/port-forward/Dockerfile                  |  25 ++++++
 .../README.md                                 |   0
 .../data.yml                                  |   6 +-
 .../logo.png                                  | Bin
 19 files changed, 56 insertions(+), 169 deletions(-)
 delete mode 100644 apps/port-forward-agent/1.3.7/Dockerfile
 delete mode 100644 apps/port-forward-agent/data.yml
 delete mode 100644 apps/port-forward-server/1.3.7/Dockerfile
 delete mode 100644 apps/port-forward-server/README.md
 delete mode 100644 apps/port-forward-server/logo.png
 rename apps/{port-forward-agent/1.3.7 => port-forward/1.3.7-agent}/.env.sample (100%)
 rename apps/{port-forward-agent/1.3.7 => port-forward/1.3.7-agent}/data.yml (100%)
 rename apps/{port-forward-agent/1.3.7 => port-forward/1.3.7-agent}/data/app.conf (100%)
 rename apps/{port-forward-agent/1.3.7 => port-forward/1.3.7-agent}/docker-compose.yml (65%)
 rename apps/{port-forward-server/1.3.7 => port-forward/1.3.7-server}/.env.sample (100%)
 rename apps/{port-forward-server/1.3.7 => port-forward/1.3.7-server}/data.yml (100%)
 rename apps/{port-forward-server/1.3.7 => port-forward/1.3.7-server}/data/conf/app.conf (94%)
 rename apps/{port-forward-server/1.3.7 => port-forward/1.3.7-server}/data/conf/data.conf (80%)
 rename apps/{port-forward-server/1.3.7 => port-forward/1.3.7-server}/data/data/data.db (100%)
 rename apps/{port-forward-server/1.3.7 => port-forward/1.3.7-server}/docker-compose.yml (76%)
 create mode 100644 apps/port-forward/Dockerfile
 rename apps/{port-forward-agent => port-forward}/README.md (100%)
 rename apps/{port-forward-server => port-forward}/data.yml (69%)
 rename apps/{port-forward-agent => port-forward}/logo.png (100%)

diff --git a/apps/port-forward-agent/1.3.7/Dockerfile b/apps/port-forward-agent/1.3.7/Dockerfile
deleted file mode 100644
index 3948bdc79..000000000
--- a/apps/port-forward-agent/1.3.7/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM debian:bullseye-slim
-
-RUN mkdir -p /app/pfg
-
-WORKDIR /app/pfg
-
-RUN apt-get update && apt-get upgrade -y && \
-    apt-get install -y wget unzip tzdata
-
-RUN wget -O pfg.zip https://gitee.com/tavenli/port-forward/releases/download/v1.3.7/forward-agent.linux64.v1.3.7.zip && \
-    unzip pfg.zip && \
-    chmod +x /app/pfg/forward-agent/forward-agent
-
-ENV TZ=Asia/Shanghai
-
-WORKDIR /app/pfg/forward-agent
-
-CMD ["./forward-agent"]
diff --git a/apps/port-forward-agent/data.yml b/apps/port-forward-agent/data.yml
deleted file mode 100644
index a8d9547de..000000000
--- a/apps/port-forward-agent/data.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Port-Forward-Agent
-tags:
-  - 工具
-title: Go 语言开发的端口转发工具 (客户端)
-description: Go 语言开发的端口转发工具 (客户端)
-additionalProperties:
-  key: port-forward-agent
-  name: Port-Forward-Agent
-  tags:
-    - Tool
-  shortDescZh: Go 语言开发的端口转发工具 (客户端)
-  shortDescEn: Port forwarding tool developed in Go (Agent)
-  type: tool
-  crossVersionUpdate: true
-  limit: 1
-  recommend: 0
-  website: https://gitee.com/tavenli/port-forward
-  github: https://gitee.com/tavenli/port-forward
-  document: https://gitee.com/tavenli/port-forward
diff --git a/apps/port-forward-server/1.3.7/Dockerfile b/apps/port-forward-server/1.3.7/Dockerfile
deleted file mode 100644
index b17c71f78..000000000
--- a/apps/port-forward-server/1.3.7/Dockerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM debian:bullseye-slim
-
-RUN mkdir -p /app/pfg
-
-WORKDIR /app/pfg
-
-RUN apt-get update && apt-get upgrade -y && \
-    apt-get install -y wget unzip tzdata
-
-RUN wget -O pfg.zip https://gitee.com/tavenli/port-forward/releases/download/v1.3.7/forward-server.linux64.v1.3.7.zip && \
-    unzip pfg.zip && \
-    chmod +x /app/pfg/forward-server/start.sh && \
-    chmod +x /app/pfg/forward-server/forward-server
-
-ENV TZ=Asia/Shanghai
-
-WORKDIR /app/pfg/forward-server
-
-CMD ["./forward-server"]
diff --git a/apps/port-forward-server/README.md b/apps/port-forward-server/README.md
deleted file mode 100644
index 514b3a87c..000000000
--- a/apps/port-forward-server/README.md
+++ /dev/null
@@ -1,74 +0,0 @@
-# 使用说明
-- 控制台：http://IP:Port/login
-
-- 账户密码：
-```
-username：admin
-password：123456
-```
-
-# 原始相关
-
-# port-forward
-Go语言开发的端口转发工具  for port data forward
-
-官网地址：
-https://gitee.com/tavenli/port-forward
-
-```
-开发语言：GO
-控制台框架：beego
-数据库：sqlite3
-```
-
-# 最近更新
-```
-v1.3.6 发布，重新增加 TCP端口数据分发功能
-v1.3.5 发布，增加批量导入、批量添加规则
-v1.3.3 发布，增加 一键开启所有转发 和 一键关闭所有转发
-v1.3.2 发布，服务稳定性已经过长时间的验证
-v1.3.1 发布，增加程序启动自动开启转发
-v1.2.9_beta 发布，完善点对点转发的稳定性，支持TCP和UDP协议转发
-```
-
-# 最新编译好的版本下载：
-[https://gitee.com/tavenli/port-forward/releases](https://gitee.com/tavenli/port-forward/releases)
-
-
-
-# 功能介绍
-
-> 支持Web控制台添加端口映射
-
-> 支持对每条端口映射进行开启和关闭控制
-
-> 支持 RestfulAPI 接口，方便被其它系统集成
-
-> 支持每条端口转发的同时，再分发给多个端口，满足某些测试场景
-
-> 类似企业交换机的功能，即软交换机，主要是方便企业网络维护人员或开发人员
-
-
-# 使用交流群
-
-> 使用问题或个性化需求可加QQ号：17020415  （申请时请备注：端口转发）
-
-# 快速安装说明
-1. 下载编译好的程序包，并解压程序包
-2. 执行 start.sh （Linux）或 start.bat （Win）命令
-3. 打开浏览器，进入控制台，打开 http://127.0.0.1:8080/login
-4. 输入用户 admin  密码 123456 进入控制台
-
-
-# 控制台UI
-![登录](https://gitee.com/tavenli/port-forward/raw/master/screenshot/Login.png "在这里输入图片标题")
-
-
-![转发列表](https://gitee.com/tavenli/port-forward/raw/master/screenshot/List.png "在这里输入图片标题")
-
-
-![端口转发配置](https://gitee.com/tavenli/port-forward/raw/master/screenshot/edit.png "在这里输入图片标题")
-
-
-![方便与其它平台集成接口](https://gitee.com/tavenli/port-forward/raw/master/screenshot/ApiDoc.png "在这里输入图片标题")
-
diff --git a/apps/port-forward-server/logo.png b/apps/port-forward-server/logo.png
deleted file mode 100644
index 9cec3e62d1817bf3fe702d0d21ccdd15beb049a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4768
zcmV;R5?}3!P)<h;3K|Lk000e1NJLTq006WA006WI0{{R33KRAK00009a7bBm000XU
z000XU0RWnu7ytkOpHNIxMMrQ<J+SRboZTa;@EEW2VVBrHjoTxV>jbaz0;>2SrtTwn
z)H1E<6|nIfMA{#)@DVcPBd_i=ZPq7b*aVQ=DY5Pzci0(h))HveB68OhgW4TK;2AyS
zBR=37iQ5q&-xx{y0kHG{i`f8%*aIc!0CLy^Eam`g*8zFh0f5*89p?dM*a14?0yE?Q
zUfBUw+5te|0Z!ZiklO)A-Ud4LYx6xd0000XbW%=J06iXX(G4#H{Qi$>R_ar^=A=Y?
z`hl*|>X+iP&Xvja=Uoc^!vFvgdPzh<RCwCVoQXo}IuM2{(iUV9+rv^7y=(<!2jBnM
zZf3Gg+5$<%B?k}@=*Q1LlckyCdADw1$ba~LNPqv!4G8_a?o+keYE`R`-DX8R_=k}h
z-rZBHRv)o{?85HU9-Ds}8<3liwb7`?TD`^_`>opiyCwmZ88QH4lWH^WzlzO}Do-^o
zG86ad{=WP0SY^N<IWx)K-}4CL@gEQw>~LR^j|cbF5!i)YpDKR~n|<@)eG9$JHHC+u
z!M(djZt_vB>;D~WjK3;H*7n7F0(&%S-TxJ9>-Z}UIQp6XNJQ%RJ1-<WX1FK(1M$c6
zaqZ!}W#M^Uh(`GLyAjD16f!>r7g6vVfkXn=--}4@RcYp{Upn^i)nATC8h<UT@RAXU
za{op|lKyYh>V}rzHarg_a`X!ksrx_IxPlM+F#3gvG&5M>cwqMA;7NGo$09Nxf1&#u
zU__37Dk4K8{z@KE^^rdlk@(%p!Q2<VTNRPt-$!B;m5RSJvHblJN!1zMKpptj9)(9P
z4FPU6{>=I?ERTIBJDYEaNFMRU@fW&ahekhyO0>SIkHl}1BiAzV2ZyQH9xeZ5_zYc%
zeandC@mDK~KRA5!n!dKJu;H`6yl0*)dRHEkw~9y{3XAb)Haj83CQZ}n%k_>C-e~v%
z&3tkwBJy^9BzIlyT>SaN4K~I-yetyDE`I;`m?HKtXR+J$ku?5ltsHU~cQ&%6>HF}4
zNbK?UD?^?FHDiB|3nTId^GF?kF#gPm(`LwPXcD{AICC_#5#z-s#O~y*eTzPl51B=K
zsASC?y{^~$^_oy`rqjZRL>n>IbSfL?evJwv@(cYfpNh(q5oD1oFARCV-V1JNl4+WY
zNHlY2I%Ux+vAIj$vk|H1k>&bGI%VZwRwn)!EpL)~t-L*~<jkBhWNh#3-up+YJn}Kj
zWl*xR6S`oVL*`8UvAd1Vet+8U4QxfdNioP&tGqDKO)48xJ4JH?@|lP%v9cqE%(cQU
z8_mp+c{9XDaE89#q@9Z32)%fd!Uqv~5vf7#spQT_q?{Lx93~lb$ec+TJPVvohXY4G
z?X%e2-!GAVN$~RdiNu>!QFC)khZIJnTG_ElBxJ~3%Z4!gZFpeF?0S;e`<&XK9Bt7n
zVyFC)rW@4yBPC*=k4TF|VszR0lo7@UY$rucxJ4%EFpttN6l35&z((Ya^fgV{@41Nd
zL`06R4z@3*49Eh5gKivqZ^+HC3p#VmHbQKG-b}gHDgp9#E+R)FkrZ27r;J)r%82^A
z!*0i}5?P6@vCj;fLc`iRiI~nVib!+%dwG>BGiJeq3S>cjAP$k_nRv>)yRx?6)>2O|
zL}Ykrfrb70a6V;JlHGPEo2E9beRklX?FH6G<V_}xOqI9u5y=w?p8d%7wO*wvPWt6X
z8DTuwG3c#8HmQYA4)L{K7vBi6Q<AZb!3cs6^OErq37gsY=3jzVVSeH9$AGtr8klz^
z9ua$JGrqx;iFxEQwi%If9St<C5^AP1FpDgg8O-&!vMGxg*sQ$-_N%5mBGU`TE{sTA
zY+wn3YF&j#va8IXOpg$6O=C;$3-MQM?bnRjYUHO|HX<RBV8}g6=+Nupr>JC+{g~0N
zwp#<7aI@=S&~Te(sLm!OLy>7-?QBF!H#Fs=@T;jjhD~Fzg0@|)B(pF#;f~$sp`x?N
zV}H=3UC>7&X3N(?k7_}NStGBA+NMjAax;FML@;bUVpU>O>~~{C!0z2aFm}ZenWIM!
zUTDVOYBgW21UK~vQp1nkOYoIdQ|N5cG&QkJXY+_8FM0w;@D;59(qM%q6F-@+=InBg
z8^8zcFU^@nXG2Ufofbsoi@|jVyGZWXozQF6YokZ{w_q@z8_ap^K^%T@;SDwc#Q)`}
z4O@dpjDaqAqKnYoI=?5Gqq%H~d&`ZD*l?5FV);sRHp(T1S%d{7^@q?m^d9OYlK}H<
zPO(>1Zn)X@f*UOqiq0k#*g6(7)H*ja)GFSi&@8bGW~@nMCH7WYWYv#uw<H_N;h)HT
z#m0^m+`R#PrylPC^2{^{k=wO1vF&V#)Et>oN1W~qG&9FcG~y7#oZS920}lU`vlTWC
z$yZM+U02X`1>Ku1xYRQ<91*<tJtuTTXOrn<D0L*xH&E!hfM$*c<^`8JgU!wSZD%J%
zXJam%$wV@|2p!E93!(MQ$Ram4b75zreJ!#1ZRdhLLa!mAGg{B$?>>tytW9k#q-K|n
zFQMxNN&~c@p7RT~Qf3ZIbvAS|BdmQDdcmQ!*sKkrpW7=Cb*7XWJpK7$1HF*ZIOpV1
zxzqMRDeN}w&v_(TDZL=RW^ECaT9l7gl`@uU(_rM}pSDVC>_sVP&+D&}ve2g1AJ^@%
zTo8xwo1oOeS!Yx!5sYnP5P~{?+CodM7iE?1L#JO3I<vGewN-kiJhCVQ&E5z*{)+po
zx1AeZTPba5T~g_Au!4RxDGg1u{`{C;h1S$4cp0UI&~taG5t=Lqi}|jN(pu}1_VBsT
z?otEvhAfAqT<Yse8(No9I`m>S=c%~v+H0rg(mP^X+2d=_OlUQvO-ewM(~iLXX#>5?
za4!Sb1IJ_-?j|)?nre+J@0Rvp%mRDqth6uIO>i8ZxIz<Tg?$BjIaw~3rmr29Rzi#U
zrIXYgdSieyf7n55YcHLZmW~#4;-nO`c{<%iX@29TGzd-RX$;%t<yvWRe%D250S?%X
z&?vOA0Fjh}Ca1wHlqOP(8#k%qd1hYhA~is-$;K$8{!A^Do_s}Ve}Jnd>=H}r#0^?d
zlYDKVv|*5?8?+D_TH^I)&Qf!w*905EuPZ$<eC?>TKM>5%p%=)>eBuU8x9M!`>@gwO
z3rA=obmaM7BB<@9=FoyV-N<o>MIdIyc2JrL%}3!qJc}k5GJB5DN^9W|3#ARQ*-r<Z
zVlf}a4heqc)Yei<d+1$r4BXxxB#YQ9t%MdX28TOIEtMvF=B$<GCUI4o3k~yzfv=X?
zxYo8(Q|Pts8Ex%>N>AME;Sc!Ca?wzyN&0d%&;i=qRk_)GT0#@Ct)Yd`jQd%iDr?Kt
zSGzZ1FHn0bHTN~>$(S;O-1bU?(AXj+bm+aIJ!Y0tbLhQkkj=&tT4PTpwjwoV0=iF{
zI$37*E(pEX`&ZYt&|{O@-W~%zt(?&YN?S@zl-6p0UWZmvyD5!AFZ1h{l6z()wNQG$
zHdBa&J;sC@nx#GZdSa<hH_g;Z1uLngJ&ZlKYYU}`)EwJRq6V1^ll4H2Z6mc(nrykX
zf;Me!t27EtuxFX2c{`~kG}%lJw-!o|4U1SotEEdN^>f@zmS#*^NUflaXk6PsBl6e<
z+VlE+mLnE0-<t4}O8l&;t)wo3wpDuUs5Cp4m{Q`bvKL{;g1figsI#N%Wk(D;vz6RJ
z>3@QG>|_tGuU1QzNgz)m;z_Znr?LB1(43k|Z3Rua$Je1zXx^UVY#AJzcJ-7=u1O8h
zC#Ce>4ch2qER^mG<c6O+gO2rl$ur09U-ua)HBjY0wn{5wUsqZR{nqpfPx`|{{yoQT
zU)%f3pkV{N-20B$dk1>}@z};5-Wx;i1?SI)V@x(7Ci@mjpNu*K_~)SX*iPxtYv!z6
ze0u+`N9G5Ypiic+EtEc*=CDvYiG7RBAegz6o|V$Hgl2zL>9L{o*a{lIe5)}PnA^hB
zT4|y7Rp_Gz78je&#bI}Z6|~fv*W%ejb5D<Lpl`S3Ln}?Rwo#gD4L3gvtx7tytu3IB
z8BhN_^dY15$qM>tMB`6G>vFc!IeUaT=wl{(G=J>B#9@aSp0E_f;68Q2t4aej1^?Il
zp^aCt6Y`K_J{3Vf(S3Pn4^wM)x!LC9E7`C?%J4MysSuhdeMF^?V-tHkNq%56Vf1=X
zC00ho<LULH($Nvy*l@@M1|-klyKNH+fka{0?qC*|vfEehlG2rbN2&Btr)t2SOy0hA
zgKVs72Mfwe^#<9z((L99{c)uJn2hDR!uM@OZud!{QV#kQ6+qWDbW@nx^tGIx|NC;$
z#hIM3BV|gYOcUera4OjJO_YZ5{82l^j73}xdA@P_!^)AJE>hwZVP@&zp)Dot8qm6s
zAvnrr_?kO}S$lcY^oRA1W>FX^z&r6DiGtJB7Ze)40`2OfnXTor!p+hjmW=3Xwp>N5
zD0kFPf1rg7by}SBAgFV;R@}Eqe=s9RRGm_`+>y5(GAluKaSphfmO+IN$0F<rS>juM
zJ^hJFSY2L43u5^dosy6Pg|aj*^zImR&DgYaf6OPo%(~OE_vQblE9lF*!Btjk(aW$)
z!y_Jmf-_M^6t)<(S=tx89gC9)T?THHPk-o)e7U1pTFQ|7fr0g?swhPfWyLH=Z2Z&M
zMM?wpb4ibcyhd|NYuRLFDWx7X%yPsg6kK;@-wl=fRr3j+&zvo>Gjkce;9j=C0ctdh
zs|I&E`<Y3Kmx+&B6_qcrP&mw0Ya{lUdW1@iC(mQw(IYrC0#;q1`G0k1+nY8J!*L1;
zNueF013Kje(t)Nf;@!Ughg;9SC);;P4iaE=s?=&#-NXL-E@%Ht9K@>MffJ^nwOuXT
zH%s`s5IC!s<KO63B)I)*n=ERQ@r<Cg%2<7&9kH}~$+cjA>)k8}OC?#$@LwAdk>T|y
zT%l*ANc0R-u=f@AIg(!QPXTf;&F=4{MIZkT;7u^I7mZkLG`l^Ua;I}UFh#;MUo@HZ
z@S4@e1!oOc7NLp`O<dtE$?q%oOi0L0G}=8RMWScOR#@`V-Mgib1Ou=s<{Ufm@}4w%
zzBNMPJ>(SL>FQ6tEp*@+q%tyUH|^d<9*r?<TS>r2wNffYi&}1&)zq<}R-se=Kr>in
zr06QWT$p6cJoPosQgPlcAv={967SdKRu?ZXlCBNMsb62LIny}z1@+H1JQA|G<49>9
za0*)E7+H)>5(<gPF{Yg5oOEsQjNiW_Hsc32O@IF2COhgRC#CQO@qZgddjUTNBl0A!
zl6;lcQMNjRXSn<Q$XbKpQZg)cvX{i<V0%hZr6G>NY`zmA)n#0@^>He^B&T)C<|QS=
zfuj2m;&w&%3AC3Jl9P07>(^&gZQ>cE$MK6Vwl3?Gl2M1$*Fj87r;HpVWQ7Fd(XDk$
zKiakbiTQz7QQ%_3KdibDy9_27!|9_A5iOaZAS5!QV{+8VrupDThih$&wQJrb8F?^B
zD<n#CnVgWwjVhKsHEZgF%R}pJ{u7kizzwdH43Ds?a(Ubo?Il4}J7YF0!fAKB?OA*E
z(YM}_x|Jrr%c!qL4pZ1(Tu6A9IiDj84SZ{ON!ItL)Gp(ukt88(Pf2#H780f*ha?bf
zwr+e&Dc0Kv$ruR~?Z+rYU|0~5r=6GUV<!-;{J9HT2Bl<-Hq@gEBa*op{330(zThwq
z`Ks={bZgB%ek4=&7$9l^+hb<08@<}_IJLLHLJNtuyXi>TBSHB4B6883c7qr;u%L%;
zN#vWF(Ln7Psl9v~`l}#qmEvUd9#6kxJot93d70XWJE6prr{2V|p30`EomF1v9}Aay
z!qE(&kkn(u%M|gKm)fsO0mfuC>9~>52XC4XM^4$B<@EQeY=eI7TjsXRFZY-;lEcwW
z21gM;(oJgi(x2MPD~8axE%Uy*+w2@R*s01L_cKBM%NCN1gWO%?FP_>RM|W5-U3p|3
zJt7?<e>3Re#KVV$%?OaT^U2ly@?TbJuRF=sw+!lfSVR(Men9;7r1scDERsx~X3VM_
zS`i-qNHSSG(PUVY+RgEIX{<H2>!}0k@$uIak@e=yjlY=N3BnWaKW~gk*dW)%cD3KH
zwneSf(5a7)G8=QG9&G%o^pIm^L|i@bbY{D?P<EI!TC9pi_0)5)^>dIy50b`l(y!p*
u)zeQLhv-{v{-Yu3Xm({aFaH6<u-8AZbzSB9S}*_r0000<MNUMnLSTYYkV|X;

diff --git a/apps/port-forward-agent/1.3.7/.env.sample b/apps/port-forward/1.3.7-agent/.env.sample
similarity index 100%
rename from apps/port-forward-agent/1.3.7/.env.sample
rename to apps/port-forward/1.3.7-agent/.env.sample
diff --git a/apps/port-forward-agent/1.3.7/data.yml b/apps/port-forward/1.3.7-agent/data.yml
similarity index 100%
rename from apps/port-forward-agent/1.3.7/data.yml
rename to apps/port-forward/1.3.7-agent/data.yml
diff --git a/apps/port-forward-agent/1.3.7/data/app.conf b/apps/port-forward/1.3.7-agent/data/app.conf
similarity index 100%
rename from apps/port-forward-agent/1.3.7/data/app.conf
rename to apps/port-forward/1.3.7-agent/data/app.conf
diff --git a/apps/port-forward-agent/1.3.7/docker-compose.yml b/apps/port-forward/1.3.7-agent/docker-compose.yml
similarity index 65%
rename from apps/port-forward-agent/1.3.7/docker-compose.yml
rename to apps/port-forward/1.3.7-agent/docker-compose.yml
index df80f102e..93ee2f158 100644
--- a/apps/port-forward-agent/1.3.7/docker-compose.yml
+++ b/apps/port-forward/1.3.7-agent/docker-compose.yml
@@ -1,10 +1,6 @@
 services:
-  port-forward-server:
-    build:
-      context: .
-      dockerfile: Dockerfile
-      args:
-        IMAGE_TAG: 1.3.7
+  port-forward-agent:
+    image: ghcr.io/pooneyy/port-forward:1.3.7-agent
     container_name: ${CONTAINER_NAME}
     restart: always
     network_mode: host
diff --git a/apps/port-forward-server/1.3.7/.env.sample b/apps/port-forward/1.3.7-server/.env.sample
similarity index 100%
rename from apps/port-forward-server/1.3.7/.env.sample
rename to apps/port-forward/1.3.7-server/.env.sample
diff --git a/apps/port-forward-server/1.3.7/data.yml b/apps/port-forward/1.3.7-server/data.yml
similarity index 100%
rename from apps/port-forward-server/1.3.7/data.yml
rename to apps/port-forward/1.3.7-server/data.yml
diff --git a/apps/port-forward-server/1.3.7/data/conf/app.conf b/apps/port-forward/1.3.7-server/data/conf/app.conf
similarity index 94%
rename from apps/port-forward-server/1.3.7/data/conf/app.conf
rename to apps/port-forward/1.3.7-server/data/conf/app.conf
index 5b522a32a..1ab1525c6 100644
--- a/apps/port-forward-server/1.3.7/data/conf/app.conf
+++ b/apps/port-forward/1.3.7-server/data/conf/app.conf
@@ -1,20 +1,20 @@
-
-app.name = "PortForward"
-app.cname = "端口转发系统"
-servername = "PortForward-Server"
-runmode ="dev"
-#runmode ="prod"
-viewspath = "views"
-#logfile.config = "close"
-
-[dev]
-httpaddr = "0.0.0.0"
-httpport = 8080
-recoverpanic = false
-[prod]
-httpaddr = "0.0.0.0"
-httpport = 8080
-recoverpanic = true
-graceful = true
-
-include "data.conf"
+
+app.name = "PortForward"
+app.cname = "端口转发系统"
+servername = "PortForward-Server"
+runmode ="dev"
+#runmode ="prod"
+viewspath = "views"
+#logfile.config = "close"
+
+[dev]
+httpaddr = "0.0.0.0"
+httpport = 8080
+recoverpanic = false
+[prod]
+httpaddr = "0.0.0.0"
+httpport = 8080
+recoverpanic = true
+graceful = true
+
+include "data.conf"
diff --git a/apps/port-forward-server/1.3.7/data/conf/data.conf b/apps/port-forward/1.3.7-server/data/conf/data.conf
similarity index 80%
rename from apps/port-forward-server/1.3.7/data/conf/data.conf
rename to apps/port-forward/1.3.7-server/data/conf/data.conf
index d75da4241..604e12853 100644
--- a/apps/port-forward-server/1.3.7/data/conf/data.conf
+++ b/apps/port-forward/1.3.7-server/data/conf/data.conf
@@ -1,6 +1,6 @@
-magic.service = ":7000"
-api.auth = "26CCD056107481F45D1AC805A24A9E59"
-
-agent.auth = "722ED8F8D9900CC1AB17243DC7B51A2D"
-
+magic.service = ":7000"
+api.auth = "26CCD056107481F45D1AC805A24A9E59"
+
+agent.auth = "722ED8F8D9900CC1AB17243DC7B51A2D"
+
 onstart.forward = "false"
\ No newline at end of file
diff --git a/apps/port-forward-server/1.3.7/data/data/data.db b/apps/port-forward/1.3.7-server/data/data/data.db
similarity index 100%
rename from apps/port-forward-server/1.3.7/data/data/data.db
rename to apps/port-forward/1.3.7-server/data/data/data.db
diff --git a/apps/port-forward-server/1.3.7/docker-compose.yml b/apps/port-forward/1.3.7-server/docker-compose.yml
similarity index 76%
rename from apps/port-forward-server/1.3.7/docker-compose.yml
rename to apps/port-forward/1.3.7-server/docker-compose.yml
index acf105bce..7eb31b6dc 100644
--- a/apps/port-forward-server/1.3.7/docker-compose.yml
+++ b/apps/port-forward/1.3.7-server/docker-compose.yml
@@ -1,10 +1,6 @@
 services:
   port-forward-server:
-    build:
-      context: .
-      dockerfile: Dockerfile
-      args:
-        IMAGE_TAG: 1.3.7
+    image: ghcr.io/pooneyy/port-forward:1.3.7-server
     container_name: ${CONTAINER_NAME}
     restart: always
     network_mode: host
diff --git a/apps/port-forward/Dockerfile b/apps/port-forward/Dockerfile
new file mode 100644
index 000000000..31b5b2b47
--- /dev/null
+++ b/apps/port-forward/Dockerfile
@@ -0,0 +1,25 @@
+FROM debian:bullseye-slim AS base
+ENV TZ=Asia/Shanghai
+RUN mkdir -p /app/pfg && \
+    apt-get update && apt-get upgrade -y && \
+    apt-get install -y wget unzip tzdata && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+WORKDIR /app/pfg
+
+FROM base AS agent
+RUN wget -O pfg.zip https://gitee.com/tavenli/port-forward/releases/download/v1.3.7/forward-agent.linux64.v1.3.7.zip && \
+    unzip pfg.zip && \
+    rm -rf pfg.zip && \
+    chmod +x /app/pfg/forward-agent/forward-agent
+WORKDIR /app/pfg/forward-agent
+CMD ["./forward-agent"]
+
+FROM base AS server
+RUN wget -O pfg.zip https://gitee.com/tavenli/port-forward/releases/download/v1.3.7/forward-server.linux64.v1.3.7.zip && \
+    unzip pfg.zip && \
+    rm -rf pfg.zip && \
+    chmod +x /app/pfg/forward-server/start.sh && \
+    chmod +x /app/pfg/forward-server/forward-server
+WORKDIR /app/pfg/forward-server
+CMD ["./forward-server"]
diff --git a/apps/port-forward-agent/README.md b/apps/port-forward/README.md
similarity index 100%
rename from apps/port-forward-agent/README.md
rename to apps/port-forward/README.md
diff --git a/apps/port-forward-server/data.yml b/apps/port-forward/data.yml
similarity index 69%
rename from apps/port-forward-server/data.yml
rename to apps/port-forward/data.yml
index 0b0a019d1..48fcd433f 100644
--- a/apps/port-forward-server/data.yml
+++ b/apps/port-forward/data.yml
@@ -1,14 +1,14 @@
 name: Port-Forward-Server
 tags:
   - 工具
-title: Go 语言开发的端口转发工具 (服务端)
-description: Go 语言开发的端口转发工具 (服务端)
+title: Go 语言开发的端口转发工具
+description: Go 语言开发的端口转发工具
 additionalProperties:
   key: port-forward-server
   name: Port-Forward-Server
   tags:
     - Tool
-  shortDescZh: Go 语言开发的端口转发工具 (服务端)
+  shortDescZh: Go 语言开发的端口转发工具
   shortDescEn: Port forwarding tool developed in Go (Server)
   type: tool
   crossVersionUpdate: true
diff --git a/apps/port-forward-agent/logo.png b/apps/port-forward/logo.png
similarity index 100%
rename from apps/port-forward-agent/logo.png
rename to apps/port-forward/logo.png

From 15b405cfbc4eda849c83686b8458db49ec746aff Mon Sep 17 00:00:00 2001
From: pooneyy <85266337+pooneyy@users.noreply.github.com>
Date: Fri, 3 Oct 2025 02:53:41 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=F0=9F=93=A6=20build(meowfacts):=20switch?=
 =?UTF-8?q?=20to=20pre-built=20docker=20image?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- replace local docker build with pre-built image from ghcr.io
- simplify docker-compose configuration by removing build arguments
---
 apps/meowfacts/latest/docker-compose.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/apps/meowfacts/latest/docker-compose.yml b/apps/meowfacts/latest/docker-compose.yml
index 14babe88a..43f901004 100644
--- a/apps/meowfacts/latest/docker-compose.yml
+++ b/apps/meowfacts/latest/docker-compose.yml
@@ -1,10 +1,6 @@
 services:
   meowfacts:
-    build:
-      context: .
-      dockerfile: Dockerfile
-      args:
-        IMAGE_TAG: latest
+    image: ghcr.io/pooneyy/meowfacts:latest
     container_name: ${CONTAINER_NAME}
     restart: always
     networks: