Merge branch 'dev' into 'master'

修改配置文件

See merge request eshop/biz_service_ebtp_project!24

pro.yaml

@@ -47,25 +47,25 @@ spec:
             mountPath: /log
         ports:            
         - containerPort: 18012  #[8] 容器需要监听的端口号，与配置文件中的server.port参数相同，与参数[4]相同
-        livenessProbe:
-          failureThreshold: 3
-          httpGet:
-            port: 18012            #[11] pod存活检测端口,修改为该微服务配置文件中server.port的端口号,与参数[5]相同
-            path: /actuator/prometheus  
-            scheme: HTTP
-          initialDelaySeconds: 300
-          periodSeconds: 60
-          successThreshold: 1
-          timeoutSeconds: 2
-        readinessProbe:
-           failureThreshold: 1
-           httpGet:
-             port: 18012           #[12] pod就绪检测端口,修改为该微服务配置文件中server.port的端口号,与参数[5]相同
-             path: /actuator/prometheus
-             scheme: HTTP
-           periodSeconds: 5
-           successThreshold: 2
-           timeoutSeconds: 2
+#        livenessProbe:
+#          failureThreshold: 3
+#          httpGet:
+#            port: 18012            #[11] pod存活检测端口,修改为该微服务配置文件中server.port的端口号,与参数[5]相同
+#            path: /actuator/prometheus
+#            scheme: HTTP
+#          initialDelaySeconds: 300
+#          periodSeconds: 60
+#          successThreshold: 1
+#          timeoutSeconds: 2
+#        readinessProbe:
+#           failureThreshold: 1
+#           httpGet:
+#             port: 18012           #[12] pod就绪检测端口,修改为该微服务配置文件中server.port的端口号,与参数[5]相同
+#             path: /actuator/prometheus
+#             scheme: HTTP
+#           periodSeconds: 5
+#           successThreshold: 2
+#           timeoutSeconds: 2
         resources:
           requests:
             cpu: 1000m

src/main/resources/application-test.yml

@@ -112,7 +112,7 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     auto-mapping-behavior: full
     # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
   mapper-locations: classpath*:com/chinaunicom/mall/ebtp/**/mapper/*Mapper.xml
   global-config:
     # 逻辑删除配置

src/main/resources/application-uat.yml

@@ -55,7 +55,7 @@ spring:
         connection-properties: druid.stat.merggSql=ture;druid.stat.slowSqlMillis=5000
     props:
       sql:
-        show: true
+        show: false
 
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss