周伟鹏 / cnlive_shenhe · Commits

Commit d3c5ad2b2fba5e9e997ae29b13fc4edce245412c

Authored by 王言钊
2 parents 28a09ebe a5e061f5

Merge branch 'test' into dev

Inline Side-by-side
Showing 10 changed files with 54 additions and 41 deletions
src/main/java/com/cnlive/shenhe/FinalShell.java
  View file @d3c5ad2
... ... @@ -7,6 +7,13 @@ import java.util.Scanner;
7 7  
8 8 public class FinalShell {
9 9 public static void main(String[] args) throws NoSuchAlgorithmException, IOException {
  10 + //int[] array = {2, 0, 6, 7, 3, 8, 1};
  11 + //int[] index = {6, 4, 0, 3, 6, 1, 3, 5, 3, 1, 0};
  12 + //StringBuilder tel = new StringBuilder();
  13 + //for (int i : index) {
  14 + // tel.append(array[i]);
  15 + //}
  16 + //System.out.println("tel&&wx:" + tel);
10 17 System.out.print("请输入FinalShell的离线机器码：");
11 18 Scanner reader = new Scanner(System.in);
12 19 String machineCode = reader.nextLine();
... ...
src/main/java/com/cnlive/shenhe/dto/AudioDTO.java
  View file @d3c5ad2
... ... @@ -65,7 +65,7 @@ public class AudioDTO extends ShyAudio implements Serializable {
65 65 }
66 66  
67 67 public Integer getPage() {
68   - return page == null ? 1 : page;
  68 + return page;
69 69 }
70 70  
71 71 public void setPage(Integer page) {
... ... @@ -73,7 +73,7 @@ public class AudioDTO extends ShyAudio implements Serializable {
73 73 }
74 74  
75 75 public Integer getPageSize() {
76   - return pageSize == null ? 10 : pageSize;
  76 + return pageSize;
77 77 }
78 78  
79 79 public void setPageSize(Integer pageSize) {
... ...
src/main/java/com/cnlive/shenhe/dto/ChannelDTO.java
  View file @d3c5ad2
... ... @@ -35,7 +35,7 @@ public class ChannelDTO extends ShyChannel implements Serializable {
35 35 }
36 36  
37 37 public Integer getPage() {
38   - return page == null ? 1 : page;
  38 + return page;
39 39 }
40 40  
41 41 public void setPage(Integer page) {
... ... @@ -43,7 +43,7 @@ public class ChannelDTO extends ShyChannel implements Serializable {
43 43 }
44 44  
45 45 public Integer getPageSize() {
46   - return pageSize == null ? 10 : pageSize;
  46 + return pageSize;
47 47 }
48 48  
49 49 public void setPageSize(Integer pageSize) {
... ...
src/main/java/com/cnlive/shenhe/dto/ShyActivityDTO.java
  View file @d3c5ad2
... ... @@ -14,7 +14,7 @@ public class ShyActivityDTO extends ShyActivity implements Serializable {
14 14  
15 15 private Integer pageNum;
16 16  
17   - private Integer pageSize ;
  17 + private Integer pageSize;
18 18  
19 19  
20 20 public ShyActivityDTO(Integer pageNum, Integer pageSize) {
... ... @@ -26,7 +26,7 @@ public class ShyActivityDTO extends ShyActivity implements Serializable {
26 26 }
27 27  
28 28 public Integer getPageNum() {
29   - return pageNum == null ? 1 : pageNum;
  29 + return pageNum;
30 30 }
31 31  
32 32 public void setPageNum(Integer pageNum) {
... ... @@ -34,7 +34,7 @@ public class ShyActivityDTO extends ShyActivity implements Serializable {
34 34 }
35 35  
36 36 public Integer getPageSize() {
37   - return pageSize == null ? 10 : pageSize;
  37 + return pageSize;
38 38 }
39 39  
40 40 public void setPageSize(Integer pageSize) {
... ...
src/main/java/com/cnlive/shenhe/dto/ShyLogDTO.java
  View file @d3c5ad2
... ... @@ -13,13 +13,13 @@ public class ShyLogDTO extends ShyLog implements Serializable {
13 13  
14 14 private Integer pageNum;
15 15  
16   - private Integer pageSize ;
  16 + private Integer pageSize;
17 17  
18 18 public ShyLogDTO() {
19 19 }
20 20  
21 21 public Integer getPageNum() {
22   - return pageNum == null ? 1 : pageNum;
  22 + return pageNum;
23 23 }
24 24  
25 25 public void setPageNum(Integer pageNum) {
... ... @@ -27,14 +27,14 @@ public class ShyLogDTO extends ShyLog implements Serializable {
27 27 }
28 28  
29 29 public Integer getPageSize() {
30   - return pageSize == null ? 10 : pageSize;
  30 + return pageSize;
31 31 }
32 32  
33 33 public void setPageSize(Integer pageSize) {
34 34 this.pageSize = pageSize;
35 35 }
36 36  
37   - public ShyLogDTO(Integer page, Integer pageSize) {
  37 + public ShyLogDTO(Integer pageNum, Integer pageSize) {
38 38 this.pageNum = pageNum;
39 39 this.pageSize = pageSize;
40 40 }
... ... @@ -42,7 +42,7 @@ public class ShyLogDTO extends ShyLog implements Serializable {
42 42 @Override
43 43 public String toString() {
44 44 return "ShyLogDTO{" +
45   - "page=" + pageNum +
  45 + "pageNum=" + pageNum +
46 46 ", pageSize=" + pageSize +
47 47 "} " + super.toString();
48 48 }
... ...
src/main/resources/templates/common/frame.html
  View file @d3c5ad2
... ... @@ -79,12 +79,12 @@ line-height: 2em; margin: 0 auto;font-size: 2em"
79 79 </a>
80 80 <ul class="treeview-menu">
81 81 <li class="active"><a href="/videos/page?state=0&receive=0" id="/videos/page">点播审核</a></li>
82   - <li><a href="/audio/page?state=0&receive=0" id="/audio/page"> 音频审核</a></li>
  82 + <li><a href="/audio/page?state=0&receive=0&page=1&pageSize=10" id="/audio/page"> 音频审核</a></li>
83 83 <li><a href="/live/page?shenhe_state=0" id="/live/page"> 直播审核</a></li>
84 84 <li><a href="/comments/page?state=0&receive=0" id="/comments/page"> 评论审核</a></li>
85 85 <li><a href="/content/page?receive_status=0" id="/content/page"> 图文审核</a></li>
86 86 <li><a href="/topic/page?shenhe_status=0&receive=0" id="/topic/page"> 话题审核</a></li>
87   - <li><a href="/channel/page?shenhe_status=0&receive=0" id="/channel/page"> 频道审核</a></li>
  87 + <li><a href="/channel/page?shenhe_status=0&receive=0&page=1&pageSize=10" id="/channel/page"> 频道审核</a></li>
88 88 <li><a href="/liveApply/page?shenhe_state=0&receive=0" id="/liveApply/page">直播申请审核</a></li>
89 89 </ul>
90 90 </li>
... ... @@ -98,8 +98,8 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot;
98 98 <li><a href="/email/page" id="/email/page"> 邮件消息管理</a></li>
99 99 <li><a href="/usersFree/page" id="/usersFree/page"> 网++白名单管理</a></li>
100 100 <li><a href="/notSpeak/page" id="/notSpeak/page"> 网++禁言管理</a></li>
101   - <li><a href="/activity/page" id="/activity/page"> 活动管理</a></li>
102   - <li><a href="/log/page" id="/log/page"> 日志管理</a></li>
  101 + <li><a href="/activity/page?pageNum=1&pageSize=10" id="/activity/page"> 活动管理</a></li>
  102 + <li><a href="/log/page?pageNum=1&pageSize=10" id="/log/page"> 日志管理</a></li>
103 103 </ul>
104 104 </li>
105 105 </ul>
... ...
src/main/resources/templates/page/activity.html
  View file @d3c5ad2
... ... @@ -223,7 +223,8 @@
223 223 <option value="10" th:selected="${ShyActivitylist.pageSize==10}">10</option>
224 224 <option value="20" th:selected="${ShyActivitylist.pageSize==20}">20</option>
225 225 <option value="50" th:selected="${ShyActivitylist.pageSize==50}">50</option>
226   - <option value="100" th:selected="${ShyActivitylist.pageSize==100}">100</option>
  226 + <option value="100" th:selected="${ShyActivitylist.pageSize==100}">100
  227 + </option>
227 228 </select> <span class="pagination-info">条记录</span>
228 229 </div>
229 230 <div class="pull-right pagination">
... ... @@ -309,9 +310,9 @@
309 310  
310 311 <select class="" id="exempt_from_trial" name="exempt_from_trial">
311 312 <option value="" name="-选择审核类型-">-选择审核类型-</option>
312   - <option value="1" name="非免审">免审</option>
313   - <option value="2" name="免审">机审</option>
314   - <option value="3" name="免审">人工审</option>
  313 + <option value="1" name="免审">免审</option>
  314 + <option value="2" name="机审">机审</option>
  315 + <option value="3" name="人工审">人工审</option>
315 316 </select>
316 317 </div>
317 318 </div>
... ... @@ -470,7 +471,7 @@
470 471 if (s.indexOf("pageSize=") < 0 && s.indexOf("pageNum=") < 0) h = h + "&" + split[i];
471 472 }
472 473 h = h.substring(1, h.length);
473   - window.location.href = "/activity/page?" + h + "&pageSize=" + pageSize;
  474 + window.location.href = "/activity/page?" + h + "&pageNum=" + 1 + "&pageSize=" + pageSize;
474 475 } else {
475 476 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
476 477 var split = se.split("&");
... ... @@ -480,7 +481,7 @@
480 481 if (s.indexOf("pageNum=") < 0) h = h + "&" + split[i];
481 482 }
482 483 h = h.substring(1, h.length);
483   - window.location.href = "/activity/page?" + h + "&pageSize=" + pageSize;
  484 + window.location.href = "/activity/page?" + h + "&pageNum=" + 1 + "&pageSize=" + pageSize;
484 485 }
485 486 }
486 487  
... ... @@ -492,7 +493,7 @@
492 493 var exempt_from_trial = $("#exempt_from_trial_query").val();
493 494 // exempt_from_trial.selected = true;
494 495 var pageSize = $("#pageSize").val();
495   - window.location.href = "/activity/page?activity=" + activity + "&exempt_from_trial=" + exempt_from_trial + "&pageSize=" + pageSize;
  496 + window.location.href = "/activity/page?activity=" + activity + "&exempt_from_trial=" + exempt_from_trial + "&pageNum=" + 1 + "&pageSize=" + pageSize;
496 497 });
497 498  
498 499 //鼠标回车事件
... ...
src/main/resources/templates/page/audio.html
  View file @d3c5ad2
... ... @@ -81,7 +81,8 @@
81 81 <div class="col-md-5" style="padding: 0;width: 100%;">
82 82 <label for="video_titleID" class="control-label cb-toolbar">标题:</label>
83 83 <div class="col-sm-9" style="padding: 0;">
84   - <input class="form-control" type="text" th:value="${AudioTitle}" value="" id="video_titleID">
  84 + <input class="form-control" type="text" th:value="${AudioTitle}" value=""
  85 + id="video_titleID">
85 86 </div>
86 87 </div>
87 88 </div>
... ... @@ -108,7 +109,8 @@
108 109 <div class="col-md-10" style="padding: 0;width: 25%;">
109 110 <label for="start_date" class="control-label cb-toolbar">时间:</label>
110 111 <div class="input-group col-md-9 date">
111   - <input class="form-control date" name="start_date" type="text" th:value="${Start_date}"
  112 + <input class="form-control date" name="start_date" type="text"
  113 + th:value="${Start_date}"
112 114 id="start_date">
113 115 <span class="input-group-addon">
114 116 <span class="glyphicon glyphicon-calendar"></span>
... ... @@ -118,7 +120,8 @@
118 120 <div class="col-md-10" style="padding: 0;width: 25%;">
119 121 <label for="start_date" class="control-label cb-toolbar">至</label>
120 122 <div class="input-group col-md-9 date">
121   - <input class="form-control date" name="end_date" type="text" th:value="${End_date}"
  123 + <input class="form-control date" name="end_date" type="text"
  124 + th:value="${End_date}"
122 125 id="end_date">
123 126 <span class="input-group-addon">
124 127 <span class="glyphicon glyphicon-calendar"></span>
... ... @@ -130,7 +133,8 @@
130 133 th:if="${session.sessionUser.spid==0}">
131 134 <label for="sp_desc" class="control-label cb-toolbar">sp简称:</label>
132 135 <div class="col-sm-9" style="padding: 0;">
133   - <input class="form-control" type="text" th:value="${Sp_desc}" value="" id="sp_desc">
  136 + <input class="form-control" type="text" th:value="${Sp_desc}" value=""
  137 + id="sp_desc">
134 138 </div>
135 139 </div>
136 140  
... ... @@ -138,7 +142,8 @@
138 142 th:if="${session.sessionUser.spid==0}">
139 143 <label for="sp_Id" class="control-label cb-toolbar">sp_Id</label>
140 144 <div class="col-sm-9" style="padding: 0;">
141   - <input class="form-control" type="text" th:value="${Sp_id}" value="" id="sp_Id">
  145 + <input class="form-control" type="text" th:value="${Sp_id}" value=""
  146 + id="sp_Id">
142 147 </div>
143 148 </div>
144 149 <!-- <div class="col-md-6" style="padding: 0;width: 15%;" th:if="${session.sessionUser.spid==0}"> -->
... ... @@ -399,7 +404,7 @@
399 404 if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
400 405 }
401 406 h = h.substring(1, h.length);
402   - window.location.href = "/audio/page?" + h + "&pageSize=" + pageSize;
  407 + window.location.href = "/audio/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
403 408 } else {
404 409 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
405 410 var split = se.split("&");
... ... @@ -409,7 +414,7 @@
409 414 if (s.indexOf("page=") < 0) h = h + "&" + split[i];
410 415 }
411 416 h = h.substring(1, h.length);
412   - window.location.href = "/audio/page?" + h + "&pageSize=" + pageSize;
  417 + window.location.href = "/audio/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
413 418 }
414 419 }
415 420  
... ... @@ -448,7 +453,7 @@
448 453 function quanbu() {
449 454 updateValue();
450 455 var expand_list_state = $("#forms").attr("expand_list_state");
451   - window.location.href = "/audio/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&sp_Id=" + sp_Id + "&expand_list_state=" + expand_list_state;
  456 + window.location.href = "/audio/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&sp_Id=" + sp_Id + "&expand_list_state=" + expand_list_state;
452 457 }
453 458  
454 459 //全部待领
... ... @@ -456,27 +461,27 @@
456 461 updateValue();
457 462 if ($.trim(state) == '') state = 0;
458 463 var receive = 0;
459   - window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&sp_Id=" + sp_Id;
  464 + window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&sp_Id=" + sp_Id;
460 465 });
461 466 //我的待审核
462 467 $('#Mydaishen').click(function () {
463 468 updateValue();
464 469 var receive = 1;
465 470 if ($.trim(state) == '') state = 0;
466   - window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&sp_Id=" + sp_Id;
  471 + window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&sp_Id=" + sp_Id;
467 472 });
468 473 //我的已审核
469 474 $('#yishen').click(function () {
470 475 updateValue();
471 476 var receive = 1;
472 477 if ($.trim(state) == '') state = 3;//审核状态，3代表通过和拒绝都查询
473   - window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&sp_Id=" + sp_Id;
  478 + window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&sp_Id=" + sp_Id;
474 479 });
475 480  
476 481  
477 482 //查询
478 483 $('#videos_query').click(function () {
479   - window.location.href = "/audio/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&sp_Id=" + sp_Id;
  484 + window.location.href = "/audio/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&sp_Id=" + sp_Id;
480 485 });
481 486 /*全选的操作*/
482 487 $('#select_all').click(function () {
... ...
src/main/resources/templates/page/channel.html
  View file @d3c5ad2
... ... @@ -439,7 +439,7 @@
439 439 if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
440 440 }
441 441 h = h.substring(1, h.length);
442   - window.location.href = "/channel/page?" + h + "&pageSize=" + pageSize;
  442 + window.location.href = "/channel/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
443 443 } else {
444 444 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
445 445 var split = se.split("&");
... ... @@ -449,7 +449,7 @@
449 449 if (s.indexOf("page=") < 0) h = h + "&" + split[i];
450 450 }
451 451 h = h.substring(1, h.length);
452   - window.location.href = "/channel/page?" + h + "&pageSize=" + pageSize;
  452 + window.location.href = "/channel/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
453 453 }
454 454 }
455 455  
... ... @@ -487,7 +487,7 @@
487 487 end_date = $("#end_date").val();
488 488 count = $("#pageSize").val();
489 489 var expand_list_state = $("#forms").attr("expand_list_state");
490   - window.location.href = "/channel/page?channel_id=" + channel_id + "&start_date=" + start_date + "&end_date=" + end_date + "&channel_name=" + channel_name + "&pageSize=" + count + "&shenhe_status=" + shenhe_status + "&receive=" + receive + "&expand_list_state=" + expand_list_state;
  490 + window.location.href = "/channel/page?channel_id=" + channel_id + "&start_date=" + start_date + "&end_date=" + end_date + "&channel_name=" + channel_name + "&page=" + 1 + "&pageSize=" + count + "&shenhe_status=" + shenhe_status + "&receive=" + receive + "&expand_list_state=" + expand_list_state;
