From fde45a0fb20e9a34ffafd8540e3eed7aca080656 Mon Sep 17 00:00:00 2001 From: okxlin Date: Mon, 25 Mar 2024 10:00:16 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E8=B0=83=E6=95=B4tianji=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/tianji/1.7.3/.env.sample | 11 ++++ apps/tianji/1.7.3/data.yml | 8 +-- apps/tianji/1.7.3/docker-compose.yml | 2 +- apps/tianji/data.yml | 31 ++++++------ apps/tianji/latest/.env.sample | 11 ++++ apps/tianji/latest/data.yml | 73 +++++++++++++++++++++++++++ apps/tianji/latest/docker-compose.yml | 20 ++++++++ 7 files changed, 136 insertions(+), 20 deletions(-) create mode 100644 apps/tianji/1.7.3/.env.sample create mode 100644 apps/tianji/latest/.env.sample create mode 100644 apps/tianji/latest/data.yml create mode 100644 apps/tianji/latest/docker-compose.yml diff --git a/apps/tianji/1.7.3/.env.sample b/apps/tianji/1.7.3/.env.sample new file mode 100644 index 000000000..fa47f3a39 --- /dev/null +++ b/apps/tianji/1.7.3/.env.sample @@ -0,0 +1,11 @@ +CONTAINER_NAME="tianji" +PANEL_APP_PORT_HTTP="40205" +ALLOW_OPENAPI="true" +ALLOW_REGISTER="false" +JWT_SECRET="any-random-text_fZpxzA" +PANEL_DB_HOST="postgresql" +PANEL_DB_HOST_NAME="postgresql" +PANEL_DB_NAME="tianji_5pz3w2" +PANEL_DB_PORT="5432" +PANEL_DB_USER="tianji_XA6H4c" +PANEL_DB_USER_PASSWORD="tianji_4X2sNe" diff --git a/apps/tianji/1.7.3/data.yml b/apps/tianji/1.7.3/data.yml index fd594b400..212060691 100644 --- a/apps/tianji/1.7.3/data.yml +++ b/apps/tianji/1.7.3/data.yml @@ -1,17 +1,17 @@ additionalProperties: formFields: - - default: 12345 + - default: 40205 edit: true envKey: PANEL_APP_PORT_HTTP - labelEn: Web Port - labelZh: Web 端口 + labelEn: Port + labelZh: 端口 required: true rule: paramPort type: number - default: "" edit: true envKey: PANEL_DB_HOST - key: postgres + key: postgresql labelEn: Database Service labelZh: 数据库服务 required: true diff --git a/apps/tianji/1.7.3/docker-compose.yml b/apps/tianji/1.7.3/docker-compose.yml index d1706ff33..490965299 100644 --- a/apps/tianji/1.7.3/docker-compose.yml +++ b/apps/tianji/1.7.3/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: tianji: container_name: ${CONTAINER_NAME} - restart: unless-stopped + restart: always image: moonrailgun/tianji:1.7.3 networks: - 1panel-network diff --git a/apps/tianji/data.yml b/apps/tianji/data.yml index 57f53ecb6..8b603638a 100644 --- a/apps/tianji/data.yml +++ b/apps/tianji/data.yml @@ -1,19 +1,20 @@ name: Tianji tags: - - 实用工具 -title: Tianji 是一款开源的 all-in-one 数据洞察中心。Tianji = Website Analytics + Uptime Monitor + Server Status -type: 实用工具 + - 工具 +title: Tianji 是一款开源的 all-in-one 数据洞察中心 +type: 工具 description: Tianji 是一款开源的 all-in-one 数据洞察中心 additionalProperties: - key: tianji - name: Tianji - tags: - - Tool - shortDescZh: Tianji 是一款开源的 all-in-one 数据洞察中心 - shortDescEn: All-in-One Insight Hub - type: tool - crossVersionUpdate: true - limit: 0 - website: https://tianji.msgbyte.com/ - github: https://github.com/msgbyte/tianji - document: https://tianji.msgbyte.com/ + key: tianji + name: Tianji + tags: + - Tool + shortDescZh: Tianji 是一款开源的 all-in-one 数据洞察中心 + shortDescEn: Tianji = Website Analytics + Uptime Monitor + Server Status + type: tool + crossVersionUpdate: true + limit: 0 + recommend: 0 + website: https://tianji.msgbyte.com/ + github: https://github.com/msgbyte/tianji + document: https://github.com/msgbyte/tianji diff --git a/apps/tianji/latest/.env.sample b/apps/tianji/latest/.env.sample new file mode 100644 index 000000000..fa47f3a39 --- /dev/null +++ b/apps/tianji/latest/.env.sample @@ -0,0 +1,11 @@ +CONTAINER_NAME="tianji" +PANEL_APP_PORT_HTTP="40205" +ALLOW_OPENAPI="true" +ALLOW_REGISTER="false" +JWT_SECRET="any-random-text_fZpxzA" +PANEL_DB_HOST="postgresql" +PANEL_DB_HOST_NAME="postgresql" +PANEL_DB_NAME="tianji_5pz3w2" +PANEL_DB_PORT="5432" +PANEL_DB_USER="tianji_XA6H4c" +PANEL_DB_USER_PASSWORD="tianji_4X2sNe" diff --git a/apps/tianji/latest/data.yml b/apps/tianji/latest/data.yml new file mode 100644 index 000000000..212060691 --- /dev/null +++ b/apps/tianji/latest/data.yml @@ -0,0 +1,73 @@ +additionalProperties: + formFields: + - default: 40205 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelEn: Port + labelZh: 端口 + required: true + rule: paramPort + type: number + - default: "" + edit: true + envKey: PANEL_DB_HOST + key: postgresql + labelEn: Database Service + labelZh: 数据库服务 + required: true + type: service + - default: tianji + envKey: PANEL_DB_NAME + labelEn: Database Name + labelZh: 数据库名 + random: true + required: true + rule: paramCommon + type: text + - default: tianji + envKey: PANEL_DB_USER + labelEn: Database User + labelZh: 数据库用户 + random: true + required: true + rule: paramCommon + type: text + - default: tianji + envKey: PANEL_DB_USER_PASSWORD + labelEn: Database Password + labelZh: 数据库用户密码 + random: true + required: true + rule: paramComplexity + type: password + - default: any-random-text + edit: true + envKey: JWT_SECRET + labelEn: Secret + labelZh: 秘钥 + random: true + required: true + rule: paramComplexity + type: text + - default: "true" + envKey: ALLOW_OPENAPI + labelEn: Allow OpenAPI + labelZh: 是否开启OpenAPI + required: true + type: select + values: + - label: "True" + value: "true" + - label: "False" + value: "false" + - default: "false" + envKey: ALLOW_REGISTER + labelEn: Allow Register + labelZh: 是否允许注册 + required: true + type: select + values: + - label: "True" + value: "true" + - label: "False" + value: "false" diff --git a/apps/tianji/latest/docker-compose.yml b/apps/tianji/latest/docker-compose.yml new file mode 100644 index 000000000..9da9abd1d --- /dev/null +++ b/apps/tianji/latest/docker-compose.yml @@ -0,0 +1,20 @@ +version: '3' +services: + tianji: + container_name: ${CONTAINER_NAME} + restart: always + image: moonrailgun/tianji:latest + networks: + - 1panel-network + ports: + - ${PANEL_APP_PORT_HTTP}:12345 + environment: + - DATABASE_URL=postgresql://${PANEL_DB_USER}:${PANEL_DB_USER_PASSWORD}@${PANEL_DB_HOST}:${PANEL_DB_PORT}/${PANEL_DB_NAME} + - JWT_SECRET=${JWT_SECRET} + - ALLOW_REGISTER=${ALLOW_REGISTER} + - ALLOW_OPENAPI=${ALLOW_OPENAPI} + labels: + createdBy: "Apps" +networks: + 1panel-network: + external: true