Commit a07a7965 authored by lee_mingzhu's avatar lee_mingzhu

remove google gson package and sun package of base64

parent 65f41783
...@@ -19,6 +19,7 @@ import cn.quantgroup.xyqb.service.jr58.Jr58Service; ...@@ -19,6 +19,7 @@ import cn.quantgroup.xyqb.service.jr58.Jr58Service;
import cn.quantgroup.xyqb.service.user.ILkbUserService; import cn.quantgroup.xyqb.service.user.ILkbUserService;
import cn.quantgroup.xyqb.util.GZipUtil; import cn.quantgroup.xyqb.util.GZipUtil;
import cn.quantgroup.xyqb.util.PasswordUtil; import cn.quantgroup.xyqb.util.PasswordUtil;
import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.CloseableHttpClient;
...@@ -230,7 +231,8 @@ public class Jr58ServiceImpl implements Jr58Service { ...@@ -230,7 +231,8 @@ public class Jr58ServiceImpl implements Jr58Service {
url= pushImportForJr58Url + "/SpiderServer/api/dataTransfer/saveUserAuthInfo.json"; url= pushImportForJr58Url + "/SpiderServer/api/dataTransfer/saveUserAuthInfo.json";
}else if("1".equals(authorizationData.getSourceFrom())){ }else if("1".equals(authorizationData.getSourceFrom())){
//读秒数据 //读秒数据
String graspingJson = Constants.GSON.toJson(authorizationData.getOperator_data()); //String graspingJson = Constants.GSON.toJson(authorizationData.getOperator_data());
String graspingJson = JSONObject.toJSONString(authorizationData.getOperator_data());
byte[] graspingJsonBytes = GZipUtil.compressToByte(graspingJson); byte[] graspingJsonBytes = GZipUtil.compressToByte(graspingJson);
String authorizationDataStr = Base64.getEncoder().encodeToString(graspingJsonBytes); String authorizationDataStr = Base64.getEncoder().encodeToString(graspingJsonBytes);
parameters = ImmutableMap.<String, String>builder() parameters = ImmutableMap.<String, String>builder()
......
...@@ -5,6 +5,7 @@ import cn.quantgroup.xyqb.model.model.BlacklistMatchResult; ...@@ -5,6 +5,7 @@ import cn.quantgroup.xyqb.model.model.BlacklistMatchResult;
import cn.quantgroup.xyqb.service.http.IHttpService; import cn.quantgroup.xyqb.service.http.IHttpService;
import cn.quantgroup.xyqb.service.model.IModelService; import cn.quantgroup.xyqb.service.model.IModelService;
import cn.quantgroup.xyqb.util.PasswordUtil; import cn.quantgroup.xyqb.util.PasswordUtil;
import com.alibaba.fastjson.JSONObject;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
...@@ -35,7 +36,8 @@ public class ModelServiceImpl implements IModelService { ...@@ -35,7 +36,8 @@ public class ModelServiceImpl implements IModelService {
String url = buildBlacklistMatchUrl(phoneNo); String url = buildBlacklistMatchUrl(phoneNo);
String result = httpService.get(url); String result = httpService.get(url);
try { try {
BlacklistMatchResult blacklistMatchResult = Constants.GSON.fromJson(result, BlacklistMatchResult.class); //BlacklistMatchResult blacklistMatchResult = Constants.GSON.fromJson(result, BlacklistMatchResult.class);
BlacklistMatchResult blacklistMatchResult = JSONObject.parseObject(result, BlacklistMatchResult.class);
return blacklistMatchResult; return blacklistMatchResult;
} catch (Exception e) { } catch (Exception e) {
return null; return null;
......
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