SpringBoot 2.0.7.RELEASE

mss-common/src/main/java/com/microservice/skeleton/common/vo/Result.java

@@ -3,7 +3,6 @@ package com.microservice.skeleton.common.vo;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -15,11 +14,10 @@ import java.util.Map;
  * Time: 11:04
  */
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class Result<T> implements Serializable {
+public class Result<T> {
 
     private static final String CODE = "code";
     private static final String MSG = "msg";
-    private static final long serialVersionUID = 2633283546876721434L;
 
     private Integer code=200;
     private String msg="操作成功";

mss-oauth/src/main/java/com/microservice/skeleton/auth/config/WebSecurityConfig.java

@@ -50,8 +50,6 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .anyRequest().fullyAuthenticated()
                 .antMatchers("/oauth/token").permitAll()
                 .and()
-                .logout().permitAll()
-                .and()
                 .csrf().disable();
     }
 

mss-oauth/src/main/java/com/microservice/skeleton/auth/endpoint/RevokeTokenEndpoint.java → mss-oauth/src/main/java/com/microservice/skeleton/auth/controller/LogoutController.java

-package com.microservice.skeleton.auth.endpoint;
+package com.microservice.skeleton.auth.controller;
 
-import com.microservice.skeleton.auth.model.Msg;
+import com.microservice.skeleton.common.util.StatusCode;
+import com.microservice.skeleton.common.vo.Result;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.oauth2.provider.endpoint.FrameworkEndpoint;
 import org.springframework.security.oauth2.provider.token.ConsumerTokenServices;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
- * Created by Mr.Yangxiufeng on 2018/1/2.
- * Time:9:22
- * ProjectName:Mirco-Service-Skeleton
+ * Created with IntelliJ IDEA.
+ * Description:
+ * User: Mr.Yangxiufeng
+ * Date: 2018-12-07
+ * Time: 19:17
  */
-@FrameworkEndpoint
-public class RevokeTokenEndpoint {
+@RestController
+public class LogoutController {
     @Autowired
     private ConsumerTokenServices consumerTokenServices;
 
-    @RequestMapping(value = "/oauth/token", method= RequestMethod.DELETE)
+    @DeleteMapping(value = "/exit")
     public @ResponseBody
-    Msg revokeToken(String access_token){
-        Msg msg = new Msg();
+    Result revokeToken(String access_token){
+        Result msg = new Result();
         if (consumerTokenServices.revokeToken(access_token)){
-            msg.setCode(Msg.SUCCESS);
+            msg.setCode(StatusCode.SUCCESS_CODE);
             msg.setMsg("注销成功");
         }else {
-            msg.setCode(Msg.FAILED);
+            msg.setCode(StatusCode.FAILURE_CODE);
             msg.setMsg("注销失败");
         }
         return msg;

mss-oauth/src/main/java/com/microservice/skeleton/auth/model/Msg.java

-package com.microservice.skeleton.auth.model;
-
-import java.io.Serializable;
-
-/**
- * Created by Mr.Yangxiufeng on 2018/1/2.
- * Time:9:28
- * ProjectName:Mirco-Service-Skeleton
- */
-public class Msg implements Serializable{
-    private static final long serialVersionUID = 7514826298158585250L;
-    public static final int SUCCESS=200;
-    public static final int FAILED=201;
-    private Integer code;
-    private String msg;
-
-    public Integer getCode() {
-        return code;
-    }
-
-    public void setCode(Integer code) {
-        this.code = code;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-}

mss-oauth/src/main/java/com/microservice/skeleton/auth/service/impl/UserDetailsServiceImpl.java

@@ -3,6 +3,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.microservice.skeleton.auth.service.PermissionService;
 import com.microservice.skeleton.auth.service.RoleService;
 import com.microservice.skeleton.auth.service.UserService;
+import com.microservice.skeleton.common.util.StatusCode;
 import com.microservice.skeleton.common.vo.MenuVo;
 import com.microservice.skeleton.common.vo.Result;
 import com.microservice.skeleton.common.vo.RoleVo;
@@ -40,7 +41,7 @@ public class UserDetailsServiceImpl implements UserDetailsService {
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
         Result<UserVo> userResult = userService.findByUsername(username);
-        if (userResult.getCode() == 100) {
+        if (userResult.getCode() != StatusCode.SUCCESS_CODE) {
             throw new UsernameNotFoundException("用户:" + username + ",不存在!");
         }
         Set<GrantedAuthority> grantedAuthorities = new HashSet<>();
@@ -51,7 +52,7 @@ public class UserDetailsServiceImpl implements UserDetailsService {
         UserVo userVo = new UserVo();
         BeanUtils.copyProperties(userResult.getData(),userVo);
         Result<List<RoleVo>> roleResult = roleService.getRoleByUserId(userVo.getId());
-        if (roleResult.getCode() != 100){
+        if (roleResult.getCode() != StatusCode.SUCCESS_CODE){
             List<RoleVo> roleVoList = roleResult.getData();
             for (RoleVo role:roleVoList){
                 //角色必须是ROLE_开头，可以在数据库中设置
@@ -59,7 +60,7 @@ public class UserDetailsServiceImpl implements UserDetailsService {
                 grantedAuthorities.add(grantedAuthority);
                 //获取权限
                 Result<List<MenuVo>> perResult  = permissionService.getRolePermission(role.getId());
-                if (perResult.getCode() != 100){
+                if (perResult.getCode() != StatusCode.SUCCESS_CODE){
                     List<MenuVo> permissionList = perResult.getData();
                     for (MenuVo menu:permissionList
                             ) {