完成springboot-jwt升级重构

Author: Xiong Neng

springboot-jwt/README.md

@@ -1,3 +1,9 @@
+# Table of Contents
+
+  * [简介](#简介)
+  * [测试](#测试)
+  * [许可证](#许可证)
+
 
 ## 简介
 
@@ -30,10 +36,19 @@ Content-Type: application/json
 ``` json
 {
 	"username": "admin",
-	"password": "12345678",
-	"appid": "111",
-	"imei": "imei"
+	"password": "12345678"
+}
+```
+
+可使用postman或者curl方式，本人更愿意使用curl方式：
+
+```
+ curl -X POST http://localhost:9095/login -H 'Content-Type: application/json' -d '
+{
+    "username": "admin",
+    "password": "12345678"
 }
+'
 ```
 
 返回值：
@@ -63,6 +78,12 @@ Content-Type: application/json
 Authorization: "上面拿到的token值"
 ```
 
+curl访问语法：
+
+```
+curl -X GET http://localhost:9095/api/v1/join?imei=imei -H 'Content-Type: application/json' -H 'Authorization: 上面拿到的token值'
+```
+
 ## 许可证
 
 Copyright (c) 2018 Xiong Neng

springboot-jwt/pom.xml

@@ -42,7 +42,7 @@
         <dependency>
             <groupId>com.auth0</groupId>
             <artifactId>java-jwt</artifactId>
-            <version>3.3.0</version>
+            <version>3.4.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -85,6 +85,7 @@
             <artifactId>commons-lang3</artifactId>
             <version>3.7</version>
         </dependency>
+
     </dependencies>
 
     <build>

springboot-jwt/src/main/java/com/xncoding/jwt/api/LoginController.java

@@ -3,14 +3,12 @@
 import com.xncoding.jwt.api.model.BaseResponse;
 import com.xncoding.jwt.api.model.LoginParam;
 import com.xncoding.jwt.common.util.JWTUtil;
-import com.xncoding.jwt.dao.entity.ManagerInfo;
+import com.xncoding.jwt.model.ManagerInfo;
 import com.xncoding.jwt.service.ManagerInfoService;
 import com.xncoding.jwt.shiro.ShiroKit;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.UnauthorizedException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -32,41 +30,16 @@ public BaseResponse<String> login(@RequestHeader(name="Content-Type", defaultVal
         _logger.info("用户请求登录获取Token");
         String username = loginParam.getUsername();
         String password = loginParam.getPassword();
-        String appid = loginParam.getAppid();
-        String imei = loginParam.getImei();
         ManagerInfo user = managerInfoService.findByUsername(username);
-        //盐（用户名+随机数）
+        //随机数盐
         String salt = user.getSalt();
-        //原密码
+        //原密码加密（通过username + salt作为盐）
         String encodedPassword = ShiroKit.md5(password, username + salt);
         if (user.getPassword().equals(encodedPassword)) {
-            if (StringUtils.isNotEmpty(appid) && StringUtils.isNotEmpty(imei)) {
-                return new BaseResponse<>(true, "Login success", JWTUtil.signSocket(username, encodedPassword, appid, imei));
-            }
             return new BaseResponse<>(true, "Login success", JWTUtil.sign(username, encodedPassword));
         } else {
             throw new UnauthorizedException();
         }
     }
 
-    @PostMapping("/notifyLogin")
-    public BaseResponse<String> notifyLogin(@RequestHeader(name="Content-Type", defaultValue = "application/json") String contentType,
-                                            @RequestBody LoginParam loginParam) {
-        _logger.info("登录用户推送请求登录获取Token");
-        String username = loginParam.getUsername();
-        String password = loginParam.getPassword();
-        ManagerInfo user = managerInfoService.findByUsername(username);
-        if (user.getPassword().equals(password)) {
-            return new BaseResponse<>(true, "Login success", JWTUtil.sign(username, password));
-        } else {
-            throw new UnauthorizedException();
-        }
-    }
-
-    @GetMapping(path = "/401")
-    @ResponseStatus(HttpStatus.UNAUTHORIZED)
-    public BaseResponse unauthorized() {
-        return new BaseResponse<>(false, "Unauthorized", null);
-    }
-
 }

springboot-jwt/src/main/java/com/xncoding/jwt/api/PublicController.java

@@ -22,8 +22,7 @@ public class PublicController {
      */
     @RequestMapping(value = "/join", method = RequestMethod.GET)
     @RequiresAuthentication
-    public BaseResponse join(@RequestHeader("Authorization") String token,
-                             @RequestParam("imei") String imei) {
+    public BaseResponse join(@RequestParam("imei") String imei) {
         _logger.info("入网查询接口 start... imei=" + imei);
         BaseResponse result = new BaseResponse();
         result.setSuccess(true);

springboot-jwt/src/main/java/com/xncoding/jwt/api/model/LoginParam.java

@@ -16,14 +16,6 @@ public class LoginParam {
      * 密码
      */
     private String password;
-    /**
-     * Application ID
-     */
-    private String appid;
-    /**
-     * IMEI码
-     */
-    private String imei;
 
     public String getUsername() {
         return username;
@@ -40,20 +32,4 @@ public String getPassword() {
     public void setPassword(String password) {
         this.password = password;
     }
-
-    public String getAppid() {
-        return appid;
-    }
-
-    public void setAppid(String appid) {
-        this.appid = appid;
-    }
-
-    public String getImei() {
-        return imei;
-    }
-
-    public void setImei(String imei) {
-        this.imei = imei;
-    }
 }