From ecb82d98e523ffa025286ffa617096dfe18c0398 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 19 八月 2024 21:00:51 +0800
Subject: [PATCH] 把微信证书文件放入resources/wxCert文件夹中，读取证书文件类是pipIrrGlobal模块的WxCertUtil类。
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCtrl.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCtrl.java
index 89aa7c8..2de7911 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCtrl.java
@@ -8,7 +8,6 @@
import com.dy.pipIrrGlobal.pojoSe.SeCodeVerify;
import com.dy.pipIrrGlobal.pojoSe.SeOpenId;
import com.dy.pipIrrGlobal.voSe.VoClientWechat;
-import com.dy.pipIrrSell.wechatpay.PayInfo;
import com.dy.pipIrrWechat.client.dto.CodeLoginDTO;
import com.dy.pipIrrWechat.client.dto.CodeVerifyDTO;
import com.dy.pipIrrWechat.result.WechatResultCode;
@@ -43,7 +42,6 @@
private final ClientSv clientSv;
private final AliyunSmsSv aliyunSmsSv;
private final RestTemplateUtil restTemplateUtil;
- private final String privateCertFileName = PayInfo.privateCertFileName;
private final String appid = PayInfo.appid;
private final String secret = PayInfo.secret;
private final String mchid = PayInfo.mchid;
@@ -62,7 +60,7 @@
* @throws IOException
*/
@PostMapping(path = "code_login", consumes = MediaType.APPLICATION_JSON_VALUE)
- public BaseResponse<VoClientWechat> codeLogin(@RequestBody @Valid CodeLoginDTO po, BindingResult bindingResult) throws IOException {
+ public BaseResponse<JSONObject> codeLogin(@RequestBody @Valid CodeLoginDTO po, BindingResult bindingResult) throws IOException {
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
@@ -77,14 +75,25 @@
Map<String, String> headerParams = new HashMap<>();
JSONObject job = restTemplateUtil.get(loginUrl, queryParams, headerParams);
+ if(job.containsKey("errmsg ")) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.INVALID_CODE.getMessage());
+ }
+
String openId = job.getString("openid");
if(openId == null) {
return BaseResponseUtils.buildErrorMsg(WechatResultCode.LOGIN_FAIL.getMessage());
}
try {
+ JSONObject job_client = new JSONObject();
VoClientWechat res = clientSv.getSimpleClientInfo(null, openId);
- return BaseResponseUtils.buildSuccess(res);
+ if(res != null) {
+ job_client.put("client", res);
+ } else {
+ VoClientWechat voClientWechat = new VoClientWechat();
+ job_client.put("client", voClientWechat);
+ }
+ return BaseResponseUtils.buildSuccess(job_client);
} catch (Exception e) {
log.error("鏌ヨ鍐滄埛寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage()) ;
--
Gitblit v1.8.0