feat:调整perfree-blog

apps/PerfreeBlog/4.0.11/data.yml

@@ -1,41 +0,0 @@
-additionalProperties:
-  formFields:
-    - default: ""
-      envKey: PANEL_DB_HOST
-      key: mysql
-      labelEn: mysql Database Service
-      labelZh: mysql数据库服务
-      required: true
-      type: service
-    - default: perfree
-      envKey: PANEL_DB_NAME
-      labelEn: Database name
-      labelZh: 数据库名
-      random: true
-      required: true
-      rule: paramCommon
-      type: text
-    - default: perfree
-      envKey: PANEL_DB_USER
-      labelEn: Database username
-      labelZh: 数据库用户
-      random: true
-      required: true
-      rule: paramCommon
-      type: text
-    - default: perfree
-      envKey: PANEL_DB_USER_PASSWORD
-      labelEn: Database password
-      labelZh: 数据库用户密码
-      random: true
-      required: true
-      rule: paramComplexity
-      type: password
-    - default: 8081
-      edit: true
-      envKey: PANEL_APP_PORT_HTTP
-      labelEn: Port
-      labelZh: 端口
-      required: true
-      rule: paramPort
-      type: number

apps/PerfreeBlog/4.0.11/docker-compose.yml

@@ -1,20 +0,0 @@
-services:
-  PerfreeBlog:
-    image: registry.cn-hangzhou.aliyuncs.com/perfree/perfree_blog:v4.0.11
-    container_name: ${CONTAINER_NAME}
-    restart: always
-    networks:
-      - 1panel-network
-    ports:
-      - ${PANEL_APP_PORT_HTTP}:8080
-    environment:
-      SPRING_DATASOURCE_URL: jdbc:mysql://${PANEL_DB_HOST}:${PANEL_DB_PORT}/${PANEL_DB_NAME}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
-      SPRING_DATASOURCE_USERNAME: ${PANEL_DB_USER}
-      SPRING_DATASOURCE_PASSWORD: ${PANEL_DB_USER_PASSWORD}
-    labels:
-      createdBy: "Apps"
-    volumes:
-      - ./data:/perfree-server/resources
-networks:
-  1panel-network:
-    external: true

apps/perfree-blog/4.0.11/.env.sample

@@ -0,0 +1,10 @@
+CONTAINER_NAME="perfree-blog"
+DATA_PATH="./data"
+PANEL_APP_PORT_HTTP=40337
+PANEL_DB_HOST="mysql"
+PANEL_DB_HOST_NAME="mysql"
+PANEL_DB_NAME="perfree"
+PANEL_DB_PORT=3306
+PANEL_DB_TYPE="mysql"
+PANEL_DB_USER="perfree"
+PANEL_DB_USER_PASSWORD="perfree"

apps/perfree-blog/4.0.11/data.yml

@@ -0,0 +1,57 @@
+additionalProperties:
+  formFields:
+    - child:
+        default: ""
+        envKey: PANEL_DB_HOST
+        required: true
+        type: service
+      default: mysql
+      envKey: PANEL_DB_TYPE
+      labelEn: Database Service
+      labelZh: 数据库服务
+      required: true
+      type: apps
+      values:
+        - label: MySQL
+          value: mysql
+        - label: LocalMySQL
+          value: localmysql
+    - default: "perfree"
+      envKey: PANEL_DB_NAME
+      labelEn: Database
+      labelZh: 数据库名
+      random: true
+      required: true
+      rule: paramCommon
+      type: text
+    - default: "perfree"
+      envKey: PANEL_DB_USER
+      labelEn: User
+      labelZh: 数据库用户
+      random: true
+      required: true
+      rule: paramCommon
+      type: text
+    - default: "perfree"
+      envKey: PANEL_DB_USER_PASSWORD
+      labelEn: Password
+      labelZh: 数据库用户密码
+      random: true
+      required: true
+      rule: paramComplexity
+      type: password
+    - default: "40337"
+      edit: true
+      envKey: PANEL_APP_PORT_HTTP
+      labelEn: Port
+      labelZh: 端口
+      required: true
+      rule: paramPort
+      type: number
+    - default: "./data"
+      edit: true
+      envKey: DATA_PATH
+      labelEn: Data Path
+      labelZh: 数据路径
+      required: true
+      type: text

apps/perfree-blog/4.0.11/docker-compose.yml

@@ -0,0 +1,20 @@
+services:
+  perfree-blog:
+    image: "registry.cn-hangzhou.aliyuncs.com/perfree/perfree_blog:v4.0.11"
+    container_name: ${CONTAINER_NAME}
+    restart: always
+    networks:
+      - 1panel-network
+    ports:
+      - ${PANEL_APP_PORT_HTTP}:8080
+    volumes:
+      - "${DATA_PATH}:/perfree-server/resources"
+    environment:
+      SPRING_DATASOURCE_URL: jdbc:${PANEL_DB_TYPE}://${PANEL_DB_HOST}:${PANEL_DB_PORT}/${PANEL_DB_NAME}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
+      SPRING_DATASOURCE_USERNAME: ${PANEL_DB_USER}
+      SPRING_DATASOURCE_PASSWORD: ${PANEL_DB_USER_PASSWORD}
+    labels:
+      createdBy: "Apps"
+networks:
+  1panel-network:
+    external: true

apps/perfree-blog/data.yml

@@ -1,19 +1,19 @@
 name: PerfreeBlog
 tags:
     - 建站
-title: 开源的博客/CMS建站工具
+title: 开源的博客/CMS 建站工具
-description: 一款Java开发的博客/CMS系统, 支持主题及扩展插件功能
+description: 开源的博客/CMS 建站工具
 additionalProperties:
-    key: PerfreeBlog
+    key: perfree-blog
     name: PerfreeBlog
     tags:
         - Website
-    shortDescZh: 开源的博客/CMS建站工具
+    shortDescZh: 开源的博客/CMS 建站工具
     shortDescEn: open source blog/CMS website builder
     type: website
     crossVersionUpdate: true
     limit: 0
-    recommend: 10
+    recommend: 0
     website: https://perfree.org.cn/
     github: https://github.com/PerfreeBlog/PerfreeBlog
     document: https://perfree.org.cn/useDocs/