Skip to content

Commit ea583b3

Browse files
committed
1. Fix bug deprecated jersey annotation
2. Add exportTableEnable parameter in dss-scriptis-server.properties 3. Modify start-defalut-appconn to install-default-appconn.sh
1 parent 512695a commit ea583b3

File tree

5 files changed

+16
-15
lines changed

5 files changed

+16
-15
lines changed

assembly/bin/install-default-appconn.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ else
99
source ~/.bashrc
1010
fi
1111

12+
shellDir=`dirname $0`
13+
workDir=`cd ${shellDir}/..;pwd`
1214

1315
function isSuccess(){
1416
if [ $? -ne 0 ]; then
@@ -29,9 +31,9 @@ echo "########################################################################"
2931
echo "###################### Begin to install DSS Default Appconn ######################"
3032
echo "########################################################################"
3133
echo "now begin to install default appconn: datachecker."
32-
sh ./bin/appconn-install.sh datachecker
34+
sh ${workDir}/bin/appconn-install.sh datachecker
3335
echo "now begin to install default appconn: eventchecker."
34-
sh ./bin/appconn-install.sh eventchecker
36+
sh ${workDir}/bin/appconn-install.sh eventchecker
3537
echo "now begin to install default appconn: sendemail."
36-
sh ./bin/appconn-install.sh sendemail
38+
sh ${workDir}/bin/appconn-install.sh sendemail
3739
isSuccess "install DSS Default Appconn"

conf/dss-scriptis-server.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,5 @@ wds.linkis.server.url=
3232
wds.linkis.test.mode=false
3333
wds.linkis.test.user=
3434

35-
wds.dss.scriptis.global.limits.exportResEnable=false
35+
wds.dss.scriptis.global.limits.exportResEnable=false
36+
wds.dss.scriptis.global.limits.exportTableEnable=false

dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/restful/ApiServiceExecuteRestfulApi.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,9 @@ private void writeMessage(HttpServletResponse resp, Message message) throws IOEx
171171
public Message openFile(HttpServletRequest req,
172172
@RequestParam(required = false, name = "path") String path,
173173
@RequestParam(required = false, name = "taskId") String taskId,
174-
@DefaultValue("1") @RequestParam(required = false, name = "page") Integer page,
175-
@DefaultValue("5000") @RequestParam(required = false, name = "pageSize") Integer pageSize,
176-
@DefaultValue("utf-8") @RequestParam(required = false, name = "charset") String charset) {
174+
@RequestParam(required = false, name = "page", defaultValue = "1") Integer page,
175+
@RequestParam(required = false, name = "pageSize", defaultValue = "5000") Integer pageSize,
176+
@RequestParam(required = false, name = "charset", defaultValue = "utf-8") String charset) {
177177
String userName = SecurityFilter.getLoginUsername(req);
178178
logger.info("User {} wants to open resultSet file {} in task {}.", userName, path, taskId);
179179
if (!isNumber(taskId)) {
@@ -208,12 +208,12 @@ public void resultsetToExcel(
208208
HttpServletResponse resp,
209209
@RequestParam(required = false, name = "path") String path,
210210
@RequestParam(required = false, name = "taskId") String taskId,
211-
@DefaultValue("utf-8") @RequestParam(required = false, name = "charset") String charset,
212-
@DefaultValue("csv") @RequestParam(required = false, name = "outputFileType") String outputFileType,
213-
@DefaultValue(",") @RequestParam(required = false, name = "csvSeperator") String csvSeperator,
214-
@DefaultValue("downloadResultset") @RequestParam(required = false, name = "outputFileName") String outputFileName,
215-
@DefaultValue("result") @RequestParam(required = false, name = "sheetName") String sheetName,
216-
@DefaultValue("NULL") @RequestParam(required = false, name = "nullValue") String nullValue) throws ApiServiceQueryException, IOException {
211+
@RequestParam(required = false, name = "charset", defaultValue = "utf-8") String charset,
212+
@RequestParam(required = false, name = "outputFileType", defaultValue = "csv") String outputFileType,
213+
@RequestParam(required = false, name = "csvSeperator", defaultValue = ",") String csvSeperator,
214+
@RequestParam(required = false, name = "outputFileName", defaultValue = "downloadResultset") String outputFileName,
215+
@RequestParam(required = false, name = "sheetName", defaultValue = "result") String sheetName,
216+
@RequestParam(required = false, name = "nullValue", defaultValue = "NULL") String nullValue) throws ApiServiceQueryException, IOException {
217217
String userName = SecurityFilter.getLoginUsername(req);
218218
logger.info("User {} wants to download resultSet file {} as {} in task {}.", userName, path, outputFileType, taskId);
219219
if (!isNumber(taskId)) {

dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/request/UpdateRoleComponentPrivRequest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.webank.wedatasphere.dss.framework.workspace.bean.request;
22

3-
import org.codehaus.jackson.JsonNode;
43

54
import java.io.Serializable;
65
import java.util.Map;

dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/request/UpdateRoleMenuPrivRequest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.webank.wedatasphere.dss.framework.workspace.bean.request;
22

3-
import org.codehaus.jackson.JsonNode;
43

54
import java.io.Serializable;
65
import java.util.Map;

0 commit comments

Comments
 (0)