Skip to content

Commit 9e4be04

Browse files
HanTang1HanTang1
committed
增加数据下载审计和工作流节点打通exchangis功能
1 parent 8c8e924 commit 9e4be04

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+867
-6
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ dss-framework/framework-plugins/dss-framework-release-server/target
4646
dss-framework/dss-framework-admin/target
4747
dss-framework/dss-framework-sql-template/target
4848
dss-framework/dss-framework-dbapi-server/target
49+
dss-framework/dss-framework-ctyun-service/target
4950

5051

5152
# dss-orchestrator

‎conf/dss-flow-execution-server.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@ wds.linkis.server.component.exclude.packages=org.apache.linkis.entrance.restful.
5151
spring.spring.main.allow-bean-definition-overriding=true
5252

5353
wds.linkis.entrance.config.log.path=file:///appcom/tmp/dss/
54-
wds.linkis.spark.engine.version=3.1.2
54+
wds.linkis.spark.engine.version=3.0.3
5555
wds.linkis.hive.engine.version=3.1.2

‎conf/dss.properties‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@ wds.dss.esb.appid=
2828
wds.dss.esb.token=
2929

3030
wds.dss.appconn.scheduler.job.label=dev
31-
wds.dss.ds.token=172.0.0.1
31+
wds.dss.ds.admin.token=172.0.0.1
3232

3333

3434
wds.linkis.reflect.scan.package=org.apache.linkis,com.webank.wedatasphere.dss
3535
spring.spring.mvc.servlet.path=/api/rest_j/v1
3636
spring.spring.servlet.multipart.max-file-size=200MB
37-
spring.spring.servlet.multipart.max-request-size=200MB
37+
spring.spring.servlet.multipart.max-request-size=200MB
38+
wds.dss.project.strict.mode=true

‎db/dss_ddl.sql‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1327,3 +1327,14 @@ CREATE TABLE IF NOT EXISTS `dss_guide_content` (
13271327
PRIMARY KEY (`id`)
13281328
) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='用户向导页面内容详情';
13291329

1330+
DROP TABLE IF EXISTS `dss_download_audit`;
1331+
CREATE TABLE `dss_download_audit` (
1332+
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
1333+
`creator` varchar(255) COMMENT '创建者',
1334+
`tenant` varchar(255) COMMENT '租户',
1335+
`path` varchar(255) COMMENT '文件路径',
1336+
`sql` varchar(3000) COMMENT '执行sql脚本',
1337+
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
1338+
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
1339+
PRIMARY KEY (`id`)
1340+
) ENGINE = INNODB DEFAULT CHARSET = utf8 COMMENT = '文件下载审计';

