Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java

@@ -36,10 +36,8 @@
import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.user.AccountMessageService;

import com.yeshi.fanli.service.inter.user.ExtractService;

import com.yeshi.fanli.service.inter.user.PassWordErrorRecordService;

import com.yeshi.fanli.service.inter.user.ShamUserService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.service.inter.user.WxDownService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.GsonUtil;

import com.yeshi.fanli.util.RedisManager;

@@ -64,9 +62,6 @@
   private ExtractService extractService;



   @Resource

   private PassWordErrorRecordService passWordErrorRecordService;



   @Resource

   private ConfigService configService;



   @Resource

@@ -88,9 +83,6 @@
   private CollectionGoodsV2Service collectionGoodsV2Service;

   @Resource

   private HongBaoManageService hongBaoManageService;



   @Resource

   private WxDownService wxDownService;



   @Resource

   private RedisManager redisManager;

@@ -314,7 +306,6 @@
            uuser.setLastLoginIp(remotIP);

            uuser.setLastLoginTime(java.lang.System.currentTimeMillis());

            userInfoService.updateLoginInfo(uuser);

            wxDownService.save(device);

         }

      });

   }

@@ -430,22 +421,6 @@
         e.printStackTrace();

      }

      out.print(JsonUtil.loadTrueResult("删除成功"));

   }



   /**

    * 
    * 方法说明: 微信登陆

    * 
    * @author mawurui createTime 2018年4月25日 下午5:02:02

    * @param acceptData

    * @param out

    */

   @RequestMapping(value = "isWxDown")

   public void isWxDown(AcceptData acceptData, PrintWriter out) {

      boolean b = wxDownService.isWxDownFirstLogin(acceptData.getDevice());

      JSONObject data = new JSONObject();

      data.put("isFirst", b);

      out.print(JsonUtil.loadTrueResult(data));

   }



   /**