feat: dataease 增加 v2 版本 (#688)

This commit is contained in:
zhengkunwang 2023-12-07 21:26:11 +08:00 committed by GitHub
parent e0924f9bd3
commit f9dccb5539
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 104 additions and 1 deletions

View File

@ -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}

55
apps/dataease/2.1.0/data.yml Executable file
View File

@ -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

View File

@ -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

View File

@ -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/

View File

@ -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"