Merge branch 'dev' into sso

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -95,7 +95,8 @@ body:
         Which version of Dinky are you running? We only accept bugs report from the LTS projects.
       options:
         - dev
-        - 1.0.2
+        - 1.1.0
+        - 1.0.3
         - 1.0.1
         - 1.0.0
         - 0.7.5(Archived, Not Maintained)

.github/workflows/auto-realease-ci.yml

@@ -62,7 +62,7 @@ jobs:
                  -Dspotless.check.skip=true \
                  -Denforcer.skip=false \
                  -Dmaven.javadoc.skip=true \
-                   -Pprod,scala-2.12,flink-single-version,flink-1.14,maven-central,web,fast \
+                   -Pprod,flink-single-version,flink-1.14,maven-central,web,fast \
                  --no-snapshot-updates
       - name: "Build Dinky ${{ inputs.version }} with Fink 1.15 Pre Release/Release Artifact"
         id: build_dinky1_15
@@ -72,7 +72,7 @@ jobs:
                  -Dspotless.check.skip=true \
                  -Denforcer.skip=false \
                  -Dmaven.javadoc.skip=true \
-                   -Pprod,scala-2.12,flink-single-version,flink-1.15,maven-central,web,fast \
+                   -Pprod,flink-single-version,flink-1.15,maven-central,web,fast \
                  --no-snapshot-updates
 
       - name: "Build Dinky ${{ inputs.version }} with Fink 1.16 Pre Release/Release Artifact"
@@ -83,7 +83,7 @@ jobs:
                  -Dspotless.check.skip=true \
                  -Denforcer.skip=false \
                  -Dmaven.javadoc.skip=true \
-                   -Pprod,scala-2.12,flink-single-version,flink-1.16,maven-central,web,fast \
+                   -Pprod,flink-single-version,flink-1.16,maven-central,web,fast \
                  --no-snapshot-updates
 
       - name: "Build Dinky ${{ inputs.version }} with Fink 1.17 Pre Release/Release Artifact"
@@ -94,7 +94,7 @@ jobs:
                  -Dspotless.check.skip=true \
                  -Denforcer.skip=false \
                  -Dmaven.javadoc.skip=true \
-                   -Pprod,scala-2.12,flink-single-version,flink-1.17,maven-central,web,fast \
+                   -Pprod,flink-single-version,flink-1.17,maven-central,web,fast \
                  --no-snapshot-updates
 
       - name: "Build Dinky ${{ inputs.version }} with Fink 1.18 Pre Release/Release Artifact"
@@ -105,7 +105,29 @@ jobs:
                  -Dspotless.check.skip=true \
                  -Denforcer.skip=false \
                  -Dmaven.javadoc.skip=true \
-                   -Pprod,scala-2.12,flink-single-version,flink-1.18,maven-central,web,fast \
+                   -Pprod,flink-single-version,flink-1.18,maven-central,web,fast \
+                 --no-snapshot-updates
+
+      - name: "Build Dinky ${{ inputs.version }} with Fink 1.19 Pre Release/Release Artifact"
+        id: build_dinky1_19
+        run: |
+          ./mvnw -B clean package \
+                  -Dmaven.test.skip=false \
+                 -Dspotless.check.skip=true \
+                 -Denforcer.skip=false \
+                 -Dmaven.javadoc.skip=true \
+                   -Pprod,flink-single-version,flink-1.19,maven-central,web,fast \
+                 --no-snapshot-updates
+
+      - name: "Build Dinky ${{ inputs.version }} with Fink 1.20 Pre Release/Release Artifact"
+        id: build_dinky1_20
+        run: |
+          ./mvnw -B clean package \
+                  -Dmaven.test.skip=false \
+                 -Dspotless.check.skip=true \
+                 -Denforcer.skip=false \
+                 -Dmaven.javadoc.skip=true \
+                   -Pprod,flink-single-version,flink-1.20,maven-central,web,fast \
                  --no-snapshot-updates
 
       - name: Automatic Upload Releases to GitHub Releases Page
@@ -120,4 +142,4 @@ jobs:
           body: |
             ${{ inputs.release_notes }}
           files: |
