(refactor) Remove env files and scripts, update config files

apps/wukongim/1.2.6/.env.sample

@@ -0,0 +1,7 @@
+CONTAINER_NAME="wukongim"
+EXTERNAL_IP="1.2.3.4"
+PANEL_APP_PORT_HTTP=5300
+PANEL_APP_PORT_WK_API=5001
+PANEL_APP_PORT_WK_DEMO_SERVER=5172
+PANEL_APP_PORT_WK_TCP=5100
+PANEL_APP_PORT_WK_WS=5200

apps/wukongim/1.2.6/data.yml

@@ -1,47 +1,49 @@
 additionalProperties:
   formFields:
-    - default: "/home/wukongim"
+    - default: ""
       edit: true
-      envKey: WUKONGIM_ROOT_PATH
-      labelZh: 数据持久化路径
-      labelEn: Data persistence path
+      envKey: EXTERNAL_IP
+      labelEn: ipAddress
+      labelZh: 外部访问 IP
       required: true
       type: text
-    - default: 5300
+    - default: "5001"
       edit: true
-      envKey: PANEL_APP_PORT_HTTP
-      labelZh: WebUI 端口
-      labelEn: WebUI port
+      envKey: PANEL_APP_PORT_WK_API
+      labelEn: WuKongIM api port
+      labelZh: 悟空 IM api 端口
       required: true
       rule: paramPort
       type: number
-    - default: 5001
-      envKey: PANEL_APP_PORT_WK_API
-      labelZh: API 端口
-      labelEn: API port
-      required: true
-      type: number
-    - default: 5100
+    - default: "5100"
+      edit: true
       envKey: PANEL_APP_PORT_WK_TCP
-      labelZh: TCP端口
-      labelEn: Tcp port
+      labelEn: WuKongIM tcp port
+      labelZh: 悟空 IM TCP 端口
       required: true
+      rule: paramPort
       type: number
-    - default: 5200
+    - default: "5200"
+      edit: true
       envKey: PANEL_APP_PORT_WK_WS
-      labelZh: WebSocket 端口
-      labelEn: WebSocket port
+      labelEn: WuKongIM ws port
+      labelZh: 悟空 IM WS 端口
       required: true
+      rule: paramPort
       type: number
-    - default: 5172
+    - default: "5300"
+      edit: true
+      envKey: PANEL_APP_PORT_HTTP
+      labelEn: WuKongIM web port
+      labelZh: 悟空 IM 监控端口
+      required: true
+      rule: paramPort
+      type: number
+    - default: "5172"
+      edit: true
       envKey: PANEL_APP_PORT_WK_DEMO_SERVER
-      labelZh: 悟空IM演示端口
       labelEn: WuKongIM demo port
+      labelZh: 悟空 IM demo 端口
       required: true
+      rule: paramPort
       type: number
-    - default: "127.0.0.1"
-      envKey: WK_EXTERNAL_IP
-      labelZh: 服务器IP
-      labelEn: Server IP
-      required: true
-      type: text

apps/wukongim/1.2.6/docker-compose.yml

@@ -1,26 +1,28 @@
+services:
+  wukongim:
+    container_name: ${CONTAINER_NAME}
+    image: "wukongim/wukongim:v1.2.6"
+    restart: always
+    ports:
+      - "${PANEL_APP_PORT_WK_API}:5001"
+      - "${PANEL_APP_PORT_WK_TCP}:5100"
+      - "${PANEL_APP_PORT_WK_WS}:5200"
+      - "${PANEL_APP_PORT_HTTP}:5300"
+      - "${PANEL_APP_PORT_WK_DEMO_SERVER}:5172"
+    volumes:
+      - ./wukongim:/root/wukongim
+    environment:
+      - WK_MODE=release
+      - WK_EXTERNAL_IP=${EXTERNAL_IP}
+      - WK_CONVERSATION_ON=true
+      - WK_WEBHOOK_GRPCADDR=tangsengdaodaoserver:6979
+      - WK_DATASOURCE_ADDR=http://tangsengdaodaoserver:8090/v1/datasource
+      - WK_DATASOURCE_CHANNELINFOON=true
+      - WK_TOKENAUTHON=true
+    networks:
+      - 1panel-network
+    labels:
+      createdBy: "Apps"
 networks:
   1panel-network:
     external: true
-
-services:
-  wukongim:
-    image: wukongim/wukongim:v1.2.6
-    container_name: ${CONTAINER_NAME}
-    labels:
-      createdBy: "Apps"
-    restart: always
-    networks:
-      - 1panel-network
-    ports:
-      - ${PANEL_APP_PORT_HTTP}:5300
-      - ${PANEL_APP_PORT_WK_API}:5001
-      - ${PANEL_APP_PORT_WK_TCP}:5100
-      - ${PANEL_APP_PORT_WK_WS}:5200
-      - ${PANEL_APP_PORT_WK_DEMO_SERVER}:5172
-    env_file:
-      - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env}
-      - ${ENV_FILE:-/etc/1panel/envs/default.env}
-    volumes:
-      - ${WUKONGIM_ROOT_PATH}/wukongim:/root/wukongim
-    environment:
-      - WK_MODE=release

apps/wukongim/1.2.6/envs/default.env

@@ -1,2 +0,0 @@
-# copyright© 2024 XinJiang Ms Studio
-ENV_FILE=.env

apps/wukongim/1.2.6/envs/global.env

@@ -1,2 +0,0 @@
-# copyright© 2024 XinJiang Ms Studio
-TZ=Asia/Shanghai

apps/wukongim/1.2.6/scripts/init.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-if [ -f .env ]; then
-  source .env
-
-  # setup-1 add default values
-  CURRENT_DIR=$(pwd)
-  sed -i '/^ENV_FILE=/d' .env
-  sed -i '/^GLOBAL_ENV_FILE=/d' .env
-  echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
-  echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env
-
-  echo "Check Finish."
-
-else
-  echo "Error: .env file not found."
-fi

apps/wukongim/1.2.6/scripts/uninstall.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-if [ -f .env ]; then
-  source .env
-
-  echo "Check Finish."
-
-else
-  echo "Error: .env file not found."
-fi

apps/wukongim/1.2.6/scripts/upgrade.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-if [ -f .env ]; then
-  source .env
-
-  # setup-1 add default values
-  CURRENT_DIR=$(pwd)
-  sed -i '/^ENV_FILE=/d' .env
-  sed -i '/^GLOBAL_ENV_FILE=/d' .env
-  echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
-  echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env
-
-  echo "Check Finish."
-
-else
-  echo "Error: .env file not found."
-fi