diff --git a/community-service/src/main/java/com/tanpu/community/feign/activity/FeignClientForActivity.java b/community-service/src/main/java/com/tanpu/community/feign/activity/FeignClientForActivity.java index 8ca1ef0e62d2f776d712c05c2361a6a110f76ab7..7e5ca1f376415f9e6c4f48b5b1fabd05712b3bbe 100644 --- a/community-service/src/main/java/com/tanpu/community/feign/activity/FeignClientForActivity.java +++ b/community-service/src/main/java/com/tanpu/community/feign/activity/FeignClientForActivity.java @@ -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 { diff --git a/community-service/src/main/java/com/tanpu/community/feign/fatools/FeignClientForFatools.java b/community-service/src/main/java/com/tanpu/community/feign/fatools/FeignClientForFatools.java index 7f817b92acbbf4cbd6b87f565b2661f44cfa9d89..595208dbade82abb79bc394020241bced64eca97 100644 --- a/community-service/src/main/java/com/tanpu/community/feign/fatools/FeignClientForFatools.java +++ b/community-service/src/main/java/com/tanpu/community/feign/fatools/FeignClientForFatools.java @@ -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 = "æ‰¹é‡æŸ¥è¯¢æŸ¥è¯¢åŸºæœ¬ä¿¡æ¯") diff --git a/community-service/src/main/java/com/tanpu/community/util/HttpServletHelper.java b/community-service/src/main/java/com/tanpu/community/util/HttpServletHelper.java index 3acf6a92cfb519d01a9bb7c8c311d4d53444f733..366daa6e4f2b39c4e9b964ea51c1eaa75c9fdab0 100644 --- a/community-service/src/main/java/com/tanpu/community/util/HttpServletHelper.java +++ b/community-service/src/main/java/com/tanpu/community/util/HttpServletHelper.java @@ -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; } diff --git a/community-service/src/main/resources/application-test.yml b/community-service/src/main/resources/application-test.yml index b7960d606541f9f556b96400582628ad6f4458ea..0e3fc7dd7ab079b6c7c4a086ec2370901bf87879 100644 --- a/community-service/src/main/resources/application-test.yml +++ b/community-service/src/main/resources/application-test.yml @@ -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