-            ./build/dinky-release-*.tar.gz
+            ./build/dinky-release-*.tar.gz

.github/workflows/backend.yaml

@@ -89,7 +89,7 @@ jobs:
       fail-fast: true
       matrix:
         jdk: [8, 11]
-        flink: [1.14, 1.15, 1.16, 1.17, 1.18, 1.19]
+        flink: [1.14, 1.15, 1.16, 1.17, 1.18, 1.19, 1.20]
 
     timeout-minutes: 30
     env:
@@ -125,7 +125,7 @@ jobs:
                  -Dspotless.check.skip=true \
                  -Denforcer.skip=false \
                  -Dmaven.javadoc.skip=true \
-                 -P prod,scala-2.12,flink-single-version,flink-${{ matrix.flink }},maven-central \
+                 -P prod,flink-single-version,flink-${{ matrix.flink }},maven-central \
                  --no-snapshot-updates
 
       # 检查打包的大小

.github/workflows/docker_build.yaml

@@ -17,196 +17,53 @@
 
 name: Docker Build
 
-
-
 on:
   workflow_dispatch:
     inputs:
-      version:
+      dinky_version:
         description: 'dinky version'
         required: true
+      docker_space:
+              description: 'docker space(eg: dinky)'
+              required: true
 
 jobs:
   build_releases:
     name: build releases
     runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      # maven编译
-      - name: Set up JDK 8
-        uses: actions/setup-java@v2
-        with:
-          java-version: 8
-          distribution: 'adopt'
-      - name: Cache local Maven repository
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.m2/repository/*/*/*
-          key: ${{ runner.os }}-maven-${{ hashFiles('pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-      #      - name: Check Style
-      #        run: |
-      #          ./mvnw -T 4C -B --no-snapshot-updates clean spotless:check
-      - name: Build and Package
-        run: |
-          ./mvnw -B clean install \
-                 -Dmaven.test.skip=true \
-                 -Dspotless.check.skip=true \
-                 -P prod,scala-2.12,flink-all,web,maven-central,fast \
-                 --no-snapshot-updates
-      - name: Upload release file
-        uses: actions/upload-artifact@v3
-        with:
-          name: release-file
-          path: ./build/dinky-release-*.tar.gz
-  dinky_mysql_image:
-    name: dinky mysql image
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-      matrix:
-        url: [ registry.cn-hangzhou.aliyuncs.com ,docker.io ]
-        include:
-          - url: registry.cn-hangzhou.aliyuncs.com
-            namespace: dinky
-          - url: docker.io
-            namespace: dinkydocker
-    steps:
-      - uses: actions/checkout@v3
-      - name: Log in to the Container registry,url -> ${{ matrix.url }}
-        if: ${{ matrix.url == 'registry.cn-hangzhou.aliyuncs.com'}}
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ matrix.url }}
-          username: ${{ secrets.DOCKER_ALIYUN_USER }}
-          password: ${{ secrets.DOCKER_ALIYUN_PASS }}
-      - name: Log in to the Container registry,url -> ${{ matrix.url }}
-        if: ${{ matrix.url == 'docker.io'}}
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ matrix.url }}
-          username: ${{ secrets.DOCKER_IO_USER }}
-          password: ${{ secrets.DOCKER_IO_PASS }}
-      - name: push docker dinky mysql image
-        uses: docker/build-push-action@v2
-        with:
-          file: docker/DockerfileMysql
-          context: .
-          push: true
-          tags: ${{ matrix.url }}/${{ matrix.namespace }}/dinky-mysql-server:${{ inputs.version }}
-
-  dinky_image:
-    name: docker dinky image
-    runs-on: ubuntu-latest
-    needs: [build_releases]
     strategy:
       fail-fast: true
       matrix:
-        url: [ registry.cn-hangzhou.aliyuncs.com ,docker.io ]
-        include:
-          - url: registry.cn-hangzhou.aliyuncs.com
-            namespace: dinky
-          - url: docker.io
-            namespace: dinkydocker
+        flink: [1.14,1.15,1.16,1.17,1.18,1.19]
     steps:
-      - uses: actions/checkout@v3
-      - name: Move Dockerfile
-        run: |
-          cp -r ./docker/Dockerfile* ./
-      - name: Download math result for job 1
-        uses: actions/download-artifact@v3
-        with:
-          name: release-file
-          path: ./build/
-      - name: Log in to the Container registry,url -> ${{ matrix.url }}
-        if: ${{ matrix.url == 'registry.cn-hangzhou.aliyuncs.com'}}
-        uses: docker/login-action@v2
+      # git checkout 代码
+      - name: Checkout
+        uses: actions/checkout@v4
+      # 设置 QEMU, 后面 docker buildx 依赖此.
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      # 设置 Docker buildx, 方便构建 Multi platform 镜像
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      # 登录 docker hub
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
         with:
-          registry: ${{ matrix.url }}
-          username: ${{ secrets.DOCKER_ALIYUN_USER }}
-          password: ${{ secrets.DOCKER_ALIYUN_PASS }}
-      - name: Log in to the Container registry,url -> ${{ matrix.url }}
-        if: ${{ matrix.url == 'docker.io'}}
-        uses: docker/login-action@v2
+          # GitHub Repo => Settings => Secrets 增加 docker hub 登录密钥信息
+          # DOCKERHUB_USERNAME 是 docker hub 账号名.
+          # DOCKERHUB_TOKEN: docker hub => Account Setting => Security 创建.
+          username: ${{ secrets.DOCKER_IO_USER  }}
+          password: ${{ secrets.DOCKER_IO_PASS  }}
+      # 构建 Docker 并推送到 Docker hub
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v5
         with:
-          registry: ${{ matrix.url }}
-          username: ${{ secrets.DOCKER_IO_USER }}
-          password: ${{ secrets.DOCKER_IO_PASS }}
-      - name: push docker dinky image
-        uses: docker/build-push-action@v2
-        with:
-          build-args: |
-            DINKY_VERSION=${{ inputs.version }}
-          file: Dockerfile
-          context: .
+          file: ./deploy/docker/Dockerfile
+          # 是否 docker push
           push: true
-          tags: ${{ matrix.url }}/${{ matrix.namespace }}/dinky-standalone-server:${{ inputs.version }}
-
-
-  dinky_flink_image:
-    name: docker dinky flink image
-    runs-on: ubuntu-latest
-    needs: [ dinky_image ]
-    strategy:
-      fail-fast: true
-      matrix:
-        url: [ registry.cn-hangzhou.aliyuncs.com ,docker.io ]
-        FLINK_VERSION: [1.14.6 , 1.15.4 , 1.16.3, 1.17.2, 1.18.1, 1.19.0]
-        include:
-          - url: registry.cn-hangzhou.aliyuncs.com
-            namespace: dinky
-          - url: docker.io
-            namespace: dinkydocker
-          - FLINK_VERSION: 1.14.6
-            FLINK_BIG_VERSION: 1.14
-          - FLINK_VERSION: 1.15.4
-            FLINK_BIG_VERSION: 1.15
-          - FLINK_VERSION: 1.16.3
-            FLINK_BIG_VERSION: 1.16
-          - FLINK_VERSION : 1.17.2
-            FLINK_BIG_VERSION: 1.17
-          - FLINK_VERSION: 1.18.1
-            FLINK_BIG_VERSION: 1.18
-          - FLINK_VERSION: 1.19.0
-            FLINK_BIG_VERSION: 1.19
-    steps:
-      - uses: actions/checkout@v3
-      - name: Move Dockerfile
-        run: |
-          cp -r ./docker/Dockerfile* ./
-      - uses: actions/checkout@v3
-      - name: set the flink_big_version
-        run: |
-          echo FLINK_BIG_VERSION=${FLINK_VERSION%.*} >> $GITHUB_ENV
-      - name: Download math result for job 1
-        uses: actions/download-artifact@v3
-        with:
-          name: release-file
-          path: ./build/
-      - name: Log in to the Container registry,url -> ${{ matrix.url }}
-        if: ${{ matrix.url == 'registry.cn-hangzhou.aliyuncs.com'}}
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ matrix.url }}
-          username: ${{ secrets.DOCKER_ALIYUN_USER }}
-          password: ${{ secrets.DOCKER_ALIYUN_PASS }}
-      - name: Log in to the Container registry,url -> ${{ matrix.url }}
-        if: ${{ matrix.url == 'docker.io'}}
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ matrix.url }}
-          username: ${{ secrets.DOCKER_IO_USER }}
-          password: ${{ secrets.DOCKER_IO_PASS }}
-      - name: push docker dinky image
-        uses: docker/build-push-action@v2
-        with:
           build-args: |