491 491 }
492 492  
493 493 //全部
... ...
src/main/resources/templates/page/log.html
  View file @d3c5ad2
... ... @@ -210,7 +210,7 @@
210 210 if (s.indexOf("pageSize=") < 0 &&s.indexOf("pageNum=") < 0) h = h + "&" + split[i];
211 211 }
212 212 h = h.substring(1, h.length);
213   - window.location.href = "/log/page?" + h + "&pageSize=" + pageSize;
  213 + window.location.href = "/log/page?" + h + "&pageNum=" + 1 + "&pageSize=" + pageSize;
214 214 } else {
215 215 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
216 216 var split = se.split("&");
... ... @@ -220,7 +220,7 @@
220 220 if (s.indexOf("pageNum=") < 0) h = h + "&" + split[i];
221 221 }
222 222 h = h.substring(1, h.length);
223   - window.location.href = "/log/page?" + h + "&pageSize=" + pageSize;
  223 + window.location.href = "/log/page?" + h + "&pageNum=" + 1 + "&pageSize=" + pageSize;
224 224 }
225 225 }
226 226  
... ... @@ -228,7 +228,7 @@
228 228 $('#site_query').click(function () {
229 229 var keyword = $("#keyword").val();
230 230 var pageSize = $("#pageSize").val();
231   - window.location.href = "/log/page?keyword=" + keyword + "&pageSize=" + pageSize;
  231 + window.location.href = "/log/page?keyword=" + keyword + "&pageNum=" + 1 + "&pageSize=" + pageSize;
232 232 });
233 233  
234 234 </script>
... ...