Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
tao.mo
cc5fe1a0 1 parent 7cbadc13

manager-server | 修改 | 

配置文件信息调整
mt
2025年5月28日15:03:48
Inline Side-by-side
Showing 7 changed files with 43 additions and 38 deletions
......@@ -7,6 +7,10 @@ import org.springframework.context.annotation.Configuration;
@Data
@Configuration
public class PropertiesConfig {
@Value("${fcl.interface.fedex_api_address}")
private String fedexApiAddress;
@Value("${fcl.login.url}")
private String fclLoginUrl;
......
......@@ -84,7 +84,7 @@ public class SysUserServiceImpl extends BaseService implements ISysUserService {
//返回匹配出来第一个账户信息
return Utils.first(resultUserList);
} catch (Exception e){
log.error(LogShowModel.showException("Exception",e));
log.error("findUserByFcl error : ",e);
return null;
}
}
......
......@@ -89,9 +89,9 @@ public class LoginControllerUtils {
fclInfoDto.setUserId(userDataApiVo.getUserId());
fclInfoDto.setEmailAddress(userDataApiVo.getEmailAddress());
}catch(Exception ex){
log.error("getFclInfo | fdxLogin: {}, secretValue: {} url: {}, userId: {} |具体原因: "
, fclInfoDto.getFdxLogin(), fclInfoDto.getOAuthSecret(), propertiesConfig.getUserInfoUrl(),fclInfoDto.getUserId());
ex.printStackTrace();
String errorInfo = String.format("getFclInfo | fdxLogin: %s, secretValue: %s url: %s, userId: %s ",
fclInfoDto.getFdxLogin(), fclInfoDto.getOAuthSecret(), propertiesConfig.getUserInfoUrl(),fclInfoDto.getUserId());
log.error(errorInfo, ex);
}finally{
/**
* 获取用户计费账号
......@@ -133,9 +133,9 @@ public class LoginControllerUtils {
(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());
ex.printStackTrace();
String errorInfo = String.format("getShipperAccount api1 | fdxLogin: %s, secretValue: %s url: %s, userId: %s",
fclInfoDto.getFdxLogin(), fclInfoDto.getOAuthSecret(), propertiesConfig.getUserInfoUrl(),fclInfoDto.getUserId());
log.error(errorInfo, ex);
}
/**
* 补偿shipperAccount
......@@ -148,9 +148,9 @@ public class LoginControllerUtils {
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());
ex.printStackTrace();
String errorInfo = String.format("getShipperAccount api2 | fdxLogin: %s, secretValue: %s url: %s, userId: %s",
fclInfoDto.getFdxLogin(), fclInfoDto.getOAuthSecret(), propertiesConfig.getUserInfoUrl(),fclInfoDto.getUserId());
log.error(errorInfo, ex);
}
/**
......@@ -190,7 +190,8 @@ public class LoginControllerUtils {
// 将List中的元素用逗号分隔符拼接成一个字符串
userEANNumber = String.join(",", uniqueElements);
}catch (Exception e){
log.error("getUniqueStr | eanOneExt1 : {} | eanTwoExt1 : {} | 具体原因: ", eanOneExt1, eanTwoExt1,e);
String errorInfo = String.format("getUniqueStr | eanOneExt1 : %s | eanTwoExt1 : %s",eanOneExt1, eanTwoExt1);
log.error(errorInfo, e);
}
return userEANNumber;
}
......
......@@ -31,23 +31,23 @@ export:
fcl:
login:
url:
https://iclear-connectuat.apac.fedex.com/manager-server/auth/wlgnLogin
redjrectLogin: https://iclear-connectuat.apac.fedex.com/ipc/#/redjrectLogin
http://127.0.0.1:8083/manager-server/auth/wlgnLogin
redjrectLogin: http://127.0.0.1/ipc/#/redjrectLogin
preClearIndex:
url: http://iclear-connectuat.apac.fedex.com
url: http://127.0.0.1:8083/ipc
interface:
logurl: https://www.fedex.com/secure-login/en-us/#/login-credentials?redirectUrl=http://iclear-connectuat.apac.fedex.com/manager-server/auth/wlgnForward
fedex_api_address: https://api.fedex.com
fedex_api_address: https://api.fedex.com.cn
proxy_url: cn2-proxy.apac.fedex.com:3128
token:
url: /auth/oauth/v2/token
url: ${fcl.interface.fedex_api_address}/auth/oauth/v2/token
grant_type : client_credentials
client_id: l7c13f958213e04d1280f807789bd783a3
client_secret: 3d43932198b6467a8e20d024bfa82e1c
scope: oob
account:
url: /user/v2/accounts
url: ${fcl.interface.fedex_api_address}/user/v2/accounts
shippingaccounts:
url: /administration/v1/users/shippingaccounts
url: ${fcl.interface.fedex_api_address}/administration/v1/users/shippingaccounts
userinfo:
url: /user/v2/users/userinfo
\ No newline at end of file
url: ${fcl.interface.fedex_api_address}/user/v2/users/userinfo
\ No newline at end of file
......
......@@ -30,17 +30,17 @@ fcl:
url: https://exportdeclaration-tw.apac.fedex.com
interface:
logurl: https://www.fedex.com/secure-login/zh-tw/#/login-credentials?redirectUrl=https://exportdeclaration-tw.apac.fedex.com/icleartw/auth/wlgnForward
fedex_api_address: https://api.fedex.com
fedex_api_address: https://api.fedex.com.cn
proxy_url: cn2-proxy.apac.fedex.com:3128
token:
url: /auth/oauth/v2/token
url: ${fcl.interface.fedex_api_address}/auth/oauth/v2/token
grant_type : client_credentials
client_id: l7c13f958213e04d1280f807789bd783a3
client_secret: 3d43932198b6467a8e20d024bfa82e1c
scope: oob
account:
url: /user/v2/accounts
url: ${fcl.interface.fedex_api_address}/user/v2/accounts
shippingaccounts:
url: /administration/v1/users/shippingaccounts
url: ${fcl.interface.fedex_api_address}/administration/v1/users/shippingaccounts
userinfo:
url: /user/v2/users/userinfo
\ No newline at end of file
url: ${fcl.interface.fedex_api_address}/user/v2/users/userinfo
\ No newline at end of file
......
......@@ -25,23 +25,23 @@ export:
fcl:
login:
url:
https://iclear-connectuat.apac.fedex.com/manager-server/auth/wlgnLogin
redjrectLogin: https://iclear-connectuat.apac.fedex.com/ipc/#/redjrectLogin
http://47.103.140.98:7010/manager-server/auth/wlgnLogin
redjrectLogin: http://192.168.1.251/ipc/#/redjrectLogin
preClearIndex:
url: http://iclear-connectuat.apac.fedex.com
url: http://192.168.1.251/ipc
interface:
logurl: https://www.fedex.com/secure-login/en-us/#/login-credentials?redirectUrl=http://iclear-connectuat.apac.fedex.com/manager-server/auth/wlgnForward
fedex_api_address: https://api.fedex.com
fedex_api_address: https://api.fedex.com.cn
proxy_url: cn2-proxy.apac.fedex.com:3128
token:
url: /auth/oauth/v2/token
url: ${fcl.interface.fedex_api_address}/auth/oauth/v2/token
grant_type : client_credentials
client_id: l7c13f958213e04d1280f807789bd783a3
client_secret: 3d43932198b6467a8e20d024bfa82e1c
scope: oob
account:
url: /user/v2/accounts
url: ${fcl.interface.fedex_api_address}/user/v2/accounts
shippingaccounts:
url: /administration/v1/users/shippingaccounts
url: ${fcl.interface.fedex_api_address}/administration/v1/users/shippingaccounts
userinfo:
url: /user/v2/users/userinfo
\ No newline at end of file
url: ${fcl.interface.fedex_api_address}/user/v2/users/userinfo
\ No newline at end of file
......
......@@ -27,20 +27,20 @@ fcl:
https://iclear-connectuat.apac.fedex.com/manager-server/auth/wlgnLogin
redjrectLogin: https://iclear-connectuat.apac.fedex.com/ipc/#/redjrectLogin
preClearIndex:
url: http://iclear-connectuat.apac.fedex.com
url: https://iclear-connectuat.apac.fedex.com/ipc
interface:
logurl: https://www.fedex.com/secure-login/en-us/#/login-credentials?redirectUrl=http://iclear-connectuat.apac.fedex.com/manager-server/auth/wlgnForward
fedex_api_address: https://api.fedex.com
fedex_api_address: https://api.fedex.com.cn
proxy_url: cn2-proxy.apac.fedex.com:3128
token:
url: /auth/oauth/v2/token
url: ${fcl.interface.fedex_api_address}/auth/oauth/v2/token
grant_type : client_credentials
client_id: l7c13f958213e04d1280f807789bd783a3
client_secret: 3d43932198b6467a8e20d024bfa82e1c
scope: oob
account:
url: /user/v2/accounts
url: ${fcl.interface.fedex_api_address}/user/v2/accounts
shippingaccounts:
url: /administration/v1/users/shippingaccounts
url: ${fcl.interface.fedex_api_address}/administration/v1/users/shippingaccounts
userinfo:
url: /user/v2/users/userinfo
\ No newline at end of file
url: ${fcl.interface.fedex_api_address}/user/v2/users/userinfo
\ No newline at end of file
......