增加清除指纹接口

tax-token/token-common/src/main/java/com/tax/token/utils/CleanCookieUtil.java

@@ -20,15 +20,15 @@ public class CleanCookieUtil {
 
     private static final Logger logger = LoggerFactory.getLogger(CleanCookieUtil.class);
 
-    public static CleanCookieVo cleanCookie(String uuIdFlag, CookieReq cookieReq, String type)  throws IOException, HttpException {
+    public static CleanCookieVo cleanCookie(String uuIdFlag, CookieReq cookieReq, String cleanType)  throws IOException, HttpException {
         CleanCookieVo cleanCookieVo = new CleanCookieVo();
         String taxno = cookieReq.getTaxno();
         JSONObject json = new JSONObject();
         json.put("userCode", cookieReq.getUserCode());
-        json.put("type", type);
+        json.put("type", cleanType);
         json.put("requestId", uuIdFlag);
 
-        if(type.equals("10")) {
+        if(cleanType.equals("10")) {
             json.put("dqdm", cookieReq.getZoneCode());
             json.put("taxno", cookieReq.getTaxno());
             if(StringUtil.isNotEmpty(cookieReq.getSite())) {
@@ -37,7 +37,7 @@ public class CleanCookieUtil {
         } else {
             if(StringUtil.isNotEmpty(cookieReq.getUserInfo())) {
                 JSONArray jsonArray = new JSONArray();
-                if (type.equals("3")) {
+                if (cleanType.equals("3")) {
                     jsonArray.add(cookieReq.getZoneCode() + ":" + cookieReq.getUserInfo());
                 } else {
                     jsonArray.add(cookieReq.getZoneCode() + ":" + taxno + ":" + cookieReq.getUserInfo());

tax-token/token-service/src/main/java/com/tax/token/service/api/TkTokenService.java

@@ -46,7 +46,7 @@ public interface TkTokenService {
 
     JsonResult<String> selectErrorTokenList(String userCode, Integer pageId);
 
-    JsonResult<String> cleanCookie(String uuId, CookieReq cookieReq);
+    JsonResult<String> cleanCookie(String uuId, CookieReq cookieReq, String cleanType);
 
     JsonResult<String> cleanGroupCookie(String uuId, CookieReq cookieReq);
 

tax-token/token-service/src/main/java/com/tax/token/service/impl/TkTokenServiceImpl.java

@@ -900,18 +900,12 @@ public class TkTokenServiceImpl implements TkTokenService {
     }
 
 
-    public JsonResult<String> cleanCookie(String uuId, CookieReq cookieReq) {
+    public JsonResult<String> cleanCookie(String uuId, CookieReq cookieReq, String cleanType) {
 
         JsonResult result = new JsonResult();
         String taxno = cookieReq.getTaxno();
-        String userCode = cookieReq.getUserCode();
         Date reqDate = DateUtils.getDate();
         CleanCookieVo resMap = null;
-
-        TkUser tkUser = tkUserService.getUserByUserCode(userCode, TokenConstants.FUNCTION_NO_FPY);
-        if(tkUser == null){
-            result.errorResponse(ResultEnum.forbidden);
-        } else {
         try {
             String newUserInfo = "";
             if(null != cookieReq.getCookieInfoJson()) {
@@ -937,8 +931,7 @@ public class TkTokenServiceImpl implements TkTokenService {
                 if(StringUtil.isNotEmpty(newUserInfo)) {
                     cookieReq.setUserInfo(MD5Util.MD5Encode(newUserInfo));
                 }
-                    if(!tkUser.getDefaultCleanType().equals("9")) {
-                        resMap = CleanCookieUtil.cleanCookie(uuId, cookieReq, tkUser.getDefaultCleanType());
+                resMap = CleanCookieUtil.cleanCookie(uuId, cookieReq, cleanType);
                 if (!(resMap!=null &&  "0".equals(resMap.getCode()))) {
                     result.errorResponse(ResultEnum.flush_error);
                     if(StringUtil.isNotEmpty(resMap.getMessage())) {
@@ -946,13 +939,11 @@ public class TkTokenServiceImpl implements TkTokenService {
                     }
                 }
             }
-                }
         } catch (Exception e) {
             e.printStackTrace();
             result.errorResponse(ResultEnum.flush_error);
             logger.error(uuId + " cleanCookie taxno is " + taxno + " ,send is error!" + e.getMessage());
         }
-        }
         logger.info(uuId + " cleanCookie taxno is " + taxno + ", result is " + result);
         tkRealTokenLogService.saveRealTokenLog(uuId, reqDate, resMap, cookieReq, result);
         return result;

tax-token/token-web/src/main/java/com/tax/token/web/controller/TokenController.java

@@ -198,7 +198,20 @@ public class TokenController extends BaseClientController {
         }
         cookieReq.setUserCode(cookieReq.getAccessKeyID());
         String uuId = UUIDGenerator.generate();
-        JsonResult<String> jsonResult = tokenService.cleanCookie(uuId, cookieReq);
+        JsonResult<String> jsonResult = tokenService.cleanCookie(uuId, cookieReq, "2");
+        return jsonResult;
+    }
+
+    @RequestMapping(value ={ "/cleanQuickLoginInfo"} , method = RequestMethod.POST)
+    @LogT
+    public JsonResult<String> cleanQuickLoginInfo(@RequestBody CookieReq cookieReq){
+        CrRpcResult crRpcResult = userClient.isSafe(cookieReq);
+        if(!checkUserSafe(crRpcResult)){
+            return JsonResult.errorResult(crRpcResult.getCode(),crRpcResult.getMessage());
+        }
+        cookieReq.setUserCode(cookieReq.getAccessKeyID());
+        String uuId = UUIDGenerator.generate();
+        JsonResult<String> jsonResult = tokenService.cleanCookie(uuId, cookieReq, "13");
         return jsonResult;
     }
 

tax-token/token-web/src/test/java/com/yxcheng/token/web/controller/test/TokenUnitTest.java

@@ -12,9 +12,9 @@ import java.util.Map;
 
 public class TokenUnitTest {
 
-    static String host = "http://127.0.0.1:8762";
+//    static String host = "http://127.0.0.1:8762";
 //    static String host = "https://api.taxservices.cn";
-//    static String host = "https://api.xfapiao.com";
+    static String host = "https://api.xfapiao.com";
     String accessKeyID = "eyongyou";
     static String accessKeySecret = "yongyou!@#566ccd";
 
@@ -115,7 +115,7 @@ public class TokenUnitTest {
 
     @Test
     public void testGetRealCookie() throws Exception{
-        String url = host + "/client/getRealCookie";
+        String url = host + "/client/realLogin";
         String signStr = "accessKeyID=%s&signatureNonce=%s&timeStamp=%s&version=1.0";
 
         String signatureNonce = UUIDGenerator.generate();
@@ -131,16 +131,17 @@ public class TokenUnitTest {
         param.put("timeStamp",timeStamp);
         param.put("version","1.0");
         param.put("signature",getSign(signStr));
-        param.put("taxno","914404003980391901");
-        param.put("zoneCode","4400");
-        param.put("userType","2");
+        param.put("taxno","YBSWY0140075646");
+        param.put("zoneCode","1100");
+        param.put("checkType","1");
 
         Map userparam = new HashMap<>();
-        userparam.put("nsrsbh","914404003980391901");
-        userparam.put("username","刘志怡021323");
-        userparam.put("password","Lzy672672");
+        userparam.put("nsrsbh","YBSWY0140075646");
+        userparam.put("username","用友46803661");
+        userparam.put("password","8221294444559633306");
+        userparam.put("phone","13411111111");
 
-        param.put("userInfoJson",userparam);
+        param.put("userInfoJson", userparam);
         System.out.println(url);
         System.out.println(JSON.toJSONString(param));
         ResponseContent ret = HttpHelper.postJsonEntity(url,JSON.toJSONString(param));