feat:修正icat_lite

2024-06-30 23:35:27 +08:00
parent 551363464c
commit 4ca55e291e
9 changed files with 193 additions and 101 deletions
--- a/apps/icat_lite/1.1/.env.sample
+++ b/apps/icat_lite/1.1/.env.sample
@@ -0,0 +1,10 @@
+CONTAINER_NAME="icat_lite"
+ICAT_COOKIEPWD="fibowrlnidazotocrichechotechovad"
+ICAT_PWDKEY="nevovltregopezeminatisejlbojudos"
+PANEL_APP_PORT_HTTP=8095
+PANEL_DB_HOST="postgresql"
+PANEL_DB_HOST_NAME="postgresql"
+PANEL_DB_NAME="icat_lite"
+PANEL_DB_PORT=5432
+PANEL_DB_USER="icat_lite"
+PANEL_DB_USER_PASSWORD="icat_bbs"
--- a/apps/icat_lite/1.1/data.yml
+++ b/apps/icat_lite/1.1/data.yml
@@ -1,82 +1,65 @@
-additionalProperties:  #固定参数
-    formFields:  
-        - default: ""  
-          envKey: PANEL_DB_HOST  #docker-compose 文件中的参数
-          key: postgres  #依赖应用的 key , 例如 mysql
-          labelEn: Database Service  #英文的label
-          labelZh: 数据库服务  #中文的label
-          required: true  #是否必填
-          type: service  #如果需要依赖其他应用，例如数据库，使用此 type 
-
-        - default: 5432
-          envKey: ICAT_DB_PORT 
-          labelEn: Database port
-          labelZh: 数据库端口 
-          random: false  #是否在 default 文字后面，增加随机字符串
-          required: true  
-          rule: paramPort  
-          type: number #端口使用此 type
-
-        
-        - default: ""
-          envKey: ICAT_DB_HOST
-          labelEn: Database host
-          labelZh: 数据库连接主机(地址)，在数据库信息里可以查询到
-          random: false  #是否在 default 文字后面，增加随机字符串
-          required: true  
-          rule: paramCommon
-          type: text 
-
-        - default: icat_lite
-          envKey: PANEL_DB_NAME  
-          labelEn: Database  
-          labelZh: 数据库名  
-          random: true  #是否在 default 文字后面，增加随机字符串
-          required: true  
-          rule: paramCommon  #校验规则
-          type: text  #需要手动填写的，使用此 type
-
-        - default: icat_lite
-          envKey: PANEL_DB_USER  
-          labelEn: User  
-          labelZh: 数据库用户  
-          random: true  
-          required: true  
-          rule: paramCommon  
-          type: text
-
-        - default: "icat_bbs"
-          envKey: PANEL_DB_USER_PASSWORD  
-          labelEn: Password  
-          labelZh: 数据库用户密码  
-          random: true  
-          required: true  
-          rule: paramComplexity  
-          type: password  #密码字段使用此 type
-
-        - default: 8095  
-          edit: true  
-          envKey: PANEL_APP_PORT_HTTP  
-          labelEn: Port  
-          labelZh: 端口  
-          required: true  
-          rule: paramPort  
-          type: number #端口使用此 type 
-
-        - default: "用于加密的密码的密钥，请务必替换成随机字符并重点保存，丢失将永久无法登录"
-          envKey: ICAT_PWDKEY  
-          labelEn: PasswordKey
-          labelZh: 密钥(Key)
-          random: true  
-          required: true  
-          rule: paramCommon
-          type: text
-
-        - default: "这里是加密登录状态的密码，随机字符，至少32位，这个不用保存，每次可以不一样"
-          envKey: ICAT_COOKIEPWD
-          labelEn: CookiePassword
-          labelZh: 登录状态加密密码
-          random: true
-          required: true
-          rule: paramCommon
-          type: text
+additionalProperties:
+  formFields:
+    - default: ""
+      edit: true
+      envKey: PANEL_DB_HOST
+      key: postgresql
+      labelEn: Database Service
+      labelZh: 数据库服务
+      required: true
+      type: service
+    - default: 5432
+      envKey: PANEL_DB_PORT
+      labelEn: Database port
+      labelZh: 数据库端口
+      random: false
+      required: true
+      rule: paramPort
+      type: number
+    - default: icat_lite
+      envKey: PANEL_DB_NAME
+      labelEn: Database
+      labelZh: 数据库名
+      random: true
+      required: true
+      rule: paramCommon
+      type: text
+    - default: icat_lite
+      envKey: PANEL_DB_USER
+      labelEn: User
+      labelZh: 数据库用户
+      random: true
+      required: true
+      rule: paramCommon
+      type: text
+    - default: "icat_bbs"
+      envKey: PANEL_DB_USER_PASSWORD
+      labelEn: Password
+      labelZh: 数据库用户密码
+      random: true
+      required: true
+      rule: paramComplexity
+      type: password
+    - default: 8095
+      edit: true  
+      envKey: PANEL_APP_PORT_HTTP
+      labelEn: Port
+      labelZh: 端口
+      required: true
+      rule: paramPort
+      type: number
+    - default: "nevovltregopezeminatisejlbojudos"
+      edit: true
+      envKey: ICAT_PWDKEY
+      labelEn: Key for encrypted password (lost and can't log in)
+      labelZh: 用于加密的密码的密钥 (丢失无法登录)
+      random: true
+      required: true
+      type: text
+    - default: "fibowrlnidazotocrichechotechovad"
+      edit: true
+      envKey: ICAT_COOKIEPWD
+      labelEn: CookiePassword (at least 32 bits)
+      labelZh: 登录状态加密密码 (至少32位)
+      required: false
+      type: text
--- a/apps/icat_lite/1.1/docker-compose.yml
+++ b/apps/icat_lite/1.1/docker-compose.yml
@@ -1,9 +1,8 @@
-version: "3"
 services:
  icat_lite:
-    image: bluesdo/icat_lite_public:latest
+    image: "bluesdo/icat_lite_public:1.1"
    container_name: ${CONTAINER_NAME}
-    restart: on-failure
+    restart: always
    networks:
      - 1panel-network
    volumes:
@@ -14,7 +13,7 @@ services:
      - ./icat_lite/certs:/icat_lite/certs
    ports:
      - ${PANEL_APP_PORT_HTTP}:8095
-    command: "serve.js --host 0.0.0.0 --port 8095 --dbHost ${ICAT_DB_HOST} --dbPort ${ICAT_DB_PORT} --dbName ${PANEL_DB_NAME} --dbUser ${PANEL_DB_USER} --dbPassword ${PANEL_DB_USER_PASSWORD} --pwdKey ${ICAT_PWDKEY} --cookiePwd ${ICAT_COOKIEPWD} --alterAll"
+    command: "serve.js --host 0.0.0.0 --port 8095 --dbHost ${PANEL_DB_HOST} --dbPort ${PANEL_DB_PORT} --dbName ${PANEL_DB_NAME} --dbUser ${PANEL_DB_USER} --dbPassword ${PANEL_DB_USER_PASSWORD} --pwdKey ${ICAT_PWDKEY} --cookiePwd ${ICAT_COOKIEPWD} --alterAll"
    labels:
      createdBy: "Apps"
 networks: