Pārlūkot izejas kodu

调整视频号同步进入系统问题

yfh 1 mēnesi atpakaļ
vecāks
revīzija
5d7ffc6c26

+ 2 - 1
fs-qw-api-msg/src/main/java/com/fs/app/controller/QwMsgController.java

@@ -302,13 +302,14 @@ public class QwMsgController {
                 break;
             case 102000:
                 WxWorkMessageDTO wxWorkMessageDTO = JSON.parseObject(wxWorkMsgResp.getJson(), WxWorkMessageDTO.class);
+                log.error("msgType:{}",wxWorkMessageDTO.getMsgtype());
                 if (wxWorkMessageDTO.getIs_room()!=0){
                     break;
                 }
                 if (wxWorkMessageDTO.getReferid()!=0){
                     break;
                 }
-                if (wxWorkMessageDTO.getMsgtype()==2||wxWorkMessageDTO.getMsgtype()==0||wxWorkMessageDTO.getMsgtype()==16||wxWorkMessageDTO.getMsgtype() == 101||wxWorkMessageDTO.getMsgtype() == 104){
+                if (wxWorkMessageDTO.getMsgtype()==2||wxWorkMessageDTO.getMsgtype()==0||wxWorkMessageDTO.getMsgtype()==16||wxWorkMessageDTO.getMsgtype() == 101||wxWorkMessageDTO.getMsgtype() == 104||wxWorkMessageDTO.getMsgtype() == 141){
 
                     String content = wxWorkMessageDTO.getContent();
                     log.info("id:{}, 接收人:"+wxWorkMessageDTO.getReceiver(), id);

+ 5 - 5
fs-service/src/main/java/com/fs/his/service/impl/FsStorePaymentServiceImpl.java

@@ -552,11 +552,11 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService {
 
         try{
             boolean locked = lock.tryLock(3, 10, TimeUnit.SECONDS);
-
-            if (!locked) {
-                logger.error("获取锁失败");
-                return R.error("[红包领取] 系统繁忙,请重试!");
-            }
+//
+//            if (!locked) {
+//                logger.error("获取锁失败");
+//                return R.error("[红包领取] 系统繁忙,请重试!");
+//            }
 
 
             // 判断当前用户是否限流

+ 1 - 1
fs-service/src/main/resources/application-config-bly.yml

@@ -137,4 +137,4 @@ ipad:
 wx_miniapp_temp:
   pay_order_temp_id: VXEvKaGNPFuJmhWK9O_QPrTZxe9umDCukq-maI8Vdek
   inquiry_temp_id: 9POPYeqhI48LOPvq-Rfoklze7H-9SlunJKh10Qt4_2I
-enableRedPackAccount: 1
+enableRedPackAccount: 0

+ 1 - 1
fs-user-app/src/main/java/com/fs/app/controller/AppBaseController.java

@@ -32,7 +32,7 @@ public class AppBaseController {
 	public String getUserId()
 	{
 		String headValue =  ServletUtils.getRequest().getHeader("APPToken");
-		log.error("token = {}",headValue);
+//		log.error("token = {}",headValue);
 		if (StringUtils.isNotEmpty(headValue)){
 			Claims claims=jwtUtils.getClaimByToken(headValue);
 			if(claims!=null){