Prechádzať zdrojové kódy

Merge remote-tracking branch 'origin/test' into test

# Conflicts:
#	module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java
xuzuoyun 5 rokov pred
rodič
commit
7a343bf675

BIN
lib/jave-1.0.2.jar


+ 7 - 0
module-common/pom.xml

@@ -23,6 +23,13 @@
     </properties>
 
     <dependencies>
+
+        <dependency>
+            <groupId>thirtpart</groupId>
+            <artifactId>jave</artifactId>
+            <version>1.0</version>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

+ 5 - 1
module-common/src/main/java/cn/com/ctop/common/module/service/IMaterialInfoService.java

@@ -26,5 +26,9 @@ public interface IMaterialInfoService extends IService<MaterialInfo> {
 
     String getRoleCodeByUserId(String userId);
 
-    public void watermarkVideo(String materialId,Integer videoWatermarkTemplateId,String userId);
+    void watermarkVideo(String materialId, Integer videoWatermarkTemplateId, String userId);
+
+    void getFile(MaterialInfo materialInfo);
+
+
 }

+ 2 - 2
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java

@@ -14,9 +14,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.aliyuncs.mts.model.v20140618.QueryJobListResponse;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
- // import it.sauronsoftware.jave.Encoder;
+import it.sauronsoftware.jave.Encoder;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -65,6 +64,7 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
         materialInfo.setWatermarkCode(jobId);
         this.updateById(materialInfo);
     }
+
     @Override
     public MaterialInfo getMaterialInfoByCode(String code) {
         QueryWrapper<MaterialInfo> queryWrapper = new QueryWrapper<>();

+ 15 - 0
pom.xml

@@ -68,8 +68,23 @@
             <url>https://packages.atlassian.com/maven-3rdparty/</url>
         </repository>
 
+        <repository>
+            <id>ctop</id>
+            <url>http://39.106.184.70:8081/repository/3rd_part</url>
+        </repository>
     </repositories>
 
+    <pluginRepositories>
+        <pluginRepository>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <id>ctop</id>
+            <url>http://39.106.184.70:8081/repository/3rd_part</url>
+        </pluginRepository>
+    </pluginRepositories>
+
+
     <properties>
         <jeecgboot.common.version>2.0.2</jeecgboot.common.version>
         <java.version>1.8</java.version>