修改登录接口，返回json，补充V3.0beta接口文档

src/main/java/com/fjy/spring/controller/LoginController.java

@@ -1,20 +1,20 @@
 package com.fjy.spring.controller;
 
+import com.fjy.spring.domain.Result;
 import com.fjy.spring.domain.TbAdmin;
 import com.fjy.spring.domain.TbLog;
 import com.fjy.spring.domain.TbUser;
+import com.fjy.spring.enums.ResultEnum;
 import com.fjy.spring.properties.ServerProperties;
 import com.fjy.spring.service.AdminService;
 import com.fjy.spring.service.LogService;
 import com.fjy.spring.service.UserService;
 import com.fjy.spring.untils.CodingUtil;
 import com.fjy.spring.untils.GetIPAddrUtil;
+import com.fjy.spring.untils.ResultUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -27,7 +27,7 @@ import java.util.Optional;
 
 import static com.fjy.spring.constant.GlobalConstant.USER_SESSION_KEY;
 
-@Controller
+@RestController
 public class LoginController {
     @Autowired
     private ServerProperties serverProperties;
@@ -42,7 +42,7 @@ public class LoginController {
     HttpServletRequest request;
 
     @PostMapping("/login/dologin")
-    public String doLogin(TbUser tbUser)throws Exception{
+    public Result doLogin(TbUser tbUser)throws Exception{
         //加密用户密码
         tbUser.setColpassword(new BigInteger(CodingUtil.encryptSHA(tbUser.getColpassword().getBytes())).toString(32));
         TbUser user = userService.doLoginService(tbUser.getColname(),tbUser.getColpassword());
@@ -66,10 +66,9 @@ public class LoginController {
             log.setColip(GetIPAddrUtil.getIpAddr(request));
             logService.addLogRec(log);
 
-            return  "redirect:" + request.getScheme() + "://" + request.getServerName() + ":"
-                    + serverProperties.getPortNum() + request.getContextPath() + "/home";
+            return ResultUtil.data(ResultEnum.SUCCESS,user);
         }
-        return "login";
+        return ResultUtil.error(ResultEnum.LOGIN_FAIL);
     }
 
     @PostMapping("/beforeLogin")

src/main/java/com/fjy/spring/enums/ResultEnum.java

@@ -2,7 +2,7 @@ package com.fjy.spring.enums;
 
 public enum ResultEnum {
     UNKOWN_ERROR(-1,"未知错误"),
-    SUCCESS(0,"请求成功"),
+    SUCCESS(0,"成功"),
     USER_NOTEXIST(601,"用户不存在"),
     UPDATE_ERROR(602,"更新失败"),
     DELETE_ERROR(603,"删除失败"),
@@ -14,6 +14,7 @@ public enum ResultEnum {
     ID_NULLPOINT(609,"id为空"),
     EMPTY_QUESTION(610,"该用户未设置密保问题"),
     QUESTION_ERROR(611,"问题与答案不匹配"),
+    LOGIN_FAIL(612,"登录失败")
 
     ;
     private Integer code;

src/main/java/com/fjy/spring/interceptor/WebAppConfig.java

@@ -5,7 +5,7 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-@Configuration
+//@Configuration
 public class WebAppConfig implements WebMvcConfigurer {
 
     /**

src/main/java/com/fjy/spring/untils/ResultUtil.java

@@ -1,6 +1,7 @@
 package com.fjy.spring.untils;
 
 import com.fjy.spring.domain.Result;
+import com.fjy.spring.enums.ResultEnum;
 
 public class ResultUtil {
     public static Result error(Integer code,String msg){
@@ -16,4 +17,33 @@ public class ResultUtil {
         result.setData(data);
         return result;
     }
+
+    public static Result error(ResultEnum resultEnum){
+        Result result = new Result();
+        result.setCode(resultEnum.getCode());
+        result.setMessage(resultEnum.getMsg());
+        return result;
+    }
+
+    public static Result error(String msg){
+        Result result = new Result();
+        result.setCode(-2);
+        result.setMessage(msg);
+        return result;
+    }
+
+    public static Result data(ResultEnum resultEnum,Object data){
+        Result result = new Result();
+        result.setCode(resultEnum.getCode());
+        result.setMessage(resultEnum.getMsg());
+        result.setData(data);
+        return result;
+    }
+
+    public static Result success(ResultEnum resultEnum){
+        Result result = new Result();
+        result.setCode(resultEnum.getCode());
+        result.setMessage(resultEnum.getMsg());
+        return result;
+    }
 }

src/main/resources/application.yml

@@ -1,4 +1,4 @@
 #控制配置文件调用
 spring:
   profiles:
-    active: dev
+    active: prod

src/main/resources/logback-spring.xml

@@ -25,8 +25,8 @@
         <!--滚动策略-->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!--路径文件名，文件名包含时间-->
-            <fileNamePattern>F:\JAVA Workspace\Temp\log\%d\info.%d.log</fileNamePattern>
-        <!--<fileNamePattern>/www/cmsfile/%d/info.%d.log</fileNamePattern>-->
+            <!--<fileNamePattern>F:\JAVA Workspace\Temp\log\%d\info.%d.log</fileNamePattern>-->
+        <fileNamePattern>/www/cmsfile/%d/info.%d.log</fileNamePattern>
     </rollingPolicy>
 </appender>
 
@@ -44,8 +44,8 @@
         <!--滚动策略-->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!--路径文件名，文件名包含时间-->
-            <fileNamePattern>F:\JAVA Workspace\Temp\log\error.%d.log</fileNamePattern>
-            <!--<fileNamePattern>/www/cmsfile/%d/error.%d.log</fileNamePattern>-->
+            <!--<fileNamePattern>F:\JAVA Workspace\Temp\log\error.%d.log</fileNamePattern>-->
+            <fileNamePattern>/www/cmsfile/%d/error.%d.log</fileNamePattern>
        </rollingPolicy>
    </appender>