Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in
Toggle navigation
T
tanpu-community
Project
Project
Details
Activity
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
探普后端
tanpu-community
Commits
b27c9f3e
Commit
b27c9f3e
authored
Sep 24, 2021
by
王亚雷
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
游客权限
parent
a6d5c8d4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
10 deletions
+18
-10
FeignClientForActivity.java
...anpu/community/feign/activity/FeignClientForActivity.java
+1
-1
FeignClientForFatools.java
.../tanpu/community/feign/fatools/FeignClientForFatools.java
+3
-6
HttpServletHelper.java
...main/java/com/tanpu/community/util/HttpServletHelper.java
+3
-2
application-test.yml
community-service/src/main/resources/application-test.yml
+11
-1
No files found.
community-service/src/main/java/com/tanpu/community/feign/activity/FeignClientForActivity.java
View file @
b27c9f3e
...
...
@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import
java.util.List
;
@FeignClient
(
value
=
"service-jifen"
,
contextId
=
"jifen"
,
fallbackFactory
=
FeignBackClientForActivity
.
class
,
url
=
"
http://tp-jifen-svc
"
,
path
=
"/jifen"
)
@FeignClient
(
value
=
"service-jifen"
,
contextId
=
"jifen"
,
fallbackFactory
=
FeignBackClientForActivity
.
class
,
url
=
"
${tanpu.jifen.svc:http://tp-jifen-svc}
"
,
path
=
"/jifen"
)
// @FeignClient(value = "service-jifen", contextId = "jifen", fallbackFactory = FeignBackClientForActivity.class, url = "http://127.0.0.1:8202/community")
public
interface
FeignClientForActivity
{
...
...
community-service/src/main/java/com/tanpu/community/feign/fatools/FeignClientForFatools.java
View file @
b27c9f3e
...
...
@@ -2,27 +2,24 @@ package com.tanpu.community.feign.fatools;
import
com.tanpu.common.api.CommonResp
;
import
com.tanpu.community.api.beans.req.page.Page
;
import
com.tanpu.community.api.beans.req.page.Pageable
;
import
com.tanpu.community.api.beans.vo.feign.course.ShortVideoBaseInfoResp
;
import
com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNewChief
;
import
com.tanpu.community.api.beans.vo.feign.fatools.UserInfoOrg
;
import
com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp
;
import
com.tanpu.community.api.beans.vo.feign.user.FileQueryResp
;
import
com.tanpu.community.api.beans.vo.feign.user.UserInfoVo
;
import
com.tanpu.community.config.FeignConfiguration
;
import
com.tanpu.community.feign.diagnose.FeignBackClientForDiagnose
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiParam
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.http.MediaType
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Set
;
@FeignClient
(
value
=
"fatools"
,
contextId
=
"fatools"
,
fallbackFactory
=
FeignbackForFatools
.
class
,
url
=
"
http://tp-fatools-svc
"
,
path
=
"/fatools"
)
@FeignClient
(
value
=
"fatools"
,
contextId
=
"fatools"
,
fallbackFactory
=
FeignbackForFatools
.
class
,
url
=
"
${tanpu.fatools.svc:http://tp-fatools-svc}
"
,
path
=
"/fatools"
)
//@FeignClient(value = "fatools", contextId = "fatoolsUser", fallbackFactory = FeignbackForFatools.class, path = "/fatools")
public
interface
FeignClientForFatools
{
...
...
@@ -44,7 +41,7 @@ public interface FeignClientForFatools {
// 用户信息查询 (供圈子服务调用)
@ApiOperation
(
value
=
"查询用户信息"
)
@GetMapping
(
value
=
"/queryUserInfoNew"
)
@GetMapping
(
value
=
"/queryUserInfoNew"
,
produces
=
{
MediaType
.
APPLICATION_JSON_VALUE
}
)
CommonResp
<
UserInfoResp
>
queryUserInfoNew
(
@RequestParam
(
"userId"
)
String
userId
);
@ApiOperation
(
value
=
"批量查询查询基本信息"
)
...
...
community-service/src/main/java/com/tanpu/community/util/HttpServletHelper.java
View file @
b27c9f3e
...
...
@@ -34,9 +34,9 @@ public class HttpServletHelper {
if
(
isAndroid
(
clientEnv
)
||
isIOS
(
clientEnv
)
||
isPc
(
clientEnv
)
||
isMiniProgram
(
clientEnv
))
{
// android,ios,pc,小程序用token
String
token
=
request
.
getHeader
(
RedisKeyConstant
.
TAMP_TOKEN
);
userId
=
redisHelper
.
get
(
RedisKeyConstant
.
REDIS_PREFIX_TOKEN
+
token
);
// redis获取的value,都带有 "",这里去掉
userId
=
StringUtils
.
remove
(
redisHelper
.
get
(
RedisKeyConstant
.
REDIS_PREFIX_TOKEN
+
token
),
"\""
);
}
else
{
// 用cookie
Cookie
[]
cookies
=
request
.
getCookies
();
if
(
cookies
!=
null
)
{
...
...
@@ -48,6 +48,7 @@ public class HttpServletHelper {
}
}
}
log
.
debug
(
"当前登录用户Id: {}"
,
userId
);
return
userId
;
}
...
...
community-service/src/main/resources/application-test.yml
View file @
b27c9f3e
...
...
@@ -96,4 +96,14 @@ recommend:
python
:
1
python
:
enable
:
false
url
:
http://172.168.0.164:9000/api/get_recommend?user_id=2431614397151511
\ No newline at end of file
url
:
http://172.168.0.164:9000/api/get_recommend?user_id=2431614397151511
tmpfile
:
dir
:
/data/tmp
tanpu
:
fatools
:
svc
:
https://testtamper.tanpuyun.com
jifen
:
svc
:
https://testtamper.tanpuyun.com
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