Merge branch 'master' into vip

austin-support/src/main/java/com/java3y/austin/support/service/impl/ConfigServiceImpl.java

@@ -7,6 +7,8 @@ import com.java3y.austin.support.service.ConfigService;
 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配置

austin-support/src/main/java/com/java3y/austin/support/utils/AccountUtils.java

@@ -42,8 +42,4 @@ public class AccountUtils {
         }
         return null;
     }
-
-
-
-
 }

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: