Merge branch 'dev'

src/main/java/com/kimgo/wepush/service/ApiSettingService.java

@@ -7,17 +7,20 @@ 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;
-    @Autowired
-    private ApiSettingMapper apiSettingMapper;
-    @Autowired
-    private UserConfig userConfig;
+    private final ApiSettingMapper apiSettingMapper;
+    private final UserConfig userConfig;
+
+    public ApiSettingService(ApiSettingMapper apiSettingMapper, UserConfig userConfig) {
+        this.apiSettingMapper = apiSettingMapper;
+        this.userConfig = userConfig;
+    }
+
     public ApiSetting getApiSetting() {
         if (apiSetting == null) {
             queryApiSetting();

src/main/java/com/kimgo/wepush/service/CallService.java

@@ -11,7 +11,6 @@ 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.*;
 
@@ -20,12 +19,17 @@ import java.io.IOException;
 @Service
 public class CallService {
     private final Logger logger = LoggerFactory.getLogger(CallService.class);
-    @Autowired
-    private QyWeChatURLService qyWeChatURLService;
-    @Autowired
-    private ApiSettingService apiSettingService;
-    @Autowired
+    private final QyWeChatURLService qyWeChatURLService;
+    private final ApiSettingService apiSettingService;
+    final
     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);

src/main/java/com/kimgo/wepush/service/MonitorService.java

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

src/main/java/com/kimgo/wepush/service/QyWeChatURLService.java

@@ -2,24 +2,23 @@ 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);
-    @Autowired
-    private QyWeChatURLMapper qyWeChatURLMapper;
-    @Autowired
-    private UserConfig userConfig;
+    private final QyWeChatURLMapper qyWeChatURLMapper;
+    private final UserConfig userConfig;
     private String sendTextCardMessageUrl;
-    private String qyWechatGetTokenUrl;
+
+    public QyWeChatURLService(QyWeChatURLMapper qyWeChatURLMapper, UserConfig userConfig) {
+        this.qyWeChatURLMapper = qyWeChatURLMapper;
+        this.userConfig = userConfig;
+    }
 
     public String getSendTextCardMessageUrl() {
         if (sendTextCardMessageUrl == null){

src/main/java/com/kimgo/wepush/service/SMSService.java

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

src/main/java/com/kimgo/wepush/service/TokenService.java

@@ -10,21 +10,23 @@ 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);
-    @Autowired
-    private UserConfig userConfig;
-    @Autowired
-    private QyWeChatAppInfoMapper qyWeChatAppInfoMapper;
-    @Autowired
-    private ApiSettingMapper apiSettingMapper;
+    private final UserConfig userConfig;
+    private final QyWeChatAppInfoMapper qyWeChatAppInfoMapper;
+    private final 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();