记得上下班打卡 | git大法好,push需谨慎

Commit 8a59626a authored by jiangxiulong's avatar jiangxiulong

获取小家伙名称 改成http

parent d621c603
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>liquidnet-bus-feign</artifactId>
<groupId>com.liquidnet</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>liquidnet-api-feign-smile</artifactId>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
<dependencies>
<dependency>
<groupId>com.liquidnet</groupId>
<artifactId>liquidnet-service-smile-api</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
\ No newline at end of file
package com.liquidnet.service.feign.smile.api;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
import feign.hystrix.FallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
@Component
@FeignClient(name = "liquidnet-service-smile",
contextId = "FeignSmileApiClient", path = "smile",
url = "${liquidnet.service.smile.url}",
fallback = FallbackFactory.Default.class)
public interface FeignSmileApiClient {
@PostMapping("frontNoLogin/getUserByid")
ResponseDto<SmileUserVO> getUserByid(@RequestParam("userId") String userId);
}
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
<module>liquidnet-api-feign-stone</module> <module>liquidnet-api-feign-stone</module>
<module>liquidnet-api-feign-candy</module> <module>liquidnet-api-feign-candy</module>
<module>liquidnet-api-feign-slime</module> <module>liquidnet-api-feign-slime</module>
<module>liquidnet-api-feign-smile</module>
<!-- <module>liquidnet-api-feign-sequence</module>--> <!-- <module>liquidnet-api-feign-sequence</module>-->
<!-- <module>liquidnet-api-feign-example</module>--> <!-- <module>liquidnet-api-feign-example</module>-->
<!-- <module>liquidnet-api-feign-account</module>--> <!-- <module>liquidnet-api-feign-account</module>-->
......
...@@ -34,8 +34,9 @@ ...@@ -34,8 +34,9 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.liquidnet</groupId> <groupId>com.liquidnet</groupId>
<artifactId>liquidnet-api-feign-smile</artifactId> <artifactId>liquidnet-service-smile-api</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
......
package com.liquidnet.service.kylin.service.impl; package com.liquidnet.service.kylin.service.impl;
import com.fasterxml.jackson.core.type.TypeReference;
import com.liquidnet.commons.lang.CommonConst; import com.liquidnet.commons.lang.CommonConst;
import com.liquidnet.commons.lang.util.*; import com.liquidnet.commons.lang.util.*;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.base.SqlMapping; import com.liquidnet.service.base.SqlMapping;
import com.liquidnet.service.base.UserPathDto; import com.liquidnet.service.base.UserPathDto;
import com.liquidnet.service.base.constant.MQConst; import com.liquidnet.service.base.constant.MQConst;
import com.liquidnet.service.feign.smile.api.FeignSmileApiClient;
import com.liquidnet.service.goblin.dto.vo.SmileUserVO; import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
import com.liquidnet.service.kylin.constant.KylinPerformanceStatusEnum; import com.liquidnet.service.kylin.constant.KylinPerformanceStatusEnum;
import com.liquidnet.service.kylin.constant.KylinTableStatusConst; import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
...@@ -25,6 +25,7 @@ import lombok.extern.slf4j.Slf4j; ...@@ -25,6 +25,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.bson.Document; import org.bson.Document;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort;
...@@ -34,6 +35,8 @@ import org.springframework.data.mongodb.core.query.Criteria; ...@@ -34,6 +35,8 @@ import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import java.util.*; import java.util.*;
import java.util.regex.Pattern; import java.util.regex.Pattern;
...@@ -59,8 +62,8 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService { ...@@ -59,8 +62,8 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
@Autowired @Autowired
private QueueUtils queueUtils; private QueueUtils queueUtils;
@Autowired @Value("${liquidnet.service.smile.url}")
private FeignSmileApiClient feignSmileApiClient; private String smileUrl;
public HashMap<String, Object> localList( public HashMap<String, Object> localList(
int days, String cityName, Integer adCode, int type, int days, String cityName, Integer adCode, int type,
...@@ -200,7 +203,13 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService { ...@@ -200,7 +203,13 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
if (StringUtil.isNotEmpty(agentId)) { if (StringUtil.isNotEmpty(agentId)) {
try { try {
ResponseDto<SmileUserVO> responseDto = feignSmileApiClient.getUserByid(agentId); MultiValueMap<String, String> params = new LinkedMultiValueMap();
params.add("agentId", agentId);
MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString();
headers.add("Accept", "application/json;charset=UTF-8");
String returnData = HttpUtil.post(smileUrl + "/smile/frontNoLogin/getUserById", params, headers);
ResponseDto<SmileUserVO> responseDto = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<SmileUserVO>>() {
});
String agentName = responseDto.getData().getName(); String agentName = responseDto.getData().getName();
performancesInfo.setAgentName(agentName); performancesInfo.setAgentName(agentName);
} catch (Exception e) { } catch (Exception e) {
......
...@@ -12,6 +12,7 @@ import lombok.extern.slf4j.Slf4j; ...@@ -12,6 +12,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; 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.RestController;
/** /**
...@@ -40,9 +41,9 @@ public class SmileNoLoginController { ...@@ -40,9 +41,9 @@ public class SmileNoLoginController {
return ResponseDto.success(smileUserVO); return ResponseDto.success(smileUserVO);
} }
@PostMapping("getUserByid") @PostMapping("getUserById")
@ApiOperation("获取用户状态,返回用户") @ApiOperation("获取用户状态,返回用户")
public ResponseDto<SmileUserVO> getUserByid(String userId) { public ResponseDto<SmileUserVO> getUserById(@RequestParam("userId") String userId) {
SmileUserVO smileUserVO = (SmileUserVO) redisUtil.get(SmileRedisConst.SMILE_USER.concat(userId)); SmileUserVO smileUserVO = (SmileUserVO) redisUtil.get(SmileRedisConst.SMILE_USER.concat(userId));
return ResponseDto.success(smileUserVO); return ResponseDto.success(smileUserVO);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment