ChenGanBin 2 лет назад
Родитель
Сommit
8ffb8e285a

+ 3 - 2
src/main/java/com/zhixinghe1/ots/atomic/entity/Attachment.java

@@ -3,14 +3,14 @@ package com.zhixinghe1.ots.atomic.entity;
 import java.io.Serial;
 import java.io.Serializable;
 
-import io.mybatis.provider.Entity.Table;
+import io.mybatis.provider.Entity;
 import lombok.Data;
 
 /**
  * 上传附件
  */
 @Data
-@Table
+@Entity.Table
 public class Attachment implements Serializable {
 
     @Serial
@@ -19,6 +19,7 @@ public class Attachment implements Serializable {
     /**
      * 主键
      */
+    @Entity.Column(id = true)
     private Long id;
 
     /**

+ 2 - 0
src/main/java/com/zhixinghe1/ots/atomic/entity/WechatUser.java

@@ -3,6 +3,7 @@ package com.zhixinghe1.ots.atomic.entity;
 import java.io.Serial;
 import java.io.Serializable;
 
+import io.mybatis.provider.Entity;
 import io.mybatis.provider.Entity.Table;
 import lombok.Data;
 
@@ -19,6 +20,7 @@ public class WechatUser implements Serializable {
     /**
      * 主键
      */
+    @Entity.Column(id = true)
     private Long id;
 
     /**

+ 1 - 1
src/main/java/com/zhixinghe1/ots/atomic/service/impl/AttachmentServiceImpl.java

@@ -30,7 +30,7 @@ public class AttachmentServiceImpl implements IAttachmentService {
         }
 
         Optional<Attachment> optional = attachmentMapper.selectByPrimaryKey(id);
-        return attachmentConverter.convert2Dto(optional.get());
+        return attachmentConverter.convert2Dto(optional.orElse(null));
     }
 
     @Override

+ 2 - 2
src/main/java/com/zhixinghe1/ots/atomic/service/impl/WechatUserServiceImpl.java

@@ -33,7 +33,7 @@ public class WechatUserServiceImpl implements IWechatUserService {
         Criteria<WechatUser> criteria = example.createCriteria();
         criteria.andEqualTo(WechatUser::getOpenId, openId);
         Optional<WechatUser> optional = wechatUserMapper.selectOneByExample(example);
-        return wechatUserConverter.convert2Dto(optional.get());
+        return wechatUserConverter.convert2Dto(optional.orElse(null));
     }
 
     @Override
@@ -59,6 +59,6 @@ public class WechatUserServiceImpl implements IWechatUserService {
         Criteria<WechatUser> criteria = example.createCriteria();
         criteria.andEqualTo(WechatUser::getId, id);
         Optional<WechatUser> optional = wechatUserMapper.selectOneByExample(example);
-        return wechatUserConverter.convert2Dto(optional.get());
+        return wechatUserConverter.convert2Dto(optional.orElse(null));
     }
 }

+ 2 - 2
src/main/java/com/zhixinghe1/ots/service/manager/impl/OssManagerImpl.java

@@ -86,13 +86,13 @@ public class OssManagerImpl implements IOssManager {
         HttpServletResponse response =
             Optional.ofNullable(((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getResponse())
                 .orElseThrow();
-        response.setContentType("application/octet-stream");
+        response.setContentType("image/png");
         response.setCharacterEncoding("UTF-8");
         response.setHeader("Content-Disposition",
             "attachment;fileName=" + URLEncoder.encode(attachmentDto.getName(), "UTF-8"));
 
         File file = new File(attachmentDto.getPath());
-        if (file.exists()) {
+        if (!file.exists()) {
             throw BusinessException.fail("资源文件不存在");
         }