Compare commits

...

5 Commits

Author SHA1 Message Date
wangsiyuan 4ccec1e8b8 更新 SMSService.java 2023-12-05 02:23:55 +08:00
wangsiyuan 58ce53ebe0 更新 QyWeChatURLService.java 2023-12-05 02:23:49 +08:00
wangsiyuan d0763da3de 更新 CallService.java 2023-12-05 02:23:46 +08:00
wangsiyuan 7972690ae8 更新 ApiSettingService.java 2023-12-05 02:23:43 +08:00
wangsiyuan 414dde635e 更新 SMSInfo.java 2023-12-05 02:23:38 +08:00
5 changed files with 13 additions and 16 deletions

View File

@ -18,8 +18,8 @@ public class SMSInfo {
public String toString() { public String toString() {
return "SMSInfo{" + return "SMSInfo{" +
"SMSNumber='" + smsNumber + '\'' + "SMSNumber='" + smsNumber + '\'' +
", SMSAcceptanceTime='" + smsNumber + '\'' + ", SMSAcceptanceTime='" + smsAcceptanceTime + '\'' +
", SMSContent='" + smsNumber + '\'' + ", SMSContent='" + smsContent + '\'' +
'}'; '}';
} }

View File

@ -28,7 +28,6 @@ public class ApiSettingService {
String phoneNumberToSearch = userConfig.getPhoneNumber(); String phoneNumberToSearch = userConfig.getPhoneNumber();
QueryWrapper<ApiSetting> wrapper = new QueryWrapper<>(); QueryWrapper<ApiSetting> wrapper = new QueryWrapper<>();
wrapper.eq("phone_number", phoneNumberToSearch); wrapper.eq("phone_number", phoneNumberToSearch);
logger.info("wrapper: {}",wrapper);
ApiSetting result = apiSettingMapper.selectOne(wrapper); ApiSetting result = apiSettingMapper.selectOne(wrapper);
logger.info("result: {}",result); logger.info("result: {}",result);
if (result == null){ if (result == null){

View File

@ -27,14 +27,10 @@ public class CallService {
private ServerResponseEntity serverResponseEntity; private ServerResponseEntity serverResponseEntity;
@Autowired @Autowired
private UserConfig userConfig; private QyWeChatURLService qyWeChatURLService;
@Autowired @Autowired
private ApiSettingService apiSettingService; private ApiSettingService apiSettingService;
@Autowired @Autowired
private URLConfig urlConfig;
@Autowired
private QyWeChatAppInfoMapper qyWeChatAppInfoMapper;
@Autowired
TokenService tokenService; TokenService tokenService;
public ServerResponseEntity getPhoneNumber(String accessToken, CallInfo callInfo){ public ServerResponseEntity getPhoneNumber(String accessToken, CallInfo callInfo){
String correctAccessToken = tokenService.getApiAccessToken(); String correctAccessToken = tokenService.getApiAccessToken();
@ -80,8 +76,8 @@ public class CallService {
} }
public QyWeChatSendMessageApiResponse requestWithOkhttp(String accessToken,String phoneNumber,String callTime){ public QyWeChatSendMessageApiResponse requestWithOkhttp(String accessToken,String phoneNumber,String callTime){
String url = qyWeChatURLService.getSendTextCardMessageUrl() + "?access_token=" + accessToken;
OkHttpClient client = new OkHttpClient(); OkHttpClient client = new OkHttpClient();
String url = urlConfig.getSendTextCardMessageUrl() + accessToken;
TextCardMessage textCardMessage = setTextCardMessage(phoneNumber,callTime); TextCardMessage textCardMessage = setTextCardMessage(phoneNumber,callTime);
// 使用Jackson进行序列化 // 使用Jackson进行序列化

View File

@ -9,7 +9,9 @@ import com.kimgo.wepush.model.QyWeChatURL;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class QyWeChatURLService { public class QyWeChatURLService {
private final Logger logger = LoggerFactory.getLogger(QyWeChatURLService.class); private final Logger logger = LoggerFactory.getLogger(QyWeChatURLService.class);
@Autowired @Autowired
@ -22,18 +24,19 @@ public class QyWeChatURLService {
public String getSendTextCardMessageUrl() { public String getSendTextCardMessageUrl() {
if (sendTextCardMessageUrl == null){ if (sendTextCardMessageUrl == null){
queryLRL(); queryURL();
} }
return sendTextCardMessageUrl; return sendTextCardMessageUrl;
} }
private void queryLRL(){ private void queryURL(){
String phoneNumberToSearch = userConfig.getPhoneNumber(); String phoneNumberToSearch = userConfig.getPhoneNumber();
QueryWrapper<QyWeChatURL> wrapper = new QueryWrapper<>(); QueryWrapper<QyWeChatURL> wrapper = new QueryWrapper<>();
wrapper.eq("phone_number", phoneNumberToSearch); wrapper.eq("phone_number", phoneNumberToSearch);
QyWeChatURL result = qyWeChatURLMapper.selectOne(wrapper); QyWeChatURL result = qyWeChatURLMapper.selectOne(wrapper);
if (result == null){ if (result == null){
logger.error("queryLRL error"); logger.error("queryURL error");
} }
logger.info("queryURL result {}",result.toString());
sendTextCardMessageUrl = result.getSendTextCardMessageUrl(); sendTextCardMessageUrl = result.getSendTextCardMessageUrl();
qyWechatGetTokenUrl = result.getQyWechatGetTokenUrl(); qyWechatGetTokenUrl = result.getQyWechatGetTokenUrl();
}; };

View File

@ -18,14 +18,13 @@ import java.io.IOException;
@Service @Service
public class SMSService { public class SMSService {
private final Logger logger = LoggerFactory.getLogger(SMSService.class); private final Logger logger = LoggerFactory.getLogger(SMSService.class);
@Autowired
private UserConfig userConfig;
@Autowired @Autowired
private ApiSettingService apiSettingService; private ApiSettingService apiSettingService;
@Autowired @Autowired
private TokenService tokenService; private TokenService tokenService;
@Autowired @Autowired
private URLConfig urlConfig; private QyWeChatURLService qyWeChatURLService;
public ServerResponseEntity getSMSInfo(String accessToken, SMSInfo smsInfo){ public ServerResponseEntity getSMSInfo(String accessToken, SMSInfo smsInfo){
String correctAccessToken = tokenService.getApiAccessToken(); String correctAccessToken = tokenService.getApiAccessToken();
@ -43,7 +42,7 @@ public class SMSService {
public QyWeChatSendMessageApiResponse requestWithOkhttp(String accessToken,SMSInfo smsInfo){ public QyWeChatSendMessageApiResponse requestWithOkhttp(String accessToken,SMSInfo smsInfo){
OkHttpClient client = new OkHttpClient(); OkHttpClient client = new OkHttpClient();
String url = urlConfig.getSendTextCardMessageUrl() + accessToken; String url = qyWeChatURLService.getSendTextCardMessageUrl() + "?access_token=" + accessToken;
TextCardMessage textCardMessage = setTextCardMessage(smsInfo); TextCardMessage textCardMessage = setTextCardMessage(smsInfo);
// 使用Jackson进行序列化 // 使用Jackson进行序列化