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

Commit 3eda2846 authored by 胡佳晨's avatar 胡佳晨

Merge branch 'test'

parents 2a0ce375 8559b1cf
...@@ -2,11 +2,11 @@ server: ...@@ -2,11 +2,11 @@ server:
port: ${liquidnet.info.port} port: ${liquidnet.info.port}
tomcat: tomcat:
uri-encoding: UTF-8 uri-encoding: UTF-8
maxThreads: 200 #默认200 maxThreads: 2000 #默认200
minSpareThreads: 30 #默认10 minSpareThreads: 2000 #默认10
maxConnections: 12000 #默认10000 maxConnections: 20000 #默认10000
acceptCount: 5000 #默认100 acceptCount: 5000 #默认100
processorCache: 200 #默认200 processorCache: -1 #默认200
servlet: servlet:
context-path: ${liquidnet.info.context} context-path: ${liquidnet.info.context}
# ----------------------------------------------------------- # -----------------------------------------------------------
...@@ -19,7 +19,7 @@ knife4j: ...@@ -19,7 +19,7 @@ knife4j:
password: ${liquidnet.security.password} password: ${liquidnet.security.password}
# ----------------------------------------------------------- # -----------------------------------------------------------
logging: logging:
# config: ${liquidnet.logfile.config} # config: ${liquidnet.logfile.config}
file: file:
name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
max-size: ${liquidnet.logfile.file-max-size} max-size: ${liquidnet.logfile.file-max-size}
...@@ -34,11 +34,11 @@ logging: ...@@ -34,11 +34,11 @@ logging:
liquidnet: ${liquidnet.logfile.level} liquidnet: ${liquidnet.logfile.level}
# ----------------------------------------------------------- # -----------------------------------------------------------
eureka: eureka:
# client: # client:
# register-with-eureka: true # register-with-eureka: true
# fetch-registry: true # fetch-registry: true
# serviceUrl: # serviceUrl:
# defaultZone: http://${liquidnet.security.username}:${liquidnet.security.password}@${liquidnet.eureka.host}/eureka-server/eureka # defaultZone: http://${liquidnet.security.username}:${liquidnet.security.password}@${liquidnet.eureka.host}/eureka-server/eureka
instance: instance:
hostname: ${spring.cloud.client.ip-address} hostname: ${spring.cloud.client.ip-address}
lease-expiration-duration-in-seconds: 15 #服务过期时间配置,超过这个时间没有接收到心跳EurekaServer就会将这个实例剔除 lease-expiration-duration-in-seconds: 15 #服务过期时间配置,超过这个时间没有接收到心跳EurekaServer就会将这个实例剔除
......
...@@ -71,7 +71,7 @@ public class DataImpl { ...@@ -71,7 +71,7 @@ public class DataImpl {
public boolean performance() { public boolean performance() {
try { try {
String driverClassName = "com.mysql.cj.jdbc.Driver"; //启动驱动 String driverClassName = "com.mysql.cj.jdbc.Driver"; //启动驱动
String url = "jdbc:mysql://zhengzai.mysql.polardb.rds.aliyuncs.com:3306/mall"; //设置连接路径 String url = "jdbc:mysql://pc-2ze6z2hxkug559q79.mysql.polardb.rds.aliyuncs.com:3306/mall"; //设置连接路径
String username = "readonly"; //数据库用户名 String username = "readonly"; //数据库用户名
String password = "ZWDsf8Fy"; //数据库连接密码 String password = "ZWDsf8Fy"; //数据库连接密码
Connection con = null; //连接 Connection con = null; //连接
...@@ -443,7 +443,7 @@ public class DataImpl { ...@@ -443,7 +443,7 @@ public class DataImpl {
public boolean order(String month) { public boolean order(String month) {
String driverClassName = "com.mysql.cj.jdbc.Driver"; //启动驱动 String driverClassName = "com.mysql.cj.jdbc.Driver"; //启动驱动
String url = "jdbc:mysql://zhengzai.mysql.polardb.rds.aliyuncs.com:3306/mall"; //设置连接路径 String url = "jdbc:mysql://pc-2ze6z2hxkug559q79.mysql.polardb.rds.aliyuncs.com:3306/mall"; //设置连接路径
String username = "readonly"; //数据库用户名 String username = "readonly"; //数据库用户名
String password = "ZWDsf8Fy"; //数据库连接密码 String password = "ZWDsf8Fy"; //数据库连接密码
Connection con = null; //连接 Connection con = null; //连接
...@@ -772,7 +772,7 @@ public class DataImpl { ...@@ -772,7 +772,7 @@ public class DataImpl {
public boolean roadShow() { public boolean roadShow() {
String driverClassName = "com.mysql.cj.jdbc.Driver"; //启动驱动 String driverClassName = "com.mysql.cj.jdbc.Driver"; //启动驱动
String url = "jdbc:mysql://zhengzai.mysql.polardb.rds.aliyuncs.com:3306/mall"; //设置连接路径 String url = "jdbc:mysql://pc-2ze6z2hxkug559q79.mysql.polardb.rds.aliyuncs.com:3306/mall"; //设置连接路径
String username = "readonly"; //数据库用户名 String username = "readonly"; //数据库用户名
String password = "ZWDsf8Fy"; //数据库连接密码 String password = "ZWDsf8Fy"; //数据库连接密码
Connection con = null; //连接 Connection con = null; //连接
......
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