소스 검색

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

syh 5 년 전
부모
커밋
5c378694a7
26개의 변경된 파일1452개의 추가작업 그리고 129개의 파일을 삭제
  1. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CallbackController.java
  2. 4 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java
  3. 244 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/VideoMergeTaskController.java
  4. 244 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/VideoPartController.java
  5. 243 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/VideoWatermarkTaskController.java
  6. 243 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/VideoWatermarkTemplateController.java
  7. 61 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/WatermarkVideoJob.java
  8. 7 7
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/authc/ShiroRealm.java
  9. 63 53
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/authc/aop/JwtFilter.java
  10. 1 1
      jeecg-boot-module-system/src/main/resources/jeecg/jeecg_config.properties
  11. BIN
      lib/jave-1.0.2.jar
  12. 7 0
      module-common/pom.xml
  13. 61 0
      module-common/src/main/java/cn/com/ctop/common/module/entity/VideoWatermarkTask.java
  14. 61 0
      module-common/src/main/java/cn/com/ctop/common/module/entity/VideoWatermarkTemplate.java
  15. 17 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/VideoWatermarkTaskMapper.java
  16. 17 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/VideoWatermarkTemplateMapper.java
  17. 5 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/VideoWatermarkTaskMapper.xml
  18. 5 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/VideoWatermarkTemplateMapper.xml
  19. 6 0
      module-common/src/main/java/cn/com/ctop/common/module/service/IMaterialInfoService.java
  20. 14 0
      module-common/src/main/java/cn/com/ctop/common/module/service/IVideoWatermarkTaskService.java
  21. 14 0
      module-common/src/main/java/cn/com/ctop/common/module/service/IVideoWatermarkTemplateService.java
  22. 79 63
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java
  23. 19 0
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/VideoWatermarkTaskServiceImpl.java
  24. 19 0
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/VideoWatermarkTemplateServiceImpl.java
  25. 2 2
      module-common/src/main/java/cn/com/ctop/common/module/utils/MpsUtils.java
  26. 15 0
      pom.xml

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CallbackController.java

