记得上下班打卡 | 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
f833f439
Commit
f833f439
authored
Mar 06, 2022
by
张国柄
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin
parents
7e8fc669
c68b3fea
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
45 additions
and
25 deletions
+45
-25
application-test.yml
liquidnet-bus-config/liquidnet-config/application-test.yml
+17
-17
liquidnet-service-adam-test.yml
...s-config/liquidnet-config/liquidnet-service-adam-test.yml
+1
-1
liquidnet-service-order-test.yml
...-config/liquidnet-config/liquidnet-service-order-test.yml
+1
-1
ConsumerGoblinShopCartStreamConfig.java
...mer/goblin/config/ConsumerGoblinShopCartStreamConfig.java
+16
-0
GoblinRedisUtils.java
...a/com/liquidnet/service/goblin/util/GoblinRedisUtils.java
+7
-4
GoblinRedisUtils.java
...a/com/liquidnet/service/order/utils/GoblinRedisUtils.java
+3
-2
No files found.
liquidnet-bus-config/liquidnet-config/application-test.yml
View file @
f833f439
...
@@ -34,50 +34,50 @@ liquidnet:
...
@@ -34,50 +34,50 @@ liquidnet:
kylin
:
kylin
:
database
:
255
database
:
255
dbs
:
0,256
dbs
:
0,256
host
:
r-2ze
7002ckw5u75fgukpd
.redis.rds.aliyuncs.com
host
:
r-2ze
tgw7zdxea5wtnr8
.redis.rds.aliyuncs.com
port
:
6380
port
:
6380
password
:
PO@B!Iud32
password
:
Zhengzai@2021
slime
:
slime
:
database
:
255
database
:
255
dbs
:
0,256
dbs
:
0,256
host
:
r-2ze
7002ckw5u75fgukpd
.redis.rds.aliyuncs.com
host
:
r-2ze
tgw7zdxea5wtnr8
.redis.rds.aliyuncs.com
port
:
6380
port
:
6380
password
:
PO@B!Iud32
password
:
Zhengzai@2021
dragon
:
dragon
:
database
:
255
database
:
255
dbs
:
0,256
dbs
:
0,256
host
:
r-2ze
7002ckw5u75fgukpd
.redis.rds.aliyuncs.com
host
:
r-2ze
tgw7zdxea5wtnr8
.redis.rds.aliyuncs.com
port
:
6380
port
:
6380
password
:
PO@B!Iud32
password
:
Zhengzai@2021
sweet
:
sweet
:
database
:
255
database
:
255
dbs
:
0,256
dbs
:
0,256
host
:
r-2ze
7002ckw5u75fgukpd
.redis.rds.aliyuncs.com
host
:
r-2ze
tgw7zdxea5wtnr8
.redis.rds.aliyuncs.com
port
:
6380
port
:
6380
password
:
PO@B!Iud32
password
:
Zhengzai@2021
adam
:
adam
:
database
:
255
database
:
255
dbs
:
0,256
dbs
:
0,256
host
:
r-2ze
7002ckw5u75fgukpd
.redis.rds.aliyuncs.com
host
:
r-2ze
tgw7zdxea5wtnr8
.redis.rds.aliyuncs.com
port
:
6380
port
:
6380
password
:
PO@B!Iud32
password
:
Zhengzai@2021
candy
:
candy
:
database
:
255
database
:
255
dbs
:
0,256
dbs
:
0,256
host
:
r-2ze
7002ckw5u75fgukpd
.redis.rds.aliyuncs.com
host
:
r-2ze
tgw7zdxea5wtnr8
.redis.rds.aliyuncs.com
port
:
6380
port
:
6380
password
:
PO@B!Iud32
password
:
Zhengzai@2021
goblin
:
goblin
:
database
:
255
database
:
255
dbs
:
0,256
dbs
:
0,256
host
:
r-2ze
7002ckw5u75fgukpd
.redis.rds.aliyuncs.com
host
:
r-2ze
tgw7zdxea5wtnr8
.redis.rds.aliyuncs.com
port
:
6380
port
:
6380
password
:
PO@B!Iud32
password
:
Zhengzai@2021
mongodb
:
mongodb
:
host
:
39.107.71.112:270
17
host
:
s-2zeb52774ceac644.mongodb.rds.aliyuncs.com:3717,s-2ze8994d25d37d74.mongodb.rds.aliyuncs.com:37
17
port
:
270
17
port
:
37
17
user
:
admin
user
:
admin
pwd
:
S&y$6d*JwJ
pwd
:
Zhengzai@2022
service
:
service
:
adam
:
adam
:
url-pay
:
url-pay
:
...
...
liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-test.yml
View file @
f833f439
...
@@ -11,7 +11,7 @@ liquidnet:
...
@@ -11,7 +11,7 @@ liquidnet:
name
:
service-adam
name
:
service-adam
config
:
classpath:logback-spring.xml
config
:
classpath:logback-spring.xml
file-max-size
:
200MB
file-max-size
:
200MB
level
:
debug
level
:
info
mysql
:
mysql
:
database-name
:
test_ln_scene
database-name
:
test_ln_scene
mongodb
:
mongodb
:
...
...
liquidnet-bus-config/liquidnet-config/liquidnet-service-order-test.yml
View file @
f833f439
...
@@ -14,7 +14,7 @@ liquidnet:
...
@@ -14,7 +14,7 @@ liquidnet:
pattern-file
:
'
%d{yyyy-MM-dd
HH:mm:ss.SSS}
[
%-5level]
%thread
[%logger{96}:%line]
-
%msg%n'
pattern-file
:
'
%d{yyyy-MM-dd
HH:mm:ss.SSS}
[
%-5level]
%thread
[%logger{96}:%line]
-
%msg%n'
pattern-console
:
'
%d{yyyy-MM-dd
HH:mm:ss.SSS}
[
%-5level]
%thread
[%logger{96}:%line]
-
%msg%n'
pattern-console
:
'
%d{yyyy-MM-dd
HH:mm:ss.SSS}
[
%-5level]
%thread
[%logger{96}:%line]
-
%msg%n'
pattern-rolling-file-name
:
${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
pattern-rolling-file-name
:
${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
level
:
debug
level
:
info
mysql
:
mysql
:
database-name
:
test_ln_scene
database-name
:
test_ln_scene
mongodb
:
mongodb
:
...
...
liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-goblin/src/main/java/com/liquidnet/service/consumer/goblin/config/ConsumerGoblinShopCartStreamConfig.java
View file @
f833f439
...
@@ -59,4 +59,20 @@ public class ConsumerGoblinShopCartStreamConfig {
...
@@ -59,4 +59,20 @@ public class ConsumerGoblinShopCartStreamConfig {
return
subscription
;
return
subscription
;
}
}
@Bean
public
Subscription
subscriptionSqlShopCart3
(
RedisConnectionFactory
factory
)
{
var
listenerContainer
=
this
.
buildStreamMessageListenerContainer
(
factory
);
var
subscription
=
receiveSqlShopCart
(
listenerContainer
,
2
);
listenerContainer
.
start
();
return
subscription
;
}
@Bean
public
Subscription
subscriptionSqlShopCart4
(
RedisConnectionFactory
factory
)
{
var
listenerContainer
=
this
.
buildStreamMessageListenerContainer
(
factory
);
var
subscription
=
receiveSqlShopCart
(
listenerContainer
,
2
);
listenerContainer
.
start
();
return
subscription
;
}
}
}
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinRedisUtils.java
View file @
f833f439
...
@@ -378,7 +378,8 @@ public class GoblinRedisUtils {
...
@@ -378,7 +378,8 @@ public class GoblinRedisUtils {
public
GoblinGoodsInfoVo
getGoodsInfoVo
(
String
spuId
)
{
public
GoblinGoodsInfoVo
getGoodsInfoVo
(
String
spuId
)
{
String
pre
=
GoblinStatusConst
.
MarketPreStatus
.
getPre
(
spuId
);
String
pre
=
GoblinStatusConst
.
MarketPreStatus
.
getPre
(
spuId
);
if
(
pre
!=
null
&&
pre
.
equals
(
GoblinStatusConst
.
MarketPreStatus
.
MARKET_PRE_ZHENGZAI
.
getValue
()))
{
if
(
pre
!=
null
&&
pre
.
equals
(
GoblinStatusConst
.
MarketPreStatus
.
MARKET_PRE_ZHENGZAI
.
getValue
()))
{
String
rk
=
GoblinRedisConst
.
BASIC_GOODS
.
concat
(
spuId
.
split
(
GoblinStatusConst
.
MarketPreStatus
.
MARKET_PRE_ZHENGZAI
.
getValue
())[
0
]);
String
[]
spuSplitArr
=
spuId
.
split
(
GoblinStatusConst
.
MarketPreStatus
.
MARKET_PRE_ZHENGZAI
.
getValue
());
String
rk
=
GoblinRedisConst
.
BASIC_GOODS
.
concat
(
spuSplitArr
[
0
]);
GoblinGoodsInfoVo
vo
=
(
GoblinGoodsInfoVo
)
redisUtil
.
get
(
rk
);
GoblinGoodsInfoVo
vo
=
(
GoblinGoodsInfoVo
)
redisUtil
.
get
(
rk
);
if
(
null
==
vo
&&
null
!=
(
vo
=
goblinMongoUtils
.
getGoodsInfoVo
(
spuId
)))
{
if
(
null
==
vo
&&
null
!=
(
vo
=
goblinMongoUtils
.
getGoodsInfoVo
(
spuId
)))
{
redisUtil
.
set
(
rk
,
vo
);
redisUtil
.
set
(
rk
,
vo
);
...
@@ -397,7 +398,7 @@ public class GoblinRedisUtils {
...
@@ -397,7 +398,7 @@ public class GoblinRedisUtils {
vo
.
setSpuId
(
marketVo
.
getSpuId
());
vo
.
setSpuId
(
marketVo
.
getSpuId
());
List
<
String
>
skuIdList
=
CollectionUtil
.
linkedListString
();
List
<
String
>
skuIdList
=
CollectionUtil
.
linkedListString
();
for
(
String
skuIds
:
vo
.
getSkuIdList
())
{
for
(
String
skuIds
:
vo
.
getSkuIdList
())
{
skuIdList
.
add
(
skuIds
.
concat
(
spuId
.
split
(
GoblinStatusConst
.
MarketPreStatus
.
MARKET_PRE_ZHENGZAI
.
getValue
())
[
1
]));
skuIdList
.
add
(
skuIds
.
concat
(
pre
).
concat
(
spuSplitArr
[
1
]));
}
}
vo
.
setSkuIdList
(
skuIdList
);
vo
.
setSkuIdList
(
skuIdList
);
vo
.
setPriceGe
(
marketVo
.
getPriceGe
());
vo
.
setPriceGe
(
marketVo
.
getPriceGe
());
...
@@ -417,7 +418,8 @@ public class GoblinRedisUtils {
...
@@ -417,7 +418,8 @@ public class GoblinRedisUtils {
public
GoblinGoodsInfoVo
getGoodsInfoVoByUnShelves
(
String
spuId
)
{
public
GoblinGoodsInfoVo
getGoodsInfoVoByUnShelves
(
String
spuId
)
{
String
pre
=
GoblinStatusConst
.
MarketPreStatus
.
getPre
(
spuId
);
String
pre
=
GoblinStatusConst
.
MarketPreStatus
.
getPre
(
spuId
);
if
(
pre
!=
null
&&
pre
.
equals
(
GoblinStatusConst
.
MarketPreStatus
.
MARKET_PRE_ZHENGZAI
.
getValue
()))
{
if
(
pre
!=
null
&&
pre
.
equals
(
GoblinStatusConst
.
MarketPreStatus
.
MARKET_PRE_ZHENGZAI
.
getValue
()))
{
String
rk
=
GoblinRedisConst
.
BASIC_GOODS_UNSHELVES
.
concat
(
spuId
.
split
(
GoblinStatusConst
.
MarketPreStatus
.
MARKET_PRE_ZHENGZAI
.
getValue
())[
0
]);
String
[]
spuSplitArr
=
spuId
.
split
(
GoblinStatusConst
.
MarketPreStatus
.
MARKET_PRE_ZHENGZAI
.
getValue
());
String
rk
=
GoblinRedisConst
.
BASIC_GOODS_UNSHELVES
.
concat
(
spuSplitArr
[
0
]);
GoblinGoodsInfoVo
vo
=
(
GoblinGoodsInfoVo
)
redisUtil
.
get
(
rk
);
GoblinGoodsInfoVo
vo
=
(
GoblinGoodsInfoVo
)
redisUtil
.
get
(
rk
);
if
(
null
==
vo
&&
null
!=
(
vo
=
goblinMongoUtils
.
getGoodsInfoVo
(
spuId
)))
{
if
(
null
==
vo
&&
null
!=
(
vo
=
goblinMongoUtils
.
getGoodsInfoVo
(
spuId
)))
{
redisUtil
.
set
(
rk
,
vo
);
redisUtil
.
set
(
rk
,
vo
);
...
@@ -436,7 +438,7 @@ public class GoblinRedisUtils {
...
@@ -436,7 +438,7 @@ public class GoblinRedisUtils {
vo
.
setSpuId
(
marketVo
.
getSpuId
());
vo
.
setSpuId
(
marketVo
.
getSpuId
());
List
<
String
>
skuIdList
=
CollectionUtil
.
linkedListString
();
List
<
String
>
skuIdList
=
CollectionUtil
.
linkedListString
();
for
(
String
skuIds
:
vo
.
getSkuIdList
())
{
for
(
String
skuIds
:
vo
.
getSkuIdList
())
{
skuIdList
.
add
(
skuIds
.
concat
(
spuId
.
split
(
GoblinStatusConst
.
MarketPreStatus
.
MARKET_PRE_ZHENGZAI
.
getValue
())
[
1
]));
skuIdList
.
add
(
skuIds
.
concat
(
pre
).
concat
(
spuSplitArr
[
1
]));
}
}
vo
.
setSkuIdList
(
skuIdList
);
vo
.
setSkuIdList
(
skuIdList
);
vo
.
setPriceGe
(
marketVo
.
getPriceGe
());
vo
.
setPriceGe
(
marketVo
.
getPriceGe
());
...
@@ -474,6 +476,7 @@ public class GoblinRedisUtils {
...
@@ -474,6 +476,7 @@ public class GoblinRedisUtils {
public
GoblinGoodsSkuInfoVo
getGoodsSkuInfoVo
(
String
skuId
)
{
public
GoblinGoodsSkuInfoVo
getGoodsSkuInfoVo
(
String
skuId
)
{
String
pre
=
GoblinStatusConst
.
MarketPreStatus
.
getPre
(
skuId
);
String
pre
=
GoblinStatusConst
.
MarketPreStatus
.
getPre
(
skuId
);
if
(
pre
!=
null
&&
pre
.
equals
(
GoblinStatusConst
.
MarketPreStatus
.
MARKET_PRE_ZHENGZAI
.
getValue
()))
{
if
(
pre
!=
null
&&
pre
.
equals
(
GoblinStatusConst
.
MarketPreStatus
.
MARKET_PRE_ZHENGZAI
.
getValue
()))
{
String
rk
=
GoblinRedisConst
.
BASIC_GOODS_SKU
.
concat
(
skuId
.
split
(
GoblinStatusConst
.
MarketPreStatus
.
MARKET_PRE_ZHENGZAI
.
getValue
())[
0
]);
String
rk
=
GoblinRedisConst
.
BASIC_GOODS_SKU
.
concat
(
skuId
.
split
(
GoblinStatusConst
.
MarketPreStatus
.
MARKET_PRE_ZHENGZAI
.
getValue
())[
0
]);
GoblinGoodsSkuInfoVo
vo
=
(
GoblinGoodsSkuInfoVo
)
redisUtil
.
get
(
rk
);
GoblinGoodsSkuInfoVo
vo
=
(
GoblinGoodsSkuInfoVo
)
redisUtil
.
get
(
rk
);
if
(
null
==
vo
&&
null
!=
(
vo
=
goblinMongoUtils
.
getGoodsSkuInfoVo
(
skuId
)))
{
if
(
null
==
vo
&&
null
!=
(
vo
=
goblinMongoUtils
.
getGoodsSkuInfoVo
(
skuId
)))
{
...
...
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/GoblinRedisUtils.java
View file @
f833f439
...
@@ -72,7 +72,8 @@ public class GoblinRedisUtils {
...
@@ -72,7 +72,8 @@ public class GoblinRedisUtils {
public
GoblinGoodsInfoVo
getGoodsInfoVo
(
String
spuId
)
{
public
GoblinGoodsInfoVo
getGoodsInfoVo
(
String
spuId
)
{
String
pre
=
GoblinStatusConst
.
MarketPreStatus
.
getPre
(
spuId
);
String
pre
=
GoblinStatusConst
.
MarketPreStatus
.
getPre
(
spuId
);
if
(
pre
!=
null
&&
pre
.
equals
(
GoblinStatusConst
.
MarketPreStatus
.
MARKET_PRE_ZHENGZAI
.
getValue
()))
{
if
(
pre
!=
null
&&
pre
.
equals
(
GoblinStatusConst
.
MarketPreStatus
.
MARKET_PRE_ZHENGZAI
.
getValue
()))
{
String
rk
=
GoblinRedisConst
.
BASIC_GOODS
.
concat
(
spuId
.
split
(
GoblinStatusConst
.
MarketPreStatus
.
MARKET_PRE_ZHENGZAI
.
getValue
())[
0
]);
String
[]
spuSplitArr
=
spuId
.
split
(
GoblinStatusConst
.
MarketPreStatus
.
MARKET_PRE_ZHENGZAI
.
getValue
());
String
rk
=
GoblinRedisConst
.
BASIC_GOODS
.
concat
(
spuSplitArr
[
0
]);
GoblinGoodsInfoVo
vo
=
(
GoblinGoodsInfoVo
)
redisUtil
.
get
(
rk
);
GoblinGoodsInfoVo
vo
=
(
GoblinGoodsInfoVo
)
redisUtil
.
get
(
rk
);
if
(
null
==
vo
&&
null
!=
(
vo
=
goblinMongoUtils
.
getGoodsInfoVo
(
spuId
)))
{
if
(
null
==
vo
&&
null
!=
(
vo
=
goblinMongoUtils
.
getGoodsInfoVo
(
spuId
)))
{
redisUtil
.
set
(
rk
,
vo
);
redisUtil
.
set
(
rk
,
vo
);
...
@@ -91,7 +92,7 @@ public class GoblinRedisUtils {
...
@@ -91,7 +92,7 @@ public class GoblinRedisUtils {
vo
.
setSpuId
(
marketVo
.
getSpuId
());
vo
.
setSpuId
(
marketVo
.
getSpuId
());
List
<
String
>
skuIdList
=
CollectionUtil
.
linkedListString
();
List
<
String
>
skuIdList
=
CollectionUtil
.
linkedListString
();
for
(
String
skuIds
:
vo
.
getSkuIdList
())
{
for
(
String
skuIds
:
vo
.
getSkuIdList
())
{
skuIdList
.
add
(
skuIds
.
concat
(
spuId
.
split
(
GoblinStatusConst
.
MarketPreStatus
.
MARKET_PRE_ZHENGZAI
.
getValue
())
[
1
]));
skuIdList
.
add
(
skuIds
.
concat
(
pre
).
concat
(
spuSplitArr
[
1
]));
}
}
vo
.
setSkuIdList
(
skuIdList
);
vo
.
setSkuIdList
(
skuIdList
);
vo
.
setPriceGe
(
marketVo
.
getPriceGe
());
vo
.
setPriceGe
(
marketVo
.
getPriceGe
());
...
...
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