架构模块 修改测试数据库、头像上传阿里云的桶以及上传头像后可预览

backend-core/src/main/java/cn/kdan/pdf/backend/core/client/OssFileClient.java

@@ -57,12 +57,20 @@ public class OssFileClient {
      * 普通上传
      *
      * @param file 文件
+     * @param isPic 是否是图片
      * @return fileKey
      * @throws IOException 异常
      */
-    public String upload(MultipartFile file) throws IOException {
+    public String upload(MultipartFile file, boolean isPic) throws IOException {
         String fileKey = generateFileKey(file.getOriginalFilename());
-        PutObjectRequest request = new PutObjectRequest(ossProperties.getBucketName(), fileKey, file.getInputStream());
+        PutObjectRequest request;
+        if(isPic) {
+            ObjectMetadata meta = new ObjectMetadata();
+            meta.setContentType("image/jpg");
+            request = new PutObjectRequest(ossProperties.getBucketName(), fileKey, file.getInputStream(), meta);
+        }else{
+            request = new PutObjectRequest(ossProperties.getBucketName(), fileKey, file.getInputStream());
+        }
         ossClient.putObject(request);
         return fileKey;
     }
@@ -312,7 +320,7 @@ public class OssFileClient {
     }
 
     /**
-     * 设置文件访问权限（读写权限）
+     * 设置文件访问权限（读权限）
      * @param objectName 文件路径（包名开始）
      * @return 设置权限是否成功
      */
@@ -320,8 +328,8 @@ public class OssFileClient {
         boolean flag = false;
         String bucketName = ossProperties.getBucketName();
         try {
-            // 创建SetObjectAclRequest对象，此示例中设置文件的访问权限为公共读写。
-            SetObjectAclRequest setObjectAclRequest = new SetObjectAclRequest(bucketName, objectName, CannedAccessControlList.PublicReadWrite);
+            // 创建SetObjectAclRequest对象，此示例中设置文件的访问权限为公共读。
+            SetObjectAclRequest setObjectAclRequest = new SetObjectAclRequest(bucketName, objectName, CannedAccessControlList.PublicRead);
             // 设置指定文件的权限。
             ossClient.setObjectAcl(setObjectAclRequest);
             flag = true;

backend-core/src/main/java/cn/kdan/pdf/backend/core/service/impl/AvatarServiceImpl.java

@@ -86,8 +86,9 @@ public class AvatarServiceImpl implements AvatarService {
         String ossFileName = "";
         try {
             //上传文件并授权为可读写
-            ossFileName = ossFileClient.upload(file);
-            ossFileClient.setAcl(ossFileName);
+            ossFileName = ossFileClient.upload(file,true);
+            //设置读权限
+//            ossFileClient.setAcl(ossFileName);
         } catch (IOException e) {
             log.error("上传头像失败：{}",e.getMessage());
         }

backend-core/src/main/resources/application-local.yml

@@ -83,9 +83,11 @@ com:
 
 17pdf:
   oss:
-    bucketName: data-center-mainland-dev
-    endpoint: http://oss-cn-shanghai.aliyuncs.com
+    bucketName: kdan-account-file
+    endpoint: https://oss-cn-shanghai.aliyuncs.com
     accessKeyId: LTAIBSxSrO3XuszA
     accessKeySecret: ylqpMGyA4qpsaobhZ34gJzNZzcnYmT
     filePrefix: avatars
-    viewUrl: http://data-center-mainland-dev.oss-cn-shanghai.aliyuncs.com/
+    viewUrl: https://kdan-account-file.oss-cn-shanghai.aliyuncs.com/
+    #    bucketName: data-center-mainland-dev
+    #    viewUrl: http://data-center-mainland-dev.oss-cn-shanghai.aliyuncs.com/

backend-core/src/main/resources/application-test-db.properties

@@ -1,7 +1,4 @@
 jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-#jdbc.url=jdbc\:mysql\://139.196.160.101\:3306/17pdf_backend_test?useUnicode\=true&characterEncoding\=UTF-8&useSSL\=false
-#jdbc.username=debian-sys-maint
-#jdbc.password=tRF4SWujyo6rZ4Qm
-jdbc.url=jdbc\:mysql\://81.68.234.235\:33056/17pdf_backend_dev?autoReconnect\=true&&useSSL\=false
+jdbc.url=jdbc\:mysql\://139.196.160.101\:33056/17pdf_backend_test?autoReconnect\=true&&useSSL\=false
 jdbc.username=root
 jdbc.password=root123

backend-core/src/main/resources/application-test.yml

@@ -90,9 +90,11 @@ com:
 
 17pdf:
   oss:
-    bucketName: data-center-mainland-dev
-    endpoint: http://oss-cn-shanghai.aliyuncs.com
+    bucketName: kdan-account-file
+    endpoint: https://oss-cn-shanghai.aliyuncs.com
     accessKeyId: LTAIBSxSrO3XuszA
     accessKeySecret: ylqpMGyA4qpsaobhZ34gJzNZzcnYmT
     filePrefix: avatars
-    viewUrl: http://data-center-mainland-dev.oss-cn-shanghai.aliyuncs.com/
+    viewUrl: https://kdan-account-file.oss-cn-shanghai.aliyuncs.com/
+    #    bucketName: data-center-mainland-dev
+    #    viewUrl: http://data-center-mainland-dev.oss-cn-shanghai.aliyuncs.com/