diff --git a/apps/icat_lite/1.1/.env.sample b/apps/icat_lite/1.1/.env.sample new file mode 100644 index 000000000..92505f841 --- /dev/null +++ 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" diff --git a/apps/icat_lite/1.1/data.yml b/apps/icat_lite/1.1/data.yml index b2aeecc56..363fa31d7 100644 --- 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 \ No newline at end of file +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 \ No newline at end of file diff --git a/apps/icat_lite/1.1/docker-compose.yml b/apps/icat_lite/1.1/docker-compose.yml index 8cfde1466..d0c911754 100644 --- 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: diff --git a/apps/icat_lite/README.md b/apps/icat_lite/README.md index 7f39070c2..8e6f2e666 100644 --- a/apps/icat_lite/README.md +++ b/apps/icat_lite/README.md @@ -1,3 +1 @@ -1. 上传并解压文件到1panel的目录:/opt/1panel/resource/apps/local -2. 点击应用商店->更新应用列表->勾选显示本地应用->菜单选择【更多】-【本地】 -3. 安装应用 \ No newline at end of file +# 喵空间社区程序 Lite 版 diff --git a/apps/icat_lite/data.yml b/apps/icat_lite/data.yml index 0b8676785..395ff3089 100644 --- a/apps/icat_lite/data.yml +++ b/apps/icat_lite/data.yml @@ -1,13 +1,19 @@ +name: icat_lite +tags: + - 建站 +title: 喵空间社区程序 Lite 版 +description: 喵空间社区程序 Lite 版 additionalProperties: - key: icat_lite #应用的 key ,仅限英文,用于在 Linux 创建文件夹 - name: 喵空间社区程序Lite版 #应用名称 - tags: - - 建站 #应用标签,可以有多个,请参照下方的标签列表 - shortDescZh: 不太可爱(*╹▽╹*)的社区程序 #应用中文描述,不要超过30个字 - shortDescEn: a mini bbs/forum/talk communicaty program. #应用英文描述 - type: website #应用类型,区别于应用分类,只能有一个,请参照下方的类型列表 - crossVersionUpdate: true #是否可以跨大版本升级 - limit: 0 #应用安装数量限制,0 代表无限制 - website: https://miao.o-o.zone #官网地址 - github: https://github.com/0ui0/icat_lite_public.git #github 地址 - document: https://github.com/0ui0/icat_lite_public.git #文档地址 \ No newline at end of file + key: icat_lite + name: icat_lite + tags: + - WebSite + shortDescZh: 喵空间社区程序 Lite 版 + shortDescEn: A mini bbs/forum/talk communicaty program + type: website + crossVersionUpdate: true + limit: 0 + recommend: 0 + website: https://miao.o-o.zone + github: https://github.com/0ui0/icat_lite_public + document: https://github.com/0ui0/icat_lite_public diff --git a/apps/icat_lite/latest/.env.sample b/apps/icat_lite/latest/.env.sample new file mode 100644 index 000000000..92505f841 --- /dev/null +++ b/apps/icat_lite/latest/.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" diff --git a/apps/icat_lite/latest/data.yml b/apps/icat_lite/latest/data.yml new file mode 100644 index 000000000..363fa31d7 --- /dev/null +++ b/apps/icat_lite/latest/data.yml @@ -0,0 +1,65 @@ +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 \ No newline at end of file diff --git a/apps/icat_lite/latest/docker-compose.yml b/apps/icat_lite/latest/docker-compose.yml new file mode 100644 index 000000000..e434821c4 --- /dev/null +++ b/apps/icat_lite/latest/docker-compose.yml @@ -0,0 +1,21 @@ +services: + icat_lite: + image: "bluesdo/icat_lite_public:latest" + container_name: ${CONTAINER_NAME} + restart: always + networks: + - 1panel-network + volumes: + - ./icat_lite/data:/icat_lite/www/data + - ./icat_lite/system:/icat_lite/www/public/statics/system + - ./icat_lite/systemBlock:/icat_lite/www/public/statics/systemBlock + - ./icat_lite/sticker:/icat_lite/www/public/statics/sticker + - ./icat_lite/certs:/icat_lite/certs + ports: + - ${PANEL_APP_PORT_HTTP}:8095 + 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: + 1panel-network: + external: true \ No newline at end of file diff --git a/apps/icat_lite/logo.png b/apps/icat_lite/logo.png index 846246e77..80094a5a9 100644 Binary files a/apps/icat_lite/logo.png and b/apps/icat_lite/logo.png differ