@@ -154,7 +154,7 @@ public class CallbackController {
                     Long projectId = json.getLong("projectId");
 
                     CtopOauthToken topOauthToken = new CtopOauthToken();
-                    topOauthToken.setId(accountId + "");
+                    topOauthToken.setId(String.valueOf(accountId));
                     topOauthToken.setAccountId(accountId);
                     topOauthToken.setMediaId("2");
                     topOauthToken.setAdvertiserId(advertiserId);

+ 4 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java

@@ -179,13 +179,11 @@ public class ProjectController {
 
             projectService.save(project);
 
-
             Long id = project.getId();
             for (Map.Entry<String, String> projectMember : memberMap.entrySet()) {
 
                 String userId = projectMember.getKey();
                 String userName = projectMember.getValue();
-
                 Map<String, Object> map = new HashMap<>();
                 map.put("project_id", id);
                 map.put("user_id", userId);
@@ -228,6 +226,10 @@ public class ProjectController {
             project.setResponsibleName(sysUser.getRealname());
         }
 
+        SysUser designSysUser = sysUserService.getById(project.getDesignResponsibleId());
+        if (!Check.isNull(designSysUser)) {
+            project.setDesignResponsibleName(designSysUser.getRealname());
+        }
         Project projectEntity = projectService.getById(project.getId());
         if (projectEntity == null) {
             result.error500("未找到对应实体");

+ 244 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/VideoMergeTaskController.java

@@ -0,0 +1,244 @@
+package org.jeecg.modules.ctop.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.com.ctop.common.module.entity.VideoMergeTask;
+import cn.com.ctop.common.module.service.IVideoMergeTaskService;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.util.oConvertUtils;
+import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+ /**
+ * 视频合成任务
+ * @author jeecg-boot
+ * @date   2019-12-16
+ * @version V1.0
+ */
+@Slf4j
+@Api(tags="视频合成任务")
+@RestController
+@RequestMapping("/ctop/videoMergeTask")
+public class VideoMergeTaskController {
+	@Autowired
+	private IVideoMergeTaskService videoMergeTaskService;
+	
+	/**
+	  * 分页列表查询
+	 * @param videoMergeTask
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "视频合成任务-分页列表查询")
+	@ApiOperation(value="视频合成任务-分页列表查询", notes="视频合成任务-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<VideoMergeTask>> queryPageList(VideoMergeTask videoMergeTask,
+													   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													   HttpServletRequest req) {
+		Result<IPage<VideoMergeTask>> result = new Result<IPage<VideoMergeTask>>();
+		QueryWrapper<VideoMergeTask> queryWrapper = QueryGenerator.initQueryWrapper(videoMergeTask, req.getParameterMap());
+		Page<VideoMergeTask> page = new Page<VideoMergeTask>(pageNo, pageSize);
+		IPage<VideoMergeTask> pageList = videoMergeTaskService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+	
+	/**
+	  *   添加
+	 * @param videoMergeTask
+	 * @return
+	 */
+	@AutoLog(value = "视频合成任务-添加")
+	@ApiOperation(value="视频合成任务-添加", notes="视频合成任务-添加")
+	@PostMapping(value = "/add")
+	public Result<VideoMergeTask> add(@RequestBody VideoMergeTask videoMergeTask) {
+		Result<VideoMergeTask> result = new Result<VideoMergeTask>();
+		try {
+			videoMergeTaskService.save(videoMergeTask);
+			result.success("添加成功!");
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			result.error500("操作失败");
+		}
+		return result;
+	}
+	
+	/**
+	  *  编辑
+	 * @param videoMergeTask
+	 * @return
+	 */
+	@AutoLog(value = "视频合成任务-编辑")
+	@ApiOperation(value="视频合成任务-编辑", notes="视频合成任务-编辑")
+	@PutMapping(value = "/edit")
+	public Result<VideoMergeTask> edit(@RequestBody VideoMergeTask videoMergeTask) {
+		Result<VideoMergeTask> result = new Result<VideoMergeTask>();
+		VideoMergeTask videoMergeTaskEntity = videoMergeTaskService.getById(videoMergeTask.getId());
+		if(videoMergeTaskEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = videoMergeTaskService.updateById(videoMergeTask);
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *   通过id删除
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "视频合成任务-通过id删除")
+	@ApiOperation(value="视频合成任务-通过id删除", notes="视频合成任务-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		try {
+			videoMergeTaskService.removeById(id);
+		} catch (Exception e) {
+			log.error("删除失败",e.getMessage());
+			return Result.error("删除失败!");
+		}
+		return Result.ok("删除成功!");
+	}
+	
+	/**
+	  *  批量删除
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "视频合成任务-批量删除")
+	@ApiOperation(value="视频合成任务-批量删除", notes="视频合成任务-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<VideoMergeTask> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<VideoMergeTask> result = new Result<VideoMergeTask>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别!");
+		}else {
+			this.videoMergeTaskService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+	
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "视频合成任务-通过id查询")
+	@ApiOperation(value="视频合成任务-通过id查询", notes="视频合成任务-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<VideoMergeTask> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<VideoMergeTask> result = new Result<VideoMergeTask>();
+		VideoMergeTask videoMergeTask = videoMergeTaskService.getById(id);
+		if(videoMergeTask==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(videoMergeTask);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+  /**
+      * 导出excel
+   *
+   * @param request
+   * @param response
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<VideoMergeTask> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (oConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              VideoMergeTask videoMergeTask = JSON.parseObject(deString, VideoMergeTask.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(videoMergeTask, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<VideoMergeTask> pageList = videoMergeTaskService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "视频合成任务列表");
+      mv.addObject(NormalExcelConstants.CLASS, VideoMergeTask.class);
+      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("视频合成任务列表数据", "导出人:Jeecg", "导出信息"));
+      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+      return mv;
+  }
+
+  /**
+      * 通过excel导入数据
+   *
+   * @param request
+   * @param response
+   * @return
+   */
+  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+          MultipartFile file = entity.getValue();
+          ImportParams params = new ImportParams();
+          params.setTitleRows(2);
+          params.setHeadRows(1);
+          params.setNeedSave(true);
+          try {
+              List<VideoMergeTask> listVideoMergeTasks = ExcelImportUtil.importExcel(file.getInputStream(), VideoMergeTask.class, params);
+              videoMergeTaskService.saveBatch(listVideoMergeTasks);
+              return Result.ok("文件导入成功!数据行数:" + listVideoMergeTasks.size());
+          } catch (Exception e) {
+              log.error(e.getMessage(),e);
+              return Result.error("文件导入失败:"+e.getMessage());
+          } finally {
+              try {
+                  file.getInputStream().close();
+              } catch (IOException e) {
+                  e.printStackTrace();
+              }
+          }
+      }
+      return Result.ok("文件导入失败!");
+  }
+
+}

+ 244 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/VideoPartController.java

@@ -0,0 +1,244 @@
+package org.jeecg.modules.ctop.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.com.ctop.common.module.entity.VideoPart;
+import cn.com.ctop.common.module.service.IVideoPartService;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.util.oConvertUtils;
+import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+ /**
+ * 视频片段
+ * @author jeecg-boot
+ * @date   2019-12-16
+ * @version V1.0
+ */
+@Slf4j
+@Api(tags="视频片段")
+@RestController
+@RequestMapping("/ctop/videoPart")
+public class VideoPartController {
+	@Autowired
+	private IVideoPartService videoPartService;
+	
+	/**
+	  * 分页列表查询
+	 * @param videoPart
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "视频片段-分页列表查询")
+	@ApiOperation(value="视频片段-分页列表查询", notes="视频片段-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<VideoPart>> queryPageList(VideoPart videoPart,
+												  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+												  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+												  HttpServletRequest req) {
+		Result<IPage<VideoPart>> result = new Result<IPage<VideoPart>>();
+		QueryWrapper<VideoPart> queryWrapper = QueryGenerator.initQueryWrapper(videoPart, req.getParameterMap());
+		Page<VideoPart> page = new Page<VideoPart>(pageNo, pageSize);
+		IPage<VideoPart> pageList = videoPartService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+	
+	/**
+	  *   添加
+	 * @param videoPart
+	 * @return
+	 */
+	@AutoLog(value = "视频片段-添加")
+	@ApiOperation(value="视频片段-添加", notes="视频片段-添加")
+	@PostMapping(value = "/add")
+	public Result<VideoPart> add(@RequestBody VideoPart videoPart) {
+		Result<VideoPart> result = new Result<VideoPart>();
+		try {
+			videoPartService.save(videoPart);
+			result.success("添加成功!");
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			result.error500("操作失败");
+		}
+		return result;
+	}
+	
+	/**
+	  *  编辑
+	 * @param videoPart
+	 * @return
+	 */
+	@AutoLog(value = "视频片段-编辑")
+	@ApiOperation(value="视频片段-编辑", notes="视频片段-编辑")
+	@PutMapping(value = "/edit")
+	public Result<VideoPart> edit(@RequestBody VideoPart videoPart) {
+		Result<VideoPart> result = new Result<VideoPart>();
+		VideoPart videoPartEntity = videoPartService.getById(videoPart.getId());
+		if(videoPartEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = videoPartService.updateById(videoPart);
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *   通过id删除
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "视频片段-通过id删除")
+	@ApiOperation(value="视频片段-通过id删除", notes="视频片段-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		try {
+			videoPartService.removeById(id);
+		} catch (Exception e) {
+			log.error("删除失败",e.getMessage());
+			return Result.error("删除失败!");
+		}
+		return Result.ok("删除成功!");
+	}
+	
+	/**
+	  *  批量删除
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "视频片段-批量删除")
+	@ApiOperation(value="视频片段-批量删除", notes="视频片段-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<VideoPart> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<VideoPart> result = new Result<VideoPart>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别!");
+		}else {
+			this.videoPartService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+	
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "视频片段-通过id查询")
+	@ApiOperation(value="视频片段-通过id查询", notes="视频片段-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<VideoPart> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<VideoPart> result = new Result<VideoPart>();
+		VideoPart videoPart = videoPartService.getById(id);
+		if(videoPart==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(videoPart);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+  /**
+      * 导出excel
+   *
+   * @param request
+   * @param response
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<VideoPart> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (oConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              VideoPart videoPart = JSON.parseObject(deString, VideoPart.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(videoPart, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<VideoPart> pageList = videoPartService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "视频片段列表");
+      mv.addObject(NormalExcelConstants.CLASS, VideoPart.class);
+      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("视频片段列表数据", "导出人:Jeecg", "导出信息"));
+      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+      return mv;
+  }
+
+  /**
+      * 通过excel导入数据
+   *
+   * @param request
+   * @param response
+   * @return
+   */
+  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+          MultipartFile file = entity.getValue();
+          ImportParams params = new ImportParams();
+          params.setTitleRows(2);
+          params.setHeadRows(1);
+          params.setNeedSave(true);
+          try {
+              List<VideoPart> listVideoParts = ExcelImportUtil.importExcel(file.getInputStream(), VideoPart.class, params);
+              videoPartService.saveBatch(listVideoParts);
+              return Result.ok("文件导入成功!数据行数:" + listVideoParts.size());
+          } catch (Exception e) {
+              log.error(e.getMessage(),e);
+              return Result.error("文件导入失败:"+e.getMessage());
+          } finally {
+              try {
+                  file.getInputStream().close();
+              } catch (IOException e) {
+                  e.printStackTrace();
+              }
+          }
+      }
+      return Result.ok("文件导入失败!");
+  }
+
+}

