From f9dccb55394ad88f9bba07df3a34c2f7af266560 Mon Sep 17 00:00:00 2001
From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com>
Date: Thu, 7 Dec 2023 21:26:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20dataease=20=E5=A2=9E=E5=8A=A0=20v2=20?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=20(#688)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/dataease/2.1.0/conf/application.yml | 12 ++++++
 apps/dataease/2.1.0/data.yml             | 55 ++++++++++++++++++++++++
 apps/dataease/2.1.0/docker-compose.yml   | 28 ++++++++++++
 apps/dataease/data.yml                   |  2 +-
 renovate.json                            |  8 ++++
 5 files changed, 104 insertions(+), 1 deletion(-)
 create mode 100644 apps/dataease/2.1.0/conf/application.yml
 create mode 100755 apps/dataease/2.1.0/data.yml
 create mode 100644 apps/dataease/2.1.0/docker-compose.yml

diff --git a/apps/dataease/2.1.0/conf/application.yml b/apps/dataease/2.1.0/conf/application.yml
new file mode 100644
index 00000000..1303eaf4
--- /dev/null
+++ b/apps/dataease/2.1.0/conf/application.yml
@@ -0,0 +1,12 @@
+server:
+  tomcat:
+    connection-timeout: 70000
+spring:
+  servlet:
+    multipart:
+      max-file-size: 500MB
+      max-request-size: 500MB
+  datasource:
+    url: jdbc:mysql://${PANEL_DB_HOST}:${PANEL_DB_PORT}/${PANEL_DB_NAME}?autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    username: ${PANEL_DB_USER}
+    password: ${PANEL_DB_USER_PASSWORD}
diff --git a/apps/dataease/2.1.0/data.yml b/apps/dataease/2.1.0/data.yml
new file mode 100755
index 00000000..27804881
--- /dev/null
+++ b/apps/dataease/2.1.0/data.yml
@@ -0,0 +1,55 @@
+additionalProperties:
+    formFields:
+        - default: ""
+          envKey: PANEL_DB_HOST
+          key: mysql
+          labelEn: Database Service
+          labelZh: 数据库服务
+          required: true
+          type: service
+        - default: de
+          envKey: PANEL_DB_NAME
+          labelEn: Database
+          labelZh: 数据库名
+          random: true
+          required: true
+          rule: paramCommon
+          type: text
+        - default: de
+          envKey: PANEL_DB_USER
+          labelEn: User
+          labelZh: 数据库用户
+          random: true
+          required: true
+          rule: paramCommon
+          type: text
+        - default: de
+          envKey: PANEL_DB_USER_PASSWORD
+          labelEn: Password
+          labelZh: 数据库用户密码
+          random: true
+          required: true
+          rule: paramComplexity
+          type: password
+        - default: admin
+          disabled: true
+          envKey: DE_ADMIN
+          labelEn: Admin User
+          labelZh: 管理员
+          required: true
+          type: text
+        - default: DataEase@123456
+          disabled: true
+          envKey: DE_ADMIN_PASSWORD
+          labelEn: Admin Password
+          labelZh: 管理员默认密码
+          required: true
+          type: text
+        - default: 8080
+          edit: true
+          envKey: PANEL_APP_PORT_HTTP
+          labelEn: Port
+          labelZh: 端口
+          required: true
+          rule: paramPort
+          type: number
diff --git a/apps/dataease/2.1.0/docker-compose.yml b/apps/dataease/2.1.0/docker-compose.yml
new file mode 100644
index 00000000..1b5a378c
--- /dev/null
+++ b/apps/dataease/2.1.0/docker-compose.yml
@@ -0,0 +1,28 @@
+version: '2.1'
+services:
+  dataease:
+    image: registry.cn-qingdao.aliyuncs.com/dataease/dataease:v2.1.0
+    restart: always
+    container_name: ${CONTAINER_NAME}
+    ports:
+      - ${PANEL_APP_PORT_HTTP}:8100
+    volumes:
+      - ./conf:/opt/apps/config
+      - ./logs:/opt/dataease2.0/logs
+      - ./data/static-resource:/opt/dataease2.0/data/static-resource
+      - ./cache:/opt/dataease2.0/cache
+      - ./data/geo:/opt/dataease2.0/data/geo
+    environment:
+      PANEL_DB_HOST: ${PANEL_DB_HOST}
+      PANEL_DB_PORT: ${PANEL_DB_PORT}
+      PANEL_DB_USER: ${PANEL_DB_USER}
+      PANEL_DB_USER_PASSWORD: ${PANEL_DB_USER_PASSWORD}
+      PANEL_DB_NAME: ${PANEL_DB_NAME}
+    networks:
+      - 1panel-network
+    labels:
+      createdBy: "Apps"
+
+networks:
+  1panel-network:
+    external: true
\ No newline at end of file
diff --git a/apps/dataease/data.yml b/apps/dataease/data.yml
index 0a7ce9b8..86d8f216 100755
--- a/apps/dataease/data.yml
+++ b/apps/dataease/data.yml
@@ -12,7 +12,7 @@ additionalProperties:
     shortDescZh: 人人可用的开源数据可视化分析工具
     shortDescEn: Open source data visualization and analysis tools available to everyone
     type: tool
-    crossVersionUpdate: true
+    crossVersionUpdate: false
     limit: 0
     recommend: 8
     website: https://dataease.io/
diff --git a/renovate.json b/renovate.json
index f7f1d0d5..d9330087 100644
--- a/renovate.json
+++ b/renovate.json
@@ -37,6 +37,14 @@
     {
       "matchFileNames": ["apps/elasticsearch/8.*/*.yml"],
       "allowedVersions": "/^8.*/"
+    },
+    {
+      "matchFileNames": ["apps/dataease/1.18.*/*.yml"],
+      "allowedVersions": "/^1.18.*/"
+    },
+    {
+      "matchFileNames": ["apps/dataease/2.*/*.yml"],
+      "allowedVersions": "/^2.*/"
     }
   ],
   "prCreation": "immediate"