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

Skip to content

L
liquidnet-bus-v1
Commit c83aab45 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

parents af69a89d c3b40520
Show whitespace changes
Inline Side-by-side
Showing with 146 additions and 203 deletions
liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web.yml
View file @ c83aab45
......@@ -38,7 +38,7 @@ server:
# 日志配置-------------------------------------------------------
logging:
level:
com.ruoyi: debug
com.ruoyi: info
org.springframework: warn
#logging:
# # config: ${liquidnet.logfile.config}
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-adam.yml
View file @ c83aab45
......@@ -3,10 +3,10 @@ server:
tomcat:
uri-encoding: UTF-8
maxThreads: 2000 #默认200
minSpareThreads: 2000 #默认10
minSpareThreads: 200 #默认10
maxConnections: 20000 #默认10000
acceptCount: 5000 #默认100
processorCache: 5000 #默认200
processorCache: -1 #默认200
servlet:
context-path: ${liquidnet.info.context}
# -----------------------------------------------------------
......@@ -82,22 +82,21 @@ spring:
password: ${liquidnet.redis.adam.password}
lettuce:
pool:
max-active: 5
max-active: 16
max-wait: -1
max-idle: 8
min-idle: 0
min-idle: 4
# -----------------------------------------------------------
# -----------------------------------------------------------
global-auth:
exclude-url-pattern: # 模式I（与模式II互斥）
- ${liquidnet.info.context}/doc.html
- ${liquidnet.info.context}/webjars/**
- ${liquidnet.info.context}/swagger-resources/**
- ${liquidnet.info.context}/v2/api-docs*
# - ${liquidnet.info.context}/doc.html
# - ${liquidnet.info.context}/webjars/**
# - ${liquidnet.info.context}/swagger-resources/**
# - ${liquidnet.info.context}/v2/api-docs*
- ${liquidnet.info.context}/ath/check
- ${liquidnet.info.context}/login/*
- ${liquidnet.info.context}/gen
- ${liquidnet.info.context}/ts
- ${liquidnet.info.context}/send
- ${liquidnet.info.context}/member/info
......@@ -110,8 +109,8 @@ global-auth:
- ${liquidnet.info.context}/enters/query/depth
- ${liquidnet.info.context}/addr/query/depth
- ${liquidnet.info.context}/plz/ad
- ${liquidnet.info.context}/wxa/code2session
- ${liquidnet.info.context}/wx/oauth2/access_token
# - ${liquidnet.info.context}/wxa/code2session
# - ${liquidnet.info.context}/wx/oauth2/access_token
- ${liquidnet.info.context}/rsc/**
include-url-pattern: # 模式II（与模式I互斥）
# - ${liquidnet.info.context}/**
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-candy.yml
View file @ c83aab45
......@@ -3,7 +3,7 @@ server:
tomcat:
uri-encoding: UTF-8
maxThreads: 2000 #默认200
minSpareThreads: 2000 #默认10
minSpareThreads: 200 #默认10
maxConnections: 20000 #默认10000
acceptCount: 5000 #默认100
processorCache: -1 #默认200
......@@ -81,19 +81,19 @@ spring:
password: ${liquidnet.redis.candy.password}
lettuce:
pool:
max-active: 8
max-active: 16
max-wait: -1
max-idle: 8
min-idle: 0
min-idle: 4
# -----------------------------------------------------------
# -----------------------------------------------------------
global-auth:
exclude-url-pattern: # 模式I（与模式II互斥）
- ${liquidnet.info.context}/doc.html
- ${liquidnet.info.context}/webjars/**
- ${liquidnet.info.context}/swagger-resources/**
- ${liquidnet.info.context}/v2/api-docs*
# - ${liquidnet.info.context}/doc.html
# - ${liquidnet.info.context}/webjars/**
# - ${liquidnet.info.context}/swagger-resources/**
# - ${liquidnet.info.context}/v2/api-docs*
- ${liquidnet.info.context}/candy-coupon/useBack
- ${liquidnet.info.context}/candy-coupon/useBackJxl
oncheck-url-pattern:
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-chime.yml
View file @ c83aab45
......@@ -2,11 +2,11 @@ server:
port: ${liquidnet.info.port}
tomcat:
uri-encoding: UTF-8
maxThreads: 200 #默认200
minSpareThreads: 30 #默认10
maxConnections: 12000 #默认10000
maxThreads: 2000 #默认200
minSpareThreads: 200 #默认10
maxConnections: 20000 #默认10000
acceptCount: 5000 #默认100
processorCache: 200 #默认200
processorCache: -1 #默认200
servlet:
context-path: ${liquidnet.info.context}
# -----------------------------------------------------------
......@@ -69,25 +69,13 @@ spring:
max-request-size: 10MB
profiles:
include: common-service #这里加载management相关公共配置
redis:
database: ${liquidnet.redis.sweet.database}
dbs: ${liquidnet.redis.sweet.dbs}
port: ${liquidnet.redis.sweet.port}
host: ${liquidnet.redis.sweet.host}
password: ${liquidnet.redis.sweet.password}
lettuce:
pool:
max-active: 8
max-wait: -1
max-idle: 8
min-idle: 0
autoconfigure:
exclude:
- org.springframework.cloud.bus.BusAutoConfiguration
- org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
data:
mongodb:
uri: mongodb://${liquidnet.mongodb.user}:${liquidnet.mongodb.pwd}@${liquidnet.mongodb.host}/?authSource=admin&maxPoolSize=2000&waitQueueMultiple=100
uri: mongodb://${liquidnet.mongodb.user}:${liquidnet.mongodb.pwd}@${liquidnet.mongodb.host}/?authSource=admin&maxPoolSize=200&waitQueueMultiple=100
sslEnabled: ${liquidnet.mongodb.sslEnabled}
database: ${liquidnet.mongodb.database}
# -----------------------------------------------------------
......@@ -95,10 +83,10 @@ spring:
# -----------------------------------------------------------
global-auth:
exclude-url-pattern: # 模式I（与模式II互斥）
- ${liquidnet.info.context}/doc.html
- ${liquidnet.info.context}/webjars/**
- ${liquidnet.info.context}/swagger-resources/**
- ${liquidnet.info.context}/v2/api-docs*
# - ${liquidnet.info.context}/doc.html
# - ${liquidnet.info.context}/webjars/**
# - ${liquidnet.info.context}/swagger-resources/**
# - ${liquidnet.info.context}/v2/api-docs*
- ${liquidnet.info.context}/user/register
- ${liquidnet.info.context}/user/userLikeOperation
- ${liquidnet.info.context}/user/userDislikeOperation
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-adam.yml
View file @ c83aab45
......@@ -18,8 +18,8 @@ logging:
name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
max-size: 200MB
pattern:
file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{26}:%line] - %msg%n'
console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{26}:%line] - %msg%n'
file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
level:
root: error
......@@ -57,7 +57,6 @@ spring:
include: common-service #这里加载management相关公共配置
redis:
database: ${liquidnet.redis.adam.database}
dbs: ${liquidnet.redis.adam.dbs}
port: ${liquidnet.redis.adam.port}
host: ${liquidnet.redis.adam.host}
password: ${liquidnet.redis.adam.password}
......@@ -75,12 +74,12 @@ spring:
# type: org.apache.tomcat.jdbc.pool.DataSource
driver-class-name: com.mysql.cj.jdbc.Driver
hikari:
maximum-pool-size: 16
maximum-pool-size: 45
minimum-idle: 8
connection-test-query: SELECT 1
data:
mongodb:
uri: mongodb://${liquidnet.mongodb.user}:${liquidnet.mongodb.pwd}@${liquidnet.mongodb.host}/?authSource=admin&maxPoolSize=2000&waitQueueMultiple=100
uri: mongodb://${liquidnet.mongodb.user}:${liquidnet.mongodb.pwd}@${liquidnet.mongodb.host}/?authSource=admin&maxPoolSize=200&waitQueueMultiple=100
sslEnabled: ${liquidnet.mongodb.sslEnabled}
database: ${liquidnet.mongodb.database}
# -----------------------------------------------------------
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-candy.yml
View file @ c83aab45
......@@ -75,7 +75,7 @@ spring:
# type: org.apache.tomcat.jdbc.pool.DataSource
driver-class-name: com.mysql.cj.jdbc.Driver
hikari:
maximum-pool-size: 16
maximum-pool-size: 45
minimum-idle: 8
connection-test-query: SELECT 1
# -----------------------------------------------------------
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-dragon.yml
View file @ c83aab45
......@@ -75,7 +75,7 @@ spring:
driver-class-name: com.mysql.cj.jdbc.Driver
hikari:
maximum-pool-size: 45
minimum-idle: 10
minimum-idle: 8
connection-test-query: SELECT 1
# -----------------------------------------------------------
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-goblin.yml
View file @ c83aab45
......@@ -75,7 +75,7 @@ spring:
# type: org.apache.tomcat.jdbc.pool.DataSource
driver-class-name: com.mysql.cj.jdbc.Driver
hikari:
maximum-pool-size: 16
maximum-pool-size: 45
minimum-idle: 8
connection-test-query: SELECT 1
# -----------------------------------------------------------
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-kylin.yml
View file @ c83aab45
......@@ -69,7 +69,7 @@ spring:
min-idle: 0
data:
mongodb:
uri: mongodb://${liquidnet.mongodb.user}:${liquidnet.mongodb.pwd}@${liquidnet.mongodb.host}/?authSource=admin&maxPoolSize=2000&waitQueueMultiple=100
uri: mongodb://${liquidnet.mongodb.user}:${liquidnet.mongodb.pwd}@${liquidnet.mongodb.host}/?authSource=admin&maxPoolSize=200&waitQueueMultiple=100
sslEnabled: ${liquidnet.mongodb.sslEnabled}
database: ${liquidnet.mongodb.database}
datasource:
......@@ -81,7 +81,7 @@ spring:
driver-class-name: com.mysql.cj.jdbc.Driver
hikari:
maximum-pool-size: 45
minimum-idle: 10
minimum-idle: 8
connection-test-query: SELECT 1
# -----------------------------------------------------------
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-stone.yml
View file @ c83aab45
......@@ -91,7 +91,7 @@ spring:
transportMode: "NIO"
data:
mongodb:
uri: mongodb://${liquidnet.mongodb.user}:${liquidnet.mongodb.pwd}@${liquidnet.mongodb.host}/?authSource=admin&maxPoolSize=2000&waitQueueMultiple=100
uri: mongodb://${liquidnet.mongodb.user}:${liquidnet.mongodb.pwd}@${liquidnet.mongodb.host}/?authSource=admin&maxPoolSize=200&waitQueueMultiple=100
sslEnabled: ${liquidnet.mongodb.sslEnabled}
database: ${liquidnet.mongodb.database}
datasource:
......@@ -103,7 +103,7 @@ spring:
driver-class-name: com.mysql.cj.jdbc.Driver
hikari:
maximum-pool-size: 45
minimum-idle: 10
minimum-idle: 8
connection-test-query: SELECT 1
# -----------------------------------------------------------
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-sweet.yml
View file @ c83aab45
......@@ -76,7 +76,7 @@ spring:
driver-class-name: com.mysql.cj.jdbc.Driver
hikari:
maximum-pool-size: 45
minimum-idle: 10
minimum-idle: 8
connection-test-query: SELECT 1
# -----------------------------------------------------------
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-dragon.yml
View file @ c83aab45
......@@ -3,7 +3,7 @@ server:
tomcat:
uri-encoding: UTF-8
maxThreads: 2000 #默认200
minSpareThreads: 2000 #默认10
minSpareThreads: 200 #默认10
maxConnections: 20000 #默认10000
acceptCount: 5000 #默认100
processorCache: -1 #默认200
......@@ -83,10 +83,10 @@ spring:
password: ${liquidnet.redis.dragon.password}
lettuce:
pool:
max-active: 8
max-active: 16
max-wait: -1
max-idle: 8
min-idle: 0
min-idle: 4
# -----------------------------------------------------------
# -----------------------------------------------------------
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-example.yml
View file @ c83aab45
......@@ -49,10 +49,10 @@ spring:
password: ${liquidnet.redis.password}
lettuce:
pool:
max-active: 5
max-active: 16
max-wait: -1
max-idle: 8
min-idle: 0
min-idle: 4
# -----------------------------------------------------------
knife4j:
enable: true
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-goblin.yml
View file @ c83aab45
......@@ -3,7 +3,7 @@ server:
tomcat:
uri-encoding: UTF-8
maxThreads: 2000 #默认200
minSpareThreads: 2000 #默认10
minSpareThreads: 200 #默认10
maxConnections: 20000 #默认10000
acceptCount: 5000 #默认100
processorCache: -1 #默认200
......@@ -81,13 +81,13 @@ spring:
password: ${liquidnet.redis.goblin.password}
lettuce:
pool:
max-active: 8
max-active: 16
max-wait: -1
max-idle: 8
min-idle: 0
min-idle: 4
data:
mongodb:
uri: mongodb://${liquidnet.mongodb.user}:${liquidnet.mongodb.pwd}@${liquidnet.mongodb.host}/?authSource=admin&maxPoolSize=2000&waitQueueMultiple=100
uri: mongodb://${liquidnet.mongodb.user}:${liquidnet.mongodb.pwd}@${liquidnet.mongodb.host}/?authSource=admin&maxPoolSize=200&waitQueueMultiple=100
sslEnabled: ${liquidnet.mongodb.sslEnabled}
database: ${liquidnet.mongodb.database}
# -----------------------------------------------------------
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin.yml
View file @ c83aab45
......@@ -3,7 +3,7 @@ server:
tomcat:
uri-encoding: UTF-8
maxThreads: 2000 #默认200
minSpareThreads: 2000 #默认10
minSpareThreads: 200 #默认10
maxConnections: 20000 #默认10000
acceptCount: 5000 #默认100
processorCache: -1 #默认200
......@@ -19,7 +19,7 @@ knife4j:
password: ${liquidnet.security.password}
# -----------------------------------------------------------
logging:
# config: ${liquidnet.logfile.config}
# config: ${liquidnet.logfile.config}
file:
name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
max-size: ${liquidnet.logfile.file-max-size}
......@@ -34,11 +34,11 @@ logging:
com.liquidnet: ${liquidnet.logfile.level}
# -----------------------------------------------------------
eureka:
# client:
# register-with-eureka: true
# fetch-registry: true
# serviceUrl:
# defaultZone: http://${liquidnet.security.username}:${liquidnet.security.password}@${liquidnet.eureka.host}/eureka-server/eureka
# client:
# register-with-eureka: true
# fetch-registry: true
# serviceUrl:
# defaultZone: http://${liquidnet.security.username}:${liquidnet.security.password}@${liquidnet.eureka.host}/eureka-server/eureka
instance:
hostname: ${spring.cloud.client.ip-address}
lease-expiration-duration-in-seconds: 15 #服务过期时间配置,超过这个时间没有接收到心跳EurekaServer就会将这个实例剔除
......@@ -81,35 +81,13 @@ spring:
password: ${liquidnet.redis.kylin.password}
lettuce:
pool:
max-active: 8
max-active: 16
max-wait: -1
max-idle: 8
min-idle: 0
# redisson:
# singleServerConfig:
# address: redis://${liquidnet.redis.host}:${liquidnet.redis.port}
# password: ${liquidnet.redis.password}
# clientName: null
# database: 7 #选择使用哪个数据库0~15
# idleConnectionTimeout: 10000
# connectTimeout: 10000
# timeout: 3000
# retryAttempts: 3
# retryInterval: 1500
# subscriptionsPerConnection: 5
# subscriptionConnectionMinimumIdleSize: 1
# subscriptionConnectionPoolSize: 50
# connectionMinimumIdleSize: 32
# connectionPoolSize: 64
# dnsMonitoringInterval: 5000
# threads: 16
# nettyThreads: 32
# codec:
# class: "org.redisson.codec.JsonJacksonCodec"
# transportMode: "NIO"
min-idle: 4
data:
mongodb:
uri: mongodb://${liquidnet.mongodb.user}:${liquidnet.mongodb.pwd}@${liquidnet.mongodb.host}/?authSource=admin&maxPoolSize=2000&waitQueueMultiple=100
uri: mongodb://${liquidnet.mongodb.user}:${liquidnet.mongodb.pwd}@${liquidnet.mongodb.host}/?authSource=admin&maxPoolSize=200&waitQueueMultiple=100
sslEnabled: ${liquidnet.mongodb.sslEnabled}
database: ${liquidnet.mongodb.database}
# -----------------------------------------------------------
......@@ -117,10 +95,10 @@ spring:
# -----------------------------------------------------------
global-auth:
exclude-url-pattern:
- ${liquidnet.info.context}/doc.html
- ${liquidnet.info.context}/webjars/**
- ${liquidnet.info.context}/swagger-resources/**
- ${liquidnet.info.context}/v2/api-docs*
# - ${liquidnet.info.context}/doc.html
# - ${liquidnet.info.context}/webjars/**
# - ${liquidnet.info.context}/swagger-resources/**
# - ${liquidnet.info.context}/v2/api-docs*
- ${liquidnet.info.context}/station/login
- ${liquidnet.info.context}/station/login/sms
# -
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-notify.yml
View file @ c83aab45
......@@ -3,7 +3,7 @@ server:
tomcat:
uri-encoding: UTF-8
maxThreads: 2000 #默认200
minSpareThreads: 2000 #默认10
minSpareThreads: 200 #默认10
maxConnections: 20000 #默认10000
acceptCount: 5000 #默认100
processorCache: -1 #默认200
......@@ -90,10 +90,10 @@ spring:
password: ${liquidnet.redis.dragon.password}
lettuce:
pool:
max-active: 8
max-active: 16
max-wait: -1
max-idle: 8
min-idle: 0
min-idle: 4
# -----------------------------------------------------------
# -----------------------------------------------------------
......@@ -104,7 +104,6 @@ global-auth:
# - ${liquidnet.info.context}/**
# -----------------------------------------------------------
# -----------------------------------------------------------
# -----------------------------------------------------------
# ---------------------以下为银联支付--------------------------------------
##交易请求地址
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-order.yml
View file @ c83aab45
......@@ -3,10 +3,10 @@ server:
tomcat:
uri-encoding: UTF-8
maxThreads: 2000 #默认200
minSpareThreads: 2000 #默认10
maxConnections: 12000 #默认10000
minSpareThreads: 200 #默认10
maxConnections: 20000 #默认10000
acceptCount: 5000 #默认100
processorCache: 200 #默认200
processorCache: -1 #默认200
servlet:
context-path: ${liquidnet.info.context}
# -----------------------------------------------------------
......@@ -81,35 +81,13 @@ spring:
password: ${liquidnet.redis.kylin.password}
lettuce:
pool:
max-active: 8
max-active: 16
max-wait: -1
max-idle: 8
min-idle: 0
# redisson:
# singleServerConfig:
# address: redis://${liquidnet.redis.host}:${liquidnet.redis.port}
# password: ${liquidnet.redis.password}
# clientName: null
# database: 7 #选择使用哪个数据库0~15
# idleConnectionTimeout: 10000
# connectTimeout: 10000
# timeout: 3000
# retryAttempts: 3
# retryInterval: 1500
# subscriptionsPerConnection: 5
# subscriptionConnectionMinimumIdleSize: 1
# subscriptionConnectionPoolSize: 50
# connectionMinimumIdleSize: 32
# connectionPoolSize: 64
# dnsMonitoringInterval: 5000
# threads: 16
# nettyThreads: 32
# codec:
# class: "org.redisson.codec.JsonJacksonCodec"
# transportMode: "NIO"
min-idle: 4
data:
mongodb:
uri: mongodb://${liquidnet.mongodb.user}:${liquidnet.mongodb.pwd}@${liquidnet.mongodb.host}/?authSource=admin&maxPoolSize=2000&waitQueueMultiple=100
uri: mongodb://${liquidnet.mongodb.user}:${liquidnet.mongodb.pwd}@${liquidnet.mongodb.host}/?authSource=admin&maxPoolSize=200&waitQueueMultiple=100
sslEnabled: ${liquidnet.mongodb.sslEnabled}
database: ${liquidnet.mongodb.database}
# -----------------------------------------------------------
......@@ -117,10 +95,10 @@ spring:
# -----------------------------------------------------------
global-auth:
exclude-url-pattern:
- ${liquidnet.info.context}/doc.html
- ${liquidnet.info.context}/webjars/**
- ${liquidnet.info.context}/swagger-resources/**
- ${liquidnet.info.context}/v2/api-docs*
# - ${liquidnet.info.context}/doc.html
# - ${liquidnet.info.context}/webjars/**
# - ${liquidnet.info.context}/swagger-resources/**
# - ${liquidnet.info.context}/v2/api-docs*
- ${liquidnet.info.context}/order/syncOrder
# -----------------------------------------------------------
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-platform.yml
View file @ c83aab45
......@@ -6,7 +6,7 @@ server:
minSpareThreads: 200 #默认10
maxConnections: 20000 #默认10000
acceptCount: 5000 #默认100
processorCache: 5000 #默认200
processorCache: -1 #默认200
servlet:
context-path: ${liquidnet.info.context}
# -----------------------------------------------------------
......@@ -87,7 +87,7 @@ spring:
pool:
max-active: 8
max-wait: -1
max-idle: 8
max-idle: 2
min-idle: 0
dragon:
database: 15
......@@ -99,7 +99,7 @@ spring:
pool:
max-active: 8
max-wait: -1
max-idle: 8
max-idle: 2
min-idle: 0
sweet:
database: 15
......@@ -111,7 +111,7 @@ spring:
pool:
max-active: 8
max-wait: -1
max-idle: 8
max-idle: 2
min-idle: 0
adam:
database: 15
......@@ -123,7 +123,7 @@ spring:
pool:
max-active: 8
max-wait: -1
max-idle: 8
max-idle: 2
min-idle: 0
candy:
database: 15
......@@ -135,7 +135,7 @@ spring:
pool:
max-active: 8
max-wait: -1
max-idle: 8
max-idle: 2
min-idle: 0
stone:
database: 15
......@@ -147,7 +147,7 @@ spring:
pool:
max-active: 8
max-wait: -1
max-idle: 8
max-idle: 2
min-idle: 0
goblin:
database: 15
......@@ -159,7 +159,7 @@ spring:
pool:
max-active: 8
max-wait: -1
max-idle: 8
max-idle: 2
min-idle: 0
data:
mongodb:
......@@ -174,7 +174,7 @@ spring:
# type: org.apache.tomcat.jdbc.pool.DataSource
driver-class-name: com.mysql.cj.jdbc.Driver
hikari:
maximum-pool-size: 50
maximum-pool-size: 45
connection-timeout: 60000
minimum-idle: 10
connection-test-query: SELECT 1
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-reconciliation.yml
View file @ c83aab45
......@@ -52,10 +52,10 @@ spring:
host: ${liquidnet.redis.host}
lettuce:
pool:
max-active: 8
max-active: 16
max-wait: -1
max-idle: 8
min-idle: 0
min-idle: 4
password: ${liquidnet.redis.password}
mvc:
static-path-pattern: /templates/**
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-slime.yml
View file @ c83aab45
......@@ -3,7 +3,7 @@ server:
tomcat:
uri-encoding: UTF-8
maxThreads: 2000 #默认200
minSpareThreads: 2000 #默认10
minSpareThreads: 200 #默认10
maxConnections: 20000 #默认10000
acceptCount: 5000 #默认100
processorCache: -1 #默认200
......@@ -81,13 +81,13 @@ spring:
password: ${liquidnet.redis.slime.password}
lettuce:
pool:
max-active: 8
max-active: 16
max-wait: -1
max-idle: 8
min-idle: 0
min-idle: 4
data:
mongodb:
uri: mongodb://${liquidnet.mongodb.user}:${liquidnet.mongodb.pwd}@${liquidnet.mongodb.host}/?authSource=admin&maxPoolSize=2000&waitQueueMultiple=100
uri: mongodb://${liquidnet.mongodb.user}:${liquidnet.mongodb.pwd}@${liquidnet.mongodb.host}/?authSource=admin&maxPoolSize=200&waitQueueMultiple=100
sslEnabled: ${liquidnet.mongodb.sslEnabled}
database: ${liquidnet.mongodb.database}
# -----------------------------------------------------------
......@@ -95,8 +95,11 @@ spring:
# -----------------------------------------------------------
global-auth:
exclude-url-pattern:
- ${liquidnet.info.context}/doc.html
- ${liquidnet.info.context}/webjars/**
- ${liquidnet.info.context}/swagger-resources/**
- ${liquidnet.info.context}/v2/api-docs*
# - ${liquidnet.info.context}/doc.html
# - ${liquidnet.info.context}/webjars/**
# - ${liquidnet.info.context}/swagger-resources/**
# - ${liquidnet.info.context}/v2/api-docs*
- ${liquidnet.info.context}/fields/app/details
# -----------------------------------------------------------
# -----------------------------------------------------------
liquidnet-bus-config/liquidnet-config/liquidnet-service-stone.yml
View file @ c83aab45
......@@ -2,11 +2,11 @@ server:
port: ${liquidnet.info.port}
tomcat:
uri-encoding: UTF-8
maxThreads: 200 #默认200
minSpareThreads: 30 #默认10
maxConnections: 12000 #默认10000
maxThreads: 2000 #默认200
minSpareThreads: 200 #默认10
maxConnections: 20000 #默认10000
acceptCount: 5000 #默认100
processorCache: 200 #默认200
processorCache: -1 #默认200
servlet:
context-path: ${liquidnet.info.context}
# -----------------------------------------------------------
......@@ -81,35 +81,13 @@ spring:
password: ${liquidnet.redis.sweet.password}
lettuce:
pool:
max-active: 8
max-active: 16
max-wait: -1
max-idle: 8
min-idle: 0
redisson:
singleServerConfig:
address: redis://${liquidnet.redis.sweet.host}:${liquidnet.redis.sweet.port}
password: ${liquidnet.redis.sweet.password}
clientName: null
database: 7 #选择使用哪个数据库0~15
idleConnectionTimeout: 10000
connectTimeout: 10000
timeout: 3000
retryAttempts: 3
retryInterval: 1500
subscriptionsPerConnection: 5
subscriptionConnectionMinimumIdleSize: 1
subscriptionConnectionPoolSize: 50
connectionMinimumIdleSize: 32
connectionPoolSize: 64
dnsMonitoringInterval: 5000
threads: 16
nettyThreads: 32
codec:
class: "org.redisson.codec.JsonJacksonCodec"
transportMode: "NIO"
min-idle: 4
data:
mongodb:
uri: mongodb://${liquidnet.mongodb.user}:${liquidnet.mongodb.pwd}@${liquidnet.mongodb.host}/?authSource=admin&maxPoolSize=2000&waitQueueMultiple=100
uri: mongodb://${liquidnet.mongodb.user}:${liquidnet.mongodb.pwd}@${liquidnet.mongodb.host}/?authSource=admin&maxPoolSize=200&waitQueueMultiple=100
sslEnabled: ${liquidnet.mongodb.sslEnabled}
database: ${liquidnet.mongodb.database}
# -----------------------------------------------------------
......@@ -117,10 +95,10 @@ spring:
# -----------------------------------------------------------
global-auth:
exclude-url-pattern:
- ${liquidnet.info.context}/doc.html
- ${liquidnet.info.context}/webjars/**
- ${liquidnet.info.context}/swagger-resources/**
- ${liquidnet.info.context}/v2/api-docs*
# - ${liquidnet.info.context}/doc.html
# - ${liquidnet.info.context}/webjars/**
# - ${liquidnet.info.context}/swagger-resources/**
# - ${liquidnet.info.context}/v2/api-docs*
- ${liquidnet.info.context}/item/**
- ${liquidnet.info.context}/user/inner/**
- ${liquidnet.info.context}/user/logs/in2111
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-sweet.yml
View file @ c83aab45
......@@ -3,10 +3,10 @@ server:
tomcat:
uri-encoding: UTF-8
maxThreads: 2000 #默认200
minSpareThreads: 2000 #默认10
minSpareThreads: 200 #默认10
maxConnections: 20000 #默认10000
acceptCount: 5000 #默认100
processorCache: 5000 #默认200
processorCache: -1 #默认200
servlet:
context-path: ${liquidnet.info.context}
# -----------------------------------------------------------
......@@ -77,10 +77,10 @@ spring:
password: ${liquidnet.redis.sweet.password}
lettuce:
pool:
max-active: 8
max-active: 16
max-wait: -1
max-idle: 8
min-idle: 0
min-idle: 4
data:
mongodb:
uri: mongodb://${liquidnet.mongodb.user}:${liquidnet.mongodb.pwd}@${liquidnet.mongodb.host}/?authSource=admin&maxPoolSize=200&waitQueueMultiple=100
......@@ -94,11 +94,9 @@ spring:
# type: org.apache.tomcat.jdbc.pool.DataSource
driver-class-name: com.mysql.cj.jdbc.Driver
hikari:
# 迁移数据暂设500
maximum-pool-size: 500
# 迁移数据暂设10分钟
connection-timeout: 600000
minimum-idle: 8
maximum-pool-size: 45
connection-timeout: 60000
minimum-idle: 10
connection-test-query: SELECT 1
# -----------------------------------------------------------
......
liquidnet-bus-config/liquidnet-config/liquidnet-support-turbine.yml
View file @ c83aab45
......@@ -25,4 +25,4 @@ turbine:
logging:
level:
root: INFO
com.netflix.turbine.monitor: DEBUG
com.netflix.turbine.monitor: info
liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/dto/SweetManualArtistListArDto.java
View file @ c83aab45
......@@ -31,8 +31,12 @@ public class SweetManualArtistListArDto implements Serializable, Cloneable {
private String title;
@ApiModelProperty("艺人演出开始")
private String performanceStart;
@ApiModelProperty("艺人演出开始时间戳 毫秒")
private Long performanceStartDate;
@ApiModelProperty("艺人演出结束")
private String performanceEnd;
@ApiModelProperty("艺人演出结束时间戳 毫秒")
private Long performanceEndDate;
@ApiModelProperty("艺人签售开始")
private String signatureStart;
@ApiModelProperty("艺人签售结束")
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/GoblinCouponController.java
View file @ c83aab45
......@@ -17,6 +17,7 @@ import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
......@@ -76,12 +77,14 @@ public class GoblinCouponController {
@ApiResponse(code = 200, message = "接口返回对象参数")
@ApiImplicitParams({
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "storeCouponId", value = "平台券id"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "uid", value = "UID"),
// @ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "number", value = "数量"),
})
public ResponseDto<Boolean> receive(@RequestParam("storeCouponId") @Valid String storeCouponId) {
public ResponseDto<Boolean> receive(@NotBlank(message = "平台券ID不能为空") @RequestParam("storeCouponId") @Valid String storeCouponId,
@NotBlank(message = "UID不能为空") @RequestParam("storeCouponId") @Valid String uid) {
// public ResponseDto<Boolean> checkOrderResult(@RequestParam("storeCouponId") @Valid String storeCouponId,
// @RequestParam("number") @Valid Integer number) {
String currentUid = CurrentUtil.getCurrentUid();
String currentUid = uid;
GoblinStoreCouponVo storeCouponVo = goblinRedisUtils.getStoreCouponVo(storeCouponId);
if (null == storeCouponVo) {
log.warn("商城:用户领取优惠券:优惠券不存在:[uid={},storeCouponId={}]", currentUid, storeCouponId);
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisArDataUtils.java
View file @ c83aab45
......@@ -12,6 +12,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
......@@ -32,7 +33,7 @@ public class RedisArDataUtils {
public List<SweetPerformArtistTimeListDto> getArtistTimeList(String performanceId) {
String redisKey = SweetConstant.REDIS_KEY_SWEET_MANUAL_ARTIST_TIME_LIST.concat(performanceId);
// redisUtil.del(redisKey);
redisUtil.del(redisKey);
Object obj = redisUtil.get(redisKey);
if (obj == null) {
List<SweetPerformArtistTimeListDto> performArtistTimeList = new ArrayList<>();
......@@ -51,6 +52,21 @@ public class RedisArDataUtils {
// 艺人
List<SweetManualArtistListArDto> artistList = sweetManualArtistsMapper.getManualListAr(performanceId);
for (SweetManualArtistListArDto artist : artistList) {
String performanceStart = artist.getPerformanceStart();
String performanceEnd = artist.getPerformanceEnd();
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Long timestampStart = 0L;
Long timestampEnd = 0L;
try {
Date start = format.parse(performanceStart);
Date end = format.parse(performanceEnd);
timestampStart = start.getTime();
timestampEnd = end.getTime();
} catch (Exception e) {
}
artist.setPerformanceStartDate(timestampStart);
artist.setPerformanceEndDate(timestampEnd);
List<SweetManualArtistResourceUrlArDto> urlList = sweetArtistsUrlMapper.selectListOfAid(artist.getArtistsId());
artist.setResourceUrl(urlList);
}
......
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