Skip to content

Commit 7f3fc2d

Browse files
liuyou2liuyou2
authored
Merge pull request #174 from WeBankFinTech/dev-0.8.0
Dev 0.8.0 has been developed and tested. It is requested to join the master branch and release the version.
2 parents 9f97984 + a93b5b5 commit 7f3fc2d

File tree

52 files changed

+1029
-106
lines changed

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

+1029
-106
lines changed

‎assembly/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>dss</artifactId>
2424
<groupId>com.webank.wedatasphere.dss</groupId>
25-
<version>0.7.0</version>
25+
<version>0.8.0</version>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
2828

@@ -103,7 +103,7 @@
103103
<dependency>
104104
<groupId>com.fasterxml.jackson.core</groupId>
105105
<artifactId>jackson-core</artifactId>
106-
<version>2.9.6</version>
106+
<version>2.10.0</version>
107107
</dependency>
108108
<dependency>
109109
<groupId>net.databinder.dispatch</groupId>

‎bin/checkServices.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ MICRO_SERVICE_PORT=$3
3131

3232
local_host="`hostname --fqdn`"
3333

34-
ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}')
34+
ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}'|awk 'NR==1')
3535

3636
function isLocal(){
3737
if [ "$1" == "127.0.0.1" ];then

‎bin/install.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ source ${DISTRIBUTION}
104104
isSuccess "load config"
105105

106106
local_host="`hostname --fqdn`"
107-
ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}')
107+
ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}'|awk 'NR==1')
108108

109109
function isLocal(){
110110
if [ "$1" == "127.0.0.1" ];then

‎bin/start-all.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ fi
4343
}
4444
local_host="`hostname --fqdn`"
4545

46-
ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}')
46+
ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}'|awk 'NR==1')
4747

4848
function isLocal(){
4949
if [ "$1" == "127.0.0.1" ];then

‎bin/stop-all.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export DISTRIBUTION=${DISTRIBUTION:-"${CONF_DIR}/config.sh"}
3434
source ${DISTRIBUTION}
3535

3636
local_host="`hostname --fqdn`"
37-
ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}')
37+
ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}'|awk 'NR==1')
3838