+ 243 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/VideoWatermarkTaskController.java

@@ -0,0 +1,243 @@
+package org.jeecg.modules.ctop.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.util.oConvertUtils;
+import cn.com.ctop.common.module.entity.VideoWatermarkTask;
+import cn.com.ctop.common.module.service.IVideoWatermarkTaskService;
+import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+ /**
+ * 水印任务表
+ * @author jeecg-boot
+ * @date   2019-12-20
+ * @version V1.0
+ */
+@Slf4j
+@Api(tags="水印任务表")
+@RestController
+@RequestMapping("/ctop/videoWatermarkTask")
+public class VideoWatermarkTaskController {
+	@Autowired
+	private IVideoWatermarkTaskService videoWatermarkTaskService;
+	
+	/**
+	  * 分页列表查询
+	 * @param videoWatermarkTask
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "水印任务表-分页列表查询")
+	@ApiOperation(value="水印任务表-分页列表查询", notes="水印任务表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<VideoWatermarkTask>> queryPageList(VideoWatermarkTask videoWatermarkTask,
+									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									  HttpServletRequest req) {
+		Result<IPage<VideoWatermarkTask>> result = new Result<IPage<VideoWatermarkTask>>();
+		QueryWrapper<VideoWatermarkTask> queryWrapper = QueryGenerator.initQueryWrapper(videoWatermarkTask, req.getParameterMap());
+		Page<VideoWatermarkTask> page = new Page<VideoWatermarkTask>(pageNo, pageSize);
+		IPage<VideoWatermarkTask> pageList = videoWatermarkTaskService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+	
+	/**
+	  *   添加
+	 * @param videoWatermarkTask
+	 * @return
+	 */
+	@AutoLog(value = "水印任务表-添加")
+	@ApiOperation(value="水印任务表-添加", notes="水印任务表-添加")
+	@PostMapping(value = "/add")
+	public Result<VideoWatermarkTask> add(@RequestBody VideoWatermarkTask videoWatermarkTask) {
+		Result<VideoWatermarkTask> result = new Result<VideoWatermarkTask>();
+		try {
+			videoWatermarkTaskService.save(videoWatermarkTask);
+			result.success("添加成功!");
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			result.error500("操作失败");
+		}
+		return result;
+	}
+	
+	/**
+	  *  编辑
+	 * @param videoWatermarkTask
+	 * @return
+	 */
+	@AutoLog(value = "水印任务表-编辑")
+	@ApiOperation(value="水印任务表-编辑", notes="水印任务表-编辑")
+	@PutMapping(value = "/edit")
+	public Result<VideoWatermarkTask> edit(@RequestBody VideoWatermarkTask videoWatermarkTask) {
+		Result<VideoWatermarkTask> result = new Result<VideoWatermarkTask>();
+		VideoWatermarkTask videoWatermarkTaskEntity = videoWatermarkTaskService.getById(videoWatermarkTask.getId());
+		if(videoWatermarkTaskEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = videoWatermarkTaskService.updateById(videoWatermarkTask);
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *   通过id删除
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "水印任务表-通过id删除")
+	@ApiOperation(value="水印任务表-通过id删除", notes="水印任务表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		try {
+			videoWatermarkTaskService.removeById(id);
+		} catch (Exception e) {
+			log.error("删除失败",e.getMessage());
+			return Result.error("删除失败!");
+		}
+		return Result.ok("删除成功!");
+	}
+	
+	/**
+	  *  批量删除
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "水印任务表-批量删除")
+	@ApiOperation(value="水印任务表-批量删除", notes="水印任务表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<VideoWatermarkTask> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<VideoWatermarkTask> result = new Result<VideoWatermarkTask>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别!");
+		}else {
+			this.videoWatermarkTaskService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+	
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "水印任务表-通过id查询")
+	@ApiOperation(value="水印任务表-通过id查询", notes="水印任务表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<VideoWatermarkTask> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<VideoWatermarkTask> result = new Result<VideoWatermarkTask>();
+		VideoWatermarkTask videoWatermarkTask = videoWatermarkTaskService.getById(id);
+		if(videoWatermarkTask==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(videoWatermarkTask);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+  /**
+      * 导出excel
+   *
+   * @param request
+   * @param response
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<VideoWatermarkTask> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (oConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              VideoWatermarkTask videoWatermarkTask = JSON.parseObject(deString, VideoWatermarkTask.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(videoWatermarkTask, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<VideoWatermarkTask> pageList = videoWatermarkTaskService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "水印任务表列表");
+      mv.addObject(NormalExcelConstants.CLASS, VideoWatermarkTask.class);
+      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("水印任务表列表数据", "导出人:Jeecg", "导出信息"));
+      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+      return mv;
+  }
+
+  /**
+      * 通过excel导入数据
+   *
+   * @param request
+   * @param response
+   * @return
+   */
+  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+          MultipartFile file = entity.getValue();
+          ImportParams params = new ImportParams();
+          params.setTitleRows(2);
+          params.setHeadRows(1);
+          params.setNeedSave(true);
+          try {
+              List<VideoWatermarkTask> listVideoWatermarkTasks = ExcelImportUtil.importExcel(file.getInputStream(), VideoWatermarkTask.class, params);
+              videoWatermarkTaskService.saveBatch(listVideoWatermarkTasks);
+              return Result.ok("文件导入成功!数据行数:" + listVideoWatermarkTasks.size());
+          } catch (Exception e) {
+              log.error(e.getMessage(),e);
+              return Result.error("文件导入失败:"+e.getMessage());
+          } finally {
+              try {
+                  file.getInputStream().close();
+              } catch (IOException e) {
+                  e.printStackTrace();
+              }
+          }
+      }
+      return Result.ok("文件导入失败!");
+  }
+
+}

