Merge pull request #1 from running-elephant/master

合并

Author: CrazyBug-11

.github/workflows/dev-ut-stage.js.yml

@@ -0,0 +1,39 @@
+# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: Node.js CI
+
+on:
+  push:
+    branches: [ "dev" ]
+  pull_request:
+    branches: [ "dev" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [14.x, 16.x]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v3
+      with:
+        node-version: ${{ matrix.node-version }}
+        cache: 'npm'
+        cache-dependency-path: '**/package-lock.json'
+    - run: npm ci
+      working-directory: ./frontend
+    - run: npm run build --if-present
+      working-directory: ./frontend
+    - run: npm run test:ci
+      working-directory: ./frontend
+    - run: npm run lint:css
+      working-directory: ./frontend
+    - run: npm run lint:style
+      working-directory: ./frontend

.gitignore

@@ -5,5 +5,8 @@
 
 /static
 
+/server/src/main/resources/javascript/**
+**/target/**
+
 *.iml
 *.zip

Dockerfile

@@ -8,4 +8,4 @@ COPY static /datart/static
 ENV TZ=Asia/Shanghai
 EXPOSE 8080
 WORKDIR /datart
-ENTRYPOINT java -cp "lib/*" datart.DatartServerApplication
+ENTRYPOINT java -server -Xms2G -Xmx2G -Dspring.profiles.active=config -Dfile.encoding=UTF-8 -cp "lib/*" datart.DatartServerApplication

bin/datart.sql

@@ -21,7 +21,4 @@ datart.register.expire-hours=
 # 邀请邮件有效期/小时, 默认48小时
 datart.invite.expire-hours=
 # 租户管理模式：platform-平台(默认)，team-团队
-datart.tenant-management-mode=platform
-# 团队模式初始组织拥有者用户名/密码: 仅团队模式且两者都不为空时重置
-datart.admin.username=
-datart.admin.password=
+datart.tenant-management-mode=platform

bin/h2/datart.demo.mv.db

@@ -1,10 +1,18 @@
 #EXAPLE:
 #  db-type: "example"
 #  name: "example"
-#  driver-class: "com.example.jdbc.Driver"
 #  literal-quote: "'"
 #  identifier-quote: "`"
-#  url-prefix: jdbc:example://
+#  driver-class: "com.example.jdbc.Driver" # optional
+#  url-prefix: "jdbc:example://" # optional
+#  sql-dialect: "datart.data.provider.calcite.dialect.ExampleSqlDialectSupport"  # optional
+#  identifier-end-quote: "`"  # optional
+#  literal-end-quote: "'"  # optional
+#  identifier-escaped-quote: "`"  # optional
+#  adapter-class: 'datart.data.provider.jdbc.adapters.ExampleDataProviderAdapter'  # optional
+#  quote-identifiers: true  # optional
+#  support-sql-limit: true  # optional
+#
 
 IMPALA:
   db-type: "impala"
@@ -29,3 +37,13 @@ DORIS:
   adapter-class: "datart.data.provider.jdbc.adapters.DorisDataProviderAdapter"
   url-prefix: "jdbc:mysql://"
 
+STARROCKS:
+  db-type: "starrocks"
+  name: "starrocks"
+  driver-class: "com.mysql.cj.jdbc.Driver"
+  literal-quote: "'"
+  identifier-quote: "`"
+  adapter-class: "datart.data.provider.jdbc.adapters.StarRocksDataProviderAdapter"
+  url-prefix: "jdbc:mysql://"
+
+