diff --git a/pom.xml b/pom.xml index 619bfa3e4..74609c88b 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,6 @@ 2.9.2 1.5.21 1.5.21 - 10.8 3.12.5 8.16 7.1.0 @@ -107,7 +106,6 @@ knife4j-spring-boot-starter ${knife4j.version} - diff --git a/youlai-admin-api/pom.xml b/youlai-admin-api/pom.xml index 0a1c42253..62d571630 100644 --- a/youlai-admin-api/pom.xml +++ b/youlai-admin-api/pom.xml @@ -20,6 +20,12 @@ io.github.openfeign feign-okhttp + 11.0 + + + io.github.openfeign + feign-httpclient + 11.0 diff --git a/youlai-auth/pom.xml b/youlai-auth/pom.xml index 765f283a9..d205cd7d2 100644 --- a/youlai-auth/pom.xml +++ b/youlai-auth/pom.xml @@ -20,7 +20,7 @@ com.youlai youlai-admin-api - ${youlai-common.version} + 1.0.0-SNAPSHOT diff --git a/youlai-auth/src/main/java/com/youlai/auth/controller/AuthController.java b/youlai-auth/src/main/java/com/youlai/auth/controller/AuthController.java index 8718abd03..7db0fceda 100644 --- a/youlai-auth/src/main/java/com/youlai/auth/controller/AuthController.java +++ b/youlai-auth/src/main/java/com/youlai/auth/controller/AuthController.java @@ -1,18 +1,18 @@ package com.youlai.auth.controller; +import com.youlai.admin.api.dto.UserDTO; +import com.youlai.admin.api.service.UmsAdminService; import com.youlai.auth.domain.Oauth2Token; import com.youlai.common.result.Result; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.oauth2.common.OAuth2AccessToken; import org.springframework.security.oauth2.provider.endpoint.TokenEndpoint; import org.springframework.web.HttpRequestMethodNotSupportedException; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; @@ -50,4 +50,14 @@ public class AuthController { .build(); return Result.success(oauth2Token); } + + @Autowired + private UmsAdminService umsAdminService; + + @GetMapping("/loadUserByUsername") + public Result loadUserByUsername(){ + UserDTO userDTO = umsAdminService.loadUserByUsername("admin"); + return Result.success(userDTO); + } + } diff --git a/youlai-auth/src/main/resources/bootstrap.yml b/youlai-auth/src/main/resources/bootstrap.yml index 91a7625ca..e45bb9923 100644 --- a/youlai-auth/src/main/resources/bootstrap.yml +++ b/youlai-auth/src/main/resources/bootstrap.yml @@ -12,6 +12,12 @@ spring: file-extension: yaml group: DEFAULT_GROUP prefix: ${spring.application.name} +feign: + httpclient: + enabled: false + okhttp: + enabled: true + # 演示配置中心使用 rsa: publicKey: 123456