3939
function isSuccess(){
4040
if [ $? -ne 0 ]; then

‎conf/config.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,4 @@ AZKABAN_ADRESS_PORT=8081
7777
QUALITIS_ADRESS_IP=127.0.0.1
7878
QUALITIS_ADRESS_PORT=8090
7979

80-
DSS_VERSION=0.7.0
80+
DSS_VERSION=0.8.0

‎datachecker-appjoint/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>dss</artifactId>
2424
<groupId>com.webank.wedatasphere.dss</groupId>
25-
<version>0.7.0</version>
25+
<version>0.8.0</version>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
2828

‎datachecker-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/schedulis/jobtype/connector/DataCheckerDao.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,9 @@ private long getTotalCount(Map<String, String> proObjectMap, Connection conn, L
158158

159159
private PreparedStatement getStatement(Connection conn, String dataObject) throws SQLException {
160160
String dataScape = dataObject.contains("{") ? "Partition" : "Table";
161-
String dbName = dataObject.split("\\.")[0];
162-
String tableName = dataObject.split("\\.")[1];
161+
String[] dataObjectArray = dataObject.split("\\.");
162+
String dbName = dataObjectArray[0];
163+
String tableName = dataObjectArray[1];
163164
if(dataScape.equals("Partition")) {
164165
Pattern pattern = Pattern.compile("\\{([^\\}]+)\\}");
165166
Matcher matcher = pattern.matcher(dataObject);
@@ -174,11 +175,13 @@ private PreparedStatement getStatement(Connection conn, String dataObject) throw
174175
pstmt.setString(2, tableName);
175176
pstmt.setString(3, partitionName);
176177
return pstmt;
177-
} else {
178+
} else if(dataObjectArray.length == 2){
178179
PreparedStatement pstmt = conn.prepareCall(SQL_SOURCE_TYPE_JOB_TABLE);
179180
pstmt.setString(1, dbName);
180181
pstmt.setString(2, tableName);
181182
return pstmt;
183+
}else {
184+
throw new SQLException("Incorrect input format for dataObject "+ dataObject);
182185
}
183186
}
184187

‎docs/en_US/ch1/DataSphereStudio_Compile_Manual.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
```xml
88
<properties>
9-
<dss.version>0.7.0</dss.version>
10-
<linkis.version>0.9.3</linkis.version>
9+
<dss.version>0.8.0</dss.version>
10+
<linkis.version>0.9.4</linkis.version>
1111
<scala.version>2.11.8</scala.version>
1212
<jdk.compile.version>1.8</jdk.compile.version>
1313
<maven.version>3.3.3</maven.version>

‎docs/en_US/ch2/Azkaban_LinkisJobType_Deployment_Manual.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33

44
## 1. Ready work
5-
1.Click [release](https://github.com/WeBankFinTech/DataSphereStudio/releases/download/0.7.0/linkis-jobtype-0.7.0.zip) to select the corresponding installation package to download:
5+
1.Click [release](https://github.com/WeBankFinTech/DataSphereStudio/releases/download/0.8.0/linkis-jobtype-0.8.0.zip) to select the corresponding installation package to download:
66

77
- linkis-jobtype-$version.zip
88

‎docs/en_US/ch2/DSS Quick Installation Guide.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ DSS also implements the integration of many external systems, such as [Qualitis]
1717
DSS environment configuration can be divided into three steps, including basic software installation, backend environment configuration, and frontend environment configuration. The details are as below:
1818

1919
### 2.1 Frontend and backend basic software installation
20-
Linkis standard version (above 0.9.3). How to install [Linkis](https://github.com/WeBankFinTech/Linkis/blob/master/docs/en_US/ch1/deploy.md)
20+
Linkis standard version (above 0.9.4). How to install [Linkis](https://github.com/WeBankFinTech/Linkis/blob/master/docs/en_US/ch1/deploy.md)
2121

2222
JDK (above 1.8.0_141). How to install [JDK](https://www.runoob.com/java/java-environment-setup.html)
2323

@@ -103,15 +103,15 @@ dss_port="8088"
103103
linkis_url="http://127.0.0.1:9001"
104104
105105
# dss ip address
106-
dss_ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}')
106+
dss_ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}'|awk 'NR==1')
107107
```
108108

109109
The environment is ready, click me to enter ****[4. Installation and use](https://github.com/WeBankFinTech/DataSphereStudio/blob/master/docs/en_US/ch2/DSS%20Quick%20Installation%20Guide.md#four-installation-and-use)**
110110

111111
## Three Standard DSS environment configuration preparation
112112
The standard DSS environment preparation is also divided into three parts, the frontEnd-end and back-end basic software installation, back-end environment preparation, and frontEnd-end environment preparation. The details are as follows:
113113
### 3.1 frontEnd and BackEnd basic software installation
114-
Linkis standard version (above 0.9.3), [How to install Linkis](https://github.com/WeBankFinTech/Linkis/blob/master/docs/en_US/ch1/deploy.md)
114+
Linkis standard version (above 0.9.4), [How to install Linkis](https://github.com/WeBankFinTech/Linkis/blob/master/docs/en_US/ch1/deploy.md)
115115

116116
JDK (above 1.8.0_141), How to install [JDK](https://www.runoob.com/java/java-environment-setup.html)
117117

@@ -219,7 +219,7 @@ dss_port="8088"
219219
linkis_url="http://127.0.0.1:9001"
220220
221221
# dss ip address
222-
dss_ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}')
222+
dss_ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}'|awk 'NR==1')
223223
```
224224

225225
The environment is ready, click me to enter **[Four Installation and use](https://github.com/WeBankFinTech/DataSphereStudio/blob/master/docs/en_US/ch2/DSS%20Quick%20Installation%20Guide.md#four-installation-and-use)**

‎docs/zh_CN/ch1/DSS编译文档.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
```xml
88
<properties>
9-
<dss.version>0.7.0</dss.version>
10-
<linkis.version>0.9.3</linkis.version>
9+
<dss.version>0.8.0</dss.version>
10+
<linkis.version>0.9.4</linkis.version>
1111
<scala.version>2.11.8</scala.version>
1212
<jdk.compile.version>1.8</jdk.compile.version>
1313
<maven.version>3.3.3</maven.version>

‎docs/zh_CN/ch2/DSS快速安装使用文档.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
## 二、精简版DSS环境配置准备
3333
DSS环境配置准备分为三部分，前后端基础软件安装、后端环境配置准备和前端环配置境准备，详细介绍如下：
3434
### 2.1 前后端基础软件安装
35-
Linkis精简版(0.9.3及以上)，[如何安装Linkis](https://github.com/WeBankFinTech/Linkis/wiki/%E5%A6%82%E4%BD%95%E5%BF%AB%E9%80%9F%E5%AE%89%E8%A3%85%E4%BD%BF%E7%94%A8Linkis)
35+
Linkis精简版(0.9.4及以上)，[如何安装Linkis](https://github.com/WeBankFinTech/Linkis/wiki/%E5%A6%82%E4%BD%95%E5%BF%AB%E9%80%9F%E5%AE%89%E8%A3%85%E4%BD%BF%E7%94%A8Linkis)
3636

3737
JDK (1.8.0_141以上)，[如何安装JDK](https://www.runoob.com/java/java-environment-setup.html)
3838

@@ -132,7 +132,7 @@ dss_port="8088"
132132
linkis_url="http://127.0.0.1:9001"
133133
134134
# dss ip address
135-
dss_ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}')
135+
dss_ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}'|awk 'NR==1')
136136
```
137137

138138
环境准备完毕，点我进入 [五、安装和使用](https://github.com/WeBankFinTech/DataSphereStudio/blob/master/docs/zh_CN/ch2/DSS%E5%BF%AB%E9%80%9F%E5%AE%89%E8%A3%85%E4%BD%BF%E7%94%A8%E6%96%87%E6%A1%A3.md#%E4%BA%94%E5%AE%89%E8%A3%85%E5%92%8C%E4%BD%BF%E7%94%A8)
@@ -143,7 +143,7 @@ dss_ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/
143143
## 三、简单版DSS环境配置准备
144144
DSS环境配置准备分为三部分，前后端基础软件安装、后端环境配置准备和前端环配置境准备，详细介绍如下：
145145
### 3.1 前后端基础软件安装
146-
Linkis简单版(0.9.3及以上)，[如何安装Linkis](https://github.com/WeBankFinTech/Linkis/wiki/%E5%A6%82%E4%BD%95%E5%BF%AB%E9%80%9F%E5%AE%89%E8%A3%85%E4%BD%BF%E7%94%A8Linkis)
146+
Linkis简单版(0.9.4及以上)，[如何安装Linkis](https://github.com/WeBankFinTech/Linkis/wiki/%E5%A6%82%E4%BD%95%E5%BF%AB%E9%80%9F%E5%AE%89%E8%A3%85%E4%BD%BF%E7%94%A8Linkis)
147147

148148
JDK (1.8.0_141以上)，[如何安装JDK](https://www.runoob.com/java/java-environment-setup.html)
149149

@@ -243,15 +243,15 @@ dss_port="8088"
243243
linkis_url="http://127.0.0.1:9001"
244244
245245
# dss ip address
246-
dss_ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}')
246+
dss_ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}'|awk 'NR==1')
247247
```
248248

249249
环境准备完毕，点我进入 [五、安装和使用](https://github.com/WeBankFinTech/DataSphereStudio/blob/master/docs/zh_CN/ch2/DSS%E5%BF%AB%E9%80%9F%E5%AE%89%E8%A3%85%E4%BD%BF%E7%94%A8%E6%96%87%E6%A1%A3.md#%E4%BA%94%E5%AE%89%E8%A3%85%E5%92%8C%E4%BD%BF%E7%94%A8)
250250

251251
## 四、标准版DSS环境配置准备
252252
标准版DSS环境准备也分为三部分，前后端基础软件安装、后端环境准备和前端环境准备，详细介绍如下：
253253
### 4.1 前后端基础软件安装
254-
Linkis标准版(0.9.3及以上)，[如何安装Linkis](https://github.com/WeBankFinTech/Linkis/wiki/%E5%A6%82%E4%BD%95%E5%BF%AB%E9%80%9F%E5%AE%89%E8%A3%85%E4%BD%BF%E7%94%A8Linkis)
254+
Linkis标准版(0.9.4及以上)，[如何安装Linkis](https://github.com/WeBankFinTech/Linkis/wiki/%E5%A6%82%E4%BD%95%E5%BF%AB%E9%80%9F%E5%AE%89%E8%A3%85%E4%BD%BF%E7%94%A8Linkis)
255255

256256
JDK (1.8.0_141以上)，[如何安装JDK](https://www.runoob.com/java/java-environment-setup.html)
257257

@@ -365,7 +365,7 @@ dss_port="8088"
365365
linkis_url="http://127.0.0.1:9001"
366366
367367
# dss ip address
368-
dss_ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}')
368+
dss_ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}'|awk 'NR==1')
369369
```
370370

371371
环境准备完毕，点我进入 [五、安装和使用](https://github.com/WeBankFinTech/DataSphereStudio/blob/master/docs/zh_CN/ch2/DSS%E5%BF%AB%E9%80%9F%E5%AE%89%E8%A3%85%E4%BD%BF%E7%94%A8%E6%96%87%E6%A1%A3.md#%E4%BA%94%E5%AE%89%E8%A3%85%E5%92%8C%E4%BD%BF%E7%94%A8)

‎dss-appjoint-auth/pom.xml

+6-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>dss</artifactId>
2424
<groupId>com.webank.wedatasphere.dss</groupId>
25-
<version>0.7.0</version>
25+
<version>0.8.0</version>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
2828

@@ -38,6 +38,11 @@
3838
<artifactId>linkis-common</artifactId>
3939
<version>${linkis.version}</version>
4040
</dependency>
41+
<dependency>
42+
<groupId>javax.servlet</groupId>
43+
<artifactId>javax.servlet-api</artifactId>
44+
<version>3.1.0</version>
45+
</dependency>
4146
</dependencies>
4247

4348
<build>

‎dss-appjoint-auth/src/main/scala/com/webank/wedatasphere/dss/appjoint/auth/impl/AppJointAuthImpl.scala

+3-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ import com.webank.wedatasphere.dss.appjoint.auth.{AppJointAuth, RedirectMsg}
2424
import com.webank.wedatasphere.linkis.common.utils.Logging
2525
import com.webank.wedatasphere.linkis.httpclient.dws.DWSHttpClient
2626
import com.webank.wedatasphere.linkis.httpclient.dws.config.DWSClientConfigBuilder
27-
import javax.servlet.http.{Cookie, HttpServletRequest}
27+
import javax.servlet.http.HttpServletRequest
2828
import org.apache.commons.io.IOUtils
29+
import org.apache.http.impl.cookie.BasicClientCookie
2930

3031
import scala.collection.JavaConversions._
3132

@@ -68,7 +69,7 @@ class AppJointAuthImpl private() extends AppJointAuth with Logging {
6869
val index = cookie.indexOf("=")
6970
val key = cookie.substring(0, index).trim
7071
val value = cookie.substring(index + 1).trim
71-
userInfoAction.addCookie(new Cookie(key, value))
72+
userInfoAction.addCookie(new BasicClientCookie(key, value))
7273
}
7374
val redirectMsg = new RedirectMsgImpl
7475
redirectMsg.setRedirectUrl(request.getParameter(AppJointAuthImpl.REDIRECT_KEY))

‎dss-appjoint-core/pom.xml

+7-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>dss</artifactId>
2424
<groupId>com.webank.wedatasphere.dss</groupId>
25-
<version>0.7.0</version>
25+
<version>0.8.0</version>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
2828

@@ -50,6 +50,12 @@
5050
<artifactId>dss-common</artifactId>
5151
<version>${dss.version}</version>
5252
</dependency>
53+
54+
<dependency>
55+
<groupId>com.webank.wedatasphere.linkis</groupId>
56+
<artifactId>linkis-httpclient</artifactId>
57+
<version>${linkis.version}</version>
58+
</dependency>
5359
</dependencies>
5460

5561

‎dss-appjoint-core/src/main/scala/com/webank/wedatasphere/dss/appjoint/execution/scheduler/ListenerEventBusNodeExecutionScheduler.scala

+12-10
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
package com.webank.wedatasphere.dss.appjoint.execution.scheduler
1919

20+
import java.util.concurrent.ArrayBlockingQueue
21+
2022
import com.webank.wedatasphere.dss.appjoint.exception.AppJointErrorException
2123
import com.webank.wedatasphere.dss.appjoint.execution.common.{AsyncNodeExecutionResponse, CompletedNodeExecutionResponse, LongTermNodeExecutionAction}
2224
import com.webank.wedatasphere.dss.appjoint.execution.conf.NodeExecutionConfiguration._
@@ -55,7 +57,7 @@ class ListenerEventBusNodeExecutionScheduler(eventQueueCapacity: Int, name: Stri
5557
val field1 = ru.typeOf[ListenerEventBus[_, _]].decl(ru.TermName("eventQueue")).asMethod
5658
val result = listenerEventBusClass.reflectMethod(field1)
5759
result() match {
58-
case queue: BlockingLoopArray[AsyncNodeExecutionResponseEvent] => queue
60+
case queue: ArrayBlockingQueue[AsyncNodeExecutionResponseEvent] => queue
5961
}
6062
}
6163

@@ -104,18 +106,18 @@ class ListenerEventBusNodeExecutionScheduler(eventQueueCapacity: Int, name: Stri
104106

105107
protected def addEvent(event: AsyncNodeExecutionResponseEvent): Unit = synchronized {
106108
listenerEventBus.post(event)
107-
event.getResponse.getAction match {
108-
case longTermAction: LongTermNodeExecutionAction =>
109-
longTermAction.setSchedulerId(eventQueue.max)
110-
case _ =>
111-
}
109+
// event.getResponse.getAction match {
110+
// case longTermAction: LongTermNodeExecutionAction =>
111+
// longTermAction.setSchedulerId(eventQueue.max)
112+
// case _ =>
113+
// }
112114
}
113115

114-
override def removeAsyncResponse(action: LongTermNodeExecutionAction): Unit =
115-
getAsyncResponse(action).setCompleted(true)
116+
override def removeAsyncResponse(action: LongTermNodeExecutionAction): Unit = {
117+
118+
}
116119

117-
override def getAsyncResponse(action: LongTermNodeExecutionAction): AsyncNodeExecutionResponse =
118-
eventQueue.get(action.getSchedulerId).getResponse
120+
override def getAsyncResponse(action: LongTermNodeExecutionAction): AsyncNodeExecutionResponse = null
119121

120122
override def start(): Unit = listenerEventBus.start()
121123

‎dss-appjoint-loader/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
<parent>
2323
<artifactId>dss</artifactId>
2424
<groupId>com.webank.wedatasphere.dss</groupId>
25-
<version>0.7.0</version>
25+
<version>0.8.0</version>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
2828

2929
<artifactId>dss-appjoint-loader</artifactId>
30-
<version>0.7.0</version>
30+
<version>0.8.0</version>
3131

3232
<dependencies>
3333
<dependency>

‎dss-application/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<artifactId>dss</artifactId>
2525
<groupId>com.webank.wedatasphere.dss</groupId>
26-
<version>0.7.0</version>
26+
<version>0.8.0</version>
2727
</parent>
2828
<artifactId>dss-application</artifactId>
2929

‎dss-azkaban-scheduler-appjoint/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>dss</artifactId>
2424
<groupId>com.webank.wedatasphere.dss</groupId>
25-
<version>0.7.0</version>
25+
<version>0.8.0</version>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
2828

‎dss-azkaban-scheduler-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/azkaban/service/AzkabanProjectService.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@ public Project createProject(Project project, Session session) throws AppJointEr
8080
params.add(new BasicNameValuePair("name", project.getName()));
8181
params.add(new BasicNameValuePair("description", project.getDescription()));
8282
HttpPost httpPost = new HttpPost(projectUrl);
83-
httpPost.addHeader(HTTP.CONTENT_ENCODING, "UTF-8");
83+
httpPost.addHeader(HTTP.CONTENT_ENCODING, HTTP.IDENTITY_CODING);
8484
CookieStore cookieStore = new BasicCookieStore();
8585
cookieStore.addCookie(session.getCookies()[0]);
86-
HttpEntity entity = EntityBuilder.create().setContentEncoding("UTF-8").
87-
setContentType(ContentType.create("application/x-www-form-urlencoded", Consts.UTF_8))
86+
HttpEntity entity = EntityBuilder.create()
87+
.setContentType(ContentType.create("application/x-www-form-urlencoded", Consts.UTF_8))
8888
.setParameters(params).build();
8989
httpPost.setEntity(entity);
9090
CloseableHttpClient httpClient = null;

‎dss-common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<artifactId>dss</artifactId>
2525
<groupId>com.webank.wedatasphere.dss</groupId>
26-
<version>0.7.0</version>
26+
<version>0.8.0</version>
2727
</parent>
2828
<artifactId>dss-common</artifactId>
2929

‎dss-flow-execution-entrance/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>dss</artifactId>
2424
<groupId>com.webank.wedatasphere.dss</groupId>
25-
<version>0.7.0</version>
25+
<version>0.8.0</version>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
2828

0 commit comments

Comments
 (0)