Merge remote-tracking branch 'origin/master' into develop

Author: xujin

moss-web/src/main/resources/application.yml

@@ -2,10 +2,10 @@ spring:
   application:
     name: halo-moss
   datasource:
-    url: jdbc:mysql://ip:端口/moss?useUnicode=true&characterEncoding=utf8
+    url: jdbc:mysql://ip:端口/moss?useUnicode=true&characterEncoding=utf8&useSSL=false
     username: 用户名
     password: 密码
-    driver-class-name: com.mysql.jdbc.Driver
+    driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
     filters: stat
     maxActive: 20

moss-web/src/main/resources/banner.txt

@@ -1,22 +1,22 @@
 ${AnsiColor.BRIGHT_BLACK}
 
 
-          ____      ,----..
-        ,'  , `.   /   /   \    .--.--.    .--.--.     Moss Version: ${application.formatted-version}
-     ,-+-,.' _ |  /   .     :  /  /    '. /  /    '.   Port: ${server.port}  Pid: ${pid}
-  ,-+-. ;   , || .   /   ;.  \|  :  /`. /|  :  /`. /
- ,--.'|'   |  ;|.   ;   /  ` ;;  |  |--` ;  |  |--`    Console: http://127.0.0.1:${server.port}
-|   |  ,', |  ':;   |  ; \ ; ||  :  ;_   |  :  ;_      Running Spring Boot ${spring-boot.version}
-|   | /  | |  |||   :  | ; | ' \  \    `. \  \    `.
-'   | :  | :  |,.   |  ' ' ' :  `----.   \ `----.   \   更多访问: http://xujin.org
-;   . |  ; |--' '   ;  \; /  |  __ \  \  | __ \  \  |
-|   : |  | ,     \   \  ',  /  /  /`--'  //  /`--'  /
-|   : '  |/       ;   :    /  '--'.     /'--'.     /
-;   | |`-'         \   \ .'     `--'---'   `--'---'
-|   ;/              `---`
-'---'
+${AnsiColor.BLUE}           ____  ${AnsiColor.BLACK}    ,----..   ${AnsiColor.RED}           ${AnsiColor.BLUE}             ${AnsiColor.BLACK}
+${AnsiColor.BLUE}         ,'  , `.${AnsiColor.BLACK}   /   /   \  ${AnsiColor.RED}  .--.--.  ${AnsiColor.BLUE}  .--.--.    ${AnsiColor.BLACK} Moss Version: ${application.formatted-version}
+${AnsiColor.BLUE}      ,-+-,.' _ |${AnsiColor.BLACK}  /   .     : ${AnsiColor.RED} /  /    '.${AnsiColor.BLUE} /  /    '.  ${AnsiColor.BLACK} Port: ${server.port}  Pid: ${pid}
+${AnsiColor.BLUE}   ,-+-. ;   , ||${AnsiColor.BLACK} .   /   ;.  \${AnsiColor.RED}|  :  /`. /${AnsiColor.BLUE}|  :  /`. /  ${AnsiColor.BLACK}
+${AnsiColor.BLUE}  ,--.'|'   |  ;|${AnsiColor.BLACK}.   ;   /  ` ;${AnsiColor.RED};  |  |--` ${AnsiColor.BLUE};  |  |--`   ${AnsiColor.BLACK} Console: http://127.0.0.1:${server.port}
+${AnsiColor.BLUE} |   |  ,', |  ':${AnsiColor.BLACK};   |  ; \ ; |${AnsiColor.RED}|  :  ;_   ${AnsiColor.BLUE}|  :  ;_     ${AnsiColor.BLACK} Running Spring Boot ${spring-boot.version}
+${AnsiColor.BLUE} |   | /  | |  ||${AnsiColor.BLACK}|   :  | ; | '${AnsiColor.RED} \  \    `.${AnsiColor.BLUE} \  \    `.  ${AnsiColor.BLACK}
+${AnsiColor.BLUE} '   | :  | :  |,${AnsiColor.BLACK}.   |  ' ' ' :${AnsiColor.RED}  `----.   \${AnsiColor.BLUE} `----.   \ ${AnsiColor.BLACK}  更多访问: http://xujin.org
+${AnsiColor.BLUE} ;   . |  ; |--' ${AnsiColor.BLACK}'   ;  \; /  |${AnsiColor.RED}  __ \  \  |${AnsiColor.BLUE} __ \  \  | ${AnsiColor.BLACK}
+${AnsiColor.BLUE} |   : |  | ,    ${AnsiColor.BLACK} \   \  ',  / ${AnsiColor.RED} /  /`--'  /${AnsiColor.BLUE}/  /`--'  / ${AnsiColor.BLACK}
+${AnsiColor.BLUE} |   : '  |/     ${AnsiColor.BLACK}  ;   :    /  ${AnsiColor.RED}'--'.     /${AnsiColor.BLUE}'--'.     /  ${AnsiColor.BLACK}
+${AnsiColor.BLUE} ;   | |`-'      ${AnsiColor.BLACK}   \   \ .'   ${AnsiColor.RED}  `--'---' ${AnsiColor.BLUE}  `--'---'   ${AnsiColor.BLACK}
+${AnsiColor.BLUE} |   ;/          ${AnsiColor.BLACK}    `---`     ${AnsiColor.RED}           ${AnsiColor.BLUE}             ${AnsiColor.BLACK}
+${AnsiColor.BLUE} '---'           ${AnsiColor.BLACK}              ${AnsiColor.RED}           ${AnsiColor.BLUE}             ${AnsiColor.BLACK}
 
-${AnsiColor.BLACK}>>>>>>>>>>>>莫斯(Moss)，让Spring Cloud应用不再"四处流浪"！<<<<<<<<<<<<
+${AnsiColor.BLACK}>>>>>>>>>>>>莫斯(Moss)，让Spring Cloud应用不再"四处流浪"！<<<<<<<<<<<<${AnsiColor.WHITE}