Commit bff6c41b authored by 周健威's avatar 周健威

修改省bug

parent a5febb86
...@@ -74,10 +74,10 @@ public class GtDataRestClient { ...@@ -74,10 +74,10 @@ public class GtDataRestClient {
// protected String gtDataPassword; // protected String gtDataPassword;
@Value("${gtdata.baseUrl}") @Value("${gtdata.baseUrl}")
protected String baseUrl; public String baseUrl;
@Value("${gtdata.gtDataUrl}") @Value("${gtdata.gtDataUrl}")
protected String gtDataUrl; public String gtDataUrl;
@Value("${gtdata.gtDataUsername}") @Value("${gtdata.gtDataUsername}")
protected String gtDataUsername; protected String gtDataUsername;
...@@ -85,6 +85,17 @@ public class GtDataRestClient { ...@@ -85,6 +85,17 @@ public class GtDataRestClient {
@Value("${gtdata.gtDataPassword}") @Value("${gtdata.gtDataPassword}")
protected String gtDataPassword; protected String gtDataPassword;
@Value("${gtdata.outUrl}")
public String outUrl;
public String getOutUrl() {
return outUrl;
}
public String getBaseUrl() {
return baseUrl;
}
private String defaultToken; private String defaultToken;
private String defaultSign; private String defaultSign;
private String defaultTime; private String defaultTime;
......
...@@ -106,7 +106,9 @@ public class GtdataController extends CommonBaseController implements UserRestIn ...@@ -106,7 +106,9 @@ public class GtdataController extends CommonBaseController implements UserRestIn
String fileName = url.substring(url.lastIndexOf("/web/gtdata/app/unauth/download/")+32); String fileName = url.substring(url.lastIndexOf("/web/gtdata/app/unauth/download/")+32);
GdLoginVO gdLoginVO = gtDataRestClient.rsignUserlogin(getAppUser().getUserid()+"", getAppUser().getGtdataPass()); GdLoginVO gdLoginVO = gtDataRestClient.rsignUserlogin(getAppUser().getUserid()+"", getAppUser().getGtdataPass());
return ObjectRestResponse.succ(gtDataRestClient.openUrl(fileName, gdLoginVO.getSign(), gdLoginVO.getTime(), getAppUser().getUserid()+ "")); String resultUrl = gtDataRestClient.openUrl(fileName, gdLoginVO.getSign(), gdLoginVO.getTime(), getAppUser().getUserid()+ "");
resultUrl = resultUrl.replace(gtDataRestClient.getBaseUrl(), gtDataRestClient.getOutUrl());
return ObjectRestResponse.succ(resultUrl);
} }
@RequestMapping(value = "/app/unauth/register", method = RequestMethod.GET) @RequestMapping(value = "/app/unauth/register", method = RequestMethod.GET)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment