From c42614978ff12013a1eabebd0289b27169a5784f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 五月 2025 17:25:56 +0800
Subject: [PATCH] 1、实现万功能token（0000-0000-1234-9876-5）； 2、web端单独实现命令结果等待器，并相应修改相关部分； 3、web端实现透传命令； 4、修改一些不当注释； 5、优化一些代码。
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCtrl.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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 a9ae627..b8c2185 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
@@ -43,8 +43,8 @@
private final ClientSv clientSv;
private final AliyunSmsSv aliyunSmsSv;
private final RestTemplateUtil restTemplateUtil;
- private final String appid = PayInfo.appid;
- private final String secret = PayInfo.secret;
+ //private final String appid = PayInfo.appid;
+ //private final String secret = PayInfo.secret;
private final String mchid = PayInfo.mchid;
private final String schema = PayInfo.schema;
private final String signType = PayInfo.signType;
@@ -69,8 +69,8 @@
// 鐧诲綍鍑瘉鏍￠獙
Map<String, Object> queryParams = new HashMap<>();
- queryParams.put("appid", appid);
- queryParams.put("secret", secret);
+ queryParams.put("appid", PayInfo.appid);
+ queryParams.put("secret", PayInfo.secret);
queryParams.put("js_code", code);
queryParams.put("grant_type", grantType);
Map<String, String> headerParams = new HashMap<>();
@@ -111,6 +111,12 @@
if(phoneNumber == null || phoneNumber.length() <= 0) {
return BaseResponseUtils.buildErrorMsg(WechatResultCode.PHONE_NUMBER_CANNOT_BE_NULL.getMessage());
}
+
+ Long clientId = clientSv.getClientIdByPhone(phoneNumber);
+ if(clientId == null) {
+ return BaseResponseUtils.buildErrorMsg("璇ユ墜鏈哄彿瀵瑰簲鐨勫啘鎴蜂笉瀛樺湪");
+ }
+
// 鐢熸垚6浣嶉獙璇佺爜骞惰浆涓篔son鏍煎紡
String securityCode = String.valueOf(RandomCode.genCode());
@@ -178,8 +184,8 @@
// 鏍￠獙閫氳繃锛岃繘琛岀櫥褰曞嚟璇佹牎楠�
Map<String, Object> queryParams = new HashMap<>();
- queryParams.put("appid", appid);
- queryParams.put("secret", secret);
+ queryParams.put("appid", PayInfo.appid);
+ queryParams.put("secret", PayInfo.secret);
queryParams.put("js_code", code);
queryParams.put("grant_type", grantType);
Map<String, String> headerParams = new HashMap<>();
@@ -207,7 +213,7 @@
}
JSONObject job_result = new JSONObject();
- job_result.put("clientId", clientId);
+ job_result.put("clientId", String.valueOf(clientId));
job_result.put("sessionId", sessionId);
return BaseResponseUtils.buildSuccess(job_result);
--
Gitblit v1.8.0