Skip to content

T
tax-sys-nacos
Commit b4080090 by ddx
Options

增加authcode节点

parent d2a2ec6e
Showing with 25 additions and 3 deletions
tax-token/token-common/src/main/java/com/tax/token/model/TkToken.java
...@@ -91,6 +91,8 @@ public class TkToken { ...@@ -91,6 +91,8 @@ public class TkToken {
private String target; private String target;
private String authCode;
@Override @Override
public String toString() { public String toString() {
return "TkToken{" + return "TkToken{" +
......
tax-token/token-common/src/main/java/com/tax/token/thirdService/TokenThirdServiceFactory.java
...@@ -122,4 +122,13 @@ public class TokenThirdServiceFactory{ ...@@ -122,4 +122,13 @@ public class TokenThirdServiceFactory{
return null; return null;
} }
} }
public static String getAuthCode(Map<String, Object> result){
if(result!=null && null!=result.get("authCode")){
String authCode = String.valueOf(result.get("authCode"));
return authCode;
}else {
return null;
}
}
} }
tax-token/token-common/src/main/java/com/tax/token/thirdService/impl/GetTokenFromEleJsonTax.java
...@@ -58,6 +58,7 @@ public class GetTokenFromEleJsonTax implements TokenThirdServiceI { ...@@ -58,6 +58,7 @@ public class GetTokenFromEleJsonTax implements TokenThirdServiceI {
resultMap.put("proxyip", ObjectUtil.fixNull(resultStrMap.get("proxyip"))); resultMap.put("proxyip", ObjectUtil.fixNull(resultStrMap.get("proxyip")));
resultMap.put("userName", ObjectUtil.fixNull(resultStrMap.get("userName"))); resultMap.put("userName", ObjectUtil.fixNull(resultStrMap.get("userName")));
resultMap.put("session", ObjectUtil.fixNull(resultStrMap.get("session"))); resultMap.put("session", ObjectUtil.fixNull(resultStrMap.get("session")));
resultMap.put("authCode", ObjectUtil.fixNull(resultStrMap.get("authCode")));
if("0".equals(resultStrMap.get("code"))){ if("0".equals(resultStrMap.get("code"))){
resultMap.put("token",resultStrMap.get("token")); resultMap.put("token",resultStrMap.get("token"));
} }
......
tax-token/token-service/src/main/java/com/tax/token/service/impl/TkTokenServiceImpl.java
...@@ -190,6 +190,7 @@ public class TkTokenServiceImpl implements TkTokenService { ...@@ -190,6 +190,7 @@ public class TkTokenServiceImpl implements TkTokenService {
json.put("proxyIp", tkToken.getProxyIp()); json.put("proxyIp", tkToken.getProxyIp());
json.put("session", tkToken.getSecretMd5()); json.put("session", tkToken.getSecretMd5());
json.put("requestId", tkToken.getRequestId()); json.put("requestId", tkToken.getRequestId());
json.put("authCode", tkToken.getAuthCode());
json.put("userGroupId", (StringUtil.isNotEmpty(tkToken.getTaxLoginName())?MD5Util.MD5Encode(tkToken.getTaxLoginName()):"")); json.put("userGroupId", (StringUtil.isNotEmpty(tkToken.getTaxLoginName())?MD5Util.MD5Encode(tkToken.getTaxLoginName()):""));
json.put("userGroupName", (StringUtil.isNotEmpty(tkToken.getTaxLoginName())?tkToken.getTaxLoginName():"")); json.put("userGroupName", (StringUtil.isNotEmpty(tkToken.getTaxLoginName())?tkToken.getTaxLoginName():""));
if(isEncrypt && (null!=tkUser.getShowFlag() && tkUser.getShowFlag().equals("1"))) { if(isEncrypt && (null!=tkUser.getShowFlag() && tkUser.getShowFlag().equals("1"))) {
...@@ -296,6 +297,7 @@ public class TkTokenServiceImpl implements TkTokenService { ...@@ -296,6 +297,7 @@ public class TkTokenServiceImpl implements TkTokenService {
json.put("proxyIp", tkToken.getProxyIp()); json.put("proxyIp", tkToken.getProxyIp());
json.put("session", tkToken.getSecretMd5()); json.put("session", tkToken.getSecretMd5());
json.put("requestId", tkToken.getRequestId()); json.put("requestId", tkToken.getRequestId());
json.put("authCode", tkToken.getAuthCode());
json.put("userGroupId", (StringUtil.isNotEmpty(tkToken.getTaxLoginName())?MD5Util.MD5Encode(tkToken.getTaxLoginName()):"")); json.put("userGroupId", (StringUtil.isNotEmpty(tkToken.getTaxLoginName())?MD5Util.MD5Encode(tkToken.getTaxLoginName()):""));
json.put("userGroupName", (StringUtil.isNotEmpty(tkToken.getTaxLoginName())?tkToken.getTaxLoginName():"")); json.put("userGroupName", (StringUtil.isNotEmpty(tkToken.getTaxLoginName())?tkToken.getTaxLoginName():""));
if(null!=tkUser.getShowFlag() && tkUser.getShowFlag().equals("1")) { if(null!=tkUser.getShowFlag() && tkUser.getShowFlag().equals("1")) {
...@@ -304,10 +306,17 @@ public class TkTokenServiceImpl implements TkTokenService { ...@@ -304,10 +306,17 @@ public class TkTokenServiceImpl implements TkTokenService {
result.setData(json); result.setData(json);
} }
} else { } else {
if(null!=tkUser.getShowFlag() && tkUser.getShowFlag().equals("1")) { if(tkToken.getFunctionNo().equals("01")) {
result.setData(EncryptUtil.encryptAesCk(token)); JSONObject json = new JSONObject();
json.put("cookie", token);
json.put("authCode", tkToken.getAuthCode());
result.setData(json);
} else { } else {
result.setData(token); if(null!=tkUser.getShowFlag() && tkUser.getShowFlag().equals("1")) {
result.setData(EncryptUtil.encryptAesCk(token));
} else {
result.setData(token);
}
} }
} }
} }
...@@ -417,6 +426,7 @@ public class TkTokenServiceImpl implements TkTokenService { ...@@ -417,6 +426,7 @@ public class TkTokenServiceImpl implements TkTokenService {
tkToken.setResContext(TokenThirdServiceFactory.getResContext(data)); tkToken.setResContext(TokenThirdServiceFactory.getResContext(data));
tkToken.setProxyIp(TokenThirdServiceFactory.getProxyIp(data)); tkToken.setProxyIp(TokenThirdServiceFactory.getProxyIp(data));
tkToken.setSecretMd5(TokenThirdServiceFactory.getSession(data)); tkToken.setSecretMd5(TokenThirdServiceFactory.getSession(data));
tkToken.setAuthCode(TokenThirdServiceFactory.getAuthCode(data));
taxLoginName = TokenThirdServiceFactory.getUserName(data); taxLoginName = TokenThirdServiceFactory.getUserName(data);
tkToken.setTaxLoginName(taxLoginName); tkToken.setTaxLoginName(taxLoginName);
......
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