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

王言钊
1 parent 04a5730c
Showing 6 changed files with 34 additions and 19 deletions
src/main/java/com/cnlive/shenhe/FinalShell.java
src/main/java/com/cnlive/shenhe/dto/TopicDTO.java
src/main/java/com/cnlive/shenhe/dto/UsersFreeDTO.java
src/main/resources/templates/common/frame.html
src/main/resources/templates/page/topic.html
src/main/resources/templates/page/usersFree.html
@@ -3,7 +3,6 @@ package com.cnlive.shenhe;
 import java.io.IOException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.util.Scanner;
 public class FinalShell {
     public static void main(String[] args) throws NoSuchAlgorithmException, IOException {
@@ -14,10 +13,28 @@ public class FinalShell {
         //    tel.append(array[i]);
         //}
         //System.out.println("tel&&wx:" + tel);
-        System.out.print("请输入FinalShell的离线机器码：");
-        Scanner reader = new Scanner(System.in);
-        String machineCode = reader.nextLine();
-        generateKey(machineCode);
+        //System.out.print("请输入FinalShell的离线机器码：");
+        //Scanner reader = new Scanner(System.in);
+        //String machineCode = reader.nextLine();
+        //generateKey(machineCode);
+        StringBuilder stringBuilder = new StringBuilder();
+        String Username = "我是中国娃哈哈我是中国娃哈哈我是中国娃哈哈";
+        int length = Username.length();
+        System.out.println(length);
+        if (length > 14 && length <= 21) {
+            String substring = Username.substring(0, 7);
+            String substring1 = Username.substring(7, 14);
+            String substring2 = Username.substring(14, length);
+            stringBuilder.append(substring).append("\n").append(substring1).append("\n").append(substring2);
+        } else if (length > 7 && length <= 14) {
+            String substring = Username.substring(0, 7);
+            String substring1 = Username.substring(7, length);
+            stringBuilder.append(substring).append("\n").append(substring1);
+        } else if (length <= 7) {
+            String substring = Username.substring(0, length);
+            stringBuilder.append(substring);
+        }
+        System.out.println(stringBuilder.toString());
     }
     public static void generateKey(String hardwareId) throws NoSuchAlgorithmException {
@@ -68,8 +68,6 @@ public class TopicDTO extends ShyTopic implements Serializable {
         this.userId = userId;
     }
-
-
     public String getTopic_name() {
         return topic_name;
     }
@@ -79,7 +77,7 @@ public class TopicDTO extends ShyTopic implements Serializable {
     }
     public Integer getPage() {
-        return page == null ? 1 : page;
+        return page;
     }
     public void setPage(Integer page) {
@@ -87,7 +85,7 @@ public class TopicDTO extends ShyTopic implements Serializable {
     }
     public Integer getPageSize() {
-        return pageSize == null ? 10 : pageSize;
+        return pageSize;
     }
     public void setPageSize(Integer pageSize) {
@@ -37,7 +37,7 @@ public class UsersFreeDTO extends ShyUsersfree implements Serializable {
     }
     public Integer getPage() {
-        return page == null ? 1 : page;
+        return page;
     }
     public void setPage(Integer page) {
@@ -45,7 +45,7 @@ public class UsersFreeDTO extends ShyUsersfree implements Serializable {
     }
     public Integer getPageSize() {
-        return pageSize == null ? 10 : pageSize;
+        return pageSize;
     }
     public void setPageSize(Integer pageSize) {
@@ -83,7 +83,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot;
                     <li><a href="/live/page?shenhe_state=0" id="/live/page"> 直播审核</a></li>
                     <li><a href="/comments/page?state=0&receive=0&page=1&pageSize=10" id="/comments/page"> 评论审核</a></li>
                     <li><a href="/content/page?receive_status=0" id="/content/page"> 图文审核</a></li>
-                    <li><a href="/topic/page?shenhe_status=0&receive=0" id="/topic/page"> 话题审核</a></li>
+                    <li><a href="/topic/page?shenhe_status=0&receive=0&page=1&pageSize=10" id="/topic/page"> 话题审核</a></li>
                     <li><a href="/channel/page?shenhe_status=0&receive=0&page=1&pageSize=10" id="/channel/page"> 频道审核</a></li>
                     <li><a href="/liveApply/page?shenhe_state=0&receive=0" id="/liveApply/page">直播申请审核</a></li>
                 </ul>
@@ -96,7 +96,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot;
                     <li><a href="/users/page" id="/users/page"> 审核云用户管理</a></li>
                     <li><a href="/sites/page?page=1&pageSize=10" id="/sites/page"> SP白名单管理</a></li>
                     <li><a href="/email/page" id="/email/page"> 邮件消息管理</a></li>
-                    <li><a href="/usersFree/page" id="/usersFree/page"> 网++白名单管理</a></li>
+                    <li><a href="/usersFree/page?page=1&pageSize=10" id="/usersFree/page"> 网++白名单管理</a></li>
                     <li><a href="/notSpeak/page" id="/notSpeak/page"> 网++禁言管理</a></li>
                     <li><a href="/activity/page?pageNum=1&pageSize=10" id="/activity/page"> 活动管理</a></li>
                     <li><a href="/log/page?pageNum=1&pageSize=10" id="/log/page"> 日志管理</a></li>
@@ -458,7 +458,7 @@
                     if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
                 }
                 h = h.substring(1, h.length);
-                window.location.href = "/topic/page?" + h + "&pageSize=" + pageSize;
+                window.location.href = "/topic/page?" + h +"&page=" + 1 + "&pageSize=" + pageSize;
             } else {
                 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
                 var split = se.split("&");
@@ -468,7 +468,7 @@
                     if (s.indexOf("page=") < 0) h = h + "&" + split[i];
                 }
                 h = h.substring(1, h.length);
-                window.location.href = "/topic/page?" + h + "&pageSize=" + pageSize;
+                window.location.href = "/topic/page?" + h +"&page=" + 1  + "&pageSize=" + pageSize;
             }
         }
@@ -508,7 +508,7 @@
             count = $("#pageSize").val();
             sp_desc = $("#sp_desc").val();
             var expand_list_state = $("#forms").attr("expand_list_state");
-            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;
+            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;
         }
         //全部
@@ -386,7 +386,7 @@ input:checked + .slider:before {
                      if (s.indexOf("pageSize=") < 0 &&s.indexOf("page=") < 0) h = h + "&" + split[i];
                  }
                  h = h.substring(1, h.length);
-                 window.location.href = "/usersFree/page?" + h + "&pageSize=" + pageSize;
+                 window.location.href = "/usersFree/page?" + h + "&page=" + 1  + "&pageSize=" + pageSize;
              } else {
             	 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
                  var split = se.split("&");
@@ -396,7 +396,7 @@ input:checked + .slider:before {
                      if (s.indexOf("page=") < 0) h = h + "&" + split[i];
                  }
                  h = h.substring(1, h.length);
-                 window.location.href = "/usersFree/page?" + h + "&pageSize=" + pageSize;
+                 window.location.href = "/usersFree/page?" + h + "&page=" + 1  + "&pageSize=" + pageSize;
              }
         }
@@ -405,7 +405,7 @@ input:checked + .slider:before {
         	var userId = $("#user_id").val();
         	var mobile = $("#mobile").val();
         	var pageSize = $("#pageSize").val();
-        	window.location.href = "/usersFree/page?userId=" + userId + "&mobile=" + mobile+ "&pageSize=" + pageSize;
+        	window.location.href = "/usersFree/page?userId=" + userId + "&mobile=" + mobile + "&page=" + 1  + "&pageSize=" + pageSize;
 		});
       //鼠标回车事件