周伟鹏 / cnlive_shenhe · Commits

Commit 5fd5a10165660f118693e3967dcee3788cf4f450

Authored by 王言钊
1 parent 04a5730c

修复话题、网++用户白名单管理模块

Inline Side-by-side
Showing 6 changed files with 34 additions and 19 deletions
src/main/java/com/cnlive/shenhe/FinalShell.java
  View file @5fd5a10
... ... @@ -3,7 +3,6 @@ package com.cnlive.shenhe;
3 3 import java.io.IOException;
4 4 import java.security.MessageDigest;
5 5 import java.security.NoSuchAlgorithmException;
6   -import java.util.Scanner;
7 6  
8 7 public class FinalShell {
9 8 public static void main(String[] args) throws NoSuchAlgorithmException, IOException {
... ... @@ -14,10 +13,28 @@ public class FinalShell {
14 13 // tel.append(array[i]);
15 14 //}
16 15 //System.out.println("tel&&wx:" + tel);
17   - System.out.print("请输入FinalShell的离线机器码：");
18   - Scanner reader = new Scanner(System.in);
19   - String machineCode = reader.nextLine();
20   - generateKey(machineCode);
  16 + //System.out.print("请输入FinalShell的离线机器码：");
  17 + //Scanner reader = new Scanner(System.in);
  18 + //String machineCode = reader.nextLine();
  19 + //generateKey(machineCode);
  20 + StringBuilder stringBuilder = new StringBuilder();
  21 + String Username = "我是中国娃哈哈我是中国娃哈哈我是中国娃哈哈";
  22 + int length = Username.length();
  23 + System.out.println(length);
  24 + if (length > 14 && length <= 21) {
  25 + String substring = Username.substring(0, 7);
  26 + String substring1 = Username.substring(7, 14);
  27 + String substring2 = Username.substring(14, length);
  28 + stringBuilder.append(substring).append("\n").append(substring1).append("\n").append(substring2);
  29 + } else if (length > 7 && length <= 14) {
  30 + String substring = Username.substring(0, 7);
  31 + String substring1 = Username.substring(7, length);
  32 + stringBuilder.append(substring).append("\n").append(substring1);
  33 + } else if (length <= 7) {
  34 + String substring = Username.substring(0, length);
  35 + stringBuilder.append(substring);
  36 + }
  37 + System.out.println(stringBuilder.toString());
21 38 }
22 39  
23 40 public static void generateKey(String hardwareId) throws NoSuchAlgorithmException {
... ...
src/main/java/com/cnlive/shenhe/dto/TopicDTO.java
  View file @5fd5a10
... ... @@ -68,8 +68,6 @@ public class TopicDTO extends ShyTopic implements Serializable {
68 68 this.userId = userId;
69 69 }
70 70  
71   -
72   -
73 71 public String getTopic_name() {
74 72 return topic_name;
75 73 }
... ... @@ -79,7 +77,7 @@ public class TopicDTO extends ShyTopic implements Serializable {
79 77 }
80 78  
81 79 public Integer getPage() {
82   - return page == null ? 1 : page;
  80 + return page;
83 81 }
84 82  
85 83 public void setPage(Integer page) {
... ... @@ -87,7 +85,7 @@ public class TopicDTO extends ShyTopic implements Serializable {
87 85 }
88 86  
89 87 public Integer getPageSize() {
90   - return pageSize == null ? 10 : pageSize;
  88 + return pageSize;
91 89 }
92 90  
93 91 public void setPageSize(Integer pageSize) {
... ...
src/main/java/com/cnlive/shenhe/dto/UsersFreeDTO.java
  View file @5fd5a10
... ... @@ -37,7 +37,7 @@ public class UsersFreeDTO extends ShyUsersfree implements Serializable {
37 37 }
38 38  
39 39 public Integer getPage() {
40   - return page == null ? 1 : page;
  40 + return page;
41 41 }
42 42  
43 43 public void setPage(Integer page) {
... ... @@ -45,7 +45,7 @@ public class UsersFreeDTO extends ShyUsersfree implements Serializable {
45 45 }
46 46  
47 47 public Integer getPageSize() {
48   - return pageSize == null ? 10 : pageSize;
  48 + return pageSize;
49 49 }
50 50  
51 51 public void setPageSize(Integer pageSize) {
... ...
src/main/resources/templates/common/frame.html
  View file @5fd5a10
... ... @@ -83,7 +83,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot;
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&page=1&pageSize=10" id="/comments/page"> 评论审核</a></li>
85 85 <li><a href="/content/page?receive_status=0" id="/content/page"> 图文审核</a></li>
86   - <li><a href="/topic/page?shenhe_status=0&receive=0" id="/topic/page"> 话题审核</a></li>
  86 + <li><a href="/topic/page?shenhe_status=0&receive=0&page=1&pageSize=10" id="/topic/page"> 话题审核</a></li>
87 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>
... ... @@ -96,7 +96,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot;
96 96 <li><a href="/users/page" id="/users/page"> 审核云用户管理</a></li>
97 97 <li><a href="/sites/page?page=1&pageSize=10" id="/sites/page"> SP白名单管理</a></li>
98 98 <li><a href="/email/page" id="/email/page"> 邮件消息管理</a></li>
99   - <li><a href="/usersFree/page" id="/usersFree/page"> 网++白名单管理</a></li>
  99 + <li><a href="/usersFree/page?page=1&pageSize=10" id="/usersFree/page"> 网++白名单管理</a></li>
100 100 <li><a href="/notSpeak/page" id="/notSpeak/page"> 网++禁言管理</a></li>
101 101 <li><a href="/activity/page?pageNum=1&pageSize=10" id="/activity/page"> 活动管理</a></li>
102 102 <li><a href="/log/page?pageNum=1&pageSize=10" id="/log/page"> 日志管理</a></li>
... ...
src/main/resources/templates/page/topic.html
  View file @5fd5a10
... ... @@ -458,7 +458,7 @@
458 458 if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
459 459 }
460 460 h = h.substring(1, h.length);
461   - window.location.href = "/topic/page?" + h + "&pageSize=" + pageSize;
  461 + window.location.href = "/topic/page?" + h +"&page=" + 1 + "&pageSize=" + pageSize;
462 462 } else {
463 463 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
464 464 var split = se.split("&");
... ... @@ -468,7 +468,7 @@
468 468 if (s.indexOf("page=") < 0) h = h + "&" + split[i];
469 469 }
470 470 h = h.substring(1, h.length);
471   - window.location.href = "/topic/page?" + h + "&pageSize=" + pageSize;
  471 + window.location.href = "/topic/page?" + h +"&page=" + 1 + "&pageSize=" + pageSize;
472 472 }
473 473 }
474 474  
... ... @@ -508,7 +508,7 @@
508 508 count = $("#pageSize").val();
509 509 sp_desc = $("#sp_desc").val();
510 510 var expand_list_state = $("#forms").attr("expand_list_state");
511   - window.location.href = "/topic/page?topic_id=" + topic_id + "&start_date=" + start_date + "&end_date=" + end_date + "&topic_name=" + topic_name + "&pageSize=" + count + "&shenhe_status=" + shenhe_status + "&receive=" + receive + "&sp_desc=" + sp_desc + "&expand_list_state=" + expand_list_state;
  511 + window.location.href = "/topic/page?topic_id=" + topic_id + "&start_date=" + start_date + "&end_date=" + end_date + "&topic_name=" + topic_name + "&page=" + 1 + "&pageSize=" + count + "&shenhe_status=" + shenhe_status + "&receive=" + receive + "&sp_desc=" + sp_desc + "&expand_list_state=" + expand_list_state;
512 512 }
513 513  
514 514 //全部
... ...
src/main/resources/templates/page/usersFree.html
  View file @5fd5a10
... ... @@ -386,7 +386,7 @@ input:checked + .slider:before {
386 386 if (s.indexOf("pageSize=") < 0 &&s.indexOf("page=") < 0) h = h + "&" + split[i];
387 387 }
388 388 h = h.substring(1, h.length);
389   - window.location.href = "/usersFree/page?" + h + "&pageSize=" + pageSize;
  389 + window.location.href = "/usersFree/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
390 390 } else {
391 391 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
392 392 var split = se.split("&");
... ... @@ -396,7 +396,7 @@ input:checked + .slider:before {
396 396 if (s.indexOf("page=") < 0) h = h + "&" + split[i];
397 397 }
398 398 h = h.substring(1, h.length);
399   - window.location.href = "/usersFree/page?" + h + "&pageSize=" + pageSize;
  399 + window.location.href = "/usersFree/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
400 400 }
401 401 }
402 402  
... ... @@ -405,7 +405,7 @@ input:checked + .slider:before {
405 405 var userId = $("#user_id").val();
406 406 var mobile = $("#mobile").val();
407 407 var pageSize = $("#pageSize").val();
408   - window.location.href = "/usersFree/page?userId=" + userId + "&mobile=" + mobile+ "&pageSize=" + pageSize;
  408 + window.location.href = "/usersFree/page?userId=" + userId + "&mobile=" + mobile + "&page=" + 1 + "&pageSize=" + pageSize;
409 409 });
410 410  
411 411 //鼠标回车事件
... ...