+ 243 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/VideoWatermarkTemplateController.java

@@ -0,0 +1,243 @@
+package org.jeecg.modules.ctop.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.util.oConvertUtils;
+import cn.com.ctop.common.module.entity.VideoWatermarkTemplate;
+import cn.com.ctop.common.module.service.IVideoWatermarkTemplateService;
+import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+ /**
+ * 水印模板
+ * @author jeecg-boot
+ * @date   2019-12-20
+ * @version V1.0
+ */
+@Slf4j
+@Api(tags="水印模板")
+@RestController
+@RequestMapping("/ctop/videoWatermarkTemplate")
+public class VideoWatermarkTemplateController {
+	@Autowired
+	private IVideoWatermarkTemplateService videoWatermarkTemplateService;
+	
+	/**
+	  * 分页列表查询
+	 * @param videoWatermarkTemplate
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "水印模板-分页列表查询")
+	@ApiOperation(value="水印模板-分页列表查询", notes="水印模板-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<VideoWatermarkTemplate>> queryPageList(VideoWatermarkTemplate videoWatermarkTemplate,
+									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									  HttpServletRequest req) {
+		Result<IPage<VideoWatermarkTemplate>> result = new Result<IPage<VideoWatermarkTemplate>>();
+		QueryWrapper<VideoWatermarkTemplate> queryWrapper = QueryGenerator.initQueryWrapper(videoWatermarkTemplate, req.getParameterMap());
+		Page<VideoWatermarkTemplate> page = new Page<VideoWatermarkTemplate>(pageNo, pageSize);
+		IPage<VideoWatermarkTemplate> pageList = videoWatermarkTemplateService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+	
+	/**
+	  *   添加
+	 * @param videoWatermarkTemplate
+	 * @return
+	 */
+	@AutoLog(value = "水印模板-添加")
+	@ApiOperation(value="水印模板-添加", notes="水印模板-添加")
+	@PostMapping(value = "/add")
+	public Result<VideoWatermarkTemplate> add(@RequestBody VideoWatermarkTemplate videoWatermarkTemplate) {
+		Result<VideoWatermarkTemplate> result = new Result<VideoWatermarkTemplate>();
+		try {
+			videoWatermarkTemplateService.save(videoWatermarkTemplate);
+			result.success("添加成功!");
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			result.error500("操作失败");
+		}
+		return result;
+	}
+	
+	/**
+	  *  编辑
+	 * @param videoWatermarkTemplate
+	 * @return
+	 */
+	@AutoLog(value = "水印模板-编辑")
+	@ApiOperation(value="水印模板-编辑", notes="水印模板-编辑")
+	@PutMapping(value = "/edit")
+	public Result<VideoWatermarkTemplate> edit(@RequestBody VideoWatermarkTemplate videoWatermarkTemplate) {
+		Result<VideoWatermarkTemplate> result = new Result<VideoWatermarkTemplate>();
+		VideoWatermarkTemplate videoWatermarkTemplateEntity = videoWatermarkTemplateService.getById(videoWatermarkTemplate.getId());
+		if(videoWatermarkTemplateEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = videoWatermarkTemplateService.updateById(videoWatermarkTemplate);
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *   通过id删除
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "水印模板-通过id删除")
+	@ApiOperation(value="水印模板-通过id删除", notes="水印模板-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		try {
+			videoWatermarkTemplateService.removeById(id);
+		} catch (Exception e) {
+			log.error("删除失败",e.getMessage());
+			return Result.error("删除失败!");
+		}
+		return Result.ok("删除成功!");
+	}
+	
+	/**
+	  *  批量删除
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "水印模板-批量删除")
+	@ApiOperation(value="水印模板-批量删除", notes="水印模板-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<VideoWatermarkTemplate> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<VideoWatermarkTemplate> result = new Result<VideoWatermarkTemplate>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别!");
+		}else {
+			this.videoWatermarkTemplateService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+	
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "水印模板-通过id查询")
+	@ApiOperation(value="水印模板-通过id查询", notes="水印模板-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<VideoWatermarkTemplate> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<VideoWatermarkTemplate> result = new Result<VideoWatermarkTemplate>();
+		VideoWatermarkTemplate videoWatermarkTemplate = videoWatermarkTemplateService.getById(id);
+		if(videoWatermarkTemplate==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(videoWatermarkTemplate);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+  /**
+      * 导出excel
+   *
+   * @param request
+   * @param response
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<VideoWatermarkTemplate> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (oConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              VideoWatermarkTemplate videoWatermarkTemplate = JSON.parseObject(deString, VideoWatermarkTemplate.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(videoWatermarkTemplate, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<VideoWatermarkTemplate> pageList = videoWatermarkTemplateService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "水印模板列表");
+      mv.addObject(NormalExcelConstants.CLASS, VideoWatermarkTemplate.class);
+      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("水印模板列表数据", "导出人:Jeecg", "导出信息"));
+      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+      return mv;
+  }
+
+  /**
+      * 通过excel导入数据
+   *
+   * @param request
+   * @param response
+   * @return
+   */
+  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+          MultipartFile file = entity.getValue();
+          ImportParams params = new ImportParams();
+          params.setTitleRows(2);
+          params.setHeadRows(1);
+          params.setNeedSave(true);
+          try {
+              List<VideoWatermarkTemplate> listVideoWatermarkTemplates = ExcelImportUtil.importExcel(file.getInputStream(), VideoWatermarkTemplate.class, params);
+              videoWatermarkTemplateService.saveBatch(listVideoWatermarkTemplates);
+              return Result.ok("文件导入成功!数据行数:" + listVideoWatermarkTemplates.size());
+          } catch (Exception e) {
+              log.error(e.getMessage(),e);
+              return Result.error("文件导入失败:"+e.getMessage());
+          } finally {
+              try {
+                  file.getInputStream().close();
+              } catch (IOException e) {
+                  e.printStackTrace();
+              }
+          }
+      }
+      return Result.ok("文件导入失败!");
+  }
+
+}

+ 61 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/WatermarkVideoJob.java

