添加菜单资源配置

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

@@ -17,6 +17,7 @@ import com.mortals.xhx.base.system.user.model.UserEntity;
 import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.key.RedisKey;
+import com.mortals.xhx.common.pdu.user.LoginPdu;
 import com.mortals.xhx.common.pdu.user.UserPdu;
 import com.mortals.xhx.common.utils.MenuEncodeUtil;
 import com.mortals.xhx.feign.site.ISiteFeign;
@@ -80,14 +81,14 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
 
     @RequestMapping("login")
     public String login(@RequestBody LoginForm loginForm) throws Exception {
+
         String loginName = loginForm.getLoginName();
         String password = loginForm.getPassword();
-        UserPdu userPdu = new UserPdu();
-        userPdu.setLoginName(loginName);
-        userPdu.setPassword(password);
-        userPdu.setSecurityCode("admin");
-        String resp = userFeign.portalLogin(userPdu);
-
+        LoginPdu loginPdu = new LoginPdu();
+        loginPdu.setLoginName(loginName);
+        loginPdu.setPassword(password);
+        loginPdu.setSecurityCode("admin");
+        String resp = userFeign.portalLogin(loginPdu);
         return resp;
     }
 

common-lib/src/main/java/com/mortals/xhx/common/pdu/user/LoginPdu.java

+package com.mortals.xhx.common.pdu.user;
+
+import com.mortals.framework.exception.AppException;
+import lombok.Data;
+
+
+@Data
+public class LoginPdu {
+    private String loginName;
+
+    private String password;
+
+    private String securityCode;
+
+    private String mark;
+    /** 加密方式 1不加密，2加密*/
+    private Integer type;
+
+
+    @Override
+    public String toString() {
+        return "loginName:" + this.loginName + "  password:" + this.password;
+    }
+
+    public boolean validate() throws AppException {
+        if (loginName == null || loginName.trim().length() == 0) {
+            throw new AppException("帐号不能为空！");
+        }
+        if (password == null || password.trim().length() == 0) {
+            throw new AppException("密码不能为空！");
+        }
+        return true;
+    }
+}

common-lib/src/main/java/com/mortals/xhx/feign/user/IUserFeign.java

 package com.mortals.xhx.feign.user;
 
+import com.mortals.framework.common.Rest;
 import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.user.LoginPdu;
 import com.mortals.xhx.common.pdu.user.UserPdu;
-import com.alibaba.fastjson.JSON;
-import com.mortals.framework.common.Rest;
 import com.mortals.xhx.feign.IFeign;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
@@ -62,7 +62,7 @@ public interface IUserFeign extends IFeign {
 
 
     @PostMapping(value = "/login/login")
-    String portalLogin(@RequestBody UserPdu userPdu);
+    String portalLogin(@RequestBody LoginPdu loginPdu);
 
     /**
      * 查询用户列表
@@ -114,8 +114,8 @@ class UserFeignFallbackFactory implements FallbackFactory<IUserFeign> {
             }
 
             @Override
-            public String portalLogin(UserPdu userPdu) {
-                return JSON.toJSONString(Rest.fail("登录失败!"));
+            public String portalLogin(LoginPdu loginPdu) {
+                return null;
             }
 
             @Override