13 changed files with 589 additions and 26 deletions
Split View
Diff Options
-
+1 -1module-base/base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java
-
+8 -0module-common/src/main/java/org/jeecg/api/Final/UserType.java
-
+24 -2module-common/src/main/java/org/jeecg/api/controller/AppletLoginController.java
-
+7 -2module-common/src/main/java/org/jeecg/api/service/AppletLoginService.java
-
+83 -13module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java
-
+12 -4module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java
-
+264 -0module-common/src/main/java/org/jeecg/api/wxUtils/WxHttpClientUtil.java
-
+179 -0module-common/src/main/java/org/jeecg/api/wxUtils/WxHttpUtils.java
-
+2 -1module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java
-
+2 -0module-pay/src/main/java/org/jeecg/modules/pay/config/WxPay.java
-
+1 -1module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
-
+5 -2module-system/src/main/resources/application-dev.yml
-
+1 -0module-system/src/main/resources/pay_weixin.properties
+ 1
- 1
module-base/base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java
View File
+ 8
- 0
module-common/src/main/java/org/jeecg/api/Final/UserType.java
View File
| @ -0,0 +1,8 @@ | |||
| package org.jeecg.api.Final; | |||
| public class UserType { | |||
| public static final String OFFICIAL = "official"; | |||
| public static final String APPLET = "applet"; | |||
| } | |||
+ 24
- 2
module-common/src/main/java/org/jeecg/api/controller/AppletLoginController.java
View File
+ 7
- 2
module-common/src/main/java/org/jeecg/api/service/AppletLoginService.java
View File
+ 83
- 13
module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java
View File
+ 12
- 4
module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java
View File
+ 264
- 0
module-common/src/main/java/org/jeecg/api/wxUtils/WxHttpClientUtil.java
View File
| @ -0,0 +1,264 @@ | |||
| package org.jeecg.api.wxUtils; | |||
| import lombok.extern.slf4j.Slf4j; | |||
| import org.apache.http.HttpStatus; | |||
| import org.apache.http.client.config.RequestConfig; | |||
| import org.apache.http.client.methods.CloseableHttpResponse; | |||
| import org.apache.http.client.methods.HttpGet; | |||
| import org.apache.http.client.methods.HttpPost; | |||
| import org.apache.http.client.utils.URIBuilder; | |||
| import org.apache.http.conn.ssl.SSLConnectionSocketFactory; | |||
| import org.apache.http.conn.ssl.SSLContextBuilder; | |||
| import org.apache.http.conn.ssl.TrustStrategy; | |||
| import org.apache.http.entity.StringEntity; | |||
| import org.apache.http.impl.client.CloseableHttpClient; | |||
| import org.apache.http.impl.client.DefaultHttpRequestRetryHandler; | |||
| import org.apache.http.impl.client.HttpClients; | |||
| import org.apache.http.util.EntityUtils; | |||
| import javax.net.ssl.SSLContext; | |||
| import java.io.IOException; | |||
| import java.net.URI; | |||
| import java.security.KeyManagementException; | |||
| import java.security.KeyStoreException; | |||
| import java.security.NoSuchAlgorithmException; | |||
| import java.security.cert.CertificateException; | |||
| import java.security.cert.X509Certificate; | |||
| import java.util.Map; | |||
| /** | |||
| * 微信API专用HTTP客户端工具类 | |||
| * 具有超时配置、重试机制和异常处理 | |||
| * | |||
| * @author system | |||
| * @date 2025-01-25 | |||
| */ | |||
| @Slf4j | |||
| public class WxHttpClientUtil { | |||
| // 超时配置常量 | |||
| private static final int CONNECTION_REQUEST_TIMEOUT = 10000; // 10秒 | |||
| private static final int CONNECT_TIMEOUT = 15000; // 15秒 | |||
| private static final int SOCKET_TIMEOUT = 30000; // 30秒 | |||
| private static final int MAX_RETRY_COUNT = 3; // 最大重试次数 | |||
| /** | |||
| * 创建带超时配置的SSL客户端 | |||
| */ | |||
| private static CloseableHttpClient createWxHttpClient() { | |||
| try { | |||
| // SSL配置 - 信任所有证书 | |||
| SSLContext sslContext = new SSLContextBuilder() | |||
| .loadTrustMaterial(null, new TrustStrategy() { | |||
| @Override | |||
| public boolean isTrusted(X509Certificate[] chain, String authType) throws CertificateException { | |||
| return true; | |||
| } | |||
| }).build(); | |||
| SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory( | |||
| sslContext, | |||
| SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER | |||
| ); | |||
| // 请求配置 | |||
| RequestConfig requestConfig = RequestConfig.custom() | |||
| .setConnectionRequestTimeout(CONNECTION_REQUEST_TIMEOUT) | |||
| .setConnectTimeout(CONNECT_TIMEOUT) | |||
| .setSocketTimeout(SOCKET_TIMEOUT) | |||
| .build(); | |||
| // 重试处理器 | |||
| DefaultHttpRequestRetryHandler retryHandler = new DefaultHttpRequestRetryHandler(MAX_RETRY_COUNT, true); | |||
| return HttpClients.custom() | |||
| .setSSLSocketFactory(sslsf) | |||
| .setDefaultRequestConfig(requestConfig) | |||
| .setRetryHandler(retryHandler) | |||
| .build(); | |||
| } catch (KeyManagementException | NoSuchAlgorithmException | KeyStoreException e) { | |||
| log.error("创建SSL客户端失败: {}", e.getMessage(), e); | |||
| // 返回默认客户端作为后备 | |||
| return HttpClients.createDefault(); | |||
| } | |||
| } | |||
| /** | |||
| * 执行GET请求（微信API专用） | |||
| * @param url 请求URL | |||
| * @param params 请求参数 | |||
| * @return 响应字符串 | |||
| */ | |||
| public static String doGet(String url, Map<String, String> params) { | |||
| return doGetWithRetry(url, params, 0); | |||
| } | |||
| /** | |||
| * 执行GET请求（微信API专用） | |||
| * @param url 请求URL | |||
| * @return 响应字符串 | |||
| */ | |||
| public static String doGet(String url) { | |||
| return doGet(url, null); | |||
| } | |||
| /** | |||
| * 带重试机制的GET请求 | |||
| */ | |||
| private static String doGetWithRetry(String url, Map<String, String> params, int retryCount) { | |||
| CloseableHttpClient httpClient = null; | |||
| CloseableHttpResponse response = null; | |||
| try { | |||
| log.info("开始请求微信API: {}, 重试次数: {}", url, retryCount); | |||
| httpClient = createWxHttpClient(); | |||
| // 构建URI | |||
| URIBuilder builder = new URIBuilder(url); | |||
| if (params != null) { | |||
| for (Map.Entry<String, String> entry : params.entrySet()) { | |||
| builder.addParameter(entry.getKey(), entry.getValue()); | |||
| } | |||
| } | |||
| URI uri = builder.build(); | |||
| // 创建GET请求 | |||
| HttpGet httpGet = new HttpGet(uri); | |||
| httpGet.setHeader("User-Agent", "WxHttpClient/1.0"); | |||
| httpGet.setHeader("Accept", "application/json, text/plain, */*"); | |||
| // 执行请求 | |||
| response = httpClient.execute(httpGet); | |||
| // 检查响应状态 | |||
| int statusCode = response.getStatusLine().getStatusCode(); | |||
| if (statusCode == HttpStatus.SC_OK) { | |||
| String result = EntityUtils.toString(response.getEntity(), "UTF-8"); | |||
| log.info("微信API请求成功: {}", url); | |||
| return result; | |||
| } else { | |||
| log.warn("微信API返回非200状态码: {}, URL: {}", statusCode, url); | |||
| throw new RuntimeException("HTTP状态码异常: " + statusCode); | |||
| } | |||
| } catch (Exception e) { | |||
| log.error("微信API请求失败: {}, 错误: {}, 重试次数: {}", url, e.getMessage(), retryCount); | |||
| // 如果还有重试机会，进行重试 | |||
| if (retryCount < MAX_RETRY_COUNT) { | |||
| log.info("准备进行第{}次重试...", retryCount + 1); | |||
| try { | |||
| Thread.sleep(1000 * (retryCount + 1)); // 递增延迟 | |||
| } catch (InterruptedException ie) { | |||
| Thread.currentThread().interrupt(); | |||
| } | |||
| return doGetWithRetry(url, params, retryCount + 1); | |||
| } | |||
| // 重试次数用尽，抛出异常 | |||
| throw new RuntimeException("微信API请求失败，已重试" + MAX_RETRY_COUNT + "次: " + e.getMessage(), e); | |||
| } finally { | |||
| // 关闭资源 | |||
| if (response != null) { | |||
| try { | |||
| response.close(); | |||
| } catch (IOException e) { | |||
| log.error("关闭响应失败: {}", e.getMessage()); | |||
| } | |||
| } | |||
| if (httpClient != null) { | |||
| try { | |||
| httpClient.close(); | |||
| } catch (IOException e) { | |||
| log.error("关闭客户端失败: {}", e.getMessage()); | |||
| } | |||
| } | |||
| } | |||
| } | |||
| /** | |||
| * 执行POST请求（微信API专用） | |||
| * @param url 请求URL | |||
| * @param jsonBody JSON请求体 | |||
| * @return 响应字符串 | |||
| */ | |||
| public static String doPost(String url, String jsonBody) { | |||
| return doPostWithRetry(url, jsonBody, 0); | |||
| } | |||
| /** | |||
| * 带重试机制的POST请求 | |||
| */ | |||
| private static String doPostWithRetry(String url, String jsonBody, int retryCount) { | |||
| CloseableHttpClient httpClient = null; | |||
| CloseableHttpResponse response = null; | |||
| try { | |||
| log.info("开始POST请求微信API: {}, 重试次数: {}", url, retryCount); | |||
| httpClient = createWxHttpClient(); | |||
| // 创建POST请求 | |||
| HttpPost httpPost = new HttpPost(url); | |||
| httpPost.setHeader("Content-Type", "application/json; charset=UTF-8"); | |||
| httpPost.setHeader("User-Agent", "WxHttpClient/1.0"); | |||
| // 设置请求体 | |||
| if (jsonBody != null) { | |||
| StringEntity entity = new StringEntity(jsonBody, "UTF-8"); | |||
| httpPost.setEntity(entity); | |||
| } | |||
| // 执行请求 | |||
| response = httpClient.execute(httpPost); | |||
| // 检查响应状态 | |||
| int statusCode = response.getStatusLine().getStatusCode(); | |||
| if (statusCode == HttpStatus.SC_OK) { | |||
| String result = EntityUtils.toString(response.getEntity(), "UTF-8"); | |||
| log.info("微信API POST请求成功: {}", url); | |||
| return result; | |||
| } else { | |||
| log.warn("微信API POST返回非200状态码: {}, URL: {}", statusCode, url); | |||
| throw new RuntimeException("HTTP状态码异常: " + statusCode); | |||
| } | |||
| } catch (Exception e) { | |||
| log.error("微信API POST请求失败: {}, 错误: {}, 重试次数: {}", url, e.getMessage(), retryCount); | |||
| // 如果还有重试机会，进行重试 | |||
| if (retryCount < MAX_RETRY_COUNT) { | |||
| log.info("准备进行第{}次重试...", retryCount + 1); | |||
| try { | |||
| Thread.sleep(1000 * (retryCount + 1)); // 递增延迟 | |||
| } catch (InterruptedException ie) { | |||
| Thread.currentThread().interrupt(); | |||
| } | |||
| return doPostWithRetry(url, jsonBody, retryCount + 1); | |||
| } | |||
| // 重试次数用尽，抛出异常 | |||
| throw new RuntimeException("微信API POST请求失败，已重试" + MAX_RETRY_COUNT + "次: " + e.getMessage(), e); | |||
| } finally { | |||
| // 关闭资源 | |||
| if (response != null) { | |||
| try { | |||
| response.close(); | |||
| } catch (IOException e) { | |||
| log.error("关闭响应失败: {}", e.getMessage()); | |||
| } | |||
| } | |||
| if (httpClient != null) { | |||
| try { | |||
| httpClient.close(); | |||
| } catch (IOException e) { | |||
| log.error("关闭客户端失败: {}", e.getMessage()); | |||
| } | |||
| } | |||
| } | |||
| } | |||
| } | |||
+ 179
- 0
module-common/src/main/java/org/jeecg/api/wxUtils/WxHttpUtils.java
View File
| @ -0,0 +1,179 @@ | |||
| package org.jeecg.api.wxUtils; | |||
| import com.alibaba.fastjson.JSON; | |||
| import com.alibaba.fastjson.JSONObject; | |||
| import com.alibaba.fastjson.TypeReference; | |||
| import lombok.Getter; | |||
| import org.springframework.beans.factory.annotation.Value; | |||
| import org.springframework.stereotype.Component; | |||
| import java.io.BufferedReader; | |||
| import java.io.DataOutputStream; | |||
| import java.io.InputStreamReader; | |||
| import java.io.UnsupportedEncodingException; | |||
| import java.net.HttpURLConnection; | |||
| import java.net.URL; | |||
| import java.nio.charset.StandardCharsets; | |||
| import java.security.MessageDigest; | |||
| import java.security.NoSuchAlgorithmException; | |||
| import java.util.Map; | |||
| import java.util.TreeMap; | |||
| @Getter | |||
| @Component | |||
| public class WxHttpUtils { | |||
| @Value("${wechat.mpAppId}") | |||
| private String appid; | |||
| @Value("${wechat.mpAppSecret}") | |||
| private String secret;// | |||
| @Value("${wechat.mchId}") | |||
| private String mchId;// | |||
| @Value("${wechat.official.appid}") | |||
| private String officialAppid; | |||
| @Value("${wechat.official.appsecret}") | |||
| private String officialSecret;// | |||
| private static String shipmentUrl = "https://api.weixin.qq.com/wxa/sec/order/upload_shipping_info?access_token="; | |||
| private static final String GET_USER_PHONE_NUMBER = "https://api.weixin.qq.com/wxa/business/getuserphonenumber"; | |||
| private static String jsapiTicket = null; // 用于缓存jsapi_ticket | |||
| /** | |||
| * 获取令牌 | |||
| * | |||
| * @return | |||
| */ | |||
| public String getAccessToken(String mAppId, String mSecret) { | |||
| String requestUrl = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + mAppId + "&secret=" + mSecret; | |||
| try { | |||
| // 使用增强版HTTP客户端，具有超时配置和重试机制 | |||
| String response = WxHttpClientUtil.doGet(requestUrl); | |||
| Map<String, String> map = JSON.parseObject(response, new TypeReference<Map<String, String>>() {}); | |||
| String accessToken = map.get("access_token"); | |||
| if (accessToken == null || accessToken.isEmpty()) { | |||
| throw new RuntimeException("获取access_token失败，响应: " + response); | |||
| } | |||
| return accessToken; | |||
| } catch (Exception e) { | |||
| throw new RuntimeException("获取微信access_token失败: " + e.getMessage(), e); | |||
| } | |||
| } | |||
| public String getAccessToken() { | |||
| return getAccessToken(appid, secret); | |||
| } | |||
| public String getPhoneNumber(String code) throws Exception { | |||
| URL url = new URL(GET_USER_PHONE_NUMBER + "?access_token=" + this.getAccessToken()); | |||
| HttpURLConnection conn = (HttpURLConnection) url.openConnection(); | |||
| conn.setRequestMethod("POST"); | |||
| conn.setRequestProperty("Content-Type", "application/json; utf-8"); | |||
| conn.setRequestProperty("Accept", "application/json"); | |||
| conn.setDoOutput(true); | |||
| JSONObject jsonInput = new JSONObject(); | |||
| jsonInput.put("code", code); | |||
| try (DataOutputStream os = new DataOutputStream(conn.getOutputStream())) { | |||
| byte[] input = jsonInput.toString().getBytes(StandardCharsets.UTF_8); | |||
| os.write(input, 0, input.length); | |||
| } | |||
| try (BufferedReader br = new BufferedReader( | |||
| new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8))) { | |||
| StringBuilder response = new StringBuilder(); | |||
| String responseLine; | |||
| while ((responseLine = br.readLine()) != null) { | |||
| response.append(responseLine.trim()); | |||
| } | |||
| //获取手机号码 | |||
| return response.toString(); | |||
| } | |||
| } | |||
| // 获取jsapi_ticket | |||
| private String getJsApiTicket() throws Exception { | |||
| String accessToken = getAccessToken(officialAppid, officialSecret); | |||
| String url = "https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=" + accessToken + "&type=jsapi"; | |||
| jsapiTicket = sendGet(url, "UTF-8"); | |||
| System.out.println("jsapiTicket=========="+jsapiTicket); | |||
| return jsapiTicket; | |||
| } | |||
| // 发送GET请求并获取响应 | |||
| private String sendGet(String url, String encoding) throws Exception { | |||
| HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection(); | |||
| connection.setRequestMethod("GET"); | |||
| connection.connect(); | |||
| BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream(), encoding)); | |||
| String inputLine; | |||
| StringBuilder content = new StringBuilder(); | |||
| while ((inputLine = in.readLine()) != null) { | |||
| content.append(inputLine); | |||
| } | |||
| in.close(); | |||
| connection.disconnect(); | |||
| return content.toString(); | |||
| } | |||
| /** | |||
| * 获取公众号签名 | |||
| * | |||
| * @param url URL | |||
| * @return 结果 | |||
| */ | |||
| public Map<String, Object> getSignPackage(String url) throws Exception { | |||
| String jsapiTicket = getJsApiTicket(); | |||
| JSONObject jsonObject = JSONObject.parseObject(jsapiTicket); // 解析JSON字符串 | |||
| jsapiTicket = jsonObject.getString("ticket"); // 提取access_token | |||
| String nonceStr = createNonceStr(); | |||
| long timestamp = System.currentTimeMillis() / 1000; | |||
| String string1 = "jsapi_ticket=" + jsapiTicket + | |||
| "&noncestr=" + nonceStr + | |||
| "×tamp=" + timestamp + | |||
| "&url=" + url; // 确保URL是编码过的 | |||
| String signature = sha1(string1); | |||
| Map<String, Object> ret = new TreeMap<>(); | |||
| ret.put("appId", officialAppid); | |||
| ret.put("timestamp", timestamp); | |||
| ret.put("nonceStr", nonceStr); | |||
| ret.put("signature", signature); | |||
| ret.put("jsapi_ticket", jsapiTicket); | |||
| ret.put("url",url); | |||
| return ret; | |||
| } | |||
| // 生成随机字符串 | |||
| private String createNonceStr() { | |||
| return String.valueOf((long) (Math.random() * 100000000)); | |||
| } | |||
| // SHA1加密 | |||
| private String sha1(String input) throws NoSuchAlgorithmException, UnsupportedEncodingException { | |||
| MessageDigest md = MessageDigest.getInstance("SHA-1"); | |||
| byte[] messageDigest = md.digest(input.getBytes("UTF-8")); | |||
| StringBuilder hexString = new StringBuilder(); | |||
| for (byte b : messageDigest) { | |||
| String hex = Integer.toHexString(0xff & b); | |||
| if (hex.length() == 1) hexString.append('0'); | |||
| hexString.append(hex); | |||
| } | |||
| return hexString.toString(); | |||
| } | |||
| } | |||