@@ -0,0 +1,61 @@
+package org.jeecg.modules.ctop.job;
+
+import cn.com.ctop.common.module.entity.MaterialInfo;
+import cn.com.ctop.common.module.entity.VideoMergeTask;
+import cn.com.ctop.common.module.entity.VideoWatermarkTask;
+import cn.com.ctop.common.module.service.IMaterialInfoService;
+import cn.com.ctop.common.module.service.IVideoMergeTaskService;
+import cn.com.ctop.common.module.service.IVideoWatermarkTaskService;
+import cn.com.ctop.common.module.utils.LoadFileUtil;
+import cn.com.ctop.common.module.utils.MpsUtils;
+import cn.com.ctop.common.module.utils.PropertiesUtils;
+import com.aliyuncs.mts.model.v20140618.QueryJobListResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.jeecg.common.util.DateUtils;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.io.IOException;
+import java.util.List;
+
+public class WatermarkVideoJob implements Job {
+    @Autowired
+    private IVideoWatermarkTaskService videoWaterMarkService;
+    @Autowired
+    private IMaterialInfoService materialInfoService;
+    @Override
+    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
+        QueryWrapper<VideoWatermarkTask> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("status","Submitted","Transcoding");
+        List<VideoWatermarkTask> list = videoWaterMarkService.list(queryWrapper);
+        if(list != null && list.size() > 0){
+            for (VideoWatermarkTask videoWatermarkTask : list){
+                MpsUtils mpsUtils = new MpsUtils();
+                QueryJobListResponse.Job job = mpsUtils.getJobStatus(videoWatermarkTask.getJobId());
+                if (job.getState().equals("TranscodeSuccess")){
+                    String url = "https://ctop-media.oss-cn-beijing.aliyuncs.com/watermark/"+DateUtils.getNowDate("yyyy-MM-dd")+"/"+job.getOutput().getOutputFile().getObject();
+
+                    try {
+                        String localPath = LoadFileUtil.downLoadFromUrl(url, PropertiesUtils.getValue("kuaishou_config", "video_sava_path"));
+//                        String localPath = LoadFileUtil.downLoadFromUrl(url,"D:/video/");
+                        String md5 = LoadFileUtil.getMD5(localPath);
+                        LoadFileUtil.delFile(localPath);
+                        QueryWrapper<MaterialInfo> materialInfoQueryWrapper = new QueryWrapper<>();
+                        materialInfoQueryWrapper.eq("watermark_code",job.getJobId());
+                        MaterialInfo materialInfo = materialInfoService.getOne(materialInfoQueryWrapper);
+                        materialInfo.setWatermarkUrl(url);
+                        materialInfoService.saveOrUpdate(materialInfo);
+                        videoWatermarkTask.setVideoUrl(url);
+                        videoWatermarkTask.setStatus(job.getState());
+                        videoWatermarkTask.setVideoId(materialInfo.getId());
+                        videoWaterMarkService.updateById(videoWatermarkTask);
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+    }
+}

+ 7 - 7
jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/authc/ShiroRealm.java

@@ -83,14 +83,14 @@ public class ShiroRealm extends AuthorizingRealm {
      */
     @Override
     protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken auth) throws AuthenticationException {
-        log.debug("————身份认证————");
-        String token = (String) auth.getCredentials();
-        if (token == null) {
-            log.error("token为空!");
+        if (!Check.isNull(auth)) {
+            String token = (String) auth.getCredentials();
+            if (token != null) {
+                LoginUser loginUser = this.checkUserTokenIsEffect(token);
+                return new SimpleAuthenticationInfo(loginUser, token, getName());
+            }
         }
-        // 校验token有效性
-        LoginUser loginUser = this.checkUserTokenIsEffect(token);
-        return new SimpleAuthenticationInfo(loginUser, token, getName());
+        return null;
     }
 
     /**

+ 63 - 53
jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/authc/aop/JwtFilter.java

@@ -1,16 +1,16 @@
 package org.jeecg.modules.shiro.authc.aop;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.shiro.authc.AuthenticationException;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.web.filter.authc.BasicHttpAuthenticationFilter;
 import org.jeecg.modules.shiro.authc.JwtToken;
 import org.jeecg.modules.shiro.vo.DefContants;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.RequestMethod;
-import lombok.extern.slf4j.Slf4j;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * @Description: 鉴权登录拦截器
@@ -20,54 +20,64 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 public class JwtFilter extends BasicHttpAuthenticationFilter {
 
-	/**
-	 * 执行登录认证
-	 *
-	 * @param request
-	 * @param response
-	 * @param mappedValue
-	 * @return
-	 */
-	@Override
-	protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) {
-		try {
-			executeLogin(request, response);
-			return true;
-		} catch (Exception e) {
-			throw new AuthenticationException("Token失效,请重新登录", e);
-		}
-	}
+    /**
+     * 执行登录认证
+     *
+     * @param request
+     * @param response
+     * @param mappedValue
+     * @return
+     */
+    @Override
+    protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) {
+
+        boolean successful = false;
+        try {
+            successful = executeLogin(request, response);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return successful;
+
+    }
+
+    /**
+     *
+     */
+    @Override
+    protected boolean executeLogin(ServletRequest request, ServletResponse response) throws Exception {
+
+        try {
+            HttpServletRequest httpServletRequest = (HttpServletRequest) request;
+            String token = httpServletRequest.getHeader(DefContants.X_ACCESS_TOKEN);
+            JwtToken jwtToken = new JwtToken(token);
+            // 提交给realm进行登入,如果错误他会抛出异常并被捕获
+            getSubject(request, response).login(jwtToken);
+            // 如果没有抛出异常则代表登入成功,返回true
+            return true;
+        } catch (Exception e) {
+            log.error("登录失败");
 
-	/**
-	 *
-	 */
-	@Override
-	protected boolean executeLogin(ServletRequest request, ServletResponse response) throws Exception {
-		HttpServletRequest httpServletRequest = (HttpServletRequest) request;
-		String token = httpServletRequest.getHeader(DefContants.X_ACCESS_TOKEN);
+        }
+        return false;
 
-		JwtToken jwtToken = new JwtToken(token);
-		// 提交给realm进行登入,如果错误他会抛出异常并被捕获
-		getSubject(request, response).login(jwtToken);
-		// 如果没有抛出异常则代表登入成功,返回true
-		return true;
-	}
+    }
 
-	/**
-	 * 对跨域提供支持
-	 */
-	@Override
-	protected boolean preHandle(ServletRequest request, ServletResponse response) throws Exception {
-		HttpServletRequest httpServletRequest = (HttpServletRequest) request;
-		HttpServletResponse httpServletResponse = (HttpServletResponse) response;
-		httpServletResponse.setHeader("Access-control-Allow-Origin", httpServletRequest.getHeader("Origin"));
-		httpServletResponse.setHeader("Access-Control-Allow-Methods", "GET,POST,OPTIONS,PUT,DELETE");
-		httpServletResponse.setHeader("Access-Control-Allow-Headers", httpServletRequest.getHeader("Access-Control-Request-Headers"));
-		// 跨域时会首先发送一个option请求,这里我们给option请求直接返回正常状态
-		if (httpServletRequest.getMethod().equals(RequestMethod.OPTIONS.name())) {
-			httpServletResponse.setStatus(HttpStatus.OK.value());
-			return false;
-		}
-		return super.preHandle(request, response);
-	}
+    /**
+     * 对跨域提供支持
+     */
+    @Override
+    protected boolean preHandle(ServletRequest request, ServletResponse response) throws Exception {
+        HttpServletRequest httpServletRequest = (HttpServletRequest) request;
+        HttpServletResponse httpServletResponse = (HttpServletResponse) response;
+        httpServletResponse.setHeader("Access-control-Allow-Origin", httpServletRequest.getHeader("Origin"));
+        httpServletResponse.setHeader("Access-Control-Allow-Methods", "GET,POST,OPTIONS,PUT,DELETE");
+        httpServletResponse.setHeader("Access-Control-Allow-Headers", httpServletRequest.getHeader("Access-Control-Request-Headers"));
+        // 跨域时会首先发送一个option请求,这里我们给option请求直接返回正常状态
+        if (httpServletRequest.getMethod().equals(RequestMethod.OPTIONS.name())) {
+            httpServletResponse.setStatus(HttpStatus.OK.value());
+            return false;
+        }
+        return super.preHandle(request, response);
+    }
 }

+ 1 - 1
jeecg-boot-module-system/src/main/resources/jeecg/jeecg_config.properties

@@ -1,7 +1,7 @@
 #code_generate_project_path
 project_path=D:\\module
 #bussi_package[User defined]
-bussi_package=cn.com.ctop.crawler.modules
+bussi_package=cn.com.ctop
 #default code path
 #source_root_package=src
 #webroot_package=WebRoot

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>

+ 61 - 0
module-common/src/main/java/cn/com/ctop/common/module/entity/VideoWatermarkTask.java

@@ -0,0 +1,61 @@
+package cn.com.ctop.common.module.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * 水印任务表
+ * @author jeecg-boot
+ * @date   2019-12-20
+ * @version V1.0
+ */
+@Data
+@TableName("ctop_video_watermark_task")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="ctop_video_watermark_task对象", description="水印任务表")
+public class VideoWatermarkTask {
+    
+	/**id*/
+	@TableId(type = IdType.UUID)
+    @ApiModelProperty(value = "id")
+	private String id;
+	/**userId*/
+	@Excel(name = "userId", width = 15)
+    @ApiModelProperty(value = "userId")
+	private String userId;
+	/**jobId*/
+	@Excel(name = "jobId", width = 15)
+    @ApiModelProperty(value = "jobId")
+	private String jobId;
+	/**videoId*/
+	@Excel(name = "videoId", width = 15)
+    @ApiModelProperty(value = "videoId")
+	private String videoId;
+	/**videoUrl*/
+	@Excel(name = "videoUrl", width = 15)
+    @ApiModelProperty(value = "videoUrl")
+	private String videoUrl;
+	/**status*/
+	@Excel(name = "status", width = 15)
+    @ApiModelProperty(value = "status")
+	private String status;
+	/**createTime*/
+    @ApiModelProperty(value = "createTime")
+	private Date createTime;
+	/**updateTime*/
+    @ApiModelProperty(value = "updateTime")
+	private Date updateTime;
+}

+ 61 - 0
module-common/src/main/java/cn/com/ctop/common/module/entity/VideoWatermarkTemplate.java

@@ -0,0 +1,61 @@
+package cn.com.ctop.common.module.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * 水印模板
+ * @author jeecg-boot
+ * @date   2019-12-20
+ * @version V1.0
+ */
+@Data
+@TableName("ctop_video_watermark_template")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="ctop_video_watermark_template对象", description="水印模板")
+public class VideoWatermarkTemplate {
+    
+	/**id*/
+	@TableId(type = IdType.UUID)
+    @ApiModelProperty(value = "id")
+	private Integer id;
+	/**name*/
+	@Excel(name = "name", width = 15)
+    @ApiModelProperty(value = "name")
+	private String name;
+	/**width*/
+	@Excel(name = "width", width = 15)
+    @ApiModelProperty(value = "width")
+	private Integer width;
+	/**height*/
+	@Excel(name = "height", width = 15)
+    @ApiModelProperty(value = "height")
+	private Integer height;
+	/**templateId*/
+	@Excel(name = "templateId", width = 15)
+    @ApiModelProperty(value = "templateId")
+	private String templateId;
+	/**templatePath*/
+	@Excel(name = "templatePath", width = 15)
+    @ApiModelProperty(value = "templatePath")
+	private String templatePath;
+	/**createTime*/
+    @ApiModelProperty(value = "createTime")
+	private Date createTime;
+	/**updateTime*/
+    @ApiModelProperty(value = "updateTime")
+	private Date updateTime;
+}

