From b511c14b00936324f924234f1ce04fca0944c13f Mon Sep 17 00:00:00 2001 From: zhengkunwang223 <31820853+zhengkunwang223@users.noreply.github.com> Date: Tue, 18 Apr 2023 13:54:59 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=A0=E9=99=A4=20Halo=20=E7=9A=84?= =?UTF-8?q?=E6=97=A7=E7=89=88=E6=9C=AC=20(#29)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/halo/versions/2.2.0/README.md | 45 -------- apps/halo/versions/2.2.0/config.json | 107 -------------------- apps/halo/versions/2.2.0/docker-compose.yml | 32 ------ apps/halo/versions/2.3.2/README.md | 45 -------- apps/halo/versions/2.3.2/config.json | 107 -------------------- apps/halo/versions/2.3.2/docker-compose.yml | 32 ------ apps/list.json | 4 +- 7 files changed, 2 insertions(+), 370 deletions(-) delete mode 100644 apps/halo/versions/2.2.0/README.md delete mode 100644 apps/halo/versions/2.2.0/config.json delete mode 100644 apps/halo/versions/2.2.0/docker-compose.yml delete mode 100644 apps/halo/versions/2.3.2/README.md delete mode 100644 apps/halo/versions/2.3.2/config.json delete mode 100644 apps/halo/versions/2.3.2/docker-compose.yml diff --git a/apps/halo/versions/2.2.0/README.md b/apps/halo/versions/2.2.0/README.md deleted file mode 100644 index a2f71576..00000000 --- a/apps/halo/versions/2.2.0/README.md +++ /dev/null @@ -1,45 +0,0 @@ ------------------------------- - -## 快速开始 ## - -``` -docker run \ - -it -d \ - --name halo \ - -p 8090:8090 \ - -v ~/.halo2:/root/.halo2 \ - halohub/halo:2.2 \ - --halo.external-url=http://localhost:8090/ \ - --halo.security.initializer.superadminuser=admin \ - --halo.security.initializer.superadminpassword=P@88w0rd -``` - -以上仅作为体验使用，详细部署文档请查阅： - -## 在线体验 ## - -- 环境地址： -- 后台地址： -- 用户名：`demo` -- 密码：`P@ssw0rd123..` - -## 生态 ## - -可访问 [awesome-halo](https://github.com/halo-sigs/awesome-halo) 查看已经适用于 Halo 2.0 的主题和插件，以及适用于 Halo -1.x 的相关仓库。 - -## 许可证 ## - -[![license](https://img.shields.io/github/license/halo-dev/halo.svg?style=flat-square)](https://github.com/halo-dev/halo/blob/master/LICENSE) - -Halo 使用 GPL-v3.0 协议开源，请遵守开源协议。 - -## 贡献 ## - -参考 [CONTRIBUTING](https://github.com/halo-dev/halo/blob/master/CONTRIBUTING.md)。 - - - -## 状态 ## - -![Repobeats analytics](https://repobeats.axiom.co/api/embed/ad008b2151c22e7cf734d2688befaa795d593b95.svg "Repobeats analytics image") diff --git a/apps/halo/versions/2.2.0/config.json b/apps/halo/versions/2.2.0/config.json deleted file mode 100644 index 47ec17ac..00000000 --- a/apps/halo/versions/2.2.0/config.json +++ /dev/null @@ -1,107 +0,0 @@ -{ - "formFields": [ - { - "type": "apps", - "labelZh": "数据库服务", - "labelEn": "Database Service", - "required": true, - "default": "mysql", - "values": [{ - "label": "MySQL", - "value": "mysql" - }], - "envKey": "HALO_PLATFORM", - "child": { - "type": "service", - "labelZh": "数据库服务", - "labelEn": "Database Service", - "required": true, - "default": "", - "envKey": "PANEL_DB_HOST" - }, - "params": [ - { - "type": "param", - "key": "mysql", - "value": "3306", - "envKey": "HALO_DB_PORT" - }, - { - "type": "param", - "key": "postgresql", - "value": "5432", - "envKey": "HALO_DB_PORT" - } - ] - }, - { - "type": "text", - "labelZh": "数据库名", - "labelEn": "Database", - "required": true, - "default": "halo", - "random": true, - "rule": "paramCommon", - "envKey": "PANEL_DB_NAME" - }, - { - "type": "text", - "labelZh": "数据库用户", - "labelEn": "User", - "required": true, - "default": "halo", - "random": true, - "rule": "paramCommon", - "envKey": "PANEL_DB_USER" - }, - { - "type": "password", - "labelZh": "数据库用户密码", - "labelEn": "Password", - "required": true, - "default": "halo", - "random": true, - "rule": "paramComplexity", - "envKey": "PANEL_DB_USER_PASSWORD" - }, - { - "type": "text", - "labelZh": "超级管理员用户名", - "labelEn": "Admin Username", - "required": true, - "default": "admin", - "rule": "paramCommon", - "envKey": "HALO_ADMIN" - }, - { - "type": "password", - "labelZh": "超级管理员密码", - "labelEn": "Admin Password", - "required": true, - "default": "halo", - "random": true, - "rule": "paramComplexity", - "envKey": "HALO_ADMIN_PASSWORD" - }, - { - "type": "text", - "labelZh": "外部访问地址", - "labelEn": "External URL", - "required": true, - "default": "http://localhost:8080", - "rule": "paramExtUrl", - "envKey": "HALO_EXTERNAL_URL", - "edit": true - }, - { - "type": "number", - "labelZh": "端口", - "labelEn": "Port", - "required": true, - "default": 8080, - "rule": "paramPort", - "envKey": "PANEL_APP_PORT_HTTP", - "edit": true - } - ] -} \ No newline at end of file diff --git a/apps/halo/versions/2.2.0/docker-compose.yml b/apps/halo/versions/2.2.0/docker-compose.yml deleted file mode 100644 index 72ef00af..00000000 --- a/apps/halo/versions/2.2.0/docker-compose.yml +++ /dev/null @@ -1,32 +0,0 @@ -version: "3" -services: - halo: - image: halohub/halo:2.2.0 - container_name: ${CONTAINER_NAME} - restart: always - networks: - - 1panel-network - volumes: - - ./data:/root/.halo2 - ports: - - ${PANEL_APP_PORT_HTTP}:8090 - healthcheck: - test: [ "CMD", "curl", "-f", "http://localhost:8090/actuator/health/readiness" ] - interval: 30s - timeout: 5s - retries: 5 - start_period: 30s - command: - - --spring.r2dbc.url=r2dbc:pool:${HALO_PLATFORM}://${PANEL_DB_HOST}:${HALO_DB_PORT}/${PANEL_DB_NAME} - - --spring.r2dbc.username=${PANEL_DB_USER} - - --spring.r2dbc.password=${PANEL_DB_USER_PASSWORD} - - --spring.sql.init.platform=${HALO_PLATFORM} - - --halo.external-url=${HALO_EXTERNAL_URL} - - --halo.security.initializer.superadminusername=${HALO_ADMIN} - - --halo.security.initializer.superadminpassword=${HALO_ADMIN_PASSWORD} - labels: - createdBy: "Apps" - -networks: - 1panel-network: - external: true diff --git a/apps/halo/versions/2.3.2/README.md b/apps/halo/versions/2.3.2/README.md deleted file mode 100644 index f97627dc..00000000 --- a/apps/halo/versions/2.3.2/README.md +++ /dev/null @@ -1,45 +0,0 @@ ------------------------------- - -## 快速开始 - -```bash -docker run \ - -it -d \ - --name halo \ - -p 8090:8090 \ - -v ~/.halo2:/root/.halo2 \ - halohub/halo:2.2 \ - --halo.external-url=http://localhost:8090/ \ - --halo.security.initializer.superadminusername=admin \ - --halo.security.initializer.superadminpassword=P@88w0rd -``` - -以上仅作为体验使用，详细部署文档请查阅： - -## 在线体验 - -- 环境地址： -- 后台地址： -- 用户名：`demo` -- 密码：`P@ssw0rd123..` - -## 生态 - -可访问 [awesome-halo](https://github.com/halo-sigs/awesome-halo) 查看已经适用于 Halo 2.0 的主题和插件，以及适用于 Halo -1.x 的相关仓库。 - -## 许可证 - -[![license](https://img.shields.io/github/license/halo-dev/halo.svg?style=flat-square)](https://github.com/halo-dev/halo/blob/master/LICENSE) - -Halo 使用 GPL-v3.0 协议开源，请遵守开源协议。 - -## 贡献 - -参考 [CONTRIBUTING](https://github.com/halo-dev/halo/blob/master/CONTRIBUTING.md)。 - - - -## 状态 - -![Repobeats analytics](https://repobeats.axiom.co/api/embed/ad008b2151c22e7cf734d2688befaa795d593b95.svg "Repobeats analytics image") diff --git a/apps/halo/versions/2.3.2/config.json b/apps/halo/versions/2.3.2/config.json deleted file mode 100644 index 47ec17ac..00000000 --- a/apps/halo/versions/2.3.2/config.json +++ /dev/null @@ -1,107 +0,0 @@ -{ - "formFields": [ - { - "type": "apps", - "labelZh": "数据库服务", - "labelEn": "Database Service", - "required": true, - "default": "mysql", - "values": [{ - "label": "MySQL", - "value": "mysql" - }], - "envKey": "HALO_PLATFORM", - "child": { - "type": "service", - "labelZh": "数据库服务", - "labelEn": "Database Service", - "required": true, - "default": "", - "envKey": "PANEL_DB_HOST" - }, - "params": [ - { - "type": "param", - "key": "mysql", - "value": "3306", - "envKey": "HALO_DB_PORT" - }, - { - "type": "param", - "key": "postgresql", - "value": "5432", - "envKey": "HALO_DB_PORT" - } - ] - }, - { - "type": "text", - "labelZh": "数据库名", - "labelEn": "Database", - "required": true, - "default": "halo", - "random": true, - "rule": "paramCommon", - "envKey": "PANEL_DB_NAME" - }, - { - "type": "text", - "labelZh": "数据库用户", - "labelEn": "User", - "required": true, - "default": "halo", - "random": true, - "rule": "paramCommon", - "envKey": "PANEL_DB_USER" - }, - { - "type": "password", - "labelZh": "数据库用户密码", - "labelEn": "Password", - "required": true, - "default": "halo", - "random": true, - "rule": "paramComplexity", - "envKey": "PANEL_DB_USER_PASSWORD" - }, - { - "type": "text", - "labelZh": "超级管理员用户名", - "labelEn": "Admin Username", - "required": true, - "default": "admin", - "rule": "paramCommon", - "envKey": "HALO_ADMIN" - }, - { - "type": "password", - "labelZh": "超级管理员密码", - "labelEn": "Admin Password", - "required": true, - "default": "halo", - "random": true, - "rule": "paramComplexity", - "envKey": "HALO_ADMIN_PASSWORD" - }, - { - "type": "text", - "labelZh": "外部访问地址", - "labelEn": "External URL", - "required": true, - "default": "http://localhost:8080", - "rule": "paramExtUrl", - "envKey": "HALO_EXTERNAL_URL", - "edit": true - }, - { - "type": "number", - "labelZh": "端口", - "labelEn": "Port", - "required": true, - "default": 8080, - "rule": "paramPort", - "envKey": "PANEL_APP_PORT_HTTP", - "edit": true - } - ] -} \ No newline at end of file diff --git a/apps/halo/versions/2.3.2/docker-compose.yml b/apps/halo/versions/2.3.2/docker-compose.yml deleted file mode 100644 index 3d4f5409..00000000 --- a/apps/halo/versions/2.3.2/docker-compose.yml +++ /dev/null @@ -1,32 +0,0 @@ -version: "3" -services: - halo: - image: halohub/halo:2.3.2 - container_name: ${CONTAINER_NAME} - restart: always - networks: - - 1panel-network - volumes: - - ./data:/root/.halo2 - ports: - - ${PANEL_APP_PORT_HTTP}:8090 - healthcheck: - test: [ "CMD", "curl", "-f", "http://localhost:8090/actuator/health/readiness" ] - interval: 30s - timeout: 5s - retries: 5 - start_period: 30s - command: - - --spring.r2dbc.url=r2dbc:pool:${HALO_PLATFORM}://${PANEL_DB_HOST}:${HALO_DB_PORT}/${PANEL_DB_NAME} - - --spring.r2dbc.username=${PANEL_DB_USER} - - --spring.r2dbc.password=${PANEL_DB_USER_PASSWORD} - - --spring.sql.init.platform=${HALO_PLATFORM} - - --halo.external-url=${HALO_EXTERNAL_URL} - - --halo.security.initializer.superadminusername=${HALO_ADMIN} - - --halo.security.initializer.superadminpassword=${HALO_ADMIN_PASSWORD} - labels: - createdBy: "Apps" - -networks: - 1panel-network: - external: true diff --git a/apps/list.json b/apps/list.json index 29b9d974..bcdd5ecd 100644 --- a/apps/list.json +++ b/apps/list.json @@ -94,7 +94,7 @@ "key": "halo", "name": "Halo", "tags": ["WebSite"], - "versions": ["2.2.0","2.3.2","2.4.1"], + "versions": ["2.4.2"], "shortDescZh": "强大易用的开源建站工具", "shortDescEn": "Powerful and easy-to-use open source website builder", "type": "website", @@ -151,7 +151,7 @@ "key": "dataease", "name": "DataEase", "tags": ["Tool"], - "versions": ["1.18.4"], + "versions": ["1.18.6"], "shortDescZh": "人人可用的开源数据可视化分析工具", "shortDescEn": "Open source data visualization and analysis tools available to everyone", "type": "tool",