Merge branch 'pr-2300' into localApps

apps/ikaros/0.15.10/data.yml

@@ -0,0 +1,101 @@
+additionalProperties:
+  formFields:
+    - child:
+        default: ""
+        envKey: PANEL_DB_HOST
+        required: true
+        type: service
+      default: postgresql
+      envKey: PANEL_DB_TYPE
+      labelEn: Database Service
+      labelZh: 数据库服务
+      required: true
+      type: apps
+      values:
+        - label: PostgreSQL
+          value: postgresql
+    - default: ikaros
+      envKey: PANEL_DB_NAME
+      labelEn: Database
+      labelZh: 数据库名
+      random: true
+      required: true
+      rule: paramCommon
+      type: text
+    - default: ikaros
+      envKey: PANEL_DB_USER
+      labelEn: User
+      labelZh: 数据库用户
+      random: true
+      required: true
+      rule: paramCommon
+      type: text
+    - default: ikaros
+      envKey: PANEL_DB_USER_PASSWORD
+      labelEn: Password
+      labelZh: 数据库用户密码
+      random: true
+      required: true
+      rule: paramComplexity
+      type: password
+    - default: 9999
+      edit: true
+      envKey: PANEL_APP_PORT_HTTP
+      labelEn: Port
+      labelZh: 端口
+      required: true
+      rule: paramPort
+      type: number
+    - default: http://localhost:9999
+      edit: true
+      envKey: IKAROS_EXTERNAL_URL
+      labelEn: External URL
+      labelZh: 外部访问地址
+      required: true
+      rule: paramHttp
+      type: text
+    # - default: "false"
+    #   envKey: ENABLE_API_DOC
+    #   labelEn: Enable Web API Doc
+    #   labelZh: 【高级】启用接口文档
+    #   required: true
+    #   type: select
+    #   values:
+    #     - label: TURE
+    #       value: "true"
+    #     - label: FALSE
+    #       value: "false"
+    - default: "INFO"
+      envKey: SERVER_LOG_LEVEL
+      labelEn: Core Server Package Log level
+      labelZh: 【高级】核心Server包日志级别
+      required: true
+      type: select
+      values:
+        - label: DEBUG
+          value: "DEBUG"
+        - label: INFO
+          value: "INFO"
+        - label: WARNING
+          value: "WARNING"
+        - label: ERROR
+          value: "ERROR"
+        - label: CRITICAL
+          value: "CRITICAL"
+    - default: "INFO"
+      envKey: PLUGIN_LOG_LEVEL
+      labelEn: Plugin Package Log level
+      labelZh: 【高级】插件包日志级别
+      required: true
+      type: select
+      values:
+        - label: DEBUG
+          value: "DEBUG"
+        - label: INFO
+          value: "INFO"
+        - label: WARNING
+          value: "WARNING"
+        - label: ERROR
+          value: "ERROR"
+        - label: CRITICAL
+          value: "CRITICAL"

apps/ikaros/0.15.10/docker-compose.yml

@@ -0,0 +1,46 @@
+services:
+  ikaros:
+    image: ikarosrun/ikaros:v0.15.10
+    container_name: ${CONTAINER_NAME}
+    restart: always
+    networks:
+      - 1panel-network
+    volumes:
+      - ./data:/root/.ikaros
+    ports:
+      - ${PANEL_APP_PORT_HTTP}:9999
+    healthcheck:
+      test: [ "CMD", "curl", "-f", "http://localhost:9999/actuator/health"]
+      interval: 30s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
+    environment:
+      - LANG=C.UTF-8
+      - LANGUAGE=C:zh
+      - LC_ALL=C.UTF-8
+      - TZ=Asia/Shanghai
+    command:
+      - --logging.charset.console=UTF-8
+      - --logging.charset.file=UTF-8
+      - --logging.level.run.ikaros.server=${SERVER_LOG_LEVEL}
+      - --logging.level.run.ikaros.plugin=${PLUGIN_LOG_LEVEL}
+      - --sun.jnu.encoding=UTF-8
+      - --spring.r2dbc.url=r2dbc:pool:${PANEL_DB_TYPE}://${PANEL_DB_HOST}/${PANEL_DB_NAME}
+      - --spring.r2dbc.username=${PANEL_DB_USER}
+      - --spring.r2dbc.password=${PANEL_DB_USER_PASSWORD}
+      # Flayway
+      - --spring.flyway.url=jdbc:postgresql://${PANEL_DB_HOST}/${PANEL_DB_NAME}
+      - --spring.flyway.locations=classpath:db/${PANEL_DB_TYPE}/migration
+      - --spring.flyway.user=${PANEL_DB_USER}
+      - --spring.flyway.password=${PANEL_DB_USER_PASSWORD}
+      # springdoc 
+      - --springdoc.api-docs.enabled=false
+      - --springdoc.swagger-ui.enabled=false
+      # ikaros
+      - --ikaros.external-url=${IKAROS_EXTERNAL_URL}
+    labels:
+      createdBy: "Apps"
+networks:
+  1panel-network:
+    external: true

