Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
youjj
cloud-platform
Commits
b649a596
Commit
b649a596
authored
Jun 08, 2019
by
hezhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改配置
parent
9c8f0f6a
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
57 deletions
+10
-57
AdminBootstrap.java
...ava/com/github/wxiaoqi/security/admin/AdminBootstrap.java
+1
-1
UserFeign.java
...va/com/github/wxiaoqi/security/admin/feign/UserFeign.java
+0
-21
AppUserDTO.java
...m/github/wxiaoqi/security/admin/feign/dto/AppUserDTO.java
+0
-25
pom.xml
xx-tour/xx-tour-api/pom.xml
+2
-2
TourApplication.java
...src/main/java/com/xxfc/platform/tour/TourApplication.java
+1
-1
TourBaseController.java
...ava/com/xxfc/platform/tour/common/TourBaseController.java
+6
-7
No files found.
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/AdminBootstrap.java
View file @
b649a596
...
@@ -33,7 +33,7 @@ import java.util.List;
...
@@ -33,7 +33,7 @@ import java.util.List;
@EnableDiscoveryClient
@EnableDiscoveryClient
@EnableCircuitBreaker
@EnableCircuitBreaker
@SpringBootApplication
@SpringBootApplication
@EnableFeignClients
({
"com.github.wxiaoqi.security.auth.client.feign"
,
"com.xxfc.platform.universal.feign"
,
"com.github.wxiaoqi.security.admin"
})
@EnableFeignClients
({
"com.github.wxiaoqi.security.auth.client.feign"
,
"com.xxfc.platform.universal.feign"
})
@EnableScheduling
@EnableScheduling
@EnableAceAuthClient
@EnableAceAuthClient
@EnableAceCache
@EnableAceCache
...
...
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java
deleted
100644 → 0
View file @
9c8f0f6a
package
com
.
github
.
wxiaoqi
.
security
.
admin
.
feign
;
import
com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
/**
* ${DESCRIPTION}
*
* @author wanghaobin
* @create 2017-06-21 8:11
*/
@FeignClient
(
value
=
"ace-admin"
)
public
interface
UserFeign
{
@RequestMapping
(
value
=
"/public/app/userinfo-by-token"
)
public
ObjectRestResponse
<
AppUserDTO
>
userDetailByToken
(
@RequestParam
(
"token"
)
String
token
);
}
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/feign/dto/AppUserDTO.java
deleted
100644 → 0
View file @
9c8f0f6a
package
com
.
github
.
wxiaoqi
.
security
.
admin
.
feign
.
dto
;
import
lombok.Data
;
/**
* 用户详情信息表
*/
@Data
public
class
AppUserDTO
{
private
Integer
id
;
private
Integer
userid
;
private
Integer
isMember
;
private
String
nickname
;
private
String
realname
;
private
String
headimgurl
;
private
String
email
;
private
Integer
sex
;
private
String
birthday
;
private
String
personSign
;
private
String
remark
;
private
Long
createtime
;
private
Long
updatetime
;
private
Integer
isdel
;
}
xx-tour/xx-tour-api/pom.xml
View file @
b649a596
...
@@ -12,8 +12,8 @@
...
@@ -12,8 +12,8 @@
<artifactId>
xx-tour-api
</artifactId>
<artifactId>
xx-tour-api
</artifactId>
<dependencies>
<dependencies>
<dependency>
<dependency>
<groupId>
com.
github.wxiaoqi
</groupId>
<groupId>
com.
xxfc.platform
</groupId>
<artifactId>
ace-admin
</artifactId>
<artifactId>
xx-vehicle-api
</artifactId>
<version>
2.0-SNAPSHOT
</version>
<version>
2.0-SNAPSHOT
</version>
<scope>
compile
</scope>
<scope>
compile
</scope>
</dependency>
</dependency>
...
...
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/TourApplication.java
View file @
b649a596
...
@@ -14,7 +14,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
...
@@ -14,7 +14,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
@EnableDiscoveryClient
@EnableDiscoveryClient
@EnableScheduling
@EnableScheduling
@EnableAceAuthClient
@EnableAceAuthClient
@EnableFeignClients
({
"com.github.wxiaoqi.security.auth.client.feign"
,
"com.github.wxiaoqi.security.admin.feign"
,
"com.xxfc.platform.tour.feign
"
})
@EnableFeignClients
({
"com.github.wxiaoqi.security.auth.client.feign"
,
"com.xxfc.platform
"
})
@EnableAceCache
@EnableAceCache
@tk
.
mybatis
.
spring
.
annotation
.
MapperScan
(
basePackages
=
"com.xxfc.platform.tour.mapper"
)
@tk
.
mybatis
.
spring
.
annotation
.
MapperScan
(
basePackages
=
"com.xxfc.platform.tour.mapper"
)
public
class
TourApplication
{
public
class
TourApplication
{
...
...
xx-tour/xx-tour-
api
/src/main/java/com/xxfc/platform/tour/common/TourBaseController.java
→
xx-tour/xx-tour-
server
/src/main/java/com/xxfc/platform/tour/common/TourBaseController.java
View file @
b649a596
package
com
.
xxfc
.
platform
.
tour
.
common
;
package
com
.
xxfc
.
platform
.
tour
.
common
;
import
com.github.wxiaoqi.security.admin.feign.UserFeign
;
import
com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO
;
import
com.github.wxiaoqi.security.auth.client.config.UserAuthConfig
;
import
com.github.wxiaoqi.security.auth.client.config.UserAuthConfig
;
import
com.github.wxiaoqi.security.common.biz.BaseBiz
;
import
com.github.wxiaoqi.security.common.biz.BaseBiz
;
import
com.github.wxiaoqi.security.common.rest.BaseController
;
import
com.xxfc.platform.vehicle.feign.UserFeign
;
import
com.xxfc.platform.vehicle.feign.dto.AppUserDTO
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
@Slf4j
@Slf4j
...
@@ -21,9 +21,8 @@ public class TourBaseController<Biz extends BaseBiz> {
...
@@ -21,9 +21,8 @@ public class TourBaseController<Biz extends BaseBiz> {
@Autowired
@Autowired
protected
UserAuthConfig
userAuthConfig
;
protected
UserAuthConfig
userAuthConfig
;
public
AppUserDTO
getUserInfo
(){
public
AppUserDTO
getUserInfo
(){
return
userFeign
.
userDetailByToken
(
userAuthConfig
.
getToken
(
request
)).
getData
();
return
userFeign
.
userDetailByToken
(
userAuthConfig
.
getToken
(
request
)).
getData
();
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment