wuxw лет назад: 5
Родитель
Сommit
056ee1d386

+ 6 - 1
java110-core/src/main/java/com/java110/core/factory/WechatFactory.java

@@ -3,6 +3,7 @@ package com.java110.core.factory;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Synchronized;
 import com.java110.utils.cache.JWTCache;
+import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.WechatConstant;
 import com.java110.utils.factory.ApplicationContextFactory;
 import com.java110.utils.util.StringUtil;
@@ -67,7 +68,11 @@ public class WechatFactory {
      * @return
      */
     private static String refreshAccessToken(String appId, String appSecure) {
-        String url = WechatConstant.GET_ACCESS_TOKEN.replace("APPID", appId)
+        String getAccessToken = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN,WechatConstant.GET_ACCESS_TOKEN_URL);
+        if(StringUtil.isEmpty(getAccessToken)){
+            getAccessToken = WechatConstant.GET_ACCESS_TOKEN;
+        }
+        String url = getAccessToken.replace("APPID", appId)
                 .replace("SECRET", appSecure);
         RestTemplate outRestTemplate = ApplicationContextFactory.getBean("outRestTemplate", RestTemplate.class);
         String response = outRestTemplate.getForObject(url, String.class);

+ 2 - 1
java110-utils/src/main/java/com/java110/utils/constant/WechatConstant.java

@@ -13,8 +13,9 @@ public class WechatConstant {
     //微信域
     public static final String WECHAT_DOMAIN = "WECHAT";
 
-    public static final String ACCESS_TOKEN_URL = "ACCESS_TOKEN_URL";
+    public static final String GET_USER_URL = "GET_USER_URL";
     public static final String SEND_TEMPLATE_URL = "SEND_TEMPLATE_URL";
+    public static final String GET_ACCESS_TOKEN_URL = "GET_ACCESS_TOKEN_URL";
 
     //微信ID
     public static final String PAGE_WECHAT_APP_ID = "wId";//微信id 一般是appId

+ 6 - 1
service-job/src/main/java/com/java110/job/task/wechat/PublicWeChatPushMessageTemplate.java

@@ -150,7 +150,12 @@ public class PublicWeChatPushMessageTemplate extends TaskSystemQuartz {
         billOweFeeDto.setCurBill("T");
         List<BillOweFeeDto> billOweFeeDtos = feeInnerServiceSMOImpl.queryBillOweFees(billOweFeeDto);
 
-        String url = sendMsgUrl + accessToken;
+        String sendTemplate = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN,WechatConstant.SEND_TEMPLATE_URL);
+        if(StringUtil.isEmpty(sendTemplate)){
+            sendTemplate = sendMsgUrl;
+        }
+        String url = sendTemplate + accessToken;
+
         String oweRoomUrl = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.OWE_FEE_PAGE);
         String oweCarUrl = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.OWE_CAR_FEE_PAGE);
         Miniprogram miniprogram = null;

+ 1 - 1
service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java

@@ -332,7 +332,7 @@ public class WeChatPushMessageTemplate extends TaskSystemQuartz {
     }
 
     private void doSendToOpenId(NoticeDto noticeDto, String templateId, String accessToken, String nextOpenid, SmallWeChatDto weChatDto) {
-        String url = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN,WechatConstant.ACCESS_TOKEN_URL);
+        String url = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN,WechatConstant.GET_USER_URL);
         if(StringUtil.isEmpty(url)){
             url = getUser;
         }