Compare commits

..

No commits in common. "dbca2373bc5b788e90cb37a47bd8d401387d2495" and "8c5ef984e778e7fe969407d65e11effc2764d14b" have entirely different histories.

6 changed files with 33 additions and 43 deletions

View File

@ -7,20 +7,17 @@ import com.kimgo.wepush.mapper.ApiSettingMapper;
import com.kimgo.wepush.model.ApiSetting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class ApiSettingService {
private final Logger logger = LoggerFactory.getLogger(ApiSettingService.class);
private ApiSetting apiSetting;
private final ApiSettingMapper apiSettingMapper;
private final UserConfig userConfig;
public ApiSettingService(ApiSettingMapper apiSettingMapper, UserConfig userConfig) {
this.apiSettingMapper = apiSettingMapper;
this.userConfig = userConfig;
}
@Autowired
private ApiSettingMapper apiSettingMapper;
@Autowired
private UserConfig userConfig;
public ApiSetting getApiSetting() {
if (apiSetting == null) {
queryApiSetting();

View File

@ -11,6 +11,7 @@ import okhttp3.OkHttpClient;
import okhttp3.RequestBody;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import okhttp3.*;
@ -19,17 +20,12 @@ import java.io.IOException;
@Service
public class CallService {
private final Logger logger = LoggerFactory.getLogger(CallService.class);
private final QyWeChatURLService qyWeChatURLService;
private final ApiSettingService apiSettingService;
final
@Autowired
private QyWeChatURLService qyWeChatURLService;
@Autowired
private ApiSettingService apiSettingService;
@Autowired
TokenService tokenService;
public CallService(QyWeChatURLService qyWeChatURLService, ApiSettingService apiSettingService, TokenService tokenService) {
this.qyWeChatURLService = qyWeChatURLService;
this.apiSettingService = apiSettingService;
this.tokenService = tokenService;
}
public ServerResponseEntity getPhoneNumber(String accessToken, CallInfo callInfo){
String correctAccessToken = tokenService.getApiAccessToken();
logger.info("accessToken: {} correctAccessToken: {}",accessToken,correctAccessToken);

View File

@ -149,6 +149,7 @@ public class MonitorService {
} catch (Exception e) {
logger.error("Error updating status for SN: " + device.getSN(), e);
throw new DatabaseUpdateException("update to mysql error.",e);
}
}
}

View File

@ -2,23 +2,24 @@ package com.kimgo.wepush.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.kimgo.wepush.config.UserConfig;
import com.kimgo.wepush.mapper.QyWeChatAppInfoMapper;
import com.kimgo.wepush.mapper.QyWeChatURLMapper;
import com.kimgo.wepush.model.QyWeChatAppInfo;
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);
private final QyWeChatURLMapper qyWeChatURLMapper;
private final UserConfig userConfig;
@Autowired
private QyWeChatURLMapper qyWeChatURLMapper;
@Autowired
private UserConfig userConfig;
private String sendTextCardMessageUrl;
public QyWeChatURLService(QyWeChatURLMapper qyWeChatURLMapper, UserConfig userConfig) {
this.qyWeChatURLMapper = qyWeChatURLMapper;
this.userConfig = userConfig;
}
private String qyWechatGetTokenUrl;
public String getSendTextCardMessageUrl() {
if (sendTextCardMessageUrl == null){

View File

@ -19,15 +19,12 @@ import java.io.IOException;
public class SMSService {
private final Logger logger = LoggerFactory.getLogger(SMSService.class);
private final ApiSettingService apiSettingService;
private final TokenService tokenService;
private final QyWeChatURLService qyWeChatURLService;
public SMSService(ApiSettingService apiSettingService, TokenService tokenService, QyWeChatURLService qyWeChatURLService) {
this.apiSettingService = apiSettingService;
this.tokenService = tokenService;
this.qyWeChatURLService = qyWeChatURLService;
}
@Autowired
private ApiSettingService apiSettingService;
@Autowired
private TokenService tokenService;
@Autowired
private QyWeChatURLService qyWeChatURLService;
public ServerResponseEntity getSMSInfo(String accessToken, SMSInfo smsInfo){
String correctAccessToken = tokenService.getApiAccessToken();

View File

@ -10,23 +10,21 @@ import com.kimgo.wepush.model.QyWeChatAppInfo;
import com.kimgo.wepush.request.WeChatAPI;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class TokenService {
private final Logger logger = LoggerFactory.getLogger(TokenService.class);
private final UserConfig userConfig;
private final QyWeChatAppInfoMapper qyWeChatAppInfoMapper;
private final ApiSettingMapper apiSettingMapper;
@Autowired
private UserConfig userConfig;
@Autowired
private QyWeChatAppInfoMapper qyWeChatAppInfoMapper;
@Autowired
private ApiSettingMapper apiSettingMapper;
private String accessToken;
private String apiAccessToken;
public TokenService(ApiSettingMapper apiSettingMapper, QyWeChatAppInfoMapper qyWeChatAppInfoMapper, UserConfig userConfig) {
this.apiSettingMapper = apiSettingMapper;
this.qyWeChatAppInfoMapper = qyWeChatAppInfoMapper;
this.userConfig = userConfig;
}
public String getAccessToken() {
if (accessToken == null) {
updateAccessToken();