wsy182/wePush
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
wangsiyuan
2023-12-06 16:48:10 +08:00
parent e8ccd78a39 2d3d3aa676
commit 1d3eaf451f
9 changed files with 185 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/kimgo/wepush/common/PhoneNumberValidation.java
View File

@@ -13,7 +13,7 @@ public class PhoneNumberValidation {
try {
Phonenumber.PhoneNumber phoneNumber = phoneNumberUtil.parse(number, "CN");
boolean isCorrect = phoneNumberUtil.isValidNumber(phoneNumber);
logger.info("号码：{},是否合法: {}",number,isCorrect);
logger.debug("号码：{},是否合法: {}",number,isCorrect);
return isCorrect;
} catch (NumberParseException e) {
logger.error("NumberParseException was thrown: ",e);

2
src/main/java/com/kimgo/wepush/controller/CallerController.java
View File

@@ -25,7 +25,7 @@ public class CallerController {
}
if (callInfo == null || isNullOrEmptyOrLiteralNull(callInfo.getPhoneNumber()) ||
isNullOrEmptyOrLiteralNull(callInfo.getCallTime())) {
logger.info("CallInfo has invalid fields.");
logger.debug("CallInfo has invalid fields.");
return ServerResponseEntity.fail("json body value error.");
}
return callService.getPhoneNumber(accessToken,callInfo);

2
src/main/java/com/kimgo/wepush/controller/SMSController.java
View File

@@ -21,7 +21,7 @@ public class SMSController {
public ServerResponseEntity receiveSMS(@RequestHeader("accessToken") String accessToken,
@RequestBody SMSInfo smsInfo) {
logger.info("SMSInfo: {},accessToken: {}",smsInfo.toString(),accessToken);
logger.info("SMSInfo: {}",smsInfo.toString());
if(accessToken == null){
return ServerResponseEntity.fail("accessToken cannot be empty.");
}

26
src/main/java/com/kimgo/wepush/model/TextMessage.java Normal file
View File

@@ -0,0 +1,26 @@
package com.kimgo.wepush.model;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
public class TextMessage {
private String touser;
private String toparty;
private String totag;
private String msgtype;
private int agentid;
private Text text;
private int safe;
private int enable_id_trans;
private int enable_duplicate_check;
private int duplicate_check_interval;
@Data
@NoArgsConstructor
public static class Text {
private String content;
}
}

2
src/main/java/com/kimgo/wepush/request/WeChatAPI.java
View File

@@ -31,7 +31,7 @@ public class WeChatAPI {
ObjectMapper objectMapper1 = new ObjectMapper();
QyWeChatGetAccessTokenApiResponse qyWeChatGetAccessTokenApiResponse = objectMapper1.readValue(responseBody, QyWeChatGetAccessTokenApiResponse.class);
if (qyWeChatGetAccessTokenApiResponse.getErrcode() == 0){
logger.info("get qyWeChat AccessToken Success");
logger.debug("get qyWeChat AccessToken Success");
return qyWeChatGetAccessTokenApiResponse.getAccess_token();
} else {
logger.error("getAccessToken error: {}",qyWeChatGetAccessTokenApiResponse.getErrmsg());

1
src/main/java/com/kimgo/wepush/service/CallService.java
View File

@@ -94,6 +94,7 @@ public class CallService {
QyWeChatSendMessageApiResponse apiResponse = objectMapper1.readValue(responseBody, QyWeChatSendMessageApiResponse.class);
if (apiResponse.getErrcode() == 0) {
logger.debug("Request qyWeChat Success.");
return apiResponse;
} else if (apiResponse.getErrcode() == 42001 || apiResponse.getErrcode() == 40014) {
logger.info("Access token expired. Refreshing token...");

92
src/main/java/com/kimgo/wepush/service/SMSService.java
View File

@@ -2,6 +2,7 @@ package com.kimgo.wepush.service;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.kimgo.wepush.model.TextMessage;
import com.kimgo.wepush.response.QyWeChatSendMessageApiResponse;
import com.kimgo.wepush.model.SMSInfo;
import com.kimgo.wepush.model.TextCardMessage;
@@ -41,22 +42,8 @@ public class SMSService {
public QyWeChatSendMessageApiResponse requestWithOkhttp(String accessToken,SMSInfo smsInfo){
OkHttpClient client = new OkHttpClient();
String url = qyWeChatURLService.getSendTextCardMessageUrl() + "?access_token=" + accessToken;
TextCardMessage textCardMessage = setTextCardMessage(smsInfo);
// 使用Jackson进行序列化
ObjectMapper objectMapper = new ObjectMapper();
String jsonBody = null;
try {
jsonBody = objectMapper.writeValueAsString(textCardMessage);
logger.info("jsonBody: {}",jsonBody);
} catch (JsonProcessingException e) {
logger.error("JSON processing error", e);
return null;
}
// 构建请求体
RequestBody body = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), jsonBody);
Request request = new Request.Builder().url(url).post(body).build();
Request request = handleMessage(accessToken,smsInfo);
try (Response response = client.newCall(request).execute()) {
String responseBody = response.body().string();
logger.info("Response: {}", responseBody);
@@ -102,4 +89,79 @@ public class SMSService {
return textCardMessage;
}
public TextMessage setTextMessage(SMSInfo smsInfo){
TextMessage textMessage = new TextMessage();
textMessage.setTouser(apiSettingService.getApiSetting().getTouser());
textMessage.setMsgtype("text");
textMessage.setAgentid(apiSettingService.getApiSetting().getAgentid());
textMessage.setEnable_duplicate_check(apiSettingService.getApiSetting().getEnableDuplicateCheck());
textMessage.setDuplicate_check_interval(apiSettingService.getApiSetting().getDuplicateCheckInterval());
TextMessage.Text text = new TextMessage.Text();
text.setContent("你有一条新短信\n短信号码: "+smsInfo.getSmsNumber() + "\n接受时间: " + smsInfo.getSmsAcceptanceTime() + "\n内容: \n"+ smsInfo.getSmsContent());
textMessage.setText(text);
logger.info("TextMessage: {}", textMessage.toString());
return textMessage;
}
private<T> Request bulidRequest(String accessToken,T object){
String url = qyWeChatURLService.getSendTextCardMessageUrl() + "?access_token=" + accessToken;
// 使用Jackson进行序列化
ObjectMapper objectMapper = new ObjectMapper();
String jsonBody = null;
try {
jsonBody = objectMapper.writeValueAsString(object);
logger.info("jsonBody: {}",jsonBody);
} catch (JsonProcessingException e) {
logger.error("JSON processing error", e);
return null;
}
// 构建请求体
RequestBody body = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), jsonBody);
Request request = new Request.Builder().url(url).post(body).build();
return request;
}
private Request handleMessage(String accessToken, SMSInfo smsInfo) {
TextCardMessage textCardMessage = setTextCardMessage(smsInfo);
int textCardMessageSize = checkMessageSize(textCardMessage.getTextcard().getDescription());
if (textCardMessageSize <= 512) {
return bulidRequest(accessToken, textCardMessage);
} else {
TextMessage textMessage = setTextMessage(smsInfo);
int textMessageSize = checkMessageSize(textMessage.getText().getContent());
if (textMessageSize <= 2048) {
return bulidRequest(accessToken, textMessage);
} else {
TextCardMessage wrMsg = setWarningTextCardMessage();
return bulidRequest(accessToken, wrMsg);
}
}
}
public TextCardMessage setWarningTextCardMessage() {
TextCardMessage textCardMessage = new TextCardMessage();
textCardMessage.setTouser(apiSettingService.getApiSetting().getTouser());
textCardMessage.setMsgtype(apiSettingService.getApiSetting().getMsgtype());
textCardMessage.setAgentid(apiSettingService.getApiSetting().getAgentid());
textCardMessage.setEnable_duplicate_check(apiSettingService.getApiSetting().getEnableDuplicateCheck());
textCardMessage.setDuplicate_check_interval(apiSettingService.getApiSetting().getDuplicateCheckInterval());
TextCardMessage.TextCard textCard = new TextCardMessage.TextCard();
textCard.setTitle("警告消息");
textCard.setDescription("<div class='highlight'>警告: 短信消息过长请查看手机。</div>");
textCard.setUrl("https://kimgo.cn");
// 将TextCard对象设置到TextCardMessage中
textCardMessage.setTextcard(textCard);
logger.info("TextCardMessage: {}", textCardMessage.toString());
return textCardMessage;
}
public int checkMessageSize(String message){
byte[] messageBytes = message.getBytes(java.nio.charset.StandardCharsets.UTF_8);
int size = messageBytes.length;
logger.info("Message size in bytes: " + size);
return size;
}
}

2
src/main/java/com/kimgo/wepush/service/TokenService.java
View File

@@ -75,7 +75,7 @@ public class TokenService {
int result = qyWeChatAppInfoMapper.update(null, updateWrapper);
if (result > 0) {
logger.info("Update successful");
logger.debug("Update successful");
} else {
logger.warn("Update failed: No rows affected");
}