apps/ikaros/README.md

@@ -0,0 +1,50 @@
+<p align="center">
+    <a href="#" target="_blank">
+        <img width="100" src="https://docs.ikaros.run/img/favicon.ico" alt="Ikaros logo" />
+    </a>
+</p>
+
+
+<p align="center">
+<a href="https://t.me/run_ikaros"><img alt="Telegram" src="https://img.shields.io/badge/Telegram-2CA5E0?style=flat-squeare&logo=telegram&logoColor=white" /></a>
+<a href="http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=78drHnTdkaGQHwAkt1eEU3JpxBfUeuPx&authKey=dvZ0CdZjiX36wKiDlDF0qKVcEDe7SNXfL%2BllKTIf%2FgiXNHwlWqTmlXTs%2BtLnB1un&noverify=0&group_code=413528874"><img alt="Telegram" src="https://img.shields.io/badge/413528874-2CA5E0?logo=tencent-qq&logoColor=white" /></a>
+<br />
+<a href="https://app.codecov.io/github/ikaros-dev/ikaros"><img alt="code coverage" src="https://img.shields.io/codecov/c/github/ikaros-dev/ikaros/main?style=flat-square" /></a>
+<a href="https://github.com/ikaros-dev/ikaros/commits"><img alt="GitHub last commit" src="https://img.shields.io/github/last-commit/ikaros-dev/ikaros.svg?style=flat-square" /></a>
+<a href="https://github.com/ikaros-dev/ikaros/actions"><img alt="GitHub workflow build status" src="https://img.shields.io/github/actions/workflow/status/ikaros-dev/ikaros/ikaros-server-ci.yml?branch=main&style=flat-square" /></a>
+<br />
+<a href="https://github.com/ikaros-dev/ikaros/releases"><img alt="Github Releases" src="https://img.shields.io/github/v/release/ikaros-dev/ikaros?include_prereleases&style=flat-square" /></a>
+<a href="https://github.com/ikaros-dev/ikaros/stargazers"><img alt="GitHub Stargazers" src="https://img.shields.io/github/stars/ikaros-dev/ikaros.svg?style=flat-square&label=Stars&logo=github" /></a>
+<a href="https://github.com/ikaros-dev/ikaros/issues"><img src="https://img.shields.io/github/issues/ikaros-dev/ikaros?color=blue&style=flat-square"/></a>
+<a href="https://hub.docker.com/r/ikarosrun/ikaros"><img alt="Docker pulls" src="https://img.shields.io/docker/pulls/ikarosrun/ikaros?style=flat-square" /></a>
+</p>
+
+<p align="center"><b>Ikaros</b> [Ίκαρος]，专注于ACGMN的内容管理系统(CMS)。</p>
+
+<p align="center">ACGMN全拼是：Anime(动画) + Comic(漫画) + Game(游戏) + Music(音乐) + Novel(小说)</p>
+
+# 特性
+
+- 统一资源管理: 所有的资源由统一的平台进行管理，再也不用东一个西一个了
+- 元数据支持: 您是否看着全是罗马音的一堆资源不明所以，ikaros 支持资源元数据
+- 快捷的搜索: 即使您有几十万资源，一样可以提供毫秒级的搜索响应
+- 插件支持: ikaros 本体只提供最为基础的功能，其它附加功能由插件提供
+- 客户端支持: 各个主流平台的客户端，包括不限于 Windows, 安卓
+
+# demo
+
+<https://demo.ikaros.run/console/>
+
+用户名: demo
+密码: demo
+
+
+## 视频
+
+- 功能预览视频: <https://www.bilibili.com/video/BV1Uw411B7o6/>
+- 安装视频：<https://www.bilibili.com/video/BV1zr4y1R7aQ/>
+- 最新日志介绍：<https://www.bilibili.com/video/BV1Sw411n73j/>
+
+# 文档
+
+更多内容请看：<https://docs.ikaros.run/>

apps/ikaros/data.yml

@@ -0,0 +1,20 @@
+name: Ikaros
+tags:
+    - CMS
+    - ACG
+    - ACGMN
+title: 强大易用的开源建站工具
+description: 强大易用的开源建站工具
+additionalProperties:
+    key: ikaros
+    name: Ikaros
+    tags:
+        - WebSite
+    shortDescZh: 专注于ACGMN的内容管理系统(CMS)
+    shortDescEn: Dedicated to ACGMN's Content Management System (CMS)
+    type: website
+    crossVersionUpdate: true
+    limit: 0
+    website: https://ikaros.run
+    github: https://github.com/ikaros-dev/ikaros
+    document: https://docs.ikaros.run