Browse Source

//mould

private_deployment
xhxu 2 years ago
parent
commit
3f6482b12d
59 changed files with 211 additions and 23 deletions
  1. +3
    -3
      suimangAdmin/src/main/java/com/iformall/controller/video/VideoController.java
  2. +4
    -2
      suimangService/src/main/java/com/iformall/domain/po/sm/MouldPatch.java
  3. +4
    -3
      suimangService/src/main/resources/mapper/MouldPatchMapper.xml
  4. +36
    -15
      suimangVideo/pom.xml
  5. +51
    -0
      suimangVideo/src/main/java/com/iformall/language/LanguageDetect.java
  6. +60
    -0
      suimangVideo/src/main/java/com/iformall/language/LanguageExcutor.java
  7. +1
    -0
      suimangVideo/src/main/resources/profiles/af
  8. +1
    -0
      suimangVideo/src/main/resources/profiles/ar
  9. +1
    -0
      suimangVideo/src/main/resources/profiles/bg
  10. +1
    -0
      suimangVideo/src/main/resources/profiles/bn
  11. +1
    -0
      suimangVideo/src/main/resources/profiles/cs
  12. +1
    -0
      suimangVideo/src/main/resources/profiles/da
  13. +1
    -0
      suimangVideo/src/main/resources/profiles/de
  14. +1
    -0
      suimangVideo/src/main/resources/profiles/el
  15. +1
    -0
      suimangVideo/src/main/resources/profiles/en
  16. +1
    -0
      suimangVideo/src/main/resources/profiles/es
  17. +1
    -0
      suimangVideo/src/main/resources/profiles/et
  18. +1
    -0
      suimangVideo/src/main/resources/profiles/fa
  19. +1
    -0
      suimangVideo/src/main/resources/profiles/fi
  20. +1
    -0
      suimangVideo/src/main/resources/profiles/fr
  21. +1
    -0
      suimangVideo/src/main/resources/profiles/gu
  22. +1
    -0
      suimangVideo/src/main/resources/profiles/he
  23. +1
    -0
      suimangVideo/src/main/resources/profiles/hi
  24. +1
    -0
      suimangVideo/src/main/resources/profiles/hr
  25. +1
    -0
      suimangVideo/src/main/resources/profiles/hu
  26. +1
    -0
      suimangVideo/src/main/resources/profiles/id
  27. +1
    -0
      suimangVideo/src/main/resources/profiles/it
  28. +1
    -0
      suimangVideo/src/main/resources/profiles/ja
  29. +1
    -0
      suimangVideo/src/main/resources/profiles/kn
  30. +1
    -0
      suimangVideo/src/main/resources/profiles/ko
  31. +1
    -0
      suimangVideo/src/main/resources/profiles/lt
  32. +1
    -0
      suimangVideo/src/main/resources/profiles/lv
  33. +1
    -0
      suimangVideo/src/main/resources/profiles/mk
  34. +1
    -0
      suimangVideo/src/main/resources/profiles/ml
  35. +1
    -0
      suimangVideo/src/main/resources/profiles/mr
  36. +1
    -0
      suimangVideo/src/main/resources/profiles/ne
  37. +1
    -0
      suimangVideo/src/main/resources/profiles/nl
  38. +1
    -0
      suimangVideo/src/main/resources/profiles/no
  39. +1
    -0
      suimangVideo/src/main/resources/profiles/pa
  40. +1
    -0
      suimangVideo/src/main/resources/profiles/pl
  41. +1
    -0
      suimangVideo/src/main/resources/profiles/pt
  42. +1
    -0
      suimangVideo/src/main/resources/profiles/ro
  43. +1
    -0
      suimangVideo/src/main/resources/profiles/ru
  44. +1
    -0
      suimangVideo/src/main/resources/profiles/sk
  45. +1
    -0
      suimangVideo/src/main/resources/profiles/sl
  46. +1
    -0
      suimangVideo/src/main/resources/profiles/so
  47. +1
    -0
      suimangVideo/src/main/resources/profiles/sq
  48. +1
    -0
      suimangVideo/src/main/resources/profiles/sv
  49. +1
    -0
      suimangVideo/src/main/resources/profiles/sw
  50. +1
    -0
      suimangVideo/src/main/resources/profiles/ta
  51. +1
    -0
      suimangVideo/src/main/resources/profiles/te
  52. +1
    -0
      suimangVideo/src/main/resources/profiles/th
  53. +1
    -0
      suimangVideo/src/main/resources/profiles/tl
  54. +1
    -0
      suimangVideo/src/main/resources/profiles/tr
  55. +1
    -0
      suimangVideo/src/main/resources/profiles/uk
  56. +1
    -0
      suimangVideo/src/main/resources/profiles/ur
  57. +1
    -0
      suimangVideo/src/main/resources/profiles/vi
  58. +1
    -0
      suimangVideo/src/main/resources/profiles/zh-cn
  59. +1
    -0
      suimangVideo/src/main/resources/profiles/zh-tw

