Commit de87b3da9915ce3a19c016bcad2ff2e09806f648
Merge branch 'dev'
Showing
4 changed files
with
8 additions
and
3 deletions
src/main/java/com/cnlive/shenhe/job/CommentsJob.java
| @@ -89,6 +89,7 @@ public class CommentsJob { | @@ -89,6 +89,7 @@ public class CommentsJob { | ||
| 89 | */ | 89 | */ |
| 90 | @Scheduled(cron="0 0 0 * * ? ")//每天0点执行 | 90 | @Scheduled(cron="0 0 0 * * ? ")//每天0点执行 |
| 91 | public void autoRetReceive() { | 91 | public void autoRetReceive() { |
| 92 | + logger.info("评论自动退领的进入....."); | ||
| 92 | ShyComments shyComments = new ShyComments(); | 93 | ShyComments shyComments = new ShyComments(); |
| 93 | shyComments.setState(CommonConst.AUDIT_INTT);//审核状态：未审核 | 94 | shyComments.setState(CommonConst.AUDIT_INTT);//审核状态：未审核 |
| 94 | shyComments.setReceive(CommonConst.RECEIVE_AFTER);//已领取 | 95 | shyComments.setReceive(CommonConst.RECEIVE_AFTER);//已领取 |
src/main/java/com/cnlive/shenhe/job/VideosJob.java
| @@ -84,6 +84,7 @@ public class VideosJob { | @@ -84,6 +84,7 @@ public class VideosJob { | ||
| 84 | */ | 84 | */ |
| 85 | @Scheduled(cron="0 0 0 * * ? ")//每天0点执行 | 85 | @Scheduled(cron="0 0 0 * * ? ")//每天0点执行 |
| 86 | public void autoRetReceive() { | 86 | public void autoRetReceive() { |
| 87 | + logger.info("点播自动退领的进入....."); | ||
| 87 | ShyVideos shyVideos = new ShyVideos(); | 88 | ShyVideos shyVideos = new ShyVideos(); |
| 88 | shyVideos.setState(CommonConst.AUDIT_INTT);//审核状态：未审核 | 89 | shyVideos.setState(CommonConst.AUDIT_INTT);//审核状态：未审核 |
| 89 | shyVideos.setReceive(CommonConst.RECEIVE_AFTER);//已领取 | 90 | shyVideos.setReceive(CommonConst.RECEIVE_AFTER);//已领取 |
src/main/resources/templates/page/comment.html
| @@ -259,7 +259,8 @@ | @@ -259,7 +259,8 @@ | ||
| 259 | style="font-weight:bold;font-size:16px;" | 259 | style="font-weight:bold;font-size:16px;" |
| 260 | data-toggle="tooltip" | 260 | data-toggle="tooltip" |
| 261 | data-placement="right" | 261 | data-placement="right" |
| 262 | - th:text="${comment.comment_content}">哈哈哈</a> | 262 | + th:text="${comment.comment_content}" |
| 263 | + th:href="@{'/comments/details/'+${comment.id}}">>哈哈哈</a> | ||
| 263 | </td> | 264 | </td> |
| 264 | <td style="text-align: center; width: 15%;" | 265 | <td style="text-align: center; width: 15%;" |
| 265 | th:text="${comment.comment_title}"> | 266 | th:text="${comment.comment_title}"> |
src/main/resources/templates/page/video.html
| @@ -196,8 +196,10 @@ | @@ -196,8 +196,10 @@ | ||
| 196 | type="checkbox" th:value="${video.id}"></td> | 196 | type="checkbox" th:value="${video.id}"></td> |
| 197 | <td style="text-align: center; width: 6%;" | 197 | <td style="text-align: center; width: 6%;" |
| 198 | th:text="${video.spid_desc}"></td> | 198 | th:text="${video.spid_desc}"></td> |
| 199 | - <td style="text-align: center; width: 20%;" th:text="${video.video_title}"> | ||
| 200 | - 邓建国正面PK冯小刚 | 199 | + <td style="text-align: center; width: 20%;" > |
| 200 | + <a class="detail" th:href="@{'/videos/details/?id='+${video.id}}"> | ||
| 201 | + <span th:text="${video.video_title}">邓建国正面PK冯小刚</span> | ||
| 202 | + </a> | ||
| 201 | </td> | 203 | </td> |
| 202 | <!--<td style="text-align: center; width: 10%;">--> | 204 | <!--<td style="text-align: center; width: 10%;">--> |
| 203 | <!--<div width="160px" height="90px"><img th:src="@{${video.video_poster}}" width="160px" alt="封面图"></div>--> | 205 | <!--<div width="160px" height="90px"><img th:src="@{${video.video_poster}}" width="160px" alt="封面图"></div>--> |