+ 17 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/VideoWatermarkTaskMapper.java

@@ -0,0 +1,17 @@
+package cn.com.ctop.common.module.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import cn.com.ctop.common.module.entity.VideoWatermarkTask;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 水印任务表
+ * @author: jeecg-boot
+ * @date:   2019-12-20
+ * @cersion: V1.0
+ */
+public interface VideoWatermarkTaskMapper extends BaseMapper<VideoWatermarkTask> {
+
+}

+ 17 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/VideoWatermarkTemplateMapper.java

@@ -0,0 +1,17 @@
+package cn.com.ctop.common.module.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import cn.com.ctop.common.module.entity.VideoWatermarkTemplate;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 水印模板
+ * @author: jeecg-boot
+ * @date:   2019-12-20
+ * @cersion: V1.0
+ */
+public interface VideoWatermarkTemplateMapper extends BaseMapper<VideoWatermarkTemplate> {
+
+}

+ 5 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/VideoWatermarkTaskMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.com.ctop.common.module.mapper.VideoWatermarkTaskMapper">
+
+</mapper>

+ 5 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/VideoWatermarkTemplateMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.com.ctop.common.module.mapper.VideoWatermarkTemplateMapper">
+
+</mapper>

+ 6 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/IMaterialInfoService.java

@@ -25,4 +25,10 @@ public interface IMaterialInfoService extends IService<MaterialInfo> {
     JSONObject report(String userId);
 
     String getRoleCodeByUserId(String userId);
+
+    void watermarkVideo(String materialId, Integer videoWatermarkTemplateId, String userId);
+
+    void getFile(MaterialInfo materialInfo);
+
+
 }

+ 14 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/IVideoWatermarkTaskService.java

@@ -0,0 +1,14 @@
+package cn.com.ctop.common.module.service;
+
+import cn.com.ctop.common.module.entity.VideoWatermarkTask;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 水印任务表
+ * @author jeecg-boot
+ * @date   2019-12-20
+ * @version V1.0
+ */
+public interface IVideoWatermarkTaskService extends IService<VideoWatermarkTask> {
+
+}

+ 14 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/IVideoWatermarkTemplateService.java

@@ -0,0 +1,14 @@
+package cn.com.ctop.common.module.service;
+
+import cn.com.ctop.common.module.entity.VideoWatermarkTemplate;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 水印模板
+ * @author jeecg-boot
+ * @date   2019-12-20
+ * @version V1.0
+ */
+public interface IVideoWatermarkTemplateService extends IService<VideoWatermarkTemplate> {
+
+}

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

@@ -1,20 +1,20 @@
 package cn.com.ctop.common.module.service.impl;
 
-import cn.com.ctop.common.module.entity.MaterialAscription;
-import cn.com.ctop.common.module.entity.MaterialInfo;
-import cn.com.ctop.common.module.entity.MaterialParameter;
-import cn.com.ctop.common.module.entity.MaterialTag;
+import cn.com.ctop.common.module.entity.*;
 import cn.com.ctop.common.module.mapper.MaterialAscriptionMapper;
 import cn.com.ctop.common.module.mapper.MaterialInfoMapper;
 import cn.com.ctop.common.module.mapper.MaterialParameterMapper;
 import cn.com.ctop.common.module.mapper.MaterialTagMapper;
 import cn.com.ctop.common.module.service.IMaterialInfoService;
+import cn.com.ctop.common.module.service.IVideoWatermarkTaskService;
+import cn.com.ctop.common.module.service.IVideoWatermarkTemplateService;
 import cn.com.ctop.common.module.utils.*;
 import com.alibaba.fastjson.JSONArray;
 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,6 +33,8 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.regex.Pattern;
 
+// import it.sauronsoftware.jave.Encoder;
+
 /**
  * 素材信息
  *
@@ -44,6 +46,26 @@ import java.util.regex.Pattern;
 @Service
 public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, MaterialInfo> implements IMaterialInfoService {
     private static ExecutorService uploadExecutorService = Executors.newFixedThreadPool(5);
+    @Autowired
+    private IVideoWatermarkTemplateService videoWatermarkTemplateService;
+    @Autowired
+    private IVideoWatermarkTaskService videoWatermarkTaskService;
+
+    @Override
+    public void watermarkVideo(String materialId, Integer videoWatermarkTemplateId, String userId) {
+        VideoWatermarkTemplate videoWatermarkTemplate = videoWatermarkTemplateService.getById(videoWatermarkTemplateId);
+        MaterialInfo materialInfo = this.getById(materialId);
+        MpsUtils mpsUtils = new MpsUtils();
+        String jobId = mpsUtils.videoWaterMark(materialInfo.getUrl(), videoWatermarkTemplate.getTemplatePath(), videoWatermarkTemplate.getTemplateId(), videoWatermarkTemplate.getHeight());
+        QueryJobListResponse.Job job = mpsUtils.getJobStatus(jobId);
+        VideoWatermarkTask videoWatermarkTask = new VideoWatermarkTask();
+        videoWatermarkTask.setJobId(jobId);
+        videoWatermarkTask.setUserId(userId);
+        videoWatermarkTask.setStatus(job.getState());
+        videoWatermarkTaskService.save(videoWatermarkTask);
+        materialInfo.setWatermarkCode(jobId);
+        this.updateById(materialInfo);
+    }
 
     @Override
     public MaterialInfo getMaterialInfoByCode(String code) {
@@ -89,7 +111,6 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
     public Map<String, Object> insert(JSONObject jsonObject) {
         Map<String, Object> resultMap = new HashMap<>();
         try {
-            // Boolean isVideo = imgLocation(jsonObject.getString("url"));
             String type = jsonObject.getString("type");
             MaterialInfo info = new MaterialInfo();
             info.setId(jsonObject.getString("code"));
@@ -146,7 +167,7 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
                     }
                 }
             }
-            //  getFile(info);
+            getFile(info);
             ResultMapUtils.setResultMap(resultMap, StatusCode.COMMON_SUCCESS.getCode());
         } catch (Exception e) {
             ResultMapUtils.setResultMap(resultMap, StatusCode.MATERIAL_UPLOAD_FAIL.getCode());
@@ -238,8 +259,6 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
         } catch (Exception e) {
             e.printStackTrace();
         }
-
-
         return json;
     }
 
@@ -252,63 +271,60 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
     @Autowired
     private MaterialParameterMapper materialParameterMapper;
 
-   /* public void getFile(MaterialInfo materialInfo) {
-       *//* uploadExecutorService.submit(new Runnable() {
+    @Override
+    public void getFile(MaterialInfo materialInfo) {
+        uploadExecutorService.submit(new Runnable() {
             @Override
-            public void run() {*//*
-        try {
-            System.err.println("开始获取素材基本信息");
-            System.err.println(materialInfo);
-            if (!Check.isNull(materialInfo)) {
-                String url = materialInfo.getUrl();
-                long l = System.currentTimeMillis();
-                //PropertiesUtils.getValue("kuaishou_config", "video_sava_path")
-                String localUrl = LoadFileUtil.downLoadFromUrl(url, PropertiesUtils.getValue("kuaishou_config", "video_sava_path"));
-                File file = new File(localUrl);
-                it.sauronsoftware.jave.Encoder encoder = new Encoder();
-                *//*try {*//*
-                it.sauronsoftware.jave.MultimediaInfo m = encoder.getInfo(file);
-                long duration = m.getDuration();
-                long secondDuration = duration / 1000;
-                MaterialParameter materialParameter = new MaterialParameter();
-                materialParameter.setMaterialId(materialInfo.getId());
-                // 视频秒数
-                materialParameter.setSecond(secondDuration);
-                // 视频格式
-                materialParameter.setFormat(m.getFormat());
-                // 视频宽
-                materialParameter.setWidth(String.valueOf(m.getVideo().getSize().getWidth()));
-                // 视频高
-                materialParameter.setHeight(String.valueOf(m.getVideo().getSize().getHeight()));
-
-                FileInputStream fis = new FileInputStream(file);
-                FileChannel fc = fis.getChannel();
-                BigDecimal fileSize = new BigDecimal(fc.size());
-                String size = fileSize.divide(new BigDecimal(1048576), 2, RoundingMode.HALF_UP) + "MB";
-                materialParameter.setSize(size);
-
-                Map<String, Object> deleteMap = new HashMap<>();
-                deleteMap.put("material_id", materialInfo.getId());
-                materialParameterMapper.deleteByMap(deleteMap);
-
-                int insert = materialParameterMapper.insert(materialParameter);
-                if (insert > 0) {
-                    log.info("素材基本信息入库完成,用时:{} s", (System.currentTimeMillis() - l) / 1000);
-
-                }
-                System.err.println(2222222);
-               *//* } catch (Exception e) {
+            public void run() {
+                try {
+                    log.info("获取素材基本信息,code:{}", materialInfo.getCode());
+                    if (!Check.isNull(materialInfo)) {
+                        String url = materialInfo.getUrl();
+                        long l = System.currentTimeMillis();
+                        String localUrl = LoadFileUtil.downLoadFromUrl(url, PropertiesUtils.getValue("kuaishou_config", "video_sava_path"));
+                        File file = new File(localUrl);
+                        it.sauronsoftware.jave.Encoder encoder = new Encoder();
+                        try {
+                            it.sauronsoftware.jave.MultimediaInfo m = encoder.getInfo(file);
+                            long duration = m.getDuration();
+                            long secondDuration = duration / 1000;
+                            MaterialParameter materialParameter = new MaterialParameter();
+                            materialParameter.setMaterialId(materialInfo.getId());
+                            // 视频秒数
+                            materialParameter.setSecond(secondDuration);
+                            // 视频格式
+                            materialParameter.setFormat(m.getFormat());
+                            // 视频宽
+                            materialParameter.setWidth(String.valueOf(m.getVideo().getSize().getWidth()));
+                            // 视频高
+                            materialParameter.setHeight(String.valueOf(m.getVideo().getSize().getHeight()));
+                            FileInputStream fis = new FileInputStream(file);
+                            FileChannel fc = fis.getChannel();
+                            BigDecimal fileSize = new BigDecimal(fc.size());
+                            String size = fileSize.divide(new BigDecimal(1048576), 2, RoundingMode.HALF_UP) + "MB";
+                            materialParameter.setSize(size);
+                            materialParameter.setUpdateTime(new Date());
+
+                            Map<String, Object> deleteMap = new HashMap<>();
+                            deleteMap.put("material_id", materialInfo.getId());
+                            materialParameterMapper.deleteByMap(deleteMap);
+                            int insert = materialParameterMapper.insert(materialParameter);
+                            if (insert > 0) {
+                                log.info("素材基本信息入库完成,用时:{} s", (System.currentTimeMillis() - l) / 1000);
+
+                            }
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        } finally {
+                            file.delete();
+                        }
+                    }
+                } catch (Exception e) {
                     e.printStackTrace();
-                } *//**//*finally {
-                    file.delete();
-                }*//*
+                }
             }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-       *//*     }
-        });*//*
-    }*/
+        });
+    }
 
 
 }

+ 19 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/impl/VideoWatermarkTaskServiceImpl.java

@@ -0,0 +1,19 @@
+package cn.com.ctop.common.module.service.impl;
+
+import cn.com.ctop.common.module.entity.VideoWatermarkTask;
+import cn.com.ctop.common.module.mapper.VideoWatermarkTaskMapper;
+import cn.com.ctop.common.module.service.IVideoWatermarkTaskService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 水印任务表
+ * @author jeecg-boot
+ * @date   2019-12-20
+ * @version V1.0
+ */
+@Service
+public class VideoWatermarkTaskServiceImpl extends ServiceImpl<VideoWatermarkTaskMapper, VideoWatermarkTask> implements IVideoWatermarkTaskService {
+
+}

+ 19 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/impl/VideoWatermarkTemplateServiceImpl.java

@@ -0,0 +1,19 @@
+package cn.com.ctop.common.module.service.impl;
+
+import cn.com.ctop.common.module.entity.VideoWatermarkTemplate;
+import cn.com.ctop.common.module.mapper.VideoWatermarkTemplateMapper;
+import cn.com.ctop.common.module.service.IVideoWatermarkTemplateService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 水印模板
+ * @author jeecg-boot
+ * @date   2019-12-20
+ * @version V1.0
+ */
+@Service
+public class VideoWatermarkTemplateServiceImpl extends ServiceImpl<VideoWatermarkTemplateMapper, VideoWatermarkTemplate> implements IVideoWatermarkTemplateService {
+
+}

+ 2 - 2
module-common/src/main/java/cn/com/ctop/common/module/utils/MpsUtils.java

@@ -269,7 +269,7 @@ public class MpsUtils {
         return jobId;
     }
 
-    public String videoWaterMark(String videoPath,String waterMarkPath,String watermarkTemplateId){
+    public String videoWaterMark(String videoPath,String waterMarkPath,String watermarkTemplateId,Integer height){
         String jobId = "";
         IAcsClient client = getClient();
         String pipelineId = getPipelineId(client);
@@ -287,7 +287,7 @@ public class MpsUtils {
         videoWatermark.put("Type", "Image");
         videoWatermark.put("InputFile", videoWatermarkInput);
         videoWatermark.put("ReferPos", "BottomLeft");
-        videoWatermark.put("Height", "240");
+        videoWatermark.put("Height", height);
         videoWatermark.put("Dx", "0");
         videoWatermark.put("Dy", "0");
         String outputOSSObject;

+ 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>