Bläddra i källkod

优化diamante

Your Name 2 år sedan
förälder
incheckning
eea16adcfc

+ 2 - 1
java110-bean/src/main/java/com/java110/dto/log/TransactionOutLogDto.java

@@ -19,7 +19,8 @@ public class TransactionOutLogDto extends PageDto implements Serializable {
     public static final String STATE_F = "F";//失败
     // 微信支付
     public static final String LOG_TYPE_WECHAT_PAY = "WECHAT_PAY";
-
+    // 微信
+    public static final String LOG_TYPE_WECHAT = "WECHAT";
     // 物联网
     public static final String LOG_TYPE_IOT = "IOT"; // 物联网
 

+ 4 - 0
java110-core/src/main/java/com/java110/core/factory/LogFactory.java

@@ -107,6 +107,10 @@ public class LogFactory {
             return TransactionOutLogDto.LOG_TYPE_WECHAT_PAY;
         }
 
+        if (url.contains("api.weixin.qq.com")) {
+            return TransactionOutLogDto.LOG_TYPE_WECHAT;
+        }
+
         if(TransactionOutLogDto.LOG_TYPE_SMS.equals(url)){
             return TransactionOutLogDto.LOG_TYPE_SMS;
         }

+ 1 - 3
service-job/src/main/java/com/java110/job/msgNotify/wechat/WechatMsgNotifyImpl.java

@@ -2,13 +2,12 @@ package com.java110.job.msgNotify.wechat;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.core.client.RestTemplate;
 import com.java110.core.log.LoggerFactory;
 import com.java110.dto.mapping.Mapping;
-import com.java110.dto.mapping.MappingDto;
 import com.java110.dto.owner.OwnerAppUserDto;
 import com.java110.dto.user.StaffAppAuthDto;
 import com.java110.dto.wechat.Content;
-import com.java110.dto.wechat.Data;
 import com.java110.dto.wechat.PropertyFeeTemplateMessage;
 import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
 import com.java110.intf.user.IStaffAppAuthInnerServiceSMO;
@@ -24,7 +23,6 @@ import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
 
 import java.util.HashMap;
 import java.util.List;