diff --git a/docker/Dockerfile.txt b/docker/Dockerfile similarity index 100% rename from docker/Dockerfile.txt rename to docker/Dockerfile diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 82e5dab4..a5e401da 100644 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -7,7 +7,6 @@ echo $startTime : wumei-smart is starting... service nginx start service redis-server start emqx start -#service mysql start #java -jar /var/wumei-smart/java/app.jar diff --git a/document/message.png b/document/message.png index 557b2c3a..10b05510 100644 Binary files a/document/message.png and b/document/message.png differ diff --git a/springboot/wumei-admin/pom.xml b/springboot/wumei-admin/pom.xml index 69a93079..e84aba32 100644 --- a/springboot/wumei-admin/pom.xml +++ b/springboot/wumei-admin/pom.xml @@ -8,7 +8,7 @@ 3.8.0 4.0.0 - war + jar wumei-admin diff --git a/springboot/wumei-admin/src/main/resources/application-druid-docker.yml b/springboot/wumei-admin/src/main/resources/application-druid-docker.yml new file mode 100644 index 00000000..2cb4c8a1 --- /dev/null +++ b/springboot/wumei-admin/src/main/resources/application-druid-docker.yml @@ -0,0 +1,57 @@ +# 数据源配置 +spring: + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.mysql.cj.jdbc.Driver + druid: + # 主库数据源 + master: + url: jdbc:mysql://${DB_HOST}/${DB_NAME}?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: ${DB_USER} + password: ${DB_PASSWORD} + # 从库数据源 + slave: + # 从数据源开关/默认关闭 + enabled: false + url: + username: + password: + # 初始连接数 + initialSize: 5 + # 最小连接池数量 + minIdle: 10 + # 最大连接池数量 + maxActive: 20 + # 配置获取连接等待超时的时间 + maxWait: 60000 + # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒 + timeBetweenEvictionRunsMillis: 60000 + # 配置一个连接在池中最小生存的时间,单位是毫秒 + minEvictableIdleTimeMillis: 300000 + # 配置一个连接在池中最大生存的时间,单位是毫秒 + maxEvictableIdleTimeMillis: 900000 + # 配置检测连接是否有效 + validationQuery: SELECT 1 FROM DUAL + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + webStatFilter: + enabled: true + statViewServlet: + enabled: true + # 设置白名单,不填则允许所有访问 + allow: + url-pattern: /druid/* + # 控制台管理用户名和密码 + login-username: wumei-smart + login-password: wumei-smart + filter: + stat: + enabled: true + # 慢SQL记录 + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: true + wall: + config: + multi-statement-allow: true diff --git a/springboot/wumei-admin/src/main/resources/logback.xml b/springboot/wumei-admin/src/main/resources/logback.xml index 7b834337..5a0ff56b 100644 --- a/springboot/wumei-admin/src/main/resources/logback.xml +++ b/springboot/wumei-admin/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - +