Skip to content

M
mes
Commit 26c94cac authored by chicheng's avatar chicheng
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 09291e69 48289352
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
admin/src/main/resources/application-sh-test.yml
View file @ 26c94cac
...@@ -56,7 +56,7 @@ spring: ...@@ -56,7 +56,7 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: master:
url: jdbc:mysql://192.168.1.128:3306/xm_mes_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:mysql://localhost:3306/xm_mes_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root username: root
password: t0psunit password: t0psunit
# 从库数据源 # 从库数据源
......
admin/src/main/resources/logback.xml
View file @ 26c94cac
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <configuration>
<!-- 日志存放路径 --> <!-- 日志存放路径 -->
<property name="log.path" value="/Users/chicheng/Documents/logs/ximai" /> <property name="log.path" value="d:/logs/mes" />
<!-- 日志输出格式 --> <!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" /> <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
......
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