Skip to content

G
gdtel-gztel-school-center
Commit b7411a5d by 罗承锋
Options

更新测试版启动配置

parent 92acbd17
Showing with 388 additions and 18 deletions
apply-net/src/main/resources/application-test.yml 0 → 100644
eureka:
instance:
hostname: localhost
# 心跳时间，即服务续约间隔时间（缺省为30s）
lease-renewal-interval-in-seconds: 10
# 发呆时间，即服务续约到期时间（缺省为90s）
lease-expiration-duration-in-seconds: 20
client:
registry-fetch-interval-seconds: 5
serviceUrl:
defaultZone: http://eureka:20000/eureka/
server:
port: 11092
servlet:
context-path: /ciop
tomcat:
uri-encoding: UTF-8
max-threads: 200
max-connections: 2000
winsun:
app:
version: @project.version@
name: ${spring.application.name}
scanner: false
auth:
#鉴权地址
serviceId: core
#是否开启swagger (true/false)
swagger-open: true
#是否开启登录时验证码 (true/false)
kaptcha-open: false
#是否开启spring session,如果是多机环境需要开启(true/false)
spring-session-open: false
redis-session-expire: 86400
#session失效时间(只在单机环境下生效，多机环境在SpringSessionConfig类中配置) 单位：秒
session-invalidate-time: 1800
#多久检测一次失效的session(只在单机环境下生效) 单位：秒
session-validation-interval: 900
fileUploadPath: tmpUpload/
spring:
profiles:
active: local
quartz:
job-store-type: jdbc
jdbc:
initialize-schema: never
properties:
org:
quartz:
scheduler:
instanceName: DefaultQuartzScheduler
instanceId: AUTO
jobStore:
dataSource: default
class: org.quartz.impl.jdbcjobstore.JobStoreTX
driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
tablePrefix: QRTZ_
isClustered: false
clusterCheckinInterval: 10000
useProperties: true
misfireThreshold: 5000
threadPool:
class: org.quartz.simpl.SimpleThreadPool
threadCount: 10
threadPriority: 5
threadsInheritContextClassLoaderOfInitializingThread: true
cloud:
stream:
bindings:
menuOutput:
destination: queue.menu.messages
binder: local_rabbit
content-type: application/json
binders:
local_rabbit:
type: rabbit
environment:
spring:
rabbitmq:
host: ${spring.rabbitmq.host}
port: ${spring.rabbitmq.port}
username: ${spring.rabbitmq.username}
password: ${spring.rabbitmq.password}
rabbit:
bindings:
input:
consumer:
# maxumum concurrency of this consumer (threads)
max-concurrency: 50
# number of prefetched messages pre consumer thread
prefetch: 100
# true to requeue rejected messages, false to discard (or route to DLQ)
requeue-rejected: false
# republish failures to the DLQ with diagnostic headers
republish-to-dlq: true
rabbitmq:
host: schoolcenterrabbitmq
port: 5672
username: guest
password: guest
redis:
# 是否使用集群模式
clusterWhether: false
cluster:
max-redirects: 3
nodes:
- ${spring.redis.host}:${spring.redis.port}
database: 0
host: schoolcenterredis
port: 6379
password:
lettuce:
pool:
max-active: -1
max-wait: -1
max-idle: 8
min-idle: 0
timeout: 50000
ip:
exprie: 600
prohibition: 600
datasource:
dynamic:
primary: master
p6spy: true
druid:
filters: stat
max-active: 30
datasource:
master:
url: jdbc:mysql://172.18.101.171:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
username: yzzx
password: yzzx123!@#
driver-class-name: com.mysql.cj.jdbc.Driver
devtools:
restart:
enabled: false
additional-paths: src/main/java
exclude: static/**,WEB-INF/view/**
servlet:
multipart:
enabled: true
max-request-size: 100MB
max-file-size: 100MB
application:
name: apply-net
feign:
hystrix:
enabled: true
httpclient:
enabled: true
okhttp:
enabled: false
ribbon:
MaxAutoRetries: 0
MaxAutoRetriesNextServer: 0
ReadTimeout: 4400
ConnectTimeout: 2000
hystrix:
threadpool:
default:
coreSize: 100
maximumSize: 100
allowMaximumSizeToDivergeFromCoreSize: true
maxQueueSize: 20000
queueSizeRejectionThreshold: 19999
command:
#default全局有效，service id指定应用有效
default:
circuitBreaker:
enabled: false
execution:
timeout:
#如果enabled设置为false，则请求超时交给ribbon控制,为true,则超时作为熔断根据
enabled: true
isolation:
thread:
#断路器超时时间，默认1000ms
timeoutInMilliseconds: 4500
mybatis-plus:
typeAliasesPackage: com.winsun.bean,com.winsun.framework.core.node
mapper-locations:
- com/winsun/mapper/mapping/*.xml
- com/winsun/modular/dao/mapping/*.xml
management:
endpoints:
web:
exposure:
include: bus-refresh
\ No newline at end of file
common/src/main/java/com/winsun/mapper/OrderMapper.java
......@@ -44,14 +44,14 @@ public interface OrderMapper extends BaseMapper<Order> {
Integer updateOrderKDIsNotNull(@Param("orderNumber") String orderNumber,@Param("company") String company,@Param("kuaidiOrder") String kuaidiOrder,@Param("sendType") String sendType,@Param("orderStatus") String orderStatus);
@Update("update `hhr_order` set order_status = #{orderStatus},company = #{company},kuaidi_order = #{kuaidiOrder},send_type = #{sendType},success_time=#{successTime} where order_number = #{orderNumber}")
Integer updateOrderKDIsNotNull(@Param("orderNumber") String orderNumber,@Param("company") String company,@Param("kuaidiOrder") String kuaidiOrder,@Param("sendType") String sendType,@Param("orderStatus") String orderStatus,@Param("successTime")Date successTime);
Integer updateOrderKDIsNotNullByTime(@Param("orderNumber") String orderNumber,@Param("company") String company,@Param("kuaidiOrder") String kuaidiOrder,@Param("sendType") String sendType,@Param("orderStatus") String orderStatus,@Param("successTime")Date successTime);
@Update("update `hhr_order` set order_status = #{orderStatus},send_type = #{sendType} where order_number = #{orderNumber}")
Integer updateOrderKDIsNull(@Param("orderNumber") String orderNumber,@Param("sendType") String sendType,@Param("orderStatus") String orderStatus);
@Update("update `hhr_order` set order_status = #{orderStatus},send_type = #{sendType},success_time=#{successTime} where order_number = #{orderNumber}")
Integer updateOrderKDIsNull(@Param("orderNumber") String orderNumber,@Param("sendType") String sendType,@Param("orderStatus") String orderStatus,@Param("successTime")Date successTime);
Integer updateOrderKDIsNullByTime(@Param("orderNumber") String orderNumber,@Param("sendType") String sendType,@Param("orderStatus") String orderStatus,@Param("successTime")Date successTime);
@Select("select id from `hhr_order` where order_number = #{orderNumber}")
String selectIdByOrderNumber(String orderNumber);
......
core-service/src/main/resources/application-test.yml 0 → 100644
eureka:
instance:
hostname: localhost
# 心跳时间，即服务续约间隔时间（缺省为30s）
lease-renewal-interval-in-seconds: 10
# 发呆时间，即服务续约到期时间（缺省为90s）
lease-expiration-duration-in-seconds: 20
client:
registry-fetch-interval-seconds: 5
serviceUrl:
defaultZone: http://eureka:20000/eureka/
server:
port: 10002
servlet:
context-path: /ciop
tomcat:
uri-encoding: UTF-8
max-threads: 200
max-connections: 2000
jetty:
max-http-post-size: 1000000
winsun:
app:
version: @project.version@
name: ${spring.application.name}
scanner: false
#是否开启swagger (true/false)
swagger-open: true
#是否开启登录时验证码 (true/false)
kaptcha-open: false
#是否开启spring session,如果是多机环境需要开启(true/false)
spring-session-open: true
redis-session-expire: 86400
#session失效时间(只在单机环境下生效，多机环境在SpringSessionConfig类中配置) 单位：秒
session-invalidate-time: 86400
#多久检测一次失效的session(只在单机环境下生效) 单位：秒
session-validation-interval: 43200
spring:
profiles:
active: local
cloud:
stream:
bindings:
menuInput:
destination: queue.menu.messages #要和output的destination一致, 这样才能将队列和写入消息的exchange关联起来
binder: local_rabbit
group: menuMessageConsumers
content-type: application/json
binders:
local_rabbit:
type: rabbit
environment:
spring:
rabbitmq:
host: ${spring.rabbitmq.host}
port: ${spring.rabbitmq.port}
username: ${spring.rabbitmq.username}
password: ${spring.rabbitmq.password}
rabbit:
bindings:
input:
consumer:
# maxumum concurrency of this consumer (threads)
max-concurrency: 50
# number of prefetched messages pre consumer thread
prefetch: 100
# true to requeue rejected messages, false to discard (or route to DLQ)
requeue-rejected: false
# republish failures to the DLQ with diagnostic headers
republish-to-dlq: true
rabbitmq:
host: schoolcenterrabbitmq
port: 5672
username: guest
password: guest
redis:
clusterWhether: false
cluster:
max-redirects: 3
nodes:
- ${spring.redis.host}:${spring.redis.port}
database: 0
host: schoolcenterredis
port: 6379
password:
lettuce:
pool:
max-active: -1
max-wait: -1
max-idle: 8
min-idle: 0
timeout: 5000
ip:
exprie: 600
prohibition: 600
datasource:
# 由于父框架的问题，这里本来不应该这样写的
url: jdbc:mysql://172.18.101.171:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
username: yzzx
password: yzzx123!@#
db-name: guns #用来搜集数据库的所有表
filters: wall,mergeStat
driver-class-name: com.mysql.cj.jdbc.Driver
max-active: 20
dynamic:
primary: master
p6spy: true
druid:
filters: stat
datasource:
master:
url: ${spring.datasource.url}
username: ${spring.datasource.username}
password: ${spring.datasource.password}
driver-class-name: ${spring.datasource.driver-class-name}
max-active: ${spring.datasource.max-active}
devtools:
restart:
enabled: false
additional-paths: src/main/java
exclude: static/**,WEB-INF/view/**
servlet:
multipart:
enabled: true
max-request-size: 100MB
max-file-size: 100MB
application:
name: core
mybatis-plus:
typeAliasesPackage: com.winsun.auth.model.common,com.winsun.auth.model.merchant,com.winsun.auth.model.user,com.winsun.auth.core.node
mapper-locations:
- /com/winsun/item/modular/system/dao/mapping/*.xml
- /com/winsun/modular/dao/mapping/*.xml
management:
endpoints:
web:
exposure:
include: bus-refresh
feign:
hystrix:
enabled: true
httpclient:
enabled: true
okhttp:
enabled: false
ribbon:
MaxAutoRetries: 0
MaxAutoRetriesNextServer: 0
ReadTimeout: 4400
ConnectTimeout: 2000
hystrix:
threadpool:
default:
coreSize: 100
maximumSize: 100
allowMaximumSizeToDivergeFromCoreSize: true
maxQueueSize: 20000
queueSizeRejectionThreshold: 19999
command:
default: #default全局有效，service id指定应用有效
circuitBreaker:
enabled: false
execution:
timeout:
#如果enabled设置为false，则请求超时交给ribbon控制,为true,则超时作为熔断根据
enabled: true
isolation:
thread:
timeoutInMilliseconds: 4500 #断路器超时时间，默认1000ms
messageconfig:
url:
user:
pwt:
channel:
phoneRule:
enabled:
rule:
\ No newline at end of file
deploy/prod/docker-gdtel-gztel-hhr/push.cmd
@echo off
:: 每次发版都需要改的版本号
SET APP_VERSION=0.0.4
SET APP_VERSION=0.0.10
SET HOST_NAME=172.18.101.172
SET APP_NAME=gateway
......
new-user/src/main/resources/application-test.yml
eureka:
instance:
hostname: eureka
prefer-ip-address: true
instance-id: ${spring.application.name}:${spring.cloud.client.ipAddress}:${spring.application.instance_id:${server.port}}
hostname: localhost
# 心跳时间，即服务续约间隔时间（缺省为30s）
lease-renewal-interval-in-seconds: 10
# 发呆时间，即服务续约到期时间（缺省为90s）
......@@ -10,7 +8,7 @@ eureka:
client:
registry-fetch-interval-seconds: 5
serviceUrl:
defaultZone: http://eureka:20000/eureka/
defaultZone: http://eureka:20000/eureka
server:
port: 11093
servlet:
......@@ -30,19 +28,20 @@ winsun:
#鉴权地址
serviceId: core
#是否开启swagger (true/false)
swagger-open: false
swagger-open: true
#是否开启登录时验证码 (true/false)
kaptcha-open: false
#是否开启spring session,如果是多机环境需要开启(true/false)
spring-session-open: true
spring-session-open: false
redis-session-expire: 86400
#session失效时间(只在单机环境下生效，多机环境在SpringSessionConfig类中配置) 单位：秒
session-invalidate-time: 1800
#多久检测一次失效的session(只在单机环境下生效) 单位：秒
session-validation-interval: 900
fileUploadPath: tmpUpload/
spring:
profiles:
active: test
active: local
quartz:
job-store-type: jdbc
jdbc:
......@@ -99,9 +98,10 @@ spring:
rabbitmq:
host: schoolcenterrabbitmq
port: 5672
username: root
password: root
username: guest
password: guest
redis:
# 是否使用集群模式
clusterWhether: false
cluster:
max-redirects: 3
......@@ -117,7 +117,7 @@ spring:
max-wait: -1
max-idle: 8
min-idle: 0
timeout: 5000
timeout: 50000
ip:
exprie: 600
prohibition: 600
......@@ -177,13 +177,16 @@ hystrix:
enabled: true
isolation:
thread:
timeoutInMilliseconds: 4500 #断路器超时时间，默认1000ms
#断路器超时时间，默认1000ms
timeoutInMilliseconds: 4500
mybatis-plus:
typeAliasesPackage: com.winsun.bean,com.winsun.framework.core.node
mapper-locations:
- com/winsun/mapper/mapping/*.xml
- com/winsun/modular/dao/mapping/*.xml
management:
endpoints:
web:
exposure:
include: bus-refresh
\ No newline at end of file
include: bus-refresh
service-manager/src/main/java/com/winsun/controller/OrderController.java
......@@ -846,13 +846,13 @@ public class OrderController extends BaseController {
if(successTime == null){
integer = orderMapper.updateOrderKDIsNull(orderNumber, sendType, orderStatus);
}else {
integer = orderMapper.updateOrderKDIsNull(orderNumber, sendType, orderStatus,successTime);
integer = orderMapper.updateOrderKDIsNullByTime(orderNumber, sendType, orderStatus,successTime);
}
} else {
if(successTime == null){
integer = orderMapper.updateOrderKDIsNotNull(orderNumber, company, kuaidiOrder, sendType, orderStatus);
}else {
integer = orderMapper.updateOrderKDIsNotNull(orderNumber, company, kuaidiOrder, sendType, orderStatus,successTime);
integer = orderMapper.updateOrderKDIsNotNullByTime(orderNumber, company, kuaidiOrder, sendType, orderStatus,successTime);
}
}
......
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