From 12b5bb388d678866dc28a126c3fff93a0d97c8f2 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 12 Aug 2020 10:15:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ComponentVerifyTicketServiceImpl.java | 4 ---- .../com/epmet/service/impl/WarrantServiceImpl.java | 11 ----------- 2 files changed, 15 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java index e0c59f0f0d..7377950f1f 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java +++ b/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; diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java index 87fa2d0a39..8e1d2bfcc7 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java +++ b/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.更新代码上传结果 From 83559233b4803b5e40b071466dd978e1856840ae Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 12 Aug 2020 16:04:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java index 4711ac11b7..ce18ca880c 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java +++ b/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 releaseResult = HttpClientManager.getInstance().sendPostByJSON(url, null); + Result releaseResult = HttpClientManager.getInstance().sendPostByJSON(url, "{}"); if (!releaseResult.success()) { result.setErrorCode(releaseResult.getCode()); result.setErrorMsg(releaseResult.getMsg());