From f07213e629058046210cfec252f067e7a5d6ba6a Mon Sep 17 00:00:00 2001 From: kosmosr Date: Wed, 6 Jul 2022 14:07:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0mysql=20compose?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/mysql/docker-compose.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 docker/mysql/docker-compose.yml diff --git a/docker/mysql/docker-compose.yml b/docker/mysql/docker-compose.yml new file mode 100644 index 000000000..f8f14bcc8 --- /dev/null +++ b/docker/mysql/docker-compose.yml @@ -0,0 +1,17 @@ +version: '3' + +services: + mysql: + image: mysql:5.7 + container_name: mysql + restart: always + ports: + - 3306:3306 + volumes: + - mysql-data:/var/lib/mysql + environment: + MYSQL_ROOT_PASSWORD: austin_pwd+- + TZ: Asia/Shanghai + command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci +volumes: + mysql-data: From d759c4f5108197a86d3707804ce3f6049f375f2d Mon Sep 17 00:00:00 2001 From: kosmosr Date: Wed, 6 Jul 2022 18:05:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E4=BD=BF=E7=94=A8UTF-8=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java3y/austin/support/service/impl/ConfigServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/austin-support/src/main/java/com/java3y/austin/support/service/impl/ConfigServiceImpl.java b/austin-support/src/main/java/com/java3y/austin/support/service/impl/ConfigServiceImpl.java index f163d7271..860e84e9f 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/service/impl/ConfigServiceImpl.java +++ b/austin-support/src/main/java/com/java3y/austin/support/service/impl/ConfigServiceImpl.java @@ -7,6 +7,8 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import java.nio.charset.StandardCharsets; + /** * @author 3y @@ -19,7 +21,7 @@ public class ConfigServiceImpl implements ConfigService { * 本地配置 */ private static final String PROPERTIES_PATH = "local.properties"; - private Props props = new Props(PROPERTIES_PATH); + private Props props = new Props(PROPERTIES_PATH, StandardCharsets.UTF_8); /** * apollo配置 From 20fdf18c19e7a476ce603a3150e83545901d1a24 Mon Sep 17 00:00:00 2001 From: kosmosr Date: Wed, 6 Jul 2022 18:06:29 +0800 Subject: [PATCH 3/3] clean up --- .../java/com/java3y/austin/support/utils/AccountUtils.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/austin-support/src/main/java/com/java3y/austin/support/utils/AccountUtils.java b/austin-support/src/main/java/com/java3y/austin/support/utils/AccountUtils.java index 922c02bbf..7b82971be 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/utils/AccountUtils.java +++ b/austin-support/src/main/java/com/java3y/austin/support/utils/AccountUtils.java @@ -42,8 +42,4 @@ public T getAccount(Integer sendAccount, String apolloKey, String prefix, Cl } return null; } - - - - }