yangdamao há 1 mês atrás
pai
commit
cbb14dd270

+ 3 - 0
zhichen-system/src/main/java/com/zhichen/modules/goods/domain/Goods.java

@@ -192,6 +192,9 @@ private static final long serialVersionUID=1L;
     /** 外部考前商品标签:0否1是 */
     private Integer beforeSign;
 
+    /** 外部考前商品题库资料url */
+    private String beforeUrl;
+
     /** 前培和补考商品关联多个 */
     @TableField(updateStrategy=FieldStrategy.IGNORED)
     private String makeGoodsIds;

+ 3 - 0
zhichen-system/src/main/java/com/zhichen/modules/goods/vo/GoodsUserVo.java

@@ -466,4 +466,7 @@ public class GoodsUserVo {
 
 	@ApiModelProperty("审核通过时间")
 	private Long periodTime;
+
+	/** 外部考前商品题库资料url */
+	private String beforeUrl;
 }

+ 3 - 0
zhichen-system/src/main/java/com/zhichen/modules/order/vo/OrderGoodsVo.java

@@ -399,4 +399,7 @@ public class OrderGoodsVo {
 
 	@ApiModelProperty("审核通过时间")
 	private Long periodTime;
+
+	/** 外部考前商品题库资料url */
+	private String beforeUrl;
 }

+ 14 - 1
zhichen-system/src/main/java/com/zhichen/modules/txcos/service/impl/CosServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zhichen.modules.txcos.service.impl;
 
 import cn.hutool.core.lang.Validator;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.qcloud.cos.COSClient;
 import com.qcloud.cos.ClientConfig;
 import com.qcloud.cos.auth.BasicCOSCredentials;
@@ -52,11 +53,23 @@ public class CosServiceImpl implements CosService {
         String bucketName = TENGXUN_COS_BUCKET_NAME;
         String key =fileName; // 对象键,即上传到COS后的文件路径
         ObjectMetadata metadata = new ObjectMetadata();
-        metadata.setContentType("image/jpeg"); // 设置 Content-Type
+        if (ObjectUtils.isNotNull(file.getImageStatus()) && file.getImageStatus() == 6){
+            metadata.setContentDisposition("attachment; filename=\"" + fileName + "\"");
+
+            // 3. 可选但推荐:设置 MIME 类型为通用二进制流
+            // 这样浏览器更不会尝试预览
+            metadata.setContentType("application/octet-stream");
+
+            // 4. 可选:设置其他元数据
+            // metadata.setContentEncoding("UTF-8");
+        }else {
+            metadata.setContentType("image/jpeg"); // 设置 Content-Type
+        }
         // 上传文件
         PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, key, inputStream,metadata);
         cosClient.putObject(putObjectRequest);
 
+
         // 关闭客户端
         cosClient.shutdown();
         return key;

+ 1 - 0
zhichen-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -180,6 +180,7 @@
         <result property="externalLinkStatus" column="external_link_status"/>
         <result property="courseNum" column="course_num"/>
         <result property="examNum" column="exam_num"/>
+        <result property="beforeUrl" column="before_url"/>
 
         <result property="supplyName" column="supply_name"/>
         <result property="educationName" column="education_name"/>

+ 1 - 0
zhichen-system/src/main/resources/mapper/modules/order/OrderGoodsMapper.xml

@@ -64,6 +64,7 @@
         <result property="distributionCode" column="distribution_code"/>
         <result property="distributionLinkCode" column="distribution_link_code"/>
         <result property="offlineRefundSign" column="offline_refund_sign"/>
+        <result property="beforeUrl" column="before_url"/>
 
         <result property="code" column="code"/>
         <result property="goodsName" column="goods_name"/>