Merge branch 'dev' into 'mp-server-test'

生产配置

See merge request quanshu/mp-server!193

mp-admin/src/main/resources/logback-spring.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/Users/daixiaodan/Documents/logs" />
+	<property name="log.path" value="/Users/Steven/Documents/logs" />
     <!-- 日志输出格式 -->
     <!-- You can override this to have a custom pattern -->
 	<property name="CONSOLE_LOG_PATTERN" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
@@ -63,4 +63,4 @@
         <appender-ref ref="DEBUG"/>
         <appender-ref ref="ERROR" />
     </root>
-</configuration> 
+</configuration>

mp-common/src/main/java/com/qs/mp/common/qcloud/QcloudFileUtils.java

@@ -26,11 +26,7 @@ public class QcloudFileUtils {
 
   private static final Logger logger = LoggerFactory.getLogger(QcloudFileUtils.class);
 
-  static COSClient cosClient = createCli();
-
-  static COSClient createCli() {
-    return createCli("ap-shanghai");
-  }
+  private static COSClient cosClient;
 
   private static String accessKey;
 
@@ -53,9 +49,16 @@ public class QcloudFileUtils {
     region = regionParam;
   }
 
+  public static COSClient getCosClient() {
+    if (null == cosClient) {
+      cosClient = createCli(region);
+    }
+    return cosClient;
+  }
+
   static COSClient createCli(String region) {
     // 初始化用户身份信息(secretId, secretKey)
-    COSCredentials cred = new BasicCOSCredentials("AKIDDF4dwzlGVTAmCMGvLVP4UfbHiuqVzFEw", "TgbFcjZ8HDse9ToujIabLo1yf5YqtfBX");
+    COSCredentials cred = new BasicCOSCredentials(accessKey, secretKey);
     // 设置bucket的区域, COS地域的简称请参照 https://www.qcloud.com/document/product/436/6224
     ClientConfig clientConfig = new ClientConfig(new Region(region));
     // 生成cos客户端
@@ -70,7 +73,7 @@ public class QcloudFileUtils {
     PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, key, file);
     putObjectRequest.withMetadata(objectMetadata);
 
-    PutObjectResult putObjectResult = cosClient.putObject(putObjectRequest);
+    PutObjectResult putObjectResult = getCosClient().putObject(putObjectRequest);
 
     LogUtil.info(logger, "put file reqId: " + putObjectResult.getRequestId());
   }
@@ -84,7 +87,7 @@ public class QcloudFileUtils {
     PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, key, stream, objectMetadata);
 //    putObjectRequest.withMetadata(objectMetadata);
 
-    PutObjectResult putObjectResult = cosClient.putObject(putObjectRequest);
+    PutObjectResult putObjectResult = getCosClient().putObject(putObjectRequest);
 
     LogUtil.info(logger, "put file reqId: " + putObjectResult.getRequestId());
 
@@ -113,7 +116,7 @@ public class QcloudFileUtils {
   public static void downloadFile(String key, String bucketName, String localDir, String saveName) {
     GetObjectRequest getObjectRequest = new GetObjectRequest(bucketName, key);
     File localFile = new File(localDir + saveName);
-    ObjectMetadata objectMetadata = cosClient.getObject(getObjectRequest, localFile);
+    ObjectMetadata objectMetadata = getCosClient().getObject(getObjectRequest, localFile);
 
     LogUtil.info(logger, "download file content length:" + objectMetadata.getContentLength());
   }