+ 3
- 3
suimangAdmin/src/main/java/com/iformall/controller/video/VideoController.java View File

@@ -94,9 +94,9 @@ public class VideoController extends BaseController {
title = multiReq.getOriginalFilename().substring(0,dot);
}
}
if(!fileFormat.endsWith("mp4")){
return new ResultData(ErrorCode.PICTURE_ENDWIDTH_ERROR);
}
// if(!fileFormat.endsWith("mp4")){
// return new ResultData(ErrorCode.PICTURE_ENDWIDTH_ERROR);
// }
VideUploadResult result = videoFactory.getExcutor(videoType).uploadVideoStream(title, multiReq.getInputStream(),fileFormat);
result.setSize(String.valueOf(size));
return new ResultData(result);


+ 4
- 2
suimangService/src/main/java/com/iformall/domain/po/sm/MouldPatch.java View File

@@ -101,13 +101,15 @@ public class MouldPatch extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="购买须知",name="remark")
private String remark;

@io.swagger.annotations.ApiModelProperty(value="模板文件",name="mouldPath")
private String mouldPath;
@io.swagger.annotations.ApiModelProperty(value="模板第三方Id",name="mouldSmId")
private String mouldSmId;

@io.swagger.annotations.ApiModelProperty(value="EnumaMouldPatchStatus 状态(-1:全部,0:草稿/待生效,1:已生效,2:已失效,3:已作废)",name="status")
private Integer status;
@io.swagger.annotations.ApiModelProperty(value="上架时间",name="putonDate")
private Date putonDate;
@io.swagger.annotations.ApiModelProperty(value="样例videoid",name="exampleVideoId")
private String exampleVideoId;
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate")
private Date createDate;
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")


+ 4
- 3
suimangService/src/main/resources/mapper/MouldPatchMapper.xml View File

@@ -20,9 +20,10 @@
<result column="send_type" jdbcType="INTEGER" property="sendType"/>
<result column="detail" jdbcType="VARCHAR" property="detail"/>
<result column="remark" jdbcType="VARCHAR" property="remark"/>
<result column="mould_path" jdbcType="VARCHAR" property="mouldPath"/>
<result column="mould_sm_id" jdbcType="VARCHAR" property="mouldSmId"/>
<result column="status" jdbcType="INTEGER" property="status"/>
<result column="puton_date" jdbcType="TIMESTAMP" property="putonDate"/>
<result column="example_video_id" jdbcType="VARCHAR" property="exampleVideoId"/>
<result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
</resultMap>
@@ -30,7 +31,7 @@
<sql id="allColumns">
`id`, `tenant_id`, `parent_tenant_id`, `type`, `cover_img`, `cover_picture`, `detail_picture`,
`title`, `sub_title`, `sex`, `age`, `colour`, `scene_sign`, `sale_price`, `price`,
`send_type`, `detail`, `remark`, `mould_path`, `status`, `puton_date`, `create_date`, `update_date`
`send_type`, `detail`, `remark`, `mould_sm_id`, `status`, `puton_date`,`example_video_id`, `create_date`, `update_date`
</sql>

<sql id="dynamicWhereConditions">
@@ -123,7 +124,7 @@
select
`id`, `type`, `cover_img`, `cover_picture`,
`title`, `sub_title`, `sex`, `age`, `colour`, `scene_sign`, `sale_price`, `price`,
`send_type`, `mould_path`, `status`, `create_date`, `update_date`
`send_type`, `mould_sm_id`, `status`,`example_video_id`, `create_date`, `update_date`
from mould_patch
<include refid="dynamicWhereConditions"/>
</select>


+ 36
- 15
suimangVideo/pom.xml View File

@@ -25,20 +25,41 @@
<dependencies>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-core</artifactId>
<version>4.5.1</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-vod</artifactId>
<version>2.15.11</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.62</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-core</artifactId>
<version>4.5.1</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-vod</artifactId>
<version>2.15.11</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.62</version>
</dependency>

<!-- <dependency>-->
<!-- <groupId>com.optimaize.languagedetector</groupId>-->
<!-- <artifactId>language-detector</artifactId>-->
<!-- <version>0.6</version>-->
<!-- </dependency>-->

<!-- https://mvnrepository.com/artifact/com.cybozu.labs/langdetect -->
<dependency>
<groupId>com.cybozu.labs</groupId>
<artifactId>langdetect</artifactId>
<version>1.1-20120112</version>
</dependency>

