Compare commits

..

No commits in common. "4ccec1e8b802489b154a6fb0748ce7ac442f17d7" and "0a5ac82c667b4fc3644118fb9cfcb8ddea75db76" have entirely different histories.

5 changed files with 16 additions and 13 deletions

View File

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

View File

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

View File

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

View File

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

View File

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