‎dss-framework/dss-framework-ctyun-service/pom.xml‎

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
5+
6+
<parent>
7+
<artifactId>dss</artifactId>
8+
<groupId>com.webank.wedatasphere.dss</groupId>
9+
<version>1.0.1</version>
10+
<relativePath>../../pom.xml</relativePath>
11+
</parent>
12+
13+
<artifactId>dss-framework-ctyun-service</artifactId>
14+
<modelVersion>4.0.0</modelVersion>
15+
16+
17+
<properties>
18+
<swagger.version>2.9.2</swagger.version>
19+
<swagger-bootstrap-ui.version>1.9.2</swagger-bootstrap-ui.version>
20+
<commons-lang3.version>3.9</commons-lang3.version>
21+
</properties>
22+
<dependencies>
23+
<dependency>
24+
<groupId>org.apache.linkis</groupId>
25+
<artifactId>linkis-module</artifactId>
26+
<version>${linkis.version}</version>
27+
<scope>provided</scope>
28+
29+
</dependency>
30+
<!--TODO 一个需要干掉的dependency-->
31+
<dependency>
32+
<groupId>com.webank.wedatasphere.dss</groupId>
33+
<artifactId>dss-common</artifactId>
34+
<version>${dss.version}</version>
35+
<scope>provided</scope>
36+
</dependency>
37+
38+
<dependency>
39+
<groupId>org.apache.commons</groupId>
40+
<artifactId>commons-lang3</artifactId>
41+
<version>${commons.lang3.version}</version>
42+
<scope>provided</scope>
43+
</dependency>
44+
<dependency>
45+
<groupId>org.apache.linkis</groupId>
46+
<artifactId>linkis-httpclient</artifactId>
47+
<version>${linkis.version}</version>
48+
<exclusions>
49+
<exclusion>
50+
<artifactId>linkis-common</artifactId>
51+
<groupId>org.apache.linkis</groupId>
52+
</exclusion>
53+
</exclusions>
54+
</dependency>
55+
56+
<dependency>
57+
<groupId>com.webank.wedatasphere.dss</groupId>
58+
<artifactId>dss-framework-common</artifactId>
59+
<version>${dss.version}</version>
60+
</dependency>
61+
<dependency>
62+
<groupId>org.apache.linkis</groupId>
63+
<artifactId>linkis-mybatis</artifactId>
64+
<version>${linkis.version}</version>
65+
<scope>provided</scope>
66+
</dependency>
67+
68+
<dependency>
69+
<groupId>org.apache.commons</groupId>
70+
<artifactId>commons-math3</artifactId>
71+
<scope>provided</scope>
72+
</dependency>
73+
<dependency>
74+
<groupId>org.projectlombok</groupId>
75+
<artifactId>lombok</artifactId>
76+
<version>1.18.16</version>
77+
<scope>compile</scope>
78+
</dependency>
79+
<!-- <dependency>
80+
<groupId>com.squareup.okhttp3</groupId>
81+
<artifactId>okhttp</artifactId>
82+
<version>4.2.2</version>
83+
<scope>compile</scope>
84+
</dependency>-->
85+
<dependency>
86+
<groupId>com.squareup.okhttp</groupId>
87+
<artifactId>okhttp</artifactId>
88+
<version>2.7.5</version>
89+
</dependency>
90+
</dependencies>
91+
92+
93+
<build>
94+
<plugins>
95+
<plugin>
96+
<groupId>org.apache.maven.plugins</groupId>
97+
<artifactId>maven-deploy-plugin</artifactId>
98+
</plugin>
99+
100+
<plugin>
101+
<groupId>net.alchim31.maven</groupId>
102+
<artifactId>scala-maven-plugin</artifactId>
103+
</plugin>
104+
<plugin>
105+
<groupId>org.apache.maven.plugins</groupId>
106+
<artifactId>maven-jar-plugin</artifactId>
107+
</plugin>
108+
<plugin>
109+
<groupId>org.apache.maven.plugins</groupId>
110+
<artifactId>maven-compiler-plugin</artifactId>
111+
<configuration>
112+
<source>8</source>
113+
<target>8</target>
114+
</configuration>
115+
</plugin>
116+
</plugins>
117+
<resources>
118+
<resource>
119+
<directory>src/main/java</directory>
120+
<includes>
121+
<include>**/*.xml</include>
122+
</includes>
123+
</resource>
124+
<!-- <resource>
125+
<directory>src/main/resources</directory>
126+
<includes>
127+
<include>**/*.xml</include>
128+
<include>**/*.properties</include>
129+
<include>**/*.yml</include>
130+
</includes>
131+
</resource>-->
132+
</resources>
133+
</build>
134+
135+
</project>

dss-framework/dss-framework-admin/src/main/java/com/webank/wedatasphere/dss/framework/admin/common/constant/UserConstants.java renamed to dss-framework/dss-framework-ctyun-service/src/main/java/com/webank/wedatasphere/dss/framework/admin/common/constant/UserConstants.java

File renamed without changes.

dss-framework/dss-framework-admin/src/main/java/com/webank/wedatasphere/dss/framework/admin/common/domain/BaseEntity.java renamed to dss-framework/dss-framework-ctyun-service/src/main/java/com/webank/wedatasphere/dss/framework/admin/common/domain/BaseEntity.java

File renamed without changes.

dss-framework/dss-framework-admin/src/main/java/com/webank/wedatasphere/dss/framework/admin/common/domain/Message.java renamed to dss-framework/dss-framework-ctyun-service/src/main/java/com/webank/wedatasphere/dss/framework/admin/common/domain/Message.java

File renamed without changes.

dss-framework/dss-framework-admin/src/main/java/com/webank/wedatasphere/dss/framework/admin/common/domain/PageDomain.java renamed to dss-framework/dss-framework-ctyun-service/src/main/java/com/webank/wedatasphere/dss/framework/admin/common/domain/PageDomain.java

File renamed without changes.

dss-framework/dss-framework-admin/src/main/java/com/webank/wedatasphere/dss/framework/admin/common/domain/PasswordResult.java renamed to dss-framework/dss-framework-ctyun-service/src/main/java/com/webank/wedatasphere/dss/framework/admin/common/domain/PasswordResult.java

File renamed without changes.

0 commit comments

Comments
 (0)