Kaynağa Gözat

tt

release_toaliyun_real
xhxu 5 yıl önce
ebeveyn
işleme
9bfb8ec0e0
3 değiştirilmiş dosya ile 11 ekleme ve 8 silme
  1. +6
    -4
      mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java
  2. +4
    -4
      mallinkService/src/main/resources/mapper/TtCouponMapper.xml
  3. +1
    -0
      mallinkVideo/src/main/java/com/iformall/video/aliyun/AliyunVideoExcutor.java

+ 6
- 4
mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java Dosyayı Görüntüle

@@ -58,8 +58,8 @@ public class TtCoupon extends TenantEntity {

@io.swagger.annotations.ApiModelProperty(value="",name="videoId")
private String videoId;
@io.swagger.annotations.ApiModelProperty(value="视频时长(分钟)",name="videoTime")
private Integer videoTime;
@io.swagger.annotations.ApiModelProperty(value="视频时长(秒)",name="videoTime")
private String videoTime;

@io.swagger.annotations.ApiModelProperty(value="富文本内容",name="html")
private String html;
@@ -117,9 +117,11 @@ public class TtCoupon extends TenantEntity {

@io.swagger.annotations.ApiModelProperty(value="作者",name="merchantId")
private Long merchantId;
@io.swagger.annotations.ApiModelProperty(value="",name="merchantName")//弃用
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="",name="merchantName")
private String merchantName;
@io.swagger.annotations.ApiModelProperty(value="",name="merchantPic")//弃用
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="",name="merchantPic")
private String merchantPic;

@io.swagger.annotations.ApiModelProperty(value="业态",name="businessId")


+ 4
- 4
mallinkService/src/main/resources/mapper/TtCouponMapper.xml Dosyayı Görüntüle

@@ -12,7 +12,7 @@
<result column="title" jdbcType="VARCHAR" property="title"/>
<result column="sub_title" jdbcType="VARCHAR" property="subTitle"/>
<result column="video_id" jdbcType="VARCHAR" property="videoId"/>
<result column="video_time" jdbcType="INTEGER" property="videoTime"/>
<result column="video_time" jdbcType="VARCHAR" property="videoTime"/>
<result column="html" jdbcType="VARCHAR" property="html"/>
<result column="is_landscape" jdbcType="INTEGER" property="isLandscape"/>
<result column="is_payment" jdbcType="INTEGER" property="isPayment"/>
@@ -36,10 +36,10 @@
<result column="column_id" jdbcType="BIGINT" property="columnId"/>
<result column="popularity" jdbcType="INTEGER" property="popularity"/>
<result column="merchant_id" jdbcType="BIGINT" property="merchantId"/>
<result column="merchant_name" jdbcType="VARCHAR" property="merchantName"/>
<result column="merchant_pic" jdbcType="VARCHAR" property="merchantPic"/>
<result column="business_id" jdbcType="BIGINT" property="businessId"/>
<result column="business_name" jdbcType="VARCHAR" property="businessName"/>


</resultMap>

<sql id="allColumns">
@@ -48,7 +48,7 @@
`sale_price`, `orig_price`, `is_preview`, `preview_duration`, `detail`, `false_sell_count`,
`dy_title`, `inventory`, `remark`, `status`, `create_date`, `update_date`,
`see_count`, `sell_count`, `assess_count`, `collect_count`, `is_del`,
`column_id`, `popularity`, `merchant_id`, `merchant_name`,`merchant_pic`, `business_id`, `business_name`
`column_id`, `popularity`, `merchant_id`, `business_id`, `business_name`
</sql>

<sql id="dynamicWhereConditions">


+ 1
- 0
mallinkVideo/src/main/java/com/iformall/video/aliyun/AliyunVideoExcutor.java Dosyayı Görüntüle

@@ -89,6 +89,7 @@ public class AliyunVideoExcutor implements VideoExcutor {
UploadStreamResponse response;
try {
response = AliyunVedioUpload.uploadStream(config.getAccessKeyId(), config.getAccessKeySecret(),config.getRegionId(), title, UUID.randomUUID().toString().replace("-","")+fileFormat, inputStream,redisTemplate);
log.info(response.toString());
if (response.isSuccess()) {
result.setVideoId(response.getVideoId());
result.setVideoUrl(getUrlByVeidoId(response.getVideoId()));


Yükleniyor…
İptal
Kaydet