From 4231cb0417322b6b974210d31ff4cbd8a842da96 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 12 八月 2025 10:42:39 +0800
Subject: [PATCH] 合并代码
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/UserUtil.java | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/UserUtil.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/UserUtil.java
index db6bdbd..98623d2 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/UserUtil.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/UserUtil.java
@@ -32,11 +32,11 @@
*/
public static List<QYTUserInfo> getUserInfoByPhone(String mobile) {
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/2.0/queryUserinfoByMobilev2";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/2.0/queryUserinfoByMobilev2";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -47,8 +47,8 @@
String messageId = UUID.randomUUID().toString().replaceAll("-", "");
contentMap.put(SystemParameterNames.getAppKey(), appKey);
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
- contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
contentMap.put("content", "{\"list\":[{\"mobile\":\"" + mobile + "\"}]}");
log.info("【根据手机号码获取人员信息】请求地址:" + url);
log.info("【根据手机号码获取人员信息】请求参数:" + JSON.toJSONString(contentMap));
@@ -84,11 +84,11 @@
*/
public static RegisterViaMobile registerViaMobile(RegisterViaMobileRequest request) {
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/m1_register_via_mobile";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/m1_register_via_mobile";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -99,8 +99,8 @@
String messageId = UUID.randomUUID().toString().replaceAll("-", "");
contentMap.put(SystemParameterNames.getAppKey(), appKey);
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
- contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
contentMap.put("content", new Gson().toJson(request));
log.info("【根据手机号注册用户】请求地址:" + url);
log.info("【根据手机号注册用户】请求参数:" + JSON.toJSONString(contentMap));
@@ -130,11 +130,11 @@
*/
public static Boolean modifyPwd(ModifyPwdRequest request) {
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/modifyPwd";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/modifyPwd";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -145,8 +145,8 @@
String messageId = UUID.randomUUID().toString().replaceAll("-", "");
contentMap.put(SystemParameterNames.getAppKey(), appKey);
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
- contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
contentMap.put("content", new Gson().toJson(request));
log.info("【易信用户修改密码】请求地址:" + url);
log.info("【易信用户修改密码】请求参数:" + JSON.toJSONString(contentMap));
@@ -176,11 +176,11 @@
*/
public static Boolean resetPwd(ResetPwdRequest request) {
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/resetPwd";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/resetPwd";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -191,8 +191,8 @@
String messageId = UUID.randomUUID().toString().replaceAll("-", "");
contentMap.put(SystemParameterNames.getAppKey(), appKey);
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
- contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
contentMap.put("content", new Gson().toJson(request));
log.info("【易信重置密码】请求地址:" + url);
log.info("【易信重置密码】请求参数:" + JSON.toJSONString(contentMap));
--
Gitblit v1.7.1