Merge remote-tracking branch 'origin/master'
# Conflicts: # src/main/java/club/joylink/rtss/wechat/MiniProgramAccessTokenManager.java # src/main/java/club/joylink/rtss/wechat/MiniProgramServiceImpl.java
This commit is contained in:
commit
7fad4fd3ae
|
@ -46,7 +46,7 @@ public class MiniProgramAccessTokenManager {
|
|||
this.expiresIn = expiresInSeconds;
|
||||
this.expiresTime = System.currentTimeMillis() + (expiresInSeconds - 200) * 1000l;
|
||||
}
|
||||
|
||||
//
|
||||
// @Scheduled(fixedRate=6600000)
|
||||
// public void getAccessTokenFromWx() {
|
||||
// if(!this.weChatConfig.getMini().isAccessTokenTaskOn()) {
|
||||
|
@ -54,7 +54,7 @@ public class MiniProgramAccessTokenManager {
|
|||
// return;
|
||||
// }
|
||||
// try {
|
||||
// String accessToken = this.getAccessToken();
|
||||
// String accessToken = this.getAccessToken(true);
|
||||
// log.info("get wechat mini program Access Token is: "+accessToken);
|
||||
// } catch (WxErrorException e) {
|
||||
// log.error("获取access token失败", e);
|
||||
|
|
|
@ -38,16 +38,7 @@ public class MiniProgramServiceImpl implements MiniProgramService {
|
|||
|
||||
public static final int Media_Type_Audio = 1;
|
||||
public static final int Media_Type_Img = 2;
|
||||
//
|
||||
// private String getMpAccessToken() {
|
||||
// try {
|
||||
// String accessToken = this.miniProgramAccessTokenManager.getAccessToken();
|
||||
// return accessToken;
|
||||
// } catch (WxErrorException e) {
|
||||
// throw BusinessExceptionAssertEnum.THIRD_SERVICE_CALL_EXCEPTION
|
||||
// .exception(String.format("获取微信小程序access_token异常"), e);
|
||||
// }
|
||||
// }
|
||||
|
||||
|
||||
@Override
|
||||
public WxError msgSecCheck(String content) {
|
||||
|
|
Loading…
Reference in New Issue