<!-- https://mvnrepository.com/artifact/net.arnx/jsonic -->
<dependency>
<groupId>net.arnx</groupId>
<artifactId>jsonic</artifactId>
<version>1.3.10</version>
</dependency>

</dependencies>
</project>

+ 51
- 0
suimangVideo/src/main/java/com/iformall/language/LanguageDetect.java View File

@@ -0,0 +1,51 @@
package com.iformall.language;

import com.cybozu.labs.langdetect.Detector;
import com.cybozu.labs.langdetect.DetectorFactory;
import com.cybozu.labs.langdetect.LangDetectException;
import lombok.extern.slf4j.Slf4j;

@Slf4j
public class LanguageDetect {

private static Detector detect = null;

private static void initDetector(){
if(detect == null){
try {
DetectorFactory.loadProfile(Thread.currentThread().getContextClassLoader().getResource("profiles").getPath());
detect = DetectorFactory.create();
} catch (LangDetectException e) {
e.printStackTrace();
log.error("语言检测初始化错误。");
}
}
}

public static String detect(String str){
if(detect == null){
initDetector();
}
if(detect == null){
return null;
}
detect.append(str);
// try {
// detect.getProbabilities();
// } catch (LangDetectException e) {
// e.printStackTrace();
// }

try {
return detect.detect();
} catch (LangDetectException e) {
e.printStackTrace();
log.error("语言检测错误。");
}
return null;
}

public static void main(String[] args) {
System.out.println(detect("aa"));
}
}

+ 60
- 0
suimangVideo/src/main/java/com/iformall/language/LanguageExcutor.java View File

@@ -0,0 +1,60 @@
//package com.iformall.language;
//
//import com.google.common.base.Optional;
//import com.optimaize.langdetect.LanguageDetector;
//import com.optimaize.langdetect.LanguageDetectorBuilder;
//import com.optimaize.langdetect.i18n.LdLocale;
//import com.optimaize.langdetect.ngram.NgramExtractors;
//import com.optimaize.langdetect.profiles.LanguageProfile;
//import com.optimaize.langdetect.profiles.LanguageProfileReader;
//import com.optimaize.langdetect.text.CommonTextObjectFactories;
//import com.optimaize.langdetect.text.TextObject;
//import com.optimaize.langdetect.text.TextObjectFactory;
//import lombok.extern.slf4j.Slf4j;
//
//import java.io.IOException;
//import java.util.List;
//
//@Slf4j
//public class LanguageExcutor {
//
// private static LanguageDetector languageDetector = null;
//
// private static void initLanguageDetector(){
// List<LanguageProfile> languageProfiles = null;
// try {
// //加载所有内置语种
// languageProfiles = new LanguageProfileReader().readAllBuiltIn();
// // 创建识别器
// languageDetector = LanguageDetectorBuilder.create(NgramExtractors.standard()).withProfiles(languageProfiles).build();
// } catch (IOException e) {
// e.printStackTrace();
// }
// }
//
// public static String detect(String str){
// if(languageDetector == null){
// initLanguageDetector();
// }
// if(languageDetector == null){
// return null;
// }
// // 创建文本对象工厂
// TextObjectFactory textObjectFactory = CommonTextObjectFactories.forDetectingOnLargeText();
// TextObject textObject = textObjectFactory.forText(str);
// Optional<LdLocale> lang = languageDetector.detect(textObject);
// if (!lang.isPresent()) {
// log.error("语种识别失败,可能文本太短或混合了多国语言");
// }
// return lang.get().toString();
// }
//
//
//
// public static void main(String[] args) {
//
// String res = detect("语种识别失败,可能文本太短或混合了多国语言 aa");
//
// System.out.println(res);
// }
//}

+ 1
- 0
suimangVideo/src/main/resources/profiles/af
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/ar
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/bg
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/bn
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/cs
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/da
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/de
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/el
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/en
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/es
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/et
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/fa
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/fi
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/fr
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/gu
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/he
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/hi
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/hr
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/hu
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/id
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/it
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/ja
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/kn
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/ko
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/lt
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/lv
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/mk
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/ml
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/mr
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/ne
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/nl
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/no
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/pa
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/pl
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/pt
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/ro
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/ru
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/sk
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/sl
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/so
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/sq
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/sv
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/sw
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/ta
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/te
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/th
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/tl
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/tr
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/uk
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/ur
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/vi
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/zh-cn
File diff suppressed because it is too large
View File


+ 1
- 0
suimangVideo/src/main/resources/profiles/zh-tw
File diff suppressed because it is too large
View File


Loading…
Cancel
Save