111

sys/src/main/java/com/rxida/xilinedu/sys/common/JsonResult.java

@@ -2,21 +2,15 @@ package com.rxida.xilinedu.sys.common;
 
 public class JsonResult {
     public static final String ERROE = "1";
-    public static final String SUCCESS = "0";
+    public static final String SUCCESS = "20000";
     private String msg;
     private Object data;
-    private String status;
+    private String code;
 
     public JsonResult() {
 
     }
 
-    public JsonResult(String msg, Object data, String status) {
-        this.msg = msg;
-        this.data = data;
-        this.status = status;
-    }
-
     public String getMsg() {
         return msg;
     }
@@ -33,11 +27,11 @@ public class JsonResult {
         this.data = data;
     }
 
-    public String getStatus() {
-        return status;
+    public String getCode() {
+        return code;
     }
 
-    public void setStatus(String status) {
-        this.status = status;
+    public void setCode(String code) {
+        this.code = code;
     }
 }

sys/src/main/java/com/rxida/xilinedu/sys/web/LoginController.java

@@ -1,13 +1,18 @@
 package com.rxida.xilinedu.sys.web;
 
+import com.rxida.xilinedu.sys.common.JsonResult;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.*;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
-@Controller
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
 public class LoginController {
     //退出的时候是get请求，主要是用于退出
     @RequestMapping(value = "/login", method = RequestMethod.GET)
@@ -18,18 +23,34 @@ public class LoginController {
     //post登录
     @RequestMapping(value = "/login", method = RequestMethod.POST)
     public String login(String username, String password) {
+        JsonResult result = new JsonResult();
+        Map<String, String> resultData = new HashMap<>();
+        result.setData(resultData);
         //添加用户认证信息
         Subject subject = SecurityUtils.getSubject();
         UsernamePasswordToken usernamePasswordToken = new UsernamePasswordToken(username, password);
         try {
             subject.login(usernamePasswordToken);
-        } catch (UnknownAccountException uae) {
+            resultData.put("token", usernamePasswordToken.toString());
+            result.setCode(JsonResult.SUCCESS);
+        }catch(Exception e) {
+            resultData.put("token", usernamePasswordToken.toString());
+            result.setCode(JsonResult.ERROE);
+            result.setMsg("登录失败");
+        }
+
+        /*catch (UnknownAccountException uae) {
+
         } catch (IncorrectCredentialsException ice) {
+
         } catch (LockedAccountException lae) {
+
         } catch (ExcessiveAttemptsException eae) {
+
         } catch (AuthenticationException ae) {
 
-        }
+        }*/
+
         return "login";
     }
 

sys/src/main/resources/mapper/sys/MenuDao.xml

@@ -2,7 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.rxida.xilinedu.sys.dao.MenuDao">
     <select id="findAll" resultType="com.rxida.xilinedu.sys.entity.Menu">
-            SELECT * FROM sys_menu a
+            SELECT
+              `name` AS 'name',
+              href AS 'href',
+              id AS 'id',
+              parent_id AS "parentId",
+              sort AS 'sort'
+            FROM sys_menu a
+              order by sort
     </select>
     <insert id="insert" parameterType="com.rxida.xilinedu.sys.entity.Menu">