Skip to content

T
tax-sys-nacos
Commit fd47310c by ddx
Options

修改登录传参为json

parent 5d0ec99c
Showing with 32 additions and 61 deletions
tax-token/token-common/src/main/java/com/tax/token/model/CookieReq.java
......@@ -18,7 +18,7 @@ public class CookieReq extends SafeModel implements MqMessage {
private String checkType;
private String site;
private String target;
private TaxUserInfo userInfoJson;
private Object userInfoJson;
@Override
public String toString() {
......
tax-token/token-common/src/main/java/com/tax/token/model/TkToken.java
package com.tax.token.model;
import com.alibaba.fastjson.JSON;
import com.yxcheng.token.common.model.TaxUserInfo;
import com.yxcheng.token.utils.StringUtil;
import lombok.Getter;
import lombok.Setter;
......@@ -75,7 +73,7 @@ public class TkToken {
private Date updateDate;
private boolean jsonFlag = false;
private TaxUserInfo taxUserInfo;
private String taxUserInfo;
private String proxyIp;
......@@ -110,9 +108,9 @@ public class TkToken {
'}';
}
public TaxUserInfo parseTaxUserInfo() {
public String parseTaxUserInfo() {
if(StringUtil.isNotEmpty(getSecert()) && StringUtil.isJSON(getSecert())) {
taxUserInfo = JSON.parseObject(getSecert(), TaxUserInfo.class);
taxUserInfo = getSecert();
}
return taxUserInfo;
}
......
tax-token/token-common/src/main/java/com/tax/token/thirdService/impl/GetTokenFromEleJsonTax.java
......@@ -40,8 +40,8 @@ public class GetTokenFromEleJsonTax implements TokenThirdServiceI {
json.put("site", tokenEntity.getSite());
json.put("target", tokenEntity.getTarget());
json.put("requestId", uuIdFlag);
if(null!=tokenEntity.getTaxUserInfo()) {
json.put("loginInfoJson", JSON.toJSON(tokenEntity.getTaxUserInfo()));
if(StringUtil.isNotEmpty(tokenEntity.getTaxUserInfo())) {
json.put("loginInfoJson", JSON.parse(tokenEntity.getTaxUserInfo()));
}
json.put("loginInfoMd5", StringUtil.transNullToEmpty(tokenEntity.getSecretMd5()));
......
tax-token/token-service/src/main/java/com/tax/token/service/api/TkTokenService.java
......@@ -36,7 +36,7 @@ public interface TkTokenService {
JsonResult<TkTokenRemarkLog> queryTokenErrorInfo(TkToken tkToken);
JsonResult<String> getRealCookie(String uuId, String taxno, String zoneCode, String userCode, boolean showData,
String functionNo, TaxUserInfo taxUserInfo, String checkType, String site, String target);
String functionNo, Object taxUserInfo, String checkType, String site, String target);
boolean updateTokenFrom(String uuId, CookieReq cookieReq, JsonResult<String> jsonResult);
......
tax-token/token-service/src/main/java/com/tax/token/service/impl/TkTokenServiceImpl.java
......@@ -221,7 +221,7 @@ public class TkTokenServiceImpl implements TkTokenService {
@Override
public JsonResult<String> getRealCookie(String uuId, String taxno, String zoneCode, String userCode, boolean showData,
String functionNo, TaxUserInfo taxUserInfo, String checkType, String site, String target) {
String functionNo, Object taxUserInfo, String checkType, String site, String target) {
JsonResult result = new JsonResult();
String token = null;
......@@ -253,7 +253,7 @@ public class TkTokenServiceImpl implements TkTokenService {
tkToken.setUserType("1");
}
tkToken.setFunctionNo(functionNo);
tkToken.setTaxUserInfo(taxUserInfo);
tkToken.setTaxUserInfo(null!=taxUserInfo?JSON.toJSONString(taxUserInfo):null);
tkToken.setSite(site);
tkToken.setTarget(target);
......@@ -275,7 +275,7 @@ public class TkTokenServiceImpl implements TkTokenService {
} else {
updFlag = true;
}
if (updFlag) {
if (updFlag && !tkToken.getFunctionNo().equals("01")) {
TkToken updToken = queryToken(taxno, zoneCode, userCode);
if(null!=updToken) {
tkToken.setId(updToken.getId());
......@@ -626,22 +626,6 @@ public class TkTokenServiceImpl implements TkTokenService {
List<TkToken> queryList = tkTokenMapper.selectByExample(example);
Date curDate = DateUtils.getDate();
String secert = null;
boolean jsonFlag = false;
if(tkUser.getIsCheckToken().equals("0")) {
if(null != tkToken.getTaxUserInfo()) {
secert = JSON.toJSONString(tkToken.getTaxUserInfo());
jsonFlag = true;
} else {
if(StringUtils.isNotEmpty(tkToken.getSecert())) {
try {
secert = new String(Base64Util.decode(tkToken.getSecert()), "UTF-8");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
}
}
}
if(queryList!=null && queryList.size()>0){
boolean updateFlag = false;
TkToken updateEntity = queryList.get(0);
......@@ -649,27 +633,12 @@ public class TkTokenServiceImpl implements TkTokenService {
if(!tkToken.getZoneCode().equals(updateEntity.getZoneCode())){
updateFlag = true;
}
//用户信息有变化修改
if(jsonFlag) {
if(null==updateEntity.parseTaxUserInfo() || !tkToken.getTaxUserInfo().toString().equals(updateEntity.parseTaxUserInfo().toString())) {
updateFlag = true;
}
} else {
String oldSecert = StringUtils.isEmpty(updateEntity.getSecert())?"":updateEntity.getSecert();
String newSecert = StringUtils.isEmpty(secert)?"":secert;
if(!oldSecert.equals(newSecert)) {
updateFlag = true;
}
}
//检测token信息
if(!updateEntity.getIsValid().equals(tkToken.getIsValid()) || !updateEntity.getUserType().equals(tkToken.getUserType())) {
updateFlag = true;
}
if(updateFlag) {
if(!tkToken.getUserType().equals("9")) {
updateEntity.setJsonFlag(jsonFlag);
updateEntity.setSecert(secert);
updateEntity.setZoneCode(tkToken.getZoneCode());
updateEntity.setUserType(tkToken.getUserType());
}
......@@ -696,7 +665,6 @@ public class TkTokenServiceImpl implements TkTokenService {
entity.setZoneCode(tkToken.getZoneCode());
entity.setUserCode(userCode);
entity.setServerNo(tkUser.getServerNo());
entity.setSecert(secert);
entity.setReqDate(curDate);
entity.setCreateDate(curDate);
entity.setUpdateDate(curDate);
......
tax-token/token-web/src/test/java/com/yxcheng/token/web/controller/test/TokenUnitTest.java
......@@ -14,17 +14,17 @@ public class TokenUnitTest {
// static String host = "http://47.94.208.133:8762";
static String host = "http://127.0.0.1:8762";
// static String host = "https://pushtoken.invservice.cn";
// String accessKeyID = "eyongyou";
// static String accessKeySecret = "yongyou!@#566ccd";
// static String host = "https://api.xfapiao.com";
String accessKeyID = "eyongyou";
static String accessKeySecret = "yongyou!@#566ccd";
// String accessKeyID = "esscj";
// static String accessKeySecret = "esscj#@rrab1s";
// String accessKeyID = "echangchen";
// static String accessKeySecret = "echangchen#@rrwea1";
String accessKeyID = "edonggang";
static String accessKeySecret = "donggang@PO!#N98";
// String accessKeyID = "edonggang";
// static String accessKeySecret = "donggang@PO!#N98";
// String accessKeyID = "youqian";
// static String accessKeySecret = "youqian!@#312bba";
......@@ -148,13 +148,13 @@ public class TokenUnitTest {
param.put("userInfoJson",userparam);
System.out.println(url);
System.out.println(JSON.toJSONString(param));
String ret = HttpHelper.postWithJson(url,JSON.toJSONString(param));
System.out.println(ret);
ResponseContent ret = HttpHelper.postJsonEntity(url,JSON.toJSONString(param));
System.out.println(ret.getContent());
}
@Test
public void testGetEtaxCookie() throws Exception{
String url = host + "/client/getEtaxCookie";
String url = host + "/client/checkEtaxLoginInfo";
String signStr = "AccessKeyID=%s&SignatureNonce=%s&TimeStamp=%s&Version=1.0";
String signatureNonce = UUIDGenerator.generate();
......@@ -170,20 +170,25 @@ public class TokenUnitTest {
param.put("timeStamp",timeStamp);
param.put("version","1.0");
param.put("signature",getSign(signStr));
param.put("taxno","911201030796150230");
param.put("zoneCode","1200");
// param.put("loginType","c");
// param.put("userInfo",Base64Util.encode("15928206518[a%b@q]@778899abcdABCD[a%b@q]15928206518[a%b@q]办税员"));
param.put("taxno","91440101MA5CRHH33W");
param.put("zoneCode","4400");
param.put("site","4400");
param.put("target","4400");
Map userparam = new HashMap<>();
userparam.put("username","120102197801310541");
userparam.put("password","aa111111");
userparam.put("loginType","b");
userparam.put("nsrsbh","91440101MA5CRHH33W");
userparam.put("username","Fanny123456");
userparam.put("userType","办税人");
userparam.put("password","Fanny123456");
param.put("userInfoJson",userparam);
// param.put("userInfoJson",userparam);
System.out.println(url);
System.out.println(JSON.toJSONString(param));
String ret = HttpHelper.postWithJson(url,JSON.toJSONString(param));
System.out.println(ret);
ResponseContent ret = HttpHelper.postJsonEntity(url,JSON.toJSONString(param));
System.out.println(ret.getContent());
}
@Test
......
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