Merge pull request #208 from Tangjiafeng/branch-1.2.0

upgrade

Author: Tangjiafeng

LICENSE

@@ -1,11 +1,13 @@
 [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)  
 
-English | [中文](docs/zh_CN/ch1/README.md)  
+English | [中文](docs/zh_CN/ch1)  
 
 ## Overview
 Qualitis is a data quality management platform that supports quality verification, notification, and management for various datasource. It is used to solve various data quality problems caused by data processing.
 
-Based on Spring Boot, Qualitis submits quality model task to [Linkis](https://github.com/WeBankFinTech/Linkis) platform. It provides functions such as data quality model construction, data quality model execution, data quality verification, reports of data quality generation and so on. At the same time, Qualitis provides enterprise-level features of financial-level resource isolation, management and access control. It is also guaranteed working well under high-concurrency, high-performance and high-availability scenarios.
+Based on Spring Boot, Qualitis submits quality model task to [Linkis](https://github.com/WeBankFinTech/Linkis) platform. It provides functions such as data quality model construction, data quality model execution, data quality verification, reports of data quality generation and so on.
+
+At the same time, Qualitis provides enterprise-level features of financial-level resource isolation, management and access control. It is also guaranteed working well under high-concurrency, high-performance and high-availability scenarios.
 
 ## Features
 - **Define Data Quality Model**  
@@ -32,13 +34,14 @@ Supports workflow
 Workflow needs [DataSphereStudio](https://github.com/WeBankFinTech/DataSphereStudio).
 
 - **Administrator Console**  
-Administrator console provided. And it also supports personnel management, access control management, privilege control management, metadata management and so on.  
+Administrator console provided.  
+And it also supports personnel management, access control management, privilege control management, metadata management and so on.  
 
 ## Compared with similar systems
 ![](images/en_US/ch1/CompareSimilarSystem.png)
 
 ## Documents
-[Quick Deploy](docs/en_US/ch1/Quick%20Deploy%20Standalone.md)  
+[Quick Deploy](docs/en_US/ch1/QuickDeploy.md)  
 [User Manual](docs/en_US/ch1/User%20Manual.md)  
 [Architecture Design](docs/en_US/ch1/Architecture%20Design.md)  
 <br/>
@@ -64,15 +67,14 @@ Supports generating data quality reports with optional latitude.
 ### 4. Support intelligent discovery of data quality problems
 <br/>
 
-**If you have any needs, please send us an issue and we will reply to you in time.**
-
-## Contributing
-Community partners are very welcome to contribute new engines and codes to us!
-
 ## Communication
 If you desire immediate response, please kindly raise issues to us or scan the below QR code by WeChat and QQ to join our group:   
 ![](images/en_US/ch1/ContractUs.png)
 
 ## License
-**Qualitis is under the Apache 2.0 license. See the [LICENSE](/LICENSE) file for details.**
+**Linkis is under the Apache 2.0 license. See the [LICENSE](/LICENSE) file for details.**
+
+## Tips
+Because the front-end code of Qualitis is FES, a front-end framework developed by WeBank, but the FES framework is not currently open source, so the front-end code of Qualitis is not open source for the time being. We will promote Qualitis's front-end open source as soon as possible. We are very sorry about this.
 
+You can download the source code and unzip web/app/src/main/resources/static/static.zip to get the compiled front-end code, or use it directly by downloading the release.

README.md

@@ -69,7 +69,7 @@ public class QualitisRefExecutionOperation extends LongTermRefExecutionOperation
 
 
     private String appId = "linkis_id";
-    private String appToken = "a33693de51";
+    private String appToken = "xxxx";
 
     @Override
     protected String getAppConnName() {

appconn/src/main/java/com/webank/wedatasphere/dss/appconn/qualitis/execution/QualitisRefExecutionOperation.java

@@ -52,7 +52,7 @@ public class QualitisRefCopyOperation extends QualitisDevelopmentOperation<Third
     private static final Logger LOGGER = LoggerFactory.getLogger(QualitisRefDeletionOperation.class);
 
     private static String appId = "linkis_id";
-    private static String appToken = "a33693de51";
+    private static String appToken = "xxxx";
 
     @Override
     protected String getAppConnName() {

appconn/src/main/java/com/webank/wedatasphere/dss/appconn/qualitis/ref/operation/QualitisRefCopyOperation.java

@@ -51,7 +51,7 @@ public class QualitisRefDeletionOperation extends QualitisDevelopmentOperation<R
     private static final Logger LOGGER = LoggerFactory.getLogger(QualitisRefDeletionOperation.class);
 
     private static String appId = "linkis_id";
-    private static String appToken = "a33693de51";
+    private static String appToken = "xxxx";
 
     @Override
     protected String getAppConnName() {

appconn/src/main/java/com/webank/wedatasphere/dss/appconn/qualitis/ref/operation/QualitisRefDeletionOperation.java

@@ -51,7 +51,7 @@ public class QualitisRefUpdateOperation extends QualitisDevelopmentOperation<Upd
     private final static Logger LOGGER = LoggerFactory.getLogger(QualitisRefUpdateOperation.class);
 
     private static String appId = "linkis_id";
-    private static String appToken = "a33693de51";
+    private static String appToken = "xxxx";
 
     @Override
     protected String getAppConnName() {

appconn/src/main/java/com/webank/wedatasphere/dss/appconn/qualitis/ref/operation/QualitisRefUpdateOperation.java

@@ -64,10 +64,12 @@ repositories {
 mainClassName = "com.webank.wedatasphere.qualitis.QualitisServer"
 
 applicationDefaultJvmArgs =
-        ['-Xms256M', '-Xmx2G',
-         '-XX:+UseG1GC', '-XX:MaxGCPauseMillis=20', '-XX:InitiatingHeapOccupancyPercent=50',
-         '-Dfile.encoding=UTF-8', "-Djava.library.path=HADOOP_COMMON_LIB_NATIVE_DIR",
-         "-Dlog.file=${project.name}-MY_USER-MY_HOSTNAME.log"]
+        ["-Xms256M", "-Xmx2G",
+         "-XX:+UseG1GC", "-XX:MaxGCPauseMillis=20", "-XX:InitiatingHeapOccupancyPercent=50",
+         "-Dfile.encoding=UTF-8", "-Djava.library.path=HADOOP_COMMON_LIB_NATIVE_DIR",
+         "-Dlog.file=${project.name}-MY_USER-MY_HOSTNAME.log",
+         "-XX:+HeapDumpOnOutOfMemoryError", "-XX:HeapDumpPath=/appcom/logs/qualitis/heapdump.hprof",
+         "-Dspring.config.location=classpath:application.yml"]
 
 tasks.startScripts << {
   def scriptFile = file "${outputDir}/${applicationName}"
@@ -105,13 +107,37 @@ distributions {
     }
   }
 }
+def timestamp = new Date().format("yyyyMMddHHmmss")
+def projectVersion = project.property("version")
+def finalArchiveName = "WDSDQMS-CORE_${projectVersion}_0_R_${timestamp}.zip"
+
+distZip {
+  archiveName = finalArchiveName
+}
 
 subprojects {
   apply plugin: 'idea'
   apply plugin: 'eclipse'
   apply plugin: 'java'
   apply plugin: 'maven'
 
+  sourceSets {
+    main {
+      java {
+        srcDirs = ['src/main/java']
+      }
+    }
+  }
+
+  task sourcesJar(type: Jar, dependsOn: classes) {
+    classifier = 'sources'
+    from sourceSets.main.allSource
+  }
+
+  artifacts {
+    archives sourcesJar
+  }
+
   [compileJava, compileTestJava, javadoc]*.options*.encoding = defaultEncoding
 
   repositories {
@@ -139,11 +165,22 @@ subprojects {
 
 configurations.all {
   resolutionStrategy {
-    force 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.1'
+    force 'org.apache.logging.log4j:log4j-slf4j2-impl:2.24.0'
+    force 'org.apache.logging.log4j:log4j-api:2.24.0'
+    force 'org.apache.logging.log4j:log4j-core:2.24.0'
+    force 'org.apache.derby:derby:10.17.1.0'
+    force 'org.slf4j:slf4j-api:2.0.11'
   }
-  resolutionStrategy.cacheChangingModulesFor 1,'minutes'
-  exclude group: 'log4j', module: 'log4j'
+  resolutionStrategy.cacheChangingModulesFor 60,'seconds'
+//  exclude group: 'log4j', module: 'log4j'
+  exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl'
   exclude group: 'org.codehaus.jackson', module: 'jackson-mapper-asl'
+  exclude group: 'com.zaxxer', module: 'HikariCP-java7'
+  exclude group: 'org.apache.poi', module: 'poi-ooxml-schemas'
+  exclude group: 'org.bouncycastle', module: 'bcprov-jdk15to18'
+  exclude group: 'javax.servlet', module: 'javax.servlet-api'
 }
 
 apply from: "profile.gradle"
+
+

build.gradle

@@ -12,12 +12,13 @@ public interface AlarmClient {
     /**
      * 发送告警
      * @param receiver
+     * @param alertTitle
      * @param alertInfo
      * @param alertLevel
-     * @param alertTitle
+     * @param subSystemId
      * @return
      */
-    void sendAlarm(String receiver, String alertTitle, String alertInfo, String alertLevel);
+    void sendAlarm(String receiver, String alertTitle, String alertInfo, String alertLevel, String subSystemId);
 
     /**
      * Send new alarm.