Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Fedex
/
iClear-Connect-Pre-Clearance
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
tao.mo
2025-05-27 17:15:06 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
50fafa07f8d2c5df5257183dc224031dc73eb127
50fafa07
1 parent
25777264
manager-server | 修改 |
FCL登录获取ean信息 mt 2025年5月27日17:15:01
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
0 deletions
server/manager-server/src/main/java/com/fedex/connect/manager/util/LoginControllerUtils.java
server/manager-server/src/main/java/com/fedex/connect/manager/util/LoginControllerUtils.java
View file @
50fafa0
...
...
@@ -124,12 +124,14 @@ public class LoginControllerUtils {
*/
try
{
ResponseEntity
<
String
>
resp
=
restTemplate
.
exchange
(
propertiesConfig
.
getUserShippingaccountsUrl
(),
HttpMethod
.
GET
,
entity
,
String
.
class
);
log
.
info
(
"apiExchange | resp: {}"
,
JSON
.
toJSONString
(
resp
));
FclEanTwoResponseVo
fclAccountsResponse
=
JSON
.
parseObject
(
resp
.
getBody
(),
FclEanTwoResponseVo
.
class
);
EanTwoVo
eanInfo
=
this
.
getEanByEanTwoApi
(
fclAccountsResponse
);
String
ext1
=
eanInfo
.
getDefaultEanInfo
();
String
ext2
=
eanInfo
.
getAccountNumberInfo
();
shipperAccountApi1
=
(
StringUtils
.
isNotEmpty
(
ext1
)
&&
StringUtils
.
isNotEmpty
(
ext2
))
?
ext1
+
","
+
ext2
:
(
StringUtils
.
isNotEmpty
(
ext1
)
?
ext1
:
(
StringUtils
.
isNotEmpty
(
ext2
)
?
ext2
:
""
));
log
.
info
(
"shipperAccountApi1 - getShipperAccount : {}"
,
shipperAccountApi1
);
}
catch
(
Exception
ex
){
log
.
error
(
"getShipperAccount api1 | fdxLogin: {}, secretValue: {} url: {}, userId: {} |具体原因: "
,
fclInfoDto
.
getFdxLogin
(),
fclInfoDto
.
getOAuthSecret
(),
propertiesConfig
.
getUserInfoUrl
(),
fclInfoDto
.
getUserId
());
...
...
@@ -141,8 +143,10 @@ public class LoginControllerUtils {
*/
try
{
ResponseEntity
<
String
>
resp
=
restTemplate
.
exchange
(
propertiesConfig
.
getUserAccountUrl
(),
HttpMethod
.
GET
,
entity
,
String
.
class
);
log
.
info
(
"apiExchange | resp: {}"
,
JSON
.
toJSONString
(
resp
));
FCLAccountsResponseVo
fclAccountsResponseVo
=
JSON
.
parseObject
(
resp
.
getBody
(),
FCLAccountsResponseVo
.
class
);
shipperAccountApi2
=
this
.
getEANInfo
(
fclAccountsResponseVo
);
log
.
info
(
"shipperAccountApi2 - getShipperAccount : {}"
,
shipperAccountApi2
);
}
catch
(
Exception
ex
){
log
.
error
(
"getShipperAccount api2 | fdxLogin: {}, secretValue: {} url: {}, userId: {} |具体原因: "
,
fclInfoDto
.
getFdxLogin
(),
fclInfoDto
.
getOAuthSecret
(),
propertiesConfig
.
getUserInfoUrl
(),
fclInfoDto
.
getUserId
());
...
...
Please
register
or
login
to post a comment