-            FLINK_VERSION=${{ matrix.FLINK_VERSION }}
-            DINKY_IMAGE=${{ matrix.url }}/${{ matrix.namespace }}/dinky-standalone-server:${{ inputs.version }}
-            FLINK_BIG_VERSION=${{ matrix.FLINK_BIG_VERSION }}
-          file: DockerfileDinkyFlink
-          context: .
-          push: true
-          tags: ${{ matrix.url }}/${{ matrix.namespace }}/dinky-standalone-server:${{ inputs.version }}-flink-${{matrix.FLINK_BIG_VERSION }}
+            FLINK_VERSION=${{ matrix.flink }}
+            DINKY_VERSION=${{ inputs.dinky_version }}
+          tags: |
+            ${{inputs.docker_space}}/dinky-standalone-server:${{ inputs.dinky_version }}-flink${{ matrix.flink }}

.github/workflows/docs.yml

@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: Build documentation
         run: |
-          cd docs && npm install --prefer-offline --no-audit --progress=false --legacy-peer-deps --registry https://repo.huaweicloud.com/repository/npm/ \
+          cd docs && npm install --prefer-offline --no-audit --progress=false --legacy-peer-deps \
           &&  npm run build
       - name: Upload documentation
         uses: burnett01/[email protected]
@@ -38,4 +38,4 @@ jobs:
           remote_host: ${{ secrets.RSYNC_HOST }}
           remote_port: ${{ secrets.RSYNC_PORT }}
           remote_user: ${{ secrets.RSYNC_USER }}
-          remote_key: ${{ secrets.RSYNC_KEY }}
+          remote_key: ${{ secrets.RSYNC_KEY }}

.gitignore

@@ -12,6 +12,9 @@ logs.zip
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
 
+# sqlite
+dinky.db
+
 # Package Files #
 *.jar
 *.war
@@ -58,3 +61,5 @@ docs/*.log
 tmp/*
 extends/*
 /.run/
+
+.idea

README.md

@@ -67,7 +67,7 @@ Thank you to all the people who already contributed to Dinky!
 
 ## How to Deploy
 
-See [source code compilation](https://github.com/DataLinkDC/dinky/blob/dev/docs/docs/deploy_guide/compile.mdx) and [installation and deployment](https://github.com/DataLinkDC/dinky/blob/dev/docs/docs/deploy_guide/deploy.mdx) for details.
+See [source code compilation](https://github.com/DataLinkDC/dinky/blob/dev/docs/docs/deploy_guide/compile.mdx) and [installation and deployment](https://github.com/DataLinkDC/dinky/blob/dev/docs/docs/deploy_guide/normal_deploy.mdx) for details.
 
 ## Thanks
 

README_zh_CN.md

@@ -70,7 +70,7 @@ Dinky 是一个基于 `Apache Flink` 的实时数据开发平台，实现了敏
 
 ## 如何部署
 
-详见 [源码编译](https://github.com/DataLinkDC/dinky/blob/dev/docs/docs/deploy_guide/compile.mdx) 和 [安装部署](https://github.com/DataLinkDC/dinky/blob/dev/docs/docs/deploy_guide/deploy.mdx) 。
+详见 [源码编译](https://github.com/DataLinkDC/dinky/blob/dev/docs/docs/deploy_guide/compile.mdx) 和 [安装部署](https://github.com/DataLinkDC/dinky/blob/dev/docs/docs/deploy_guide/normal_deploy.mdx) 。
 
 ## 感谢