记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
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
董敬伟
liquidnet-bus-v1
Commits
8a59626a
Commit
8a59626a
authored
Mar 29, 2022
by
jiangxiulong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
获取小家伙名称 改成http
parent
d621c603
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
57 deletions
+18
-57
pom.xml
liquidnet-bus-feign/liquidnet-api-feign-smile/pom.xml
+0
-29
FeignSmileApiClient.java
...iquidnet/service/feign/smile/api/FeignSmileApiClient.java
+0
-20
pom.xml
liquidnet-bus-feign/pom.xml
+0
-1
pom.xml
...uidnet-service-kylin/liquidnet-service-kylin-impl/pom.xml
+2
-1
KylinPerformancesServiceImpl.java
...vice/kylin/service/impl/KylinPerformancesServiceImpl.java
+13
-4
SmileNoLoginController.java
.../liquidnet/service/controller/SmileNoLoginController.java
+3
-2
No files found.
liquidnet-bus-feign/liquidnet-api-feign-smile/pom.xml
deleted
100644 → 0
View file @
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
liquidnet-bus-feign/liquidnet-api-feign-smile/src/main/java/com/liquidnet/service/feign/smile/api/FeignSmileApiClient.java
deleted
100644 → 0
View file @
d621c603
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
);
}
liquidnet-bus-feign/pom.xml
View file @
8a59626a
...
@@ -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>-->
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/pom.xml
View file @
8a59626a
...
@@ -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>
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java
View file @
8a59626a
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
)
{
...
...
liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/controller/SmileNoLoginController.java
View file @
8a59626a
...
@@ -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
(
"getUserBy
i
d"
)
@PostMapping
(
"getUserBy
I
d"
)
@ApiOperation
(
"获取用户状态,返回用户"
)
@ApiOperation
(
"获取用户状态,返回用户"
)
public
ResponseDto
<
SmileUserVO
>
getUserBy
id
(
String
userId
)
{
public
ResponseDto
<
SmileUserVO
>
getUserBy
Id
(
@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
);
}
}
...
...
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