添加海康部分接口实现类

refined-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java

 package com.mortals.xhx.base.login.web;
 
-import cn.hutool.core.util.IdUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.ap.CookieService;
 import com.mortals.framework.ap.GlobalSysInfo;
@@ -10,7 +10,6 @@ import com.mortals.framework.service.IAuthTokenService;
 import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.service.IUser;
 import com.mortals.framework.util.AESUtil;
-import com.mortals.framework.util.DateUtils;
 import com.mortals.framework.util.HttpUtil;
 import com.mortals.framework.util.StringUtils;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
@@ -24,8 +23,7 @@ import com.mortals.xhx.common.key.RedisKey;
 import com.mortals.xhx.common.pdu.user.UserPdu;
 import com.mortals.xhx.feign.user.IUserFeign;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.util.ObjectUtils;
@@ -45,7 +43,7 @@ import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED_CONTENT;
 @Slf4j
 @RequestMapping("login")
 @ConditionalOnExpression("'${platform.type:null}'=='cloud'")
-public class LoginController extends BaseCRUDJsonBodyMappingController<UserService, UserEntity, Long> {
+public class LoginController extends BaseCRUDJsonBodyMappingController<UserService, UserEntity, Long> implements InitializingBean {
 
     @Autowired
     private UserService userService;
@@ -55,6 +53,8 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
     private ResourceService resourceService;
     @Autowired
     private MenuService menuService;
+    //    @Autowired
+//    private ITokenService tokenService;
     @Autowired
     private ICacheService cacheService;
     @Autowired
@@ -65,7 +65,6 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
     @RequestMapping("login")
     public String login(@RequestBody LoginForm loginForm) throws Exception {
 
-/*
         JSONObject ret = new JSONObject();
         String loginName = loginForm.getLoginName();
         String password = loginForm.getPassword();
@@ -76,10 +75,8 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
         String resp = userFeign.portalLogin(userPdu);
 
         return resp;
-*/
-        JSONObject ret = new JSONObject();
-        String loginName = loginForm.getLoginName();
-        String password = loginForm.getPassword();
+
+       /* String securityCode = loginForm.getSecurityCode();
         String ip = super.getRequestIP(request);
         if (StringUtils.isEmpty(loginName) || StringUtils.isEmpty(password)) {
             ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
@@ -89,9 +86,20 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
         UserEntity userEntity = null;
         try {
             loginForm.validate();
+//            boolean result = validCodeService.doCheckImageValidCode(request.getSession().getId(), ip, securityCode);
+//            if ("8888".equals(securityCode)) {
+//                result = true;
+//            }
+//            if (!result) {
+//                recordSysLog(request, userEntity, "登录验证码不正确或已过期!");
+//                ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+//                ret.put(KEY_RESULT_MSG, "登录验证码不正确或已过期!");
+//                return ret.toJSONString();
+//            }
             userEntity = userService.doLogin(loginName, password, ip);
             userEntity.setLastLoginAddress(ip);
 
+
             recordSysLog(request, userEntity, "用户登录系统成功!");
             // 返回拥有的菜单数据
             Set<String> urls = resourceService.findUrlSetByUserId(userEntity.getId());
@@ -130,7 +138,7 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
             ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
             ret.put(KEY_RESULT_MSG, super.convertException(e));
             return ret.toJSONString();
-        }
+        }*/
     }
 
     @RequestMapping("logout")
@@ -148,6 +156,7 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
             return JSONObject.toJSONString(Rest.fail(ERROR_TOKEN_EXPIRED, ERROR_TOKEN_EXPIRED_CONTENT));
         }
         Set<String> urls = resourceService.findUrlSetByUserId(user.getId());
+        log.info("userId:{},urls:{}", user.getId(),JSON.toJSONString(urls));
         List<MenuEntity> outlookBarList = menuService.findTreeMenu(user, urls);
         String currUserName = user.getRealName();
         if (currUserName == null || currUserName.trim().length() == 0) {
@@ -162,7 +171,8 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
         data.put("id", user.getId());
         data.put("userType", user.getUserType());
         ret.put(KEY_RESULT_DATA, data);
-        //this.generateBlackCookie(request, response, user.getLoginName(), urls);
+        generateMenuUrlCode(urls);
+        // this.generateBlackCookie(request, response, user.getLoginName(), urls);
         ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
         ret.put(KEY_RESULT_MSG, "用户登录系统成功!");
         ret.put("resources", urls);
@@ -272,4 +282,9 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
         }
         return null;
     }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        log.info("初始化加载云服务版登录。。。");
+    }
 }

refined-manager/src/main/resources/bootstrap.yml

+platform:
+  #  type: standalone
+  type: @profiles.platform.type@
 server:
   tomcat:
     uri-encoding: utf-8