From 48efd66cbfc9f5d6b2c64745ec6d844976fd4084 Mon Sep 17 00:00:00 2001 From: wangsiyuan <2392948297@qq.com> Date: Sat, 16 Dec 2023 14:33:15 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20ApiSettingService.ja?= =?UTF-8?q?va?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kimgo/wepush/service/ApiSettingService.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/kimgo/wepush/service/ApiSettingService.java b/src/main/java/com/kimgo/wepush/service/ApiSettingService.java index c09af3f..d1eec60 100644 --- a/src/main/java/com/kimgo/wepush/service/ApiSettingService.java +++ b/src/main/java/com/kimgo/wepush/service/ApiSettingService.java @@ -14,10 +14,14 @@ import org.springframework.stereotype.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(); From 5f8f281beceab259ee9a340e7f6763e1a88a718b Mon Sep 17 00:00:00 2001 From: wangsiyuan <2392948297@qq.com> Date: Sat, 16 Dec 2023 14:33:19 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20CallService.java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kimgo/wepush/service/CallService.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/kimgo/wepush/service/CallService.java b/src/main/java/com/kimgo/wepush/service/CallService.java index 8c1a483..17ff268 100644 --- a/src/main/java/com/kimgo/wepush/service/CallService.java +++ b/src/main/java/com/kimgo/wepush/service/CallService.java @@ -20,12 +20,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); From b9c55d3928c6caeb4a245ab72c1409242237fa94 Mon Sep 17 00:00:00 2001 From: wangsiyuan <2392948297@qq.com> Date: Sat, 16 Dec 2023 14:34:02 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20QyWeChatURLService.j?= =?UTF-8?q?ava?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kimgo/wepush/service/QyWeChatURLService.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/kimgo/wepush/service/QyWeChatURLService.java b/src/main/java/com/kimgo/wepush/service/QyWeChatURLService.java index 0c0df9e..0b4e28f 100644 --- a/src/main/java/com/kimgo/wepush/service/QyWeChatURLService.java +++ b/src/main/java/com/kimgo/wepush/service/QyWeChatURLService.java @@ -14,13 +14,16 @@ 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){ queryURL(); From 3ebb79170c1f13e5b402d6877f8f301ae3235c1e Mon Sep 17 00:00:00 2001 From: wangsiyuan <2392948297@qq.com> Date: Mon, 18 Dec 2023 10:36:18 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20TokenService.java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kimgo/wepush/service/TokenService.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/kimgo/wepush/service/TokenService.java b/src/main/java/com/kimgo/wepush/service/TokenService.java index 42ffd93..c7d80f3 100644 --- a/src/main/java/com/kimgo/wepush/service/TokenService.java +++ b/src/main/java/com/kimgo/wepush/service/TokenService.java @@ -16,15 +16,18 @@ 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(); From 4fefc8136f78fab24b0a48777ac2718ea6ddc16c Mon Sep 17 00:00:00 2001 From: wangsiyuan <2392948297@qq.com> Date: Tue, 19 Dec 2023 14:27:03 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20SMSService.java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kimgo/wepush/service/SMSService.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/kimgo/wepush/service/SMSService.java b/src/main/java/com/kimgo/wepush/service/SMSService.java index 1c00d1a..25229ab 100644 --- a/src/main/java/com/kimgo/wepush/service/SMSService.java +++ b/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(); From e0b0c628718286efb033dfc7ca1fd11e387a3928 Mon Sep 17 00:00:00 2001 From: wangsiyuan <2392948297@qq.com> Date: Tue, 19 Dec 2023 14:46:18 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20ApiSettingService.ja?= =?UTF-8?q?va?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/kimgo/wepush/service/ApiSettingService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/kimgo/wepush/service/ApiSettingService.java b/src/main/java/com/kimgo/wepush/service/ApiSettingService.java index d1eec60..1ca055b 100644 --- a/src/main/java/com/kimgo/wepush/service/ApiSettingService.java +++ b/src/main/java/com/kimgo/wepush/service/ApiSettingService.java @@ -7,7 +7,6 @@ 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 From fcf84f81d6d13ab6de3ef4df1de90e4353a2d99a Mon Sep 17 00:00:00 2001 From: wangsiyuan <2392948297@qq.com> Date: Wed, 20 Dec 2023 10:55:11 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20CallService.java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/kimgo/wepush/service/CallService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/kimgo/wepush/service/CallService.java b/src/main/java/com/kimgo/wepush/service/CallService.java index 17ff268..bf4ed45 100644 --- a/src/main/java/com/kimgo/wepush/service/CallService.java +++ b/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.*; From d8e207eda7a2a518846abebffb49acaa76b9278d Mon Sep 17 00:00:00 2001 From: wangsiyuan <2392948297@qq.com> Date: Thu, 21 Dec 2023 11:27:56 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20TokenService.java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/kimgo/wepush/service/TokenService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/kimgo/wepush/service/TokenService.java b/src/main/java/com/kimgo/wepush/service/TokenService.java index c7d80f3..35d0096 100644 --- a/src/main/java/com/kimgo/wepush/service/TokenService.java +++ b/src/main/java/com/kimgo/wepush/service/TokenService.java @@ -10,7 +10,6 @@ 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 From e826383b4f9c7c3e5f3a5400432c651421f1f339 Mon Sep 17 00:00:00 2001 From: wangsiyuan <2392948297@qq.com> Date: Thu, 21 Dec 2023 14:53:14 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20MonitorService.java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/kimgo/wepush/service/MonitorService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/kimgo/wepush/service/MonitorService.java b/src/main/java/com/kimgo/wepush/service/MonitorService.java index fb65678..7eef08f 100644 --- a/src/main/java/com/kimgo/wepush/service/MonitorService.java +++ b/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); - } } } From dd1ca0bef74ab540f627dcd7b8e277a1c2b9bdbe Mon Sep 17 00:00:00 2001 From: wangsiyuan <2392948297@qq.com> Date: Fri, 22 Dec 2023 10:49:36 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20QyWeChatURLService.j?= =?UTF-8?q?ava?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/kimgo/wepush/service/QyWeChatURLService.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/com/kimgo/wepush/service/QyWeChatURLService.java b/src/main/java/com/kimgo/wepush/service/QyWeChatURLService.java index 0b4e28f..0cd5524 100644 --- a/src/main/java/com/kimgo/wepush/service/QyWeChatURLService.java +++ b/src/main/java/com/kimgo/wepush/service/QyWeChatURLService.java @@ -2,13 +2,10 @@ 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 From 9eb3f6c61c035a0734dd005e4cb18926f8305dff Mon Sep 17 00:00:00 2001 From: wangsiyuan <2392948297@qq.com> Date: Fri, 22 Dec 2023 14:10:27 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20QyWeChatURLService.j?= =?UTF-8?q?ava?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/kimgo/wepush/service/QyWeChatURLService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/kimgo/wepush/service/QyWeChatURLService.java b/src/main/java/com/kimgo/wepush/service/QyWeChatURLService.java index 0cd5524..0faa677 100644 --- a/src/main/java/com/kimgo/wepush/service/QyWeChatURLService.java +++ b/src/main/java/com/kimgo/wepush/service/QyWeChatURLService.java @@ -14,7 +14,6 @@ public class QyWeChatURLService { private final QyWeChatURLMapper qyWeChatURLMapper; private final UserConfig userConfig; private String sendTextCardMessageUrl; - private String qyWechatGetTokenUrl; public QyWeChatURLService(QyWeChatURLMapper qyWeChatURLMapper, UserConfig userConfig) { this.qyWeChatURLMapper = qyWeChatURLMapper;