Merge remote-tracking branch 'origin/master'

src/main/java/com/yx/face/service/impl/AdminServiceImpl.java

@@ -74,6 +74,7 @@ public class AdminServiceImpl implements AdminService {
          * */
         Integer adminLogin = (Integer) redisUtil.get(ADMIN_LOGIN + adminInfo.getId());
         if (adminLogin != null && adminLogin >= 5) {
+            redisUtil.incr(ADMIN_LOGIN + adminInfo.getId(), 1);
             redisUtil.expire(ADMIN_LOGIN + adminInfo.getId(), 300);
             throw new ServiceException("连续输错" + adminLogin + "次，账号锁定，请过5分钟后重试!");
         }

src/main/java/com/yx/face/service/impl/SystemPushConfigServiceImpl.java

@@ -50,7 +50,7 @@ public class SystemPushConfigServiceImpl implements SystemPushConfigService {
         }
         Date date = new Date();
         SystemPushConfig config = JSONObject.parseObject(JSON.toJSONString(dto), SystemPushConfig.class);
-        config.setAccount(primary.getNickname());
+        config.setAccount(primary.getUsername());
         config.setAccountId(primary.getId());
         config.setAdminId(userId);
         config.setCreateTime(date);

src/main/java/com/yx/face/service/impl/UserInfoServiceImpl.java

@@ -77,7 +77,7 @@ public class UserInfoServiceImpl implements UserInfoService {
     private AsyncTriggerRetryImpl asyncTriggerRetryImpl;
 
 //    @Value("${wx.phone.url}")
-    private static final String wxUrl = "http://192.168.99.11:9012/winxin-fyzd/weiXin/getPhone";
+    private static final String wxUrl = "http://192.168.99.11:9810/winxin-fyzd/weiXin/getPhone";
 
     @Override
     public String getWxPhone(WxInfoDTO dto) {