Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
rs-cloud-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
周健威
rs-cloud-platform
Commits
bff6c41b
Commit
bff6c41b
authored
Jan 20, 2021
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改省bug
parent
a5febb86
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
3 deletions
+16
-3
GtDataRestClient.java
.../java/com/upyuns/platform/rs/gtdata/GtDataRestClient.java
+13
-2
GtdataController.java
.../upyuns/platform/rs/datacenter/rest/GtdataController.java
+3
-1
No files found.
ace-common/src/main/java/com/upyuns/platform/rs/gtdata/GtDataRestClient.java
View file @
bff6c41b
...
@@ -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}"
)
p
rotected
String
baseUrl
;
p
ublic
String
baseUrl
;
@Value
(
"${gtdata.gtDataUrl}"
)
@Value
(
"${gtdata.gtDataUrl}"
)
p
rotected
String
gtDataUrl
;
p
ublic
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
;
...
...
rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/GtdataController.java
View file @
bff6c41b
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment