Commit f2143450 authored by 赵啸非's avatar 赵啸非

精简pom.xml

parent ffdd9761
This diff is collapsed.
This diff is collapsed.
...@@ -14,7 +14,7 @@ SHELL_LOG="${BASEDIR}/${SHELL_NAME}.log" ...@@ -14,7 +14,7 @@ SHELL_LOG="${BASEDIR}/${SHELL_NAME}.log"
JAVA_HOME="/usr/local/java/jdk1.8" JAVA_HOME="/usr/local/java/jdk1.8"
SERVICE_PATH="/usr/lib/systemd/system" SERVICE_PATH="/usr/lib/systemd/system"
PUBLISH_PATH="@profiles.publish.path@" PUBLISH_PATH="/home/publish"
PROJECT_NAME="@project.artifactId@" PROJECT_NAME="@project.artifactId@"
PROJECT_EXECPATH="${PUBLISH_PATH}/${PROJECT_NAME}" PROJECT_EXECPATH="${PUBLISH_PATH}/${PROJECT_NAME}"
...@@ -73,7 +73,9 @@ start_service() { ...@@ -73,7 +73,9 @@ start_service() {
systemctl enable ${PROJECT_NAME} systemctl enable ${PROJECT_NAME}
systemctl daemon-reload systemctl daemon-reload
writelog "${PROJECT_NAME}服务启动..." writelog "${PROJECT_NAME}服务启动..."
systemctl stop ${PROJECT_NAME} && systemctl start ${PROJECT_NAME} systemctl stop ${PROJECT_NAME}
sleep 5
systemctl start ${PROJECT_NAME}
project_status=$(systemctl status "${PROJECT_NAME}"|grep Active |awk '{print $2}') project_status=$(systemctl status "${PROJECT_NAME}"|grep Active |awk '{print $2}')
jcpid=$(ps -ef | grep -v "grep" | grep "${PROJECT_NAME} " | awk '{print $2}') jcpid=$(ps -ef | grep -v "grep" | grep "${PROJECT_NAME} " | awk '{print $2}')
writelog "${PROJECT_NAME}服务启动,PID is ${jcpid} ,status:${project_status}" writelog "${PROJECT_NAME}服务启动,PID is ${jcpid} ,status:${project_status}"
......
...@@ -3,7 +3,7 @@ spring: ...@@ -3,7 +3,7 @@ spring:
allow-bean-definition-overriding: true allow-bean-definition-overriding: true
application: application:
log: log:
level: @profiles.log.level@ level: info
path: @profiles.log.path@ path: @profiles.log.path@
...@@ -15,18 +15,6 @@ spring: ...@@ -15,18 +15,6 @@ spring:
serialization: serialization:
WRITE_DATES_AS_TIMESTAMPS: true WRITE_DATES_AS_TIMESTAMPS: true
default-property-inclusion: NON_NULL default-property-inclusion: NON_NULL
redis:
host: @profiles.redis.uri@
port: @profiles.redis.port@
username: @profiles.redis.username@
password: @profiles.redis.password@
database: @profiles.redis.database@
timeout: 30000
pool:
max-idle: 30
min-idle: 0
max-active: 100
max-wait: 1000
cloud: cloud:
loadbalancer: loadbalancer:
ribbon: ribbon:
...@@ -42,55 +30,9 @@ spring: ...@@ -42,55 +30,9 @@ spring:
group: ${spring.cloud.nacos.discovery.group} group: ${spring.cloud.nacos.discovery.group}
namespace: ${spring.cloud.nacos.discovery.namespace} # Nacos 命名空间 dev 的编号 namespace: ${spring.cloud.nacos.discovery.namespace} # Nacos 命名空间 dev 的编号
file-extension: yaml file-extension: yaml
rabbitmq:
host: @profiles.rabbitmq.host@
port: @profiles.rabbitmq.port@
username: @profiles.rabbitmq.username@
password: @profiles.rabbitmq.password@
virtualHost: @profiles.rabbitmq.virtualhost@
dao: dao:
exceptiontranslation: exceptiontranslation:
enabled: false enabled: false
datasource:
druid:
# 连接池初始化时创建的连接数
initialSize: 5
# 连接池中最大连接数
maxActive: 50
# 连接池中最小空闲连接数
minIdle: 5
maxWait: 3000
validationQuery: SELECT 1
validationQueryTimeout: 1000
testWhileIdle: true
testOnBorrow: false
timeBetweenEvictionRunsMillis: 60000
minEvictableIdleTimeMillis: 300000
# 连接池
hikari:
#连接池名
pool-name: DateHikariCP
#最小空闲连接数
minimum-idle: 5
# 空闲连接存活最大时间,默认600000(10分钟)
idle-timeout: 180000
# 连接池最大连接数,默认是10
maximum-pool-size: 50
# 此属性控制从池返回的连接的默认自动提交行为,默认值:true
auto-commit: true
# 此属性控制池中连接的最长生命周期,值0表示无限生命周期,默认1800000即30分钟
max-lifetime: 1800000
# 数据库连接超时时间,默认30秒,即30000
connection-timeout: 30000
connection-test-query: SELECT 1
#type: com.alibaba.druid.pool.DruidDataSource
type: com.zaxxer.hikari.HikariDataSource
#driver-class-name: com.p6spy.engine.spy.P6SpyDriver
driver-class-name: com.mysql.cj.jdbc.Driver
url: @profiles.datasource.uri@
username: @profiles.datasource.username@
password: @profiles.datasource.password@
mybatis: mybatis:
root-path: com.mortals root-path: com.mortals
type-aliases-package: com.mortals.framework.model,com.mortals.xhx.common.**.model,com.mortals.xhx.**.model type-aliases-package: com.mortals.framework.model,com.mortals.xhx.common.**.model,com.mortals.xhx.**.model
...@@ -105,7 +47,5 @@ application: ...@@ -105,7 +47,5 @@ application:
deviceInitApiPath: /api/deviceInit deviceInitApiPath: /api/deviceInit
deviceUpdateApiPath: /api/deviceUpdate deviceUpdateApiPath: /api/deviceUpdate
upload:
path: @profiles.filepath@
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