Unverified Commit a1fe80ea authored by samz406's avatar samz406 Committed by GitHub
Browse files

Merge pull request #21 from apache/dev 

update
parents b0d73fb7 1baeefc8

.github/workflows/ci_ut.yml

+6 −5
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
# limitations under the License.

#



on: ["pull_request"]

on: [push, "pull_request"]

env:

  DOCKER_DIR: ./docker

  LOG_DIR: /tmp/dolphinscheduler
@@ -49,11 +49,12 @@ jobs: 
          export MAVEN_OPTS='-Dmaven.repo.local=.m2/repository -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit -Xmx3g'

          mvn test -Dmaven.test.skip=false cobertura:cobertura

          CODECOV_TOKEN="09c2663f-b091-4258-8a47-c981827eb29a" bash <(curl -s https://codecov.io/bash)

      - name: Run SonarCloud analysis

      - name: Run SonarCloud Analysis

        run: >

          mvn clean --batch-mode

          verify

          mvn verify --batch-mode

          org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.1.1688:sonar

          -Dsonar.junit.reportPaths=target/cobertura

          -Dmaven.test.skip=true

          -Dsonar.host.url=https://sonarcloud.io

          -Dsonar.organization=apache

          -Dsonar.projectKey=apache-dolphinscheduler

README.md

+8 −8
Original line number Diff line number Diff line
@@ -58,25 +58,25 @@ Overload processing: Task queue mechanism, the number of schedulable tasks on a 


### Document



- <a href="https://dolphinscheduler.apache.org/en-us/docs/user_doc/backend-deployment.html" target="_blank">Backend deployment documentation</a>

- <a href="https://dolphinscheduler.apache.org/en-us/docs/1.2.0/user_doc/backend-deployment.html" target="_blank">Backend deployment documentation</a>



- <a href="https://dolphinscheduler.apache.org/en-us/docs/user_doc/frontend-deployment.html" target="_blank">Front-end deployment documentation</a>

- <a href="https://dolphinscheduler.apache.org/en-us/docs/1.2.0/user_doc/frontend-deployment.html" target="_blank">Front-end deployment documentation</a>



- [**User manual**](https://dolphinscheduler.apache.org/en-us/docs/user_doc/system-manual.html?_blank "System manual")

- [**User manual**](https://dolphinscheduler.apache.org/en-us/docs/1.2.0/user_doc/system-manual.html?_blank "System manual")



- [**Upgrade document**](https://dolphinscheduler.apache.org/en-us/docs/release/upgrade.html?_blank "Upgrade document")

- [**Upgrade document**](https://dolphinscheduler.apache.org/en-us/docs/1.2.0/release/upgrade.html?_blank "Upgrade document")



- <a href="http://106.75.43.194:8888" target="_blank">Online Demo</a>



More documentation please refer to <a href="https://dolphinscheduler.apache.org/en-us/docs/user_doc/quick-start.html" target="_blank">[DolphinScheduler online documentation]</a>

More documentation please refer to <a href="https://dolphinscheduler.apache.org/en-us/docs/1.2.0/user_doc/quick-start.html" target="_blank">[DolphinScheduler online documentation]</a>



### Recent R&D plan

Work plan of Dolphin Scheduler: [R&D plan](https://github.com/apache/incubator-dolphinscheduler/projects/1), Under the `In Develop` card is what is currently being developed, TODO card is to be done (including feature ideas)



### How to contribute code

### How to contribute



Welcome to participate in contributing code, please refer to the process of submitting the code:

[[How to contribute code](https://github.com/apache/incubator-dolphinscheduler/issues/310)]

Welcome to participate in contributing, please refer to the process of submitting the code:

[[How to contribute](https://dolphinscheduler.apache.org/en-us/docs/development/contribute.html)]



### How to Build

README_zh_CN.md

+12 −12
Original line number Diff line number Diff line
@@ -44,27 +44,27 @@ Dolphin Scheduler Official Website 


### 文档



- <a href="https://dolphinscheduler.apache.org/zh-cn/docs/user_doc/backend-deployment.html" target="_blank">后端部署文档</a>

- <a href="https://dolphinscheduler.apache.org/zh-cn/docs/1.2.0/user_doc/backend-deployment.html" target="_blank">后端部署文档</a>



- <a href="https://dolphinscheduler.apache.org/zh-cn/docs/user_doc/frontend-deployment.html" target="_blank">前端部署文档</a>

- <a href="https://dolphinscheduler.apache.org/zh-cn/docs/1.2.0/user_doc/frontend-deployment.html" target="_blank">前端部署文档</a>



- [**使用手册**](https://dolphinscheduler.apache.org/zh-cn/docs/user_doc/system-manual.html?_blank "系统使用手册")

- [**使用手册**](https://dolphinscheduler.apache.org/zh-cn/docs/1.2.0/user_doc/system-manual.html?_blank "系统使用手册")



- [**升级文档**](https://dolphinscheduler.apache.org/zh-cn/docs/release/upgrade.html?_blank "升级文档")

- [**升级文档**](https://dolphinscheduler.apache.org/zh-cn/docs/1.2.0/release/upgrade.html?_blank "升级文档")



- <a href="http://106.75.43.194:8888" target="_blank">我要体验</a>



更多文档请参考 <a href="https://dolphinscheduler.apache.org/zh-cn/docs/user_doc/quick-start.html" target="_blank">DolphinScheduler中文在线文档</a>

更多文档请参考 <a href="https://dolphinscheduler.apache.org/zh-cn/docs/1.2.0/user_doc/quick-start.html" target="_blank">DolphinScheduler中文在线文档</a>





### 近期研发计划



DolphinScheduler的工作计划：<a href="https://github.com/apache/incubator-dolphinscheduler/projects/1" target="_blank">研发计划</a> ，其中 In Develop卡片下是正在研发的功能，TODO卡片是待做事项(包括 feature ideas)



### 贡献代码

### 参与贡献



非常欢迎大家来参与贡献代码，提交代码流程请参考：

[[How to contribute code](https://github.com/apache/incubator-dolphinscheduler/issues/310)]

非常欢迎大家来参与贡献，贡献流程请参考：

[[参与贡献](https://dolphinscheduler.apache.org/zh-cn/docs/development/contribute.html)]



### How to Build
@@ -88,12 +88,12 @@ Dolphin Scheduler使用了很多优秀的开源项目，比如google的guava、g 




### 获得帮助

1. Submit an issue

1. Mail to dev-subscribe@dolphinscheduler.apache.org, follow the reply to subscribe the mail list. then you can send mail to dev@dolphinscheduler.apache.org.

1. Contact WeChat group manager, ID 510570367. This is for Mandarin(CN) discussion.

1. 提交issue

1. 先订阅邮件开发列表:[订阅邮件列表](https://dolphinscheduler.apache.org/zh-cn/docs/1.2.0/user_doc/subscribe.html), 订阅成功后发送邮件到dev@dolphinscheduler.apache.org.

1. 联系微信群助手(ID:dailidong66). 微信仅用于中国用户讨论.



### 版权

Please refer to [LICENSE](https://github.com/apache/incubator-dolphinscheduler/blob/dev/LICENSE) file.

请参考 [LICENSE](https://github.com/apache/incubator-dolphinscheduler/blob/dev/LICENSE) 文件.

dolphinscheduler-alert/pom.xml

+23 −25
Original line number Diff line number Diff line
@@ -36,15 +36,34 @@ 
            <artifactId>junit</artifactId>

            <scope>test</scope>

        </dependency>

        <dependency>

            <groupId>org.mockito</groupId>

            <artifactId>mockito-core</artifactId>

            <type>jar</type>

            <scope>test</scope>

        </dependency>



        <dependency>

            <groupId>org.apache.commons</groupId>

            <artifactId>commons-email</artifactId>

            <groupId>org.powermock</groupId>

            <artifactId>powermock-module-junit4</artifactId>

            <scope>test</scope>

        </dependency>



        <dependency>

            <groupId>org.powermock</groupId>

            <artifactId>powermock-api-mockito2</artifactId>

            <scope>test</scope>

            <exclusions>

                <exclusion>

                    <groupId>org.mockito</groupId>

                    <artifactId>mockito-core</artifactId>

                </exclusion>

            </exclusions>

        </dependency>



        <dependency>

            <groupId>org.freemarker</groupId>

            <artifactId>freemarker</artifactId>

            <groupId>org.apache.commons</groupId>

            <artifactId>commons-email</artifactId>

        </dependency>



        <dependency>
@@ -67,21 +86,6 @@ 
            <artifactId>slf4j-api</artifactId>

        </dependency>



        <dependency>

            <groupId>org.apache.commons</groupId>

            <artifactId>commons-collections4</artifactId>

        </dependency>



        <dependency>

            <groupId>commons-logging</groupId>

            <artifactId>commons-logging</artifactId>

        </dependency>



        <dependency>

            <groupId>org.apache.commons</groupId>

            <artifactId>commons-lang3</artifactId>

        </dependency>



        <dependency>

            <groupId>com.google.guava</groupId>

            <artifactId>guava</artifactId>
@@ -92,12 +96,6 @@ 
            <artifactId>logback-classic</artifactId>

        </dependency>



        <dependency>

            <groupId>commons-io</groupId>

            <artifactId>commons-io</artifactId>

        </dependency>





        <!--excel poi-->

        <dependency>

            <groupId>org.apache.poi</groupId>

dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java

+2 −2
Original line number Diff line number Diff line
@@ -16,14 +16,14 @@ 
 */

package org.apache.dolphinscheduler.alert.runner;



import org.apache.commons.collections4.CollectionUtils;

import org.apache.commons.lang3.StringUtils;

import org.apache.dolphinscheduler.alert.manager.EmailManager;

import org.apache.dolphinscheduler.alert.manager.EnterpriseWeChatManager;

import org.apache.dolphinscheduler.alert.utils.Constants;

import org.apache.dolphinscheduler.alert.utils.EnterpriseWeChatUtils;

import org.apache.dolphinscheduler.common.enums.AlertStatus;

import org.apache.dolphinscheduler.common.enums.AlertType;

import org.apache.dolphinscheduler.common.utils.CollectionUtils;

import org.apache.dolphinscheduler.common.utils.StringUtils;

import org.apache.dolphinscheduler.dao.AlertDao;

import org.apache.dolphinscheduler.dao.entity.Alert;

import org.apache.dolphinscheduler.dao.entity.User;