Merge remote-tracking branch 'remotes/origin/master' into developerA

src/main/java/com/caimei/service/impl/AuthProductServiceImpl.java

@@ -210,8 +210,9 @@ public class AuthProductServiceImpl implements AuthProductService {
             if (null != imgFile) {
                 imagePath = imageDomain + "/" + saveImage(imgFile);
             }
+            log.info(">>>>>>>>>>>>>>>>水印图片上传成功:" + imagePath);
         }
-        log.info(">>>>>>>>>>>>>>>>水印图片上传成功:" + imagePath);
+        log.info(">>>>>>>>>>>>>>>>水印图片上传失败");
         return imagePath;
     }
 

src/main/resources/config/beta/application-beta.yml

@@ -1,9 +1,9 @@
 spring:
   #数据源连接--start
   datasource:
-    url: jdbc:mysql://119.29.164.246:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://172.31.165.28:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
     username: developer
-    password: 05bZ/OxTB:X+yd%1
+    password: J5p3tgOVazNl4ydf
     # Hikari will use the above plus the following to setup connection pooling
     type: com.zaxxer.hikari.HikariDataSource
     hikari:
@@ -18,9 +18,9 @@ spring:
   #数据源连接--end
 
   redis:
-    host: 10.104.50.235
+    host: 47.119.112.46
     port: 6379
-        #password: 6#xsI%b4o@5c3RoE
+    password: 6#xsI%b4o@5c3RoE
 #    host: 47.119.112.46
 #    port: 6379
 #    password: 6#xsI%b4o@5c3RoE
@@ -48,7 +48,7 @@ spring:
 #日志配置
 logging:
   file:
-    path: /mnt/newdatadrive/data/runtime/tomcat-instance/zplma/logs
+    path: /mnt/newdatadrive/data/runtime/jar-instance/zplma/logs
   level:
     root: info
 
@@ -71,4 +71,4 @@ fdfs:
     width: 150
     height: 150
   tracker-list:            #TrackerList参数,支持多个
-    - 10.104.50.235:22122
+    - 172.31.165.28:22122