登录接口设置

common/src/main/java/com/lantone/common/constant/AuthConstant.java

@@ -20,7 +20,7 @@ public interface AuthConstant {
     /**
      * 用户处理中心client_id
      */
-    String USER_ADMIN_CLIENT_ID = "security-center";
+    String SECURITY_CENTER_CLIENT_ID = "security-center";
 
     /**
      * 后台管理接口路径匹配

gateway-service/src/main/java/com/lantone/authorization/AuthorizationManager.java

@@ -68,7 +68,7 @@ public class AuthorizationManager implements ReactiveAuthorizationManager<Author
             JWSObject jwsObject = JWSObject.parse(realToken);
             String userStr = jwsObject.getPayload().toString();
             UserDto userDto = JSONUtil.toBean(userStr, UserDto.class);
-            if (AuthConstant.USER_ADMIN_CLIENT_ID.equals(userDto.getClientId()) && !pathMatcher.match(AuthConstant.ADMIN_URL_PATTERN, uri.getPath())) {
+            if (AuthConstant.SECURITY_CENTER_CLIENT_ID.equals(userDto.getClientId()) && !pathMatcher.match(AuthConstant.ADMIN_URL_PATTERN, uri.getPath())) {
                 return Mono.just(new AuthorizationDecision(false));
             }
         } catch (ParseException e) {

gateway-service/src/main/resources/bootstrap.yml

@@ -21,19 +21,19 @@ spring:
         - id: structure-center
           uri: lb://structure-center
           predicates:
-            - Path=/sc/**
+            - Path=/structure-center/**
           filters:
             - StripPrefix=1
         - id: security-center
           uri: lb://security-center
           predicates:
-            - Path=/security/**
+            - Path=/security-center/**
           filters:
             - StripPrefix=1
         - id: user-auth
           uri: lb://user-auth
           predicates:
-            - Path=/userauth/**
+            - Path=/user-auth/**
           filters:
             - StripPrefix=1
   redis:
@@ -82,5 +82,6 @@ secure:
       - "/**/*.ico"
       - "/webjars/springfox-swagger-ui/**"
       - "/actuator/**"
-      - "/userauthh/oauth/token"
-      - "/userauth/rsa/publicKey"
+      - "/user-auth/oauth/token"
+      - "/user-auth/rsa/publicKey"
+      - "/security-center/userAdmin/login"

security-center/src/main/java/com/lantone/security/facade/UserAdminFacade.java

@@ -23,8 +23,8 @@ public class UserAdminFacade {
 
     public CommonResult login(LoginVO loginVO) {
         Map<String, String> params = new HashMap<>();
-        params.put("client_id", AuthConstant.USER_ADMIN_CLIENT_ID);
-        params.put("client_secret", "123456");
+        params.put("client_id", AuthConstant.SECURITY_CENTER_CLIENT_ID);
+        params.put("client_secret", "lantone_20210723");
         params.put("grant_type", "password");
         params.put("username", loginVO.getUsername());
         params.put("password", loginVO.getPassword());

security-center/src/main/java/com/lantone/security/web/UserAdminController.java

@@ -1,6 +1,8 @@
 package com.lantone.security.web;
 
+import com.google.common.collect.Lists;
 import com.lantone.common.api.CommonResult;
+import com.lantone.common.domain.UserDto;
 import com.lantone.security.facade.UserAdminFacade;
 import com.lantone.security.vo.LoginVO;
 import io.swagger.annotations.Api;
@@ -11,6 +13,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 /**
@@ -40,4 +43,29 @@ public class UserAdminController {
         return CommonResult.success(null);
     }
 
+    @ApiOperation(value = "登录以后返回token")
+    @RequestMapping(value = "/getMyName", method = RequestMethod.POST)
+    @ResponseBody
+    public CommonResult getMyName() {
+        return CommonResult.success("任国宾");
+    }
+
+
+    @ApiOperation("根据用户名获取通用用户信息")
+    @RequestMapping(value = "/loadByUsername", method = RequestMethod.GET)
+    @ResponseBody
+    public UserDto loadUserByUsername(@RequestParam String username) {
+        if (!username.equals("lantone")) {
+            return null;
+        }
+        UserDto userDTO = new UserDto();
+        userDTO.setUsername("lantone");
+        userDTO.setPassword("$2a$10$T/ndIW6vgydYOVqj0syXeeSvgYbChiIU.azRmoZ.uqDQhYjN.yozy");
+        userDTO.setId(1l);
+        userDTO.setClientId("security-center");
+        userDTO.setStatus(1);
+        userDTO.setRoles(Lists.newArrayList("t1"));
+        return userDTO;
+    }
+
 }

user-auth/src/main/java/com/lantone/userauth/config/Oauth2ServerConfig.java

@@ -40,15 +40,8 @@ public class Oauth2ServerConfig extends AuthorizationServerConfigurerAdapter {
     @Override
     public void configure(ClientDetailsServiceConfigurer clients) throws Exception {
         clients.inMemory()
-                .withClient("admin-app")
-                .secret(passwordEncoder.encode("123456"))
-                .scopes("all")
-                .authorizedGrantTypes("password", "refresh_token")
-                .accessTokenValiditySeconds(3600 * 24)
-                .refreshTokenValiditySeconds(3600 * 24 * 7)
-                .and()
-                .withClient("portal-app")
-                .secret(passwordEncoder.encode("123456"))
+                .withClient("security-center")
+                .secret(passwordEncoder.encode("lantone_20210723"))
                 .scopes("all")
                 .authorizedGrantTypes("password", "refresh_token")
                 .accessTokenValiditySeconds(3600 * 24)

user-auth/src/main/java/com/lantone/userauth/service/UmsAdminService.java

@@ -13,6 +13,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 @FeignClient("security-center")
 public interface UmsAdminService {
 
-    @GetMapping("/admin/loadByUsername")
+    @GetMapping("/userAdmin/loadByUsername")
     UserDto loadUserByUsername(@RequestParam String username);
 }

user-auth/src/main/java/com/lantone/userauth/service/impl/UserServiceImpl.java

@@ -34,7 +34,7 @@ public class UserServiceImpl implements UserDetailsService {
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
         String clientId = request.getParameter("client_id");
         UserDto userDto = null;
-        if (AuthConstant.USER_ADMIN_CLIENT_ID.equals(clientId)) {
+        if (AuthConstant.SECURITY_CENTER_CLIENT_ID.equals(clientId)) {
             userDto = adminService.loadUserByUsername(username);
         }
         if (userDto == null) {