Skip to content

Commit c415d09

Browse files
LMQ0023LMQ0023
authored
Merge branch 'WeBankFinTech:master' into master
2 parents 7620aab + 144ff7d commit c415d09

File tree

7 files changed

+50
-132
lines changed

7 files changed

+50
-132
lines changed

‎.gitignore

Lines changed: 30 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -1,110 +1,33 @@
1-
.idea
2-
.idea/*
3-
41
.DS_Store
2+
.cache
53

6-
assembly/target
7-
assembly/dss-package/target
8-
9-
10-
# dss-commons
11-
dss-commons/dss-sender-service/target
12-
13-
# dss-appconn
14-
dss-appconn/appconns/dss-datachecker-appconn/target
15-
dss-appconn/appconns/dss-eventchecker-appconn/target
16-
dss-appconn/appconns/dss-orchestrator-framework-appconn/target
17-
dss-appconn/appconns/dss-schedulis-appconn/target
18-
dss-appconn/appconns/dss-sendemail-appconn/esb-email-support/target
19-
dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/target
20-
dss-appconn/appconns/dss-workflow-appconn/target
21-
dss-appconn/appconns/dss-sso-appconn/target
22-
dss-appconn/appconns/dss-scriptis-appconn-appconn/target
23-
dss-appconn/dss-appconn-core/target
24-
dss-appconn/dss-appconn-loader/target
25-
dss-appconn/dss-schedule-appconn-core/target
26-
dss-appconn/linkis-appconn-engineplugin/target
27-
dss-appconn/appconns/dss-dolphinscheduler-appconn/target
28-
dss-appconn/dss-appconn-manager/dss-appconn-manager-client/target
29-
dss-appconn/dss-appconn-manager/dss-appconn-manager-core/target
30-
dss-appconn/dss-scheduler-appconn/target
31-
32-
# dss-apps
33-
dss-apps/dss-apiservice-server/target
34-
dss-apps/dss-scriptis-server/target
35-
36-
#dss-guide
37-
dss-apps/dss-user-guide/dss-user-guide-server/src/main/resources/
38-
dss-apps/dss-user-guide/dss-user-guide-server/target
39-
40-
# dss-commons
41-
dss-commons/dss-common/target
42-
dss-commons/dss-contextservice/target
43-
44-
# dss-framework
45-
dss-framework/dss-appconn-framework/target
46-
dss-framework/dss-framework-common/target
47-
dss-framework/dss-framework-orchestrator-server/target
48-
dss-framework/dss-framework-project-server/target
49-
dss-framework/dss-framework-workspace-server/target
50-
dss-framework/framework-plugins/dss-framework-orchestrator-publish/target
51-
dss-framework/framework-plugins/dss-framework-release-server/target
52-
dss-framework/framework-plugins/dss-framework-migrate-server/target
53-
dss-framework/dss-framework-admin/target
54-
dss-framework/dss-framework-sql-template/target
55-
dss-framework/dss-framework-dbapi-server/target
56-
dss-framework/dss-framework-admin-service/target
57-
58-
59-
# dss-orchestrator
60-
dss-orchestrator/dss-orchestrator-common/target
61-
dss-orchestrator/dss-orchestrator-core/target
62-
dss-orchestrator/dss-orchestrator-db/target
63-
dss-orchestrator/dss-orchestrator-loader/target
64-
dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/target
65-
dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/target
66-
dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/target
67-
dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/target
68-
dss-orchestrator/dss-orchestrator-conversion-standard/target
69-
dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/target
70-
dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/target
71-
72-
# dss-standars
73-
dss-standard/dss-standard-common/target
74-
dss-standard/sso-standard/origin-sso-integration-standard/target
75-
dss-standard/sso-standard/spring-origin-sso-integration-plugin/target
76-
dss-standard/sso-standard/sso-integration-standard/target
77-
dss-standard/development-standard/development-process-standard/target
78-
dss-standard/development-standard/development-process-standard-execution/target
79-
dss-standard/structure-standard/dss-project-plugin/target
80-
dss-standard/structure-standard/dss-role-plugin/target
81-
dss-standard/structure-standard/dss-structure-integration-standard/target
82-
dss-standard/structure-standard/spring-origin-dss-project-plugin/target
83-
84-
#dss-data-api
85-
dss-apps/dss-data-api/dss-data-api-server/src/main/resources
86-
dss-apps/dss-data-api/dss-api-sql-template/target
87-
dss-apps/dss-data-api/dss-data-api-server/target
88-
89-
#dss-data-governance
90-
dss-apps/dss-data-governance/dss-data-governance-server/src/main/resources
91-
dss-apps/dss-data-governance/dss-data-governance-server/target
92-
dss-apps/dss-data-governance/dss-data-governance-common/target
93-
dss-apps/dss-data-governance/dss-data-asset-server/target
94-
dss-apps/dss-data-governance/dss-data-classification-server/target
95-
dss-apps/dss-data-governance/dss-data-warehouse-dao/target
96-
dss-apps/dss-data-governance/dss-data-warehouse-service/target
97-
dss-apps/dss-data-governance/dss-data-warehouse-server/target
98-
99-
100-
# plugins
101-
plugins/azkaban/linkis-jobtype/target
102-
plugins/linkis/dss-gateway-support/target
103-
104-
logs
105-
logs/*
106-
4+
# for ide
1075
*.iml
108-
/plugins/dolphinscheduler/dss-dolphinscheduler-client/target
109-
/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/target
110-
/plugins/dolphinscheduler/dss-dolphinscheduler-token/target
6+
*.ipr
7+
*.iws
8+
*.pyc
9+
*.pyo
10+
*.swp
11+
.idea/
12+
.idea_modules/
13+
.project
14+
.pydevproject
15+
.scala_dependencies
16+
.settings
17+
.classpath
18+
19+
# For SBT
20+
.jvmopts
21+
22+
# For Node.js
23+
node_modules/
24+
25+
# generated file
26+
.mvn/wrapper/maven-wrapper.jar
27+
dist/
28+
out/
29+
target/
30+
31+
# log folder
32+
logs/
33+
*.log

‎conf/log4j2.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
2222
<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%t] %logger{36} %L %M - %msg%xEx%n"/>
2323
</Console>
24-
<RollingFile name="RollingFile" fileName="logs/dss-server.log"
25-
filePattern="logs/$${date:yyyy-MM}/${serviceName}-log-%d{yyyy-MM-dd}-%i.log">
24+
<RollingFile name="RollingFile" fileName="${env:DSS_LOG_DIR:-logs}/${sys:serviceName}.log"
25+
filePattern="${env:DSS_LOG_DIR:-logs}/$${date:yyyy-MM}/${sys:serviceName}-log-%d{yyyy-MM-dd}-%i.log">
2626
<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%-40t] %c{1.} (%L) [%M] - %msg%xEx%n"/>
2727
<SizeBasedTriggeringPolicy size="100MB"/>
2828
<DefaultRolloverStrategy max="20"/>

‎dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@
2828
<artifactId>dss-flow-execution-server</artifactId>
2929

3030
<dependencies>
31-
32-
<dependency>
33-
<groupId>org.apache.linkis</groupId>
34-
<artifactId>linkis-jobhistory</artifactId>
35-
<version>${linkis.version}</version>
36-
</dependency>
3731
<dependency>
3832
<groupId>org.apache.linkis</groupId>
3933
<artifactId>linkis-entrance</artifactId>

‎dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/java/com/webank/wedatasphere/dss/flow/execution/entrance/restful/FlowEntranceRestfulApi.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.apache.commons.lang.StringUtils;
2727
import org.apache.linkis.common.log.LogUtils;
2828
import org.apache.linkis.entrance.EntranceServer;
29-
import org.apache.linkis.entrance.annotation.EntranceServerBeanAnnotation;
3029
import org.apache.linkis.entrance.execute.EntranceJob;
3130
import org.apache.linkis.entrance.restful.EntranceRestfulApi;
3231
import org.apache.linkis.entrance.utils.JobHistoryHelper;
@@ -64,7 +63,7 @@ public class FlowEntranceRestfulApi extends EntranceRestfulApi {
6463
@Autowired
6564
private TaskMapper taskMapper;
6665
@Override
67-
@EntranceServerBeanAnnotation.EntranceServerAutowiredAnnotation
66+
@Autowired
6867
public void setEntranceServer(EntranceServer entranceServer) {
6968
super.setEntranceServer(entranceServer);
7069
this.entranceServer = entranceServer;

‎dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/java/com/webank/wedatasphere/dss/flow/execution/entrance/restful/FlowExecutionRestfulApi.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import com.webank.wedatasphere.dss.flow.execution.entrance.job.FlowEntranceJob;
2222
import com.webank.wedatasphere.dss.flow.execution.entrance.service.WorkflowExecutionInfoService;
2323
import org.apache.linkis.entrance.EntranceServer;
24-
import org.apache.linkis.entrance.annotation.EntranceServerBeanAnnotation;
2524
import org.apache.linkis.protocol.utils.ZuulEntranceUtils;
2625
import org.apache.linkis.scheduler.queue.Job;
2726
import org.apache.linkis.scheduler.queue.SchedulerEventState;
@@ -30,7 +29,11 @@
3029
import org.slf4j.Logger;
3130
import org.slf4j.LoggerFactory;
3231
import org.springframework.beans.factory.annotation.Autowired;
33-
import org.springframework.web.bind.annotation.*;
32+
import org.springframework.web.bind.annotation.PathVariable;
33+
import org.springframework.web.bind.annotation.RequestMapping;
34+
import org.springframework.web.bind.annotation.RequestMethod;
35+
import org.springframework.web.bind.annotation.RequestParam;
36+
import org.springframework.web.bind.annotation.RestController;
3437
import scala.Enumeration;
3538
import scala.Option;
3639

@@ -46,7 +49,7 @@ public class FlowExecutionRestfulApi {
4649

4750
private static final Logger logger = LoggerFactory.getLogger(FlowExecutionRestfulApi.class);
4851

49-
@EntranceServerBeanAnnotation.EntranceServerAutowiredAnnotation
52+
@Autowired
5053
public void setEntranceServer(EntranceServer entranceServer) {
5154
this.entranceServer = entranceServer;
5255
}

‎dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/conf/FlowExecutionEntranceSpringConfiguration.scala

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,34 +20,30 @@ import com.webank.wedatasphere.dss.flow.execution.entrance.engine.{FlowEntranceE
2020
import com.webank.wedatasphere.dss.flow.execution.entrance.entranceparser.FlowExecutionParser
2121
import com.webank.wedatasphere.dss.flow.execution.entrance.persistence.WorkflowPersistenceEngine
2222
import org.apache.linkis.entrance.EntranceParser
23-
import org.apache.linkis.entrance.annotation.{EntranceExecutorManagerBeanAnnotation, EntranceParserBeanAnnotation, PersistenceEngineBeanAnnotation, PersistenceManagerBeanAnnotation}
2423
import org.apache.linkis.entrance.persistence.{PersistenceEngine, PersistenceManager}
2524
import org.apache.linkis.scheduler.executer.ExecutorManager
2625
import org.slf4j.LoggerFactory
27-
import org.springframework.beans.factory.annotation.Autowired
28-
import org.springframework.context.annotation.Configuration
29-
26+
import org.springframework.context.annotation.{Bean, Configuration}
3027

3128
@Configuration
3229
class FlowExecutionEntranceSpringConfiguration {
3330
private val logger = LoggerFactory.getLogger(classOf[FlowExecutionEntranceSpringConfiguration])
3431

35-
@EntranceExecutorManagerBeanAnnotation
36-
def generateExternalEntranceExecutorManager(@Autowired flowEntranceEngine:FlowEntranceEngine): ExecutorManager = {
32+
@Bean
33+
def executorManager(flowEntranceEngine: FlowEntranceEngine): ExecutorManager = {
3734
logger.info("begin to get FlowExecution Entrance EntranceExecutorManager")
3835
new FlowExecutionExecutorManagerImpl(flowEntranceEngine)
3936
}
4037

41-
@PersistenceEngineBeanAnnotation
42-
def generatePersistenceEngine(): PersistenceEngine ={
38+
@Bean
39+
def persistenceEngine(): PersistenceEngine ={
4340
new WorkflowPersistenceEngine()
4441
}
4542

46-
@EntranceParserBeanAnnotation
47-
def generateEntranceParser(@PersistenceManagerBeanAnnotation.PersistenceManagerAutowiredAnnotation persistenceManager: PersistenceManager): EntranceParser = {
43+
@Bean
44+
def entranceParser(persistenceManager: PersistenceManager): EntranceParser = {
4845
logger.info("begin to get FlowExecution Entrance parser")
4946
new FlowExecutionParser(persistenceManager)
5047
}
5148

52-
5349
}

‎plugins/dolphinscheduler/dss-dolphinscheduler-client/src/main/resources/linkis.properties

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
wds.linkis.gateway.url=
2-
wds.linkis.flow.job.creator.v1=DolphinScheduler
2+
wds.linkis.flow.job.creator.v1=DolphinScheduler
3+
4+
#wds.linkis.spark.engine.version=2.4.3
5+
#wds.linkis.hive.engine.version=2.3.3

0 commit comments

Comments
 (0)