周伟鹏 / cnlive_shenhe · Commits

Commit 7546247a299743e45e0fb5e870b2b714a880b3a9

Authored by liwei2917
2 parents 10db09ee 9a1e3ce9

Merge branch 'dev'

Inline Side-by-side
Showing 3 changed files with 28 additions and 26 deletions
src/main/java/com/cnlive/shenhe/api/CommentsControllerApi.java
  View file @7546247
@@ -33,8 +33,8 @@ public class CommentsControllerApi { @@ -33,8 +33,8 @@ public class CommentsControllerApi {
33 @Autowired 33 @Autowired
34 TopicServiceImpl topicService; 34 TopicServiceImpl topicService;
35 35
36 - @Value("${topic_comment_shareH5}")  
37 - String topic_comment_shareH5; 36 +// @Value("${topic_comment_shareH5}")
  37 +// String topic_comment_shareH5;
38 38
39 /** 39 /**
40 * @Auther: chenhao 40 * @Auther: chenhao
@@ -66,19 +66,19 @@ public class CommentsControllerApi { @@ -66,19 +66,19 @@ public class CommentsControllerApi {
66 if (CommonUtils.isNotEmpty(commentTime)) { 66 if (CommonUtils.isNotEmpty(commentTime)) {
67 timestamp = CommonUtils.getTimestamp(commentTime, "yyyy-MM-dd HH:mm"); 67 timestamp = CommonUtils.getTimestamp(commentTime, "yyyy-MM-dd HH:mm");
68 } 68 }
69 -  
70 - if(type.equals(CommonConst.CATEGORY_TOPIC)){//评论类型是话题  
71 - if(level==1){  
72 - ShyTopic shyTopic = new ShyTopic();  
73 - shyTopic.setTopic_id(programId);  
74 - shyTopic=topicService.getShyTopic(shyTopic);  
75 - if(shyTopic!=null){  
76 - commentTitle=shyTopic.getTitle();//设置标题  
77 - originalUrl=topic_comment_shareH5+programId;  
78 - }  
79 - }  
80 -  
81 - } 69 +// 2020.01.07 修改评论审核类型是话题时分享和标题从互动云获取
  70 +// if(type.equals(CommonConst.CATEGORY_TOPIC)){//评论类型是话题
  71 +// if(level==1){
  72 +// ShyTopic shyTopic = new ShyTopic();
  73 +// shyTopic.setTopic_id(programId);
  74 +// shyTopic=topicService.getShyTopic(shyTopic);
  75 +// if(shyTopic!=null){
  76 +// commentTitle=shyTopic.getTitle();//设置标题
  77 +// originalUrl=topic_comment_shareH5+programId;
  78 +// }
  79 +// }
  80 +//
  81 +// }
82 82
83 //判断是否存在 83 //判断是否存在
84 ShyComments shyComments = new ShyComments(); 84 ShyComments shyComments = new ShyComments();
src/main/resources/application.properties
  View file @7546247
@@ -53,7 +53,7 @@ spring.rabbitmq.listener.direct.acknowledge-mode=manual @@ -53,7 +53,7 @@ spring.rabbitmq.listener.direct.acknowledge-mode=manual
53 spring.rabbitmq.listener.simple.acknowledge-mode=manual 53 spring.rabbitmq.listener.simple.acknowledge-mode=manual
54 54
55 #\u8bdd\u9898\u8bc4\u8bba\u5206\u4eabh5 55 #\u8bdd\u9898\u8bc4\u8bba\u5206\u4eabh5
56 -topic_comment_shareH5=http://www.baidu.com?id= 56 +#topic_comment_shareH5=http://wjjh5test.cnlive.com/cnShareTopic.html?tid=
57 57
58 #\u5173\u95edspringboot\u63d0\u4f9b\u7684\u9ed8\u8ba4ico 58 #\u5173\u95edspringboot\u63d0\u4f9b\u7684\u9ed8\u8ba4ico
59 spring.mvc.favicon.enabled = false 59 spring.mvc.favicon.enabled = false
src/main/resources/templates/page/topic.html
  View file @7546247
@@ -172,23 +172,23 @@ @@ -172,23 +172,23 @@
172 <div class="th-inner ">话题ID</div> 172 <div class="th-inner ">话题ID</div>
173 <div class="fht-cell"></div> 173 <div class="fht-cell"></div>
174 </th> 174 </th>
175 - <th style="text-align: center; width: 6%; " 175 + <th style="text-align: center; width: 4%; "
176 data-field="topic_user_name" tabindex="0"> 176 data-field="topic_user_name" tabindex="0">
177 <div class="th-inner ">sp名称</div> 177 <div class="th-inner ">sp名称</div>
178 <div class="fht-cell"></div> 178 <div class="fht-cell"></div>
179 </th> 179 </th>
180 - <th style="text-align: center; width: 6%; " data-field="topic_user_ip" 180 + <th style="text-align: center; width: 5%; " data-field="topic_user_ip"
181 tabindex="0"> 181 tabindex="0">
182 <div class="th-inner ">话题图片</div> 182 <div class="th-inner ">话题图片</div>
183 <div class="fht-cell"></div> 183 <div class="fht-cell"></div>
184 </th> 184 </th>
185 - <th style="text-align: center; width: 14%; " 185 + <th style="text-align: center; width: 16%; "
186 data-field="topic_user_avatar" tabindex="0"> 186 data-field="topic_user_avatar" tabindex="0">
187 <div class="th-inner ">话题标题 187 <div class="th-inner ">话题标题
188 </div> 188 </div>
189 <div class="fht-cell"></div> 189 <div class="fht-cell"></div>
190 </th> 190 </th>
191 - <th style="text-align: center; width: 10%; " data-field="topic_user_ip" 191 + <th style="text-align: center; width: 20%; " data-field="topic_user_ip"
192 tabindex="0"> 192 tabindex="0">
193 <div class="th-inner ">话题描述</div> 193 <div class="th-inner ">话题描述</div>
194 <div class="fht-cell"></div> 194 <div class="fht-cell"></div>
@@ -211,7 +211,7 @@ @@ -211,7 +211,7 @@
211 <div class="fht-cell"></div> 211 <div class="fht-cell"></div>
212 </th> 212 </th>
213 213
214 - <th style="text-align: center; width: 10%; " data-field="is_hot_name" 214 + <th style="text-align: center; width: 8%; " data-field="is_hot_name"
215 tabindex="0"> 215 tabindex="0">
216 <div class="th-inner ">审核消息</div> 216 <div class="th-inner ">审核消息</div>
217 <div class="fht-cell"></div> 217 <div class="fht-cell"></div>
@@ -226,7 +226,7 @@ @@ -226,7 +226,7 @@
226 <div class="th-inner ">话题送审时间</div> 226 <div class="th-inner ">话题送审时间</div>
227 <div class="fht-cell"></div> 227 <div class="fht-cell"></div>
228 </th> 228 </th>
229 - <th style="text-align: center; width: 16%; " data-field="action" 229 + <th style="text-align: center; width: 8%; " data-field="action"
230 tabindex="0"> 230 tabindex="0">
231 <div class="th-inner ">操作 231 <div class="th-inner ">操作
232 </div> 232 </div>
@@ -252,11 +252,13 @@ @@ -252,11 +252,13 @@
252 th:src="@{${topic.topic_image}}" width="60px" height="60px" 252 th:src="@{${topic.topic_image}}" width="60px" height="60px"
253 alt="话题图片" th:if="${topic.topic_image!=null and topic.topic_image!=''}"></div> 253 alt="话题图片" th:if="${topic.topic_image!=null and topic.topic_image!=''}"></div>
254 </td> 254 </td>
255 - <td style="text-align: center; vertical-align:middle; width: 14%;"  
256 - th:text="${topic.title}">优秀传统文化与现代幼儿教育 教师研修班 255 + <td style="text-align: center; vertical-align:middle; ">
  256 + <textarea class="form-control" name="title" cols="50" rows="3"
  257 + id="title" th:text="${topic.title}">优秀传统文化与现代幼儿教育 教师研修班</textarea>
257 </td> 258 </td>
258 - <td style="text-align: center; vertical-align:middle; width: 10%;"  
259 - th:text="${topic.topic_text}">优秀传统文化与现代幼儿教育 教师研修班 259 + <td style="text-align: center; vertical-align:middle; ">
  260 + <textarea class="form-control" name="title_text" cols="50" rows="3"
  261 + id="title_text" th:text="${topic.topic_text}">优秀传统文化与现代幼儿教育 教师研修班</textarea>
260 </td> 262 </td>
261 <td style="text-align: center; vertical-align:middle; width: 3%;"> 263 <td style="text-align: center; vertical-align:middle; width: 3%;">
262 <span th:if="${topic.shenhe_type==1}">免审</span> 264 <span th:if="${topic.shenhe_type==1}">免审</span>