Bladeren bron

Merge branch 'test' of ssh://anderx@git.jishutao.com:55555/jishutao/jitao-server.git into test

anderx 7 jaren geleden
bovenliggende
commit
379e1eaab7

+ 27 - 19
src/main/java/com/goafanti/admin/controller/AdminVideoApiController.java

@@ -61,6 +61,8 @@ public class AdminVideoApiController extends CertifyApiController {
 	private String ffprobePath = null;
 	@Value(value = "${video.path}")
 	private String videoPath = null;
+	@Value(value = "${video.temppath}")
+	private String videoTemppath = null;
 	
 	
 
@@ -72,7 +74,8 @@ public class AdminVideoApiController extends CertifyApiController {
 		AttachmentType attachmentType = AttachmentType.getField(sign);
 		if (attachmentType == AttachmentType.VIDEO) {
 			// 先将视频存在本地文件中
-			String filename = handleVideoFiles(res, req, videoPath);
+			String dir =  videoTemppath + "/convert_before";
+			String filename = handleVideoFiles(res, req, dir);
 			res.setData(filename);
 		} else if (attachmentType == AttachmentType.VIDEO_COVER) {
 			String picturebase = req.getParameter("picturebase");
@@ -146,6 +149,7 @@ public class AdminVideoApiController extends CertifyApiController {
 		
 		// 生成保存到数据库的url
 		String output = System.nanoTime() + ".mp4";
+
 		video.setUrl(createFileName(videoPath) + "/" + output);
 		
 		video.setTranscoding(1);
@@ -153,7 +157,8 @@ public class AdminVideoApiController extends CertifyApiController {
 		result.setData(adminVideoService.insertVideo(video));
 
 		// 压缩视频并将视频
-		videoChange(filename, output, video.getUrl());
+		//output = videoTemppath + "/convert_after";
+		videoChange(filename, output, video.getUrl(), videoTemppath + "/convert_after");
 		
 		return result;
 	}
@@ -200,11 +205,12 @@ public class AdminVideoApiController extends CertifyApiController {
 			String filename = video.getUrl();
 			String output = System.nanoTime() + ".mp4";
 			video.setUrl(createFileName(videoPath) + "/" + output);
-			videoChange(filename, output, video.getUrl());
+			videoChange(filename, output, video.getUrl(), videoTemppath + "/convert_after");
 			
 			//删除原来远程的视频
 			deleteFtpVideo(oldVideo.getUrl());
 			
+			
 		}else{
 			video.setUrl(null);
 		}
@@ -219,7 +225,7 @@ public class AdminVideoApiController extends CertifyApiController {
 	}
 
 	// 将文件转码
-	private String videoChange(String input, String output, String url) throws IOException,
+	private String videoChange(String input, String output, String url,String outputdir) throws IOException,
 			InterruptedException, ExecutionException {
 
 		FFmpeg ffmpeg = new FFmpeg(ffmpegPath);
@@ -230,7 +236,7 @@ public class AdminVideoApiController extends CertifyApiController {
 		FFmpegBuilder builder = new FFmpegBuilder();
 		builder.setInput(in) // 输入文件
 				.overrideOutputFiles(true) // 覆盖重复文件
-				.addOutput(output) // 输出文件
+				.addOutput(outputdir+"/"+output) // 输出文件
 				.setFormat("mp4") // 设置格式
 				.setTargetSize(250_000) // 目标大小
 				.disableSubtitle() // 没有子标题
@@ -246,7 +252,7 @@ public class AdminVideoApiController extends CertifyApiController {
 		FFmpegExecutor executor = new FFmpegExecutor(ffmpeg, ffprobe);
 		ExecutorService service = Executors.newCachedThreadPool();
 		// 3.直接new一个FutureTask
-		SubTask subTask = new SubTask(executor, builder, in, url, input, output);
+		SubTask subTask = new SubTask(executor, builder, in, url, input, output, outputdir+"/"+output);
 		FutureTask<Boolean> result = new FutureTask<Boolean>(subTask);
 		// 4.提交任务
 		service.submit(result);
@@ -258,30 +264,30 @@ public class AdminVideoApiController extends CertifyApiController {
 		return "SUCESS";
 	}
 
-	private void updateSql(String url, String filename) {
+	private void updateSql(String url, String tempdir, String filename) {
 		// 修改数据
-		File file = new File(filename);
+		File file = new File(tempdir);
 		JtVideo video = new JtVideo();
 		video.setMd5(FileMD5(file));
 		video.setTranscoding(2);
 		video.setUrl(url);
-		int c = adminVideoService.updateByUrl(video);
-		if (c > 0){
-			url = url.substring(0,url.lastIndexOf("/"));
-			videoChange(url, filename);// 上传到远程
-		}
+		url = url.substring(0,url.lastIndexOf("/"));
+		if(videoChange(url, tempdir, filename)){
+			adminVideoService.updateByUrl(video);//修改状态
+		}// 上传到远程
 	}
 
-	private void videoChange(String url, String filename) {
-		
-		File f2 = new File(filename);// 临时压缩后的文件
+	private boolean videoChange(String url, String tempdir, String filename) {
+		boolean t =false;
+		File f2 = new File(tempdir);// 临时压缩后的文件
 		if (f2.exists()) {
 			// 传到远程服务器
 			FtpUtils ftp = new FtpUtils();
-			ftp.uploadFile(url, filename, filename);
+			t = ftp.uploadFile(url, filename, tempdir);
 			// 删除视频
 			f2.delete();
 		}
+		return t;
 	}
 
 	// 获得文件md5
@@ -314,16 +320,18 @@ public class AdminVideoApiController extends CertifyApiController {
 		private String url;
 		private String input;
 		private String output;
+		private String tempdir;
 
 		public SubTask(FFmpegExecutor executor, FFmpegBuilder builder,
 				FFmpegProbeResult probeResult, String url, String input,
-				String output) {
+				String output, String tempdir) {
 			this.executor = executor;
 			this.builder = builder;
 			this.probeResult = probeResult;
 			this.url = url;
 			this.input = input;
 			this.output = output;
+			this.tempdir = tempdir;
 		}
 
 		public FFmpegExecutor getExecutor() {
@@ -378,7 +386,7 @@ public class AdminVideoApiController extends CertifyApiController {
 				// System.out.println("设置 sate");
 				// latch.wait();
 				state = true;
-				updateSql(url, output);
+				updateSql(url, tempdir,output);
 				// 删除未压缩的视频
 				File f1 = new File(input);
 				f1.delete();

+ 11 - 11
src/main/java/com/goafanti/common/dao/JtVideoMapper.java

@@ -12,69 +12,69 @@ public interface JtVideoMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	int countByExample(JtVideoExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	int deleteByExample(JtVideoExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	int insert(JtVideo record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	int insertSelective(JtVideo record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	List<JtVideo> selectByExample(JtVideoExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	JtVideo selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	int updateByExampleSelective(@Param("record") JtVideo record,
 			@Param("example") JtVideoExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	int updateByExample(@Param("record") JtVideo record,
 			@Param("example") JtVideoExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	int updateByPrimaryKeySelective(JtVideo record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	int updateByPrimaryKey(JtVideo record);
 

+ 1 - 0
src/main/java/com/goafanti/common/enums/VideoFields.java

@@ -4,6 +4,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public enum VideoFields {
+	
 	NAME("name", "视频名称"),
 	URL("url", "视频地址"),
 	TYPE("type", "视频类型"),

+ 42 - 27
src/main/java/com/goafanti/common/mapper/JtVideoMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Oct 30 20:16:39 CST 2018.
+      This element was generated on Fri Nov 02 16:14:39 CST 2018.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
@@ -19,12 +19,13 @@
     <result column="release_time" jdbcType="TIMESTAMP" property="releaseTime" />
     <result column="transcoding" jdbcType="INTEGER" property="transcoding" />
     <result column="md5" jdbcType="VARCHAR" property="md5" />
+    <result column="position" jdbcType="INTEGER" property="position" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Oct 30 20:16:39 CST 2018.
+      This element was generated on Fri Nov 02 16:14:39 CST 2018.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -58,7 +59,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Oct 30 20:16:39 CST 2018.
+      This element was generated on Fri Nov 02 16:14:39 CST 2018.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -92,16 +93,16 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Oct 30 20:16:39 CST 2018.
+      This element was generated on Fri Nov 02 16:14:39 CST 2018.
     -->
     id, name, url, type, owner, create_time, status, summary, cover_url, release_time, 
-    transcoding, md5
+    transcoding, md5, position
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.JtVideoExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Oct 30 20:16:39 CST 2018.
+      This element was generated on Fri Nov 02 16:14:39 CST 2018.
     -->
     select
     <if test="distinct">
@@ -120,7 +121,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Oct 30 20:16:39 CST 2018.
+      This element was generated on Fri Nov 02 16:14:39 CST 2018.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -131,7 +132,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Oct 30 20:16:39 CST 2018.
+      This element was generated on Fri Nov 02 16:14:39 CST 2018.
     -->
     delete from jt_video
     where id = #{id,jdbcType=VARCHAR}
@@ -140,7 +141,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Oct 30 20:16:39 CST 2018.
+      This element was generated on Fri Nov 02 16:14:39 CST 2018.
     -->
     delete from jt_video
     <if test="_parameter != null">
@@ -151,24 +152,24 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Oct 30 20:16:39 CST 2018.
+      This element was generated on Fri Nov 02 16:14:39 CST 2018.
     -->
     insert into jt_video (id, name, url, 
       type, owner, create_time, 
       status, summary, cover_url, 
-      release_time, transcoding, md5
-      )
+      release_time, transcoding, md5, 
+      position)
     values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR}, 
       #{type,jdbcType=INTEGER}, #{owner,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{status,jdbcType=INTEGER}, #{summary,jdbcType=VARCHAR}, #{coverUrl,jdbcType=VARCHAR}, 
-      #{releaseTime,jdbcType=TIMESTAMP}, #{transcoding,jdbcType=INTEGER}, #{md5,jdbcType=VARCHAR}
-      )
+      #{releaseTime,jdbcType=TIMESTAMP}, #{transcoding,jdbcType=INTEGER}, #{md5,jdbcType=VARCHAR}, 
+      #{position,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.JtVideo">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Oct 30 20:16:39 CST 2018.
+      This element was generated on Fri Nov 02 16:14:39 CST 2018.
     -->
     insert into jt_video
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -208,6 +209,9 @@
       <if test="md5 != null">
         md5,
       </if>
+      <if test="position != null">
+        position,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -246,13 +250,16 @@
       <if test="md5 != null">
         #{md5,jdbcType=VARCHAR},
       </if>
+      <if test="position != null">
+        #{position,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.JtVideoExample" resultType="java.lang.Integer">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Oct 30 20:16:39 CST 2018.
+      This element was generated on Fri Nov 02 16:14:39 CST 2018.
     -->
     select count(*) from jt_video
     <if test="_parameter != null">
@@ -263,7 +270,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Oct 30 20:16:39 CST 2018.
+      This element was generated on Fri Nov 02 16:14:39 CST 2018.
     -->
     update jt_video
     <set>
@@ -303,6 +310,9 @@
       <if test="record.md5 != null">
         md5 = #{record.md5,jdbcType=VARCHAR},
       </if>
+      <if test="record.position != null">
+        position = #{record.position,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -312,7 +322,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Oct 30 20:16:39 CST 2018.
+      This element was generated on Fri Nov 02 16:14:39 CST 2018.
     -->
     update jt_video
     set id = #{record.id,jdbcType=VARCHAR},
@@ -326,7 +336,8 @@
       cover_url = #{record.coverUrl,jdbcType=VARCHAR},
       release_time = #{record.releaseTime,jdbcType=TIMESTAMP},
       transcoding = #{record.transcoding,jdbcType=INTEGER},
-      md5 = #{record.md5,jdbcType=VARCHAR}
+      md5 = #{record.md5,jdbcType=VARCHAR},
+      position = #{record.position,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -335,7 +346,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Oct 30 20:16:39 CST 2018.
+      This element was generated on Fri Nov 02 16:14:39 CST 2018.
     -->
     update jt_video
     <set>
@@ -372,6 +383,9 @@
       <if test="md5 != null">
         md5 = #{md5,jdbcType=VARCHAR},
       </if>
+      <if test="position != null">
+        position = #{position,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -379,7 +393,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Oct 30 20:16:39 CST 2018.
+      This element was generated on Fri Nov 02 16:14:39 CST 2018.
     -->
     update jt_video
     set name = #{name,jdbcType=VARCHAR},
@@ -392,15 +406,15 @@
       cover_url = #{coverUrl,jdbcType=VARCHAR},
       release_time = #{releaseTime,jdbcType=TIMESTAMP},
       transcoding = #{transcoding,jdbcType=INTEGER},
-      md5 = #{md5,jdbcType=VARCHAR}
+      md5 = #{md5,jdbcType=VARCHAR},
+      position = #{position,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  
   <!-- 查看视频列表 -->
   <select id="getVideoListBySome" parameterType="java.util.Map" resultType="com.goafanti.admin.bo.AdminVideoBo">
   	select  
   	v.id, v.name, url, type, owner, v.create_time as createTime, v.status, summary, cover_url as coverUrl, 
-  	release_time as releaseTime, transcoding, md5, a.name as ownerName  
+  	release_time as releaseTime, transcoding, md5, v.position, a.name as ownerName  
   	from jt_video v
 	left join admin a on v.owner = a.id
   	where 1=1
@@ -470,7 +484,7 @@
    <select id="selectById" parameterType="java.lang.String" resultType="com.goafanti.admin.bo.AdminVideoBo">
     select 
     v.id, v.name, url, type, owner, v.create_time as createTime, v.status, summary, cover_url as coverUrl, 
-    release_time as releaseTime, transcoding, md5, a.name as ownerName  
+    release_time as releaseTime, transcoding, md5, v.position, a.name as ownerName  
   	from jt_video v
 	left join admin a on v.owner = a.id
     where v.id = #{id,jdbcType=VARCHAR}
@@ -510,12 +524,12 @@
   <select id="getIndexVideo" parameterType="java.lang.String" resultType="com.goafanti.admin.bo.AdminVideoBo">
   select 
     id, name, url, type, owner, create_time as createTime, status, summary, cover_url as coverUrl, 
-    release_time as releaseTime, transcoding, md5
+    release_time as releaseTime, transcoding, md5, position
   	from jt_video
     where 
     transcoding = 2
     and status = 1
-    and summary = #{_parameter,jdbcType=VARCHAR}
+    and position = 1
     order by release_time desc
     limit 1
   </select>
@@ -535,4 +549,5 @@
     and id &lt;&gt; #{_parameter,jdbcType=VARCHAR}
     order by release_time desc
   </select>
+  
 </mapper>

+ 73 - 43
src/main/java/com/goafanti/common/model/JtVideo.java

@@ -12,82 +12,94 @@ public class JtVideo {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_video.id
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
-	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR
+			+ "}")
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_video.name
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
-	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR
+			+ "}")
 	private String name;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_video.url
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
-	@Size(min = 0, max = 64, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 64, message = "{" + ErrorConstants.PARAM_SIZE_ERROR
+			+ "}")
 	private String url;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_video.type
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	@Max(value = 3, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer type;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_video.owner
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
-	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR
+			+ "}")
 	private String owner;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_video.create_time
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_video.status
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	@Max(value = 3, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_video.summary
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
-	@Size(min = 0, max = 512, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 512, message = "{" + ErrorConstants.PARAM_SIZE_ERROR
+			+ "}")
 	private String summary;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_video.cover_url
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
-	@Size(min = 0, max = 64, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 64, message = "{" + ErrorConstants.PARAM_SIZE_ERROR
+			+ "}")
 	private String coverUrl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_video.release_time
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	private Date releaseTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_video.transcoding
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	@Max(value = 2, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer transcoding;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_video.md5
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
-	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR
+			+ "}")
 	private String md5;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_video.position
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
+	 */
+	private Integer position;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_video.id
 	 * @return  the value of jt_video.id
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public String getId() {
 		return id;
@@ -96,7 +108,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_video.id
 	 * @param id  the value for jt_video.id
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -105,7 +117,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_video.name
 	 * @return  the value of jt_video.name
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public String getName() {
 		return name;
@@ -114,7 +126,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_video.name
 	 * @param name  the value for jt_video.name
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void setName(String name) {
 		this.name = name;
@@ -123,7 +135,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_video.url
 	 * @return  the value of jt_video.url
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public String getUrl() {
 		return url;
@@ -132,7 +144,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_video.url
 	 * @param url  the value for jt_video.url
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void setUrl(String url) {
 		this.url = url;
@@ -141,7 +153,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_video.type
 	 * @return  the value of jt_video.type
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public Integer getType() {
 		return type;
@@ -150,7 +162,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_video.type
 	 * @param type  the value for jt_video.type
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void setType(Integer type) {
 		this.type = type;
@@ -159,7 +171,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_video.owner
 	 * @return  the value of jt_video.owner
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public String getOwner() {
 		return owner;
@@ -168,7 +180,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_video.owner
 	 * @param owner  the value for jt_video.owner
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void setOwner(String owner) {
 		this.owner = owner;
@@ -177,7 +189,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_video.create_time
 	 * @return  the value of jt_video.create_time
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -186,7 +198,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_video.create_time
 	 * @param createTime  the value for jt_video.create_time
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -195,7 +207,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_video.status
 	 * @return  the value of jt_video.status
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public Integer getStatus() {
 		return status;
@@ -204,7 +216,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_video.status
 	 * @param status  the value for jt_video.status
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -213,7 +225,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_video.summary
 	 * @return  the value of jt_video.summary
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public String getSummary() {
 		return summary;
@@ -222,7 +234,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_video.summary
 	 * @param summary  the value for jt_video.summary
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void setSummary(String summary) {
 		this.summary = summary;
@@ -231,7 +243,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_video.cover_url
 	 * @return  the value of jt_video.cover_url
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public String getCoverUrl() {
 		return coverUrl;
@@ -240,7 +252,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_video.cover_url
 	 * @param coverUrl  the value for jt_video.cover_url
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void setCoverUrl(String coverUrl) {
 		this.coverUrl = coverUrl;
@@ -249,7 +261,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_video.release_time
 	 * @return  the value of jt_video.release_time
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public Date getReleaseTime() {
 		return releaseTime;
@@ -258,7 +270,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_video.release_time
 	 * @param releaseTime  the value for jt_video.release_time
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void setReleaseTime(Date releaseTime) {
 		this.releaseTime = releaseTime;
@@ -267,7 +279,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_video.transcoding
 	 * @return  the value of jt_video.transcoding
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public Integer getTranscoding() {
 		return transcoding;
@@ -276,7 +288,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_video.transcoding
 	 * @param transcoding  the value for jt_video.transcoding
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void setTranscoding(Integer transcoding) {
 		this.transcoding = transcoding;
@@ -285,7 +297,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_video.md5
 	 * @return  the value of jt_video.md5
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public String getMd5() {
 		return md5;
@@ -294,9 +306,27 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_video.md5
 	 * @param md5  the value for jt_video.md5
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void setMd5(String md5) {
 		this.md5 = md5;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_video.position
+	 * @return  the value of jt_video.position
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
+	 */
+	public Integer getPosition() {
+		return position;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_video.position
+	 * @param position  the value for jt_video.position
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
+	 */
+	public void setPosition(Integer position) {
+		this.position = position;
+	}
 }

+ 76 - 16
src/main/java/com/goafanti/common/model/JtVideoExample.java

@@ -7,23 +7,23 @@ import java.util.List;
 public class JtVideoExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public JtVideoExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +31,7 @@ public class JtVideoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +39,7 @@ public class JtVideoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +47,7 @@ public class JtVideoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +55,7 @@ public class JtVideoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +63,7 @@ public class JtVideoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class JtVideoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +79,7 @@ public class JtVideoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +89,7 @@ public class JtVideoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +101,7 @@ public class JtVideoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +110,7 @@ public class JtVideoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +120,7 @@ public class JtVideoExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -959,11 +959,71 @@ public class JtVideoExample {
 			addCriterion("md5 not between", value1, value2, "md5");
 			return (Criteria) this;
 		}
+
+		public Criteria andPositionIsNull() {
+			addCriterion("position is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPositionIsNotNull() {
+			addCriterion("position is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPositionEqualTo(Integer value) {
+			addCriterion("position =", value, "position");
+			return (Criteria) this;
+		}
+
+		public Criteria andPositionNotEqualTo(Integer value) {
+			addCriterion("position <>", value, "position");
+			return (Criteria) this;
+		}
+
+		public Criteria andPositionGreaterThan(Integer value) {
+			addCriterion("position >", value, "position");
+			return (Criteria) this;
+		}
+
+		public Criteria andPositionGreaterThanOrEqualTo(Integer value) {
+			addCriterion("position >=", value, "position");
+			return (Criteria) this;
+		}
+
+		public Criteria andPositionLessThan(Integer value) {
+			addCriterion("position <", value, "position");
+			return (Criteria) this;
+		}
+
+		public Criteria andPositionLessThanOrEqualTo(Integer value) {
+			addCriterion("position <=", value, "position");
+			return (Criteria) this;
+		}
+
+		public Criteria andPositionIn(List<Integer> values) {
+			addCriterion("position in", values, "position");
+			return (Criteria) this;
+		}
+
+		public Criteria andPositionNotIn(List<Integer> values) {
+			addCriterion("position not in", values, "position");
+			return (Criteria) this;
+		}
+
+		public Criteria andPositionBetween(Integer value1, Integer value2) {
+			addCriterion("position between", value1, value2, "position");
+			return (Criteria) this;
+		}
+
+		public Criteria andPositionNotBetween(Integer value1, Integer value2) {
+			addCriterion("position not between", value1, value2, "position");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public static class Criterion {
 		private String condition;

+ 1 - 0
src/main/resources/props/config_local.properties

@@ -86,5 +86,6 @@ ffmpeg.path=E\:\\mytools\\ffmpeg-20181028-bdfd2e3-win64-static\\bin\\ffmpeg.exe
 ffprobe.path=E\:\\mytools\\ffmpeg-20181028-bdfd2e3-win64-static\\bin\\ffprobe.exe
 
 video.path=local
+video.temppath=F:/data/local/video
 
 collect_flag=true

+ 0 - 71
src/main/resources/props/config_prod.properties

@@ -1,71 +0,0 @@
-#Driver
-jdbc.driverClassName=com.mysql.jdbc.Driver
-#\u6570\u636e\u5e93\u94fe\u63a5\uff0c
-jdbc.url=jdbc:mysql://123.57.207.214:3306/pro_aft_test?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true
-#\u5e10\u53f7
-jdbc.username=xiaolong
-#\u5bc6\u7801
-jdbc.password=!qaz2wsx
-#\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
-jdbc.validationQuery=SELECT 'x'
-#\u521d\u59cb\u8fde\u63a5\u6570
-jdbc.initialSize=3
-#\u6700\u5927\u8fde\u63a5\u6c60\u6570\u91cf
-jdbc.maxActive=20
-#\u53bb\u6389\uff0c\u914d\u7f6e\u6587\u4ef6\u5bf9\u5e94\u53bb\u6389
-#jdbc.maxIdle=20
-#\u914d\u7f6e0,\u5f53\u7ebf\u7a0b\u6c60\u6570\u91cf\u4e0d\u8db3\uff0c\u81ea\u52a8\u8865\u5145\u3002
-jdbc.minIdle=0
-#\u83b7\u53d6\u94fe\u63a5\u8d85\u65f6\u65f6\u95f4\u4e3a1\u5206\u949f\uff0c\u5355\u4f4d\u4e3a\u6beb\u79d2\u3002
-jdbc.maxWait=120000
-#\u83b7\u53d6\u94fe\u63a5\u7684\u65f6\u5019\uff0c\u4e0d\u6821\u9a8c\u662f\u5426\u53ef\u7528\uff0c\u5f00\u542f\u4f1a\u6709\u635f\u6027\u80fd\u3002
-jdbc.testOnBorrow=false
-#\u5f52\u8fd8\u94fe\u63a5\u5230\u8fde\u63a5\u6c60\u7684\u65f6\u5019\u6821\u9a8c\u94fe\u63a5\u662f\u5426\u53ef\u7528\u3002
-jdbc.testOnReturn=false
-#\u6b64\u9879\u914d\u7f6e\u4e3atrue\u5373\u53ef\uff0c\u4e0d\u5f71\u54cd\u6027\u80fd\uff0c\u5e76\u4e14\u4fdd\u8bc1\u5b89\u5168\u6027\u3002\u610f\u4e49\u4e3a\uff1a\u7533\u8bf7\u8fde\u63a5\u7684\u65f6\u5019\u68c0\u6d4b\uff0c\u5982\u679c\u7a7a\u95f2\u65f6\u95f4\u5927\u4e8etimeBetweenEvictionRunsMillis\uff0c\u6267\u884cvalidationQuery\u68c0\u6d4b\u8fde\u63a5\u662f\u5426\u6709\u6548\u3002
-jdbc.testWhileIdle=true
-#1.Destroy\u7ebf\u7a0b\u4f1a\u68c0\u6d4b\u8fde\u63a5\u7684\u95f4\u9694\u65f6\u95f4
-#2.testWhileIdle\u7684\u5224\u65ad\u4f9d\u636e
-jdbc.timeBetweenEvictionRunsMillis=60000
-#\u4e00\u4e2a\u94fe\u63a5\u751f\u5b58\u7684\u65f6\u95f4\uff08\u4e4b\u524d\u7684\u503c\uff1a25200000\uff0c\u8fd9\u4e2a\u65f6\u95f4\u6709\u70b9BT\uff0c\u8fd9\u4e2a\u7ed3\u679c\u4e0d\u77e5\u9053\u662f\u600e\u4e48\u6765\u7684\uff0c\u6362\u7b97\u540e\u7684\u7ed3\u679c\u662f\uff1a25200000/1000/60/60 = 7\u4e2a\u5c0f\u65f6\uff09
-jdbc.minEvictableIdleTimeMillis=300000
-#\u94fe\u63a5\u4f7f\u7528\u8d85\u8fc7\u65f6\u95f4\u9650\u5236\u662f\u5426\u56de\u6536
-jdbc.removeAbandoned=true
-#\u8d85\u8fc7\u65f6\u95f4\u9650\u5236\u65f6\u95f4\uff08\u5355\u4f4d\u79d2\uff09\uff0c\u76ee\u524d\u4e3a5\u5206\u949f\uff0c\u5982\u679c\u6709\u4e1a\u52a1\u5904\u7406\u65f6\u95f4\u8d85\u8fc75\u5206\u949f\uff0c\u53ef\u4ee5\u9002\u5f53\u8c03\u6574\u3002
-jdbc.removeAbandonedTimeout=300
-#\u94fe\u63a5\u56de\u6536\u7684\u65f6\u5019\u63a7\u5236\u53f0\u6253\u5370\u4fe1\u606f\uff0c\u6d4b\u8bd5\u73af\u5883\u53ef\u4ee5\u52a0\u4e0atrue\uff0c\u7ebf\u4e0a\u73af\u5883false\u3002\u4f1a\u5f71\u54cd\u6027\u80fd\u3002
-jdbc.logAbandoned=true
-#\u7edf\u8ba1\u76d1\u63a7
-jdbc.filters=stat
-
-jedis.host=123.57.207.214
-jedis.port=6379
-jedis.timeout=5000
-jedis.password=aft@2016!redis$
-
-pwd.hash_algorithm_name=md5
-pwd.hash_iterations=2
-
-session.timeout=12000000
-session.validate.timespan=18000000
-
-app.name=AFT
-
-static.host=//s.jishutao.com/1.0.41
-
-template.cacheable=true
-
-mobileCodeTemplate=SMS_37845022
-
-portal.host=//s.jishutao.com/portal/1.0.11
-
-patentTemplate=SMS_72005286
-
-avatar.host=//s.jishutao.com
-
-avatar.upload.host=//s.jishutao.com/upload
-
-ffmpeg.path=/usr/bin/ffmpeg
-ffprobe.path=/usr/bin/ffprobe
-
-video.path=prod

+ 1 - 0
src/main/resources/props/config_test.properties

@@ -85,5 +85,6 @@ ffmpeg.path=/usr/bin/ffmpeg
 ffprobe.path=/usr/bin/ffprobe
 
 video.path=test
+video.temppath=/data/statics/video
 
 collect_flag=true

File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceDetails.html


+ 2 - 2
src/main/webapp/WEB-INF/views/portal/video/video.html

@@ -51,7 +51,7 @@
                 <span class="totalCount">共0条数据</span>
             </nav>
 		</div>
-		<div class="videoPlay">
+		<!-- <div class="videoPlay">
 			<div class="videoTopM">
 				<span class="glyphicon glyphicon-remove"></span>	
 				<span class="videoPre">播放上一个</span>
@@ -62,7 +62,7 @@
 					</video>
 				</div>
 			</div>
-		</div>	
+		</div>	 -->
 		<!-- 下面是公共底部 -->	
 		<footer>
         <div th:replace="common::copyright"></div>

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/video/videoDetail.html

@@ -61,7 +61,7 @@
 							<div class="txt">
 								<h4 th:text="${list.name}">申请军工三证72问</h4>
 								<!-- 2排字 -->
-								<p th:text="${#strings.abbreviate(list.summary,14)}">注意此处限制2排字注意此处限制2排字注意此处限制2排字注意此处限制2排字注意此处限制2排字</p>
+								<p th:text="${#strings.abbreviate(list.summary,18)}">注意此处限制2排字注意此处限制2排字注意此处限制2排字注意此处限制2排字注意此处限制2排字</p>
 								<input type="hidden" th:value="${'http://118.190.205.7:8000' + list.url}"/>
 							</div>
 							</a>