From d370748f50fe51fa36a4d978856eeaf83bf05896 Mon Sep 17 00:00:00 2001 From: ms group dev Date: Sun, 27 Jan 2019 20:55:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 25a0a051..4f121f61 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # 温馨提示，请使用master分支 -当前版本:4.7.0 开发版本极其不稳定，如有使用概不解答，请耐心等待稳定版本的发布，
\ No newline at end of file +当前版本:4.7.0 开发版本极其不稳定，如有使用概不解答，请耐心等待稳定版本的发布，
\ No newline at end of file From c3c4ae463fd3547d6b78c68569649c98d9a240d3 Mon Sep 17 00:00:00 2001 From: ms group dev Date: Mon, 28 Jan 2019 04:48:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=86=85=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-test.yml | 2 +- src/main/resources/application.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 2c3a9d64..d2e93439 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -1,6 +1,6 @@ spring: datasource: - url: jdbc:mysql://192.168.1.18:3306/mcms-4.7.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false + url: jdbc:mysql://192.168.1.18:3307/mcms-4.7.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false username: root password: root filters: wall,mergeStat diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 3ff3d837..2b80f513 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -22,7 +22,7 @@ ms: spring: profiles: - active: dev + active: test mvc: pathmatch: use-suffix-pattern: true From 164b3813a58dbf354ed64acae4568eeece84d5ea Mon Sep 17 00:00:00 2001 From: ms group dev Date: Mon, 28 Jan 2019 05:07:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=86=85=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index d2e93439..e7af895d 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -1,6 +1,6 @@ spring: datasource: - url: jdbc:mysql://192.168.1.18:3307/mcms-4.7.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false + url: jdbc:mysql://localhost:3307/mcms-4.7.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false username: root password: root filters: wall,mergeStat