From fcbbdae83021f307f382447452f458e640520848 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 12 九月 2024 08:33:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
index bf3f011..471cdae 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
@@ -1,23 +1,17 @@
server:
port: 8084
spring:
- datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8&characterEncoding=utf-8&useSSL=false
- username: root
- password: beibo.123/
- cloud:
- nacos:
- discovery:
- server-addr: 10.153.19.150:8848
+ profiles:
+ active: dev
application:
name: temperingGlass
- redis:
- database: 0
- host: 10.153.19.150
- port: 6379
- password: 123456
+ liquibase:
+ enabled: true
+ change-log: classpath:changelog/changelog.sql
mybatis-plus:
mapper-locations: classpath*:mapper/*.xml
configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
\ No newline at end of file
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+mes:
+ width: 2800
+ height: 5000
\ No newline at end of file
--
Gitblit v1.8.0