Merge branch 'dev_thirdplatform' into dev

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java

@@ -3,10 +3,7 @@ package com.epmet.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.nacos.client.config.utils.IOUtils;
-import com.dingtalk.api.DefaultDingTalkClient;
-import com.dingtalk.api.DingTalkClient;
 import com.dingtalk.api.request.OapiRobotSendRequest;
-import com.dingtalk.api.response.OapiRobotSendResponse;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -26,7 +23,6 @@ import com.epmet.mpaes.WXXmlToMapUtil;
 import com.epmet.redis.RedisThird;
 import com.epmet.service.ComponentVerifyTicketService;
 import com.epmet.wxapi.constant.WxMaCodeConstant;
-import com.taobao.api.ApiException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java

@@ -9,7 +9,6 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.HttpClientManager;
-import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.ModuleConstant;
 import com.epmet.constant.ThirdRedisKeyConstant;
 import com.epmet.constant.ThirdRunTimeInfoConstant;
@@ -27,7 +26,6 @@ import com.epmet.redis.RedisThird;
 import com.epmet.service.WarrantService;
 import com.epmet.wxapi.constant.WxMaCodeConstant;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
 import org.dom4j.DocumentException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,14 +33,11 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
-import java.net.URLEncoder;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -57,8 +52,6 @@ public class WarrantServiceImpl implements WarrantService {
 
     @Value("${third.platform.appId}")
     private String componentAppId;
-    @Value("${third.platform.appSecret}")
-    private String appSecret;
     @Value("${third.platform.aesKey}")
     private String aesKey;
     @Value("${third.platform.token}")
@@ -74,11 +67,7 @@ public class WarrantServiceImpl implements WarrantService {
     @Autowired
     private ComponentVerifyTicketServiceImpl componentVerifyTicketServiceImpl;
     @Autowired
-    private MessagePushTextDao messagePushTextDao;
-    @Autowired
     private RedisThird redisThird;
-    @Autowired
-    private PaCustomerDao paCustomerDao;
 
     /**
      * @Description  1.保存代码审核结果 2.更新代码上传结果

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java

@@ -188,7 +188,7 @@ public class WxMaCodeServiceImpl implements WxMaCodeService {
 	public WxResult release(String accessToken) {
 		WxResult result = new WxResult();
 		String url = WxMaCodeConstant.RELEASE_URL + "?" + "access_token=" + accessToken;
-		Result<String> releaseResult = HttpClientManager.getInstance().sendPostByJSON(url, null);
+		Result<String> releaseResult = HttpClientManager.getInstance().sendPostByJSON(url, "{}");
 		if (!releaseResult.success()) {
 			result.setErrorCode(releaseResult.getCode());
 			result.setErrorMsg(releaseResult.getMsg());