Merge remote-tracking branch 'origin/master'

mall-service/src/main/resources/bootstrap.properties

@@ -18,7 +18,7 @@ spring.profiles.active=dev
 local.nacos=124.222.152.234:8848 
 dev.nacos=172.17.0.3:8848
 #dev.nacos=172.17.0.3:8848
-#pro.nacos=172.17.0.15:8848,172.17.0.15:8849,172.17.0.13:8848
+pro.nacos=172.31.181.53:8848
 #spring.profiles.include=wx,wxmp
 #spring.cloud.nacos.discovery.server-addr=129.211.99.19:84
 spring.cloud.nacos.discovery.server-addr=${${spring.profiles.active}.nacos}
@@ -102,9 +102,9 @@ redisson.singleServerConfig.retryInterval=1500
 local.job=http://8.219.117.74/xxl-job-admin
 dev.job=http://124.220.229.80:9096/xxl-job-admin
 test.job=http://172.10.100.40:8080/xxl-job-admin
-pro.job=http://172.10.100.40:8080/xxl-job-admin
+pro.job=http://172.31.181.53:8080/xxl-job-admin
 dev.accessToken=
-
+pro.accessToken=
 xxl.job.admin.addresses=${${spring.profiles.active}.job}
 xxl.job.executor.appname=${spring.application.name}executor
 xxl.job.accessToken=${${spring.profiles.active}.accessToken}

mall-service/src/main/resources/logback.xml

@@ -5,6 +5,7 @@
     <!-- 控制台输出 -->
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <charset>UTF-8</charset>
             <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
         </encoder>