审核云error页面动态获取失败数据

liwei2917
1 parent 529a0c92
Showing 19 changed files with 191 additions and 75 deletions
src/main/java/com/cnlive/shenhe/controller/BaseController.java
src/main/java/com/cnlive/shenhe/controller/ChannelController.java
src/main/java/com/cnlive/shenhe/controller/CommentsController.java
src/main/java/com/cnlive/shenhe/controller/ContentController.java
src/main/java/com/cnlive/shenhe/controller/EmailController.java
src/main/java/com/cnlive/shenhe/controller/LiveApplyController.java
src/main/java/com/cnlive/shenhe/controller/LiveController.java
src/main/java/com/cnlive/shenhe/controller/SitesController.java
src/main/java/com/cnlive/shenhe/controller/TopicController.java
src/main/java/com/cnlive/shenhe/controller/UsersController.java
src/main/java/com/cnlive/shenhe/controller/UsersFreeController.java
src/main/java/com/cnlive/shenhe/controller/VideosController.java
src/main/java/com/cnlive/shenhe/utils/AuditPass.java
src/main/resources/application.properties
src/main/resources/static/favicon.ico
src/main/resources/templates/common/head.html
src/main/resources/templates/error.html
src/main/resources/templates/error3.html
src/main/resources/templates/page/error.html
@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -71,7 +72,39 @@ public class BaseController {
 	public void setSessionUser(SessionUser sessionUser){
 		 this.getsession().setAttribute("",null);
 	}
+	
+	/**
+	 * 设置报错页面显示信息——站点查询失败
+	 * @param model
+	 */
+	public void setmodel_site(Model model){
+		model.addAttribute("errorMessage", "站点查询失败，不存在此站点，请重新查询！");
+		model.addAttribute("remindMessage", "提示：站点查询请输入全称，不支持模糊查询");
+	}
+	/**
+	 * 设置报错页面显示信息——参数校验失败
+	 * @param model
+	 * @param value 不能为空的参数
+	 */
+	public void setmodel_param(Model model,String value){
+		model.addAttribute("errorMessage", "参数传递不能为空！"+value);
+		model.addAttribute("remindMessage", "提示：请检查所传参数，存在非空参数未赋值");
+	}
-   
+	/**
+	 * 设置报错页面显示信息——入库结果失败
+	 * @param model
+	 */
+	public void setmodel_result(Model model){
+		model.addAttribute("errorMessage", "数据入库失败，请重试！");
+		model.addAttribute("remindMessage", "提示：如连续两次以上入库失败，请联系开发人员");
+	}
+	/**
+	 * 设置报错页面显示信息——权限不足
+	 * @param model
+	 */
+	public void setmodel_limit(Model model){
+		model.addAttribute("errorMessage", "您没有此操作的权限，请重试或者联系管理员开通！");
+	}
 }
@@ -34,7 +34,7 @@ import java.util.Map;
 @Controller
 @RequestMapping("/channel")
-public class ChannelController {
+public class ChannelController extends BaseController {
     private static Logger logger = LoggerFactory.getLogger(ChannelController.class);
     @Value("${spring.localhost.url}")
 	private String localhost_url;//本机地址
@@ -83,7 +83,8 @@ public class ChannelController {
         	if(CommonUtils.isNotNull(shySite)){
         		spid = shySite.getSpid();
         	}else{
-        		return "page/sitesError.html";
+        		setmodel_site(model);
+        		return "error.html";
         	}
         } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
             spid = null;
@@ -31,7 +31,7 @@ import java.util.List;
 @Controller
 @RequestMapping("/comments")
-public class CommentsController {
+public class CommentsController extends BaseController {
     private static Logger logger = LoggerFactory.getLogger(CommentsController.class);
     @Autowired
     AuditPass Pass;
@@ -45,7 +45,7 @@ import java.util.List;
 @Controller
 @RequestMapping("/content")
-public class ContentController {
+public class ContentController extends BaseController {
     private static Logger logger = LoggerFactory.getLogger(ContentController.class);
     @Autowired
     AuditPass Pass;
@@ -91,7 +91,8 @@ public class ContentController {
         	if(CommonUtils.isNotNull(shySite)){
         		spid = shySite.getSpid();
         	}else{
-        		return "page/sitesError.html";
+        		setmodel_site(model);
+        		return "error.html";
         	}
         } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
             spid = null;
@@ -40,7 +40,7 @@ import javax.servlet.http.HttpSession;
  */
 @Controller
 @RequestMapping("/email")
-public class EmailController {
+public class EmailController extends BaseController {
     @Autowired
     EmailServiceImpl emailServiceImpl;
@@ -121,8 +121,9 @@ public class EmailController {
     @PostMapping(value = "/write")
-    public String write(Integer id,String email,String remark, String[] write_business, HttpSession session, String redirect_url) {
+    public String write(Model model,Integer id,String email,String remark, String[] write_business, HttpSession session, String redirect_url) {
     	if(CommonUtils.isEmpty(email)&&CommonUtils.isEmpty(remark)){
+    		setmodel_param(model,"email,remark不能为空");
     		return "error.html";
     	}
     	SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
@@ -137,7 +138,8 @@ public class EmailController {
         if (success) {
             return "redirect:" + redirect_url;
         } else {
-            return "error.html";
+        	setmodel_result(model);
+    		return "error.html";
         }
     }
@@ -45,7 +45,7 @@ import java.util.Map;
 @Controller
 @RequestMapping("/liveApply")
-public class LiveApplyController {
+public class LiveApplyController extends BaseController {
     private static Logger logger = LoggerFactory.getLogger(LiveApplyController.class);
     @Autowired
     AuditPass Pass;
@@ -147,7 +147,8 @@ public class LiveApplyController {
         	if(CommonUtils.isNotNull(shySite)){
         		spid = shySite.getSpid();
         	}else{
-        		return "page/sitesError.html";
+        		setmodel_site(model);
+        		return "error.html";
         	}
         } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
             spid = null;
@@ -40,7 +40,7 @@ import java.util.List;
 @Controller
 @RequestMapping("/live")
-public class LiveController {
+public class LiveController extends BaseController {
     private static Logger logger = LoggerFactory.getLogger(LiveController.class);
     @Autowired
     AuditPass Pass;
@@ -133,7 +133,8 @@ public class LiveController {
         	if(CommonUtils.isNotNull(shySite)){
         		spid = shySite.getSpid();
         	}else{
-        		return "page/sitesError.html";
+        		setmodel_site(model);
+        		return "error.html";
         	}
         } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
             spid = null;
@@ -26,7 +26,7 @@ import java.util.List;
  */
 @Controller
 @RequestMapping("/sites")
-public class SitesController {
+public class SitesController extends BaseController {
     private static Logger logger = LoggerFactory.getLogger(SitesController.class);
@@ -50,7 +50,8 @@ public class SitesController {
         }
         Integer spid = sessionUser.getSpid();
         if (!sessionUser.isMaster() && spid != 0) {
-            return "page/error.html";
+        	setmodel_site(model);
+    		return "error.html";
         }
         if (spid == 0) spid = null;
         if (CommonUtils.isNull(page)) page = 1;
@@ -79,12 +80,11 @@ public class SitesController {
     @PostMapping(value = "/write")
-    public String write(Integer siteId, String[] write_business, HttpSession session, String redirect_url) {
+    public String write(Model model,Integer siteId, String[] write_business, HttpSession session, String redirect_url) {
         ShySites site = sitesService.get(siteId);
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
-        Integer spid = sessionUser.getSpid();
-        if ((!sessionUser.isMaster() && spid != 0) ) {
-            return "page/error.html";
+        if(CommonUtils.isNull(sessionUser)){
+        	return "redirect:/users/login";
         }
         String write = "";
         if (CommonUtils.isNotNull(write_business) && write_business.length > 0) {
@@ -98,7 +98,8 @@ public class SitesController {
         if (success) {
             return "redirect:" + redirect_url;
         } else {
-            return "error.html";
+        	setmodel_result(model);
+    		return "error.html";
         }
     }
@@ -47,7 +47,7 @@ import java.util.List;
 @Controller
 @RequestMapping("/topic")
-public class TopicController {
+public class TopicController extends BaseController {
     private static Logger logger = LoggerFactory.getLogger(TopicController.class);
     @Autowired
     AuditPass Pass;
@@ -93,7 +93,8 @@ public class TopicController {
         	if(CommonUtils.isNotNull(shySite)){
         		spid = shySite.getSpid();
         	}else{
-        		return "page/sitesError.html";
+        		setmodel_site(model);
+        		return "error.html";
         	}
         } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
             spid = null;
@@ -38,7 +38,7 @@ import javax.servlet.http.HttpSession;
  */
 @Controller
 @RequestMapping("/users")
-public class UsersController {
+public class UsersController extends BaseController {
     @Autowired
     UsersServiceImpl usersService;
@@ -92,9 +92,6 @@ public class UsersController {
         	return "redirect:/users/login";
         }
         Integer spid = sessionUser.getSpid();
-        if (!sessionUser.isMaster() && spid != 0) {
-            return "page/error.html";
-        }
         if (spid == 0) spid = null;
         if (CommonUtils.isNull(page)) page = 1;
         if (CommonUtils.isNull(pageSize)) pageSize = 10;
@@ -145,12 +142,12 @@ public class UsersController {
     @PostMapping(value = "/write")
-    public String write(Integer userId, String[] write_notice, HttpSession session, String redirect_url) {
+    public String write(Model model,Integer userId, String[] write_notice, HttpSession session, String redirect_url) {
     	SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
-    	Integer spid = sessionUser.getSpid();
-    	if (spid != 0) {
-    		return "page/error.html";
-    	}
+//    	Integer spid = sessionUser.getSpid();
+//    	if (spid != 0) {
+//    		return "page/error.html";
+//    	}
     	ShyUsers user = usersService.get(userId);
     	String write = "";
     	if (CommonUtils.isNotNull(write_notice) && write_notice.length > 0) {
@@ -164,7 +161,8 @@ public class UsersController {
     	if (success) {
     		return "redirect:" + redirect_url;
     	} else {
-    		return "error.html";
+    		setmodel_result(model);
+			return "error.html";
     	}
     }
@@ -36,7 +36,7 @@ import javax.servlet.http.HttpSession;
  */
 @Controller
 @RequestMapping("/usersFree")
-public class UsersFreeController {
+public class UsersFreeController extends BaseController {
     @Autowired
     UsersfreeServiceImpl usersfreeService;
@@ -100,8 +100,9 @@ public class UsersFreeController {
     @PostMapping(value = "/write")
-    public String write(String userId,String userMobile,Integer spId, String[] write_business, HttpSession session, String redirect_url) {
+    public String write(Model model,String userId,String userMobile,Integer spId, String[] write_business, HttpSession session, String redirect_url) {
     	if(CommonUtils.isEmpty(userId)&&CommonUtils.isEmpty(userMobile)){
+    		setmodel_param(model,"userId,userMobile不能为空！");
     		return "error.html";
     	}
     	SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
@@ -116,6 +117,7 @@ public class UsersFreeController {
         if (success) {
             return "redirect:" + redirect_url;
         } else {
+        	setmodel_result(model);
             return "error.html";
         }
     }
@@ -129,7 +129,8 @@ public class VideosController extends BaseController {
         	if(CommonUtils.isNotNull(shySite)){
         		spid = shySite.getSpid();
         	}else{
-        		return "page/sitesError.html";
+        		setmodel_site(model);
+				return "error.html";
         	}
         } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
             spid = null;
@@ -31,6 +31,19 @@ public class AuditPass {
     @Value("${queryUserByUserId}")
     private String queryUserByUserId;//用户云查网家家用户信息（通过用户id）
+    
+    public static void main(String[] args) {
+    	JSONObject map= new JSONObject();
+    	map.put("platform","a" );
+    	map.put("commentUserAvatar","http://yweb0.cnliveimg.com/images/headImg/2019/1129/1575022593286.jpg" );
+    	map.put("appId","60#iqw7flx829" );
+    	map.put("commentUserIP", null);
+    	map.put("type", "topic");
+    	map.put("activityId", "802:video:comets:604_ab79303bd0074a24965a92dd6514681a#20939");
+    	HttpUtil httpUtil = HttpUtil.init();
+    	httpUtil.setParam("param", map.toJSONString());
+    	Map<String, String> post = httpUtil.post("http://test.shen.cnlive.com/api/comments/import");
+    }
     /**
      * 点播视频回调
@@ -49,8 +49,12 @@ spring.rabbitmq.publisher-returns=true
 spring.rabbitmq.listener.direct.acknowledge-mode=manual
 spring.rabbitmq.listener.simple.acknowledge-mode=manual
+#\u8bdd\u9898\u8bc4\u8bba\u5206\u4eabh5
 topic_comment_shareH5=http://www.baidu.com?id=
+#\u5173\u95edspringboot\u63d0\u4f9b\u7684\u9ed8\u8ba4ico
+spring.mvc.favicon.enabled = false
+
 #logback\u65e5\u5fd7\u4e2d\u4f7f\u7528
 spring.application.name=cnlive_shenhe_test
 spring.application.home=/usr/local/test_cnlive_shenhe/cnlive_shenhe/log
@@ -14,7 +14,8 @@
     <!--JQuery-->
     <script src="../../static/js/jquery.min.js"></script>
-
+<!-- 	<link rel="icon" href="http://app.shineup.com.cn/goldenline/play_sel.png" type="image/x-icon"> -->
+	<link rel="icon" href="/static/favicon.ico" type="image/x-icon">
     <!--Bootstrap-->
     <link href="../../static/css/bootstrap.min.css" rel="stylesheet">
     <script src="../../static/js/bootstrap.min.js"></script>
 <!DOCTYPE html>
-<html>
-<head>
-    <title>审核云平台</title>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
-    <style>
-        html, body {
-            height: 100%;
-        }
-
-        body {
-            margin: 0;
-            padding: 0;
-            width: 100%;
-            display: table;
-            font-weight: 100;
-            font-family: 'Lato', sans-serif;
-        }
-
-        .container {
-            text-align: center;
-            display: table-cell;
-            vertical-align: middle;
-        }
+<head th:replace="../templates/common/head::head">
+</head>
-        .content {
-            text-align: center;
-            display: inline-block;
-        }
+<body class="skin-blue sidebar-mini">
-        .title {
-            font-size: 40px;
-        }
-    </style>
-</head>
-<body>
-<div class="container">
-    <div class="content">
-        <div class="title">出错了，请稍后再试！</div>
+<div class="wrapper">
+    <div th:replace="../templates/common/frame::frame"></div>
+    <div class="content-wrapper" style="min-height: 588px;">
+        <section class="content-header">
+            <h1>
+                报错页面
+            </h1>
+            <ol class="breadcrumb">
+                <li>首页</li>
+                <li class="active">报错页面</li>
+            </ol>
+        </section>
+        <section class="content">
+				<div class="row">
+					<div class="col-md-12">
+						<div class="box box-info">
+							<div class="box-body">
+								<div class="container" style="background-color:#FFF;padding:150px;text-align: center; display: table-cell; vertical-align: middle;">
+								      <div class="content" style="text-align: center;display: inline-block;">
+								         <div style="font-size: 40px;" th:utext="${errorMessage}">出错了，请稍后再试！</div>
+								         <br>
+								         <div style="font-size: 20px;color:red;" th:utext="${remindMessage}">出错了，请稍后再试！</div>
+								       </div>
+						    	</div>
+								
+							</div>
+						</div>
+					</div>
+				</div>
+			</section>
     </div>
-</div>
-</body>
-</html>
+    <footer th:replace="../templates/common/foot::foot"></footer>
+    <!-- Add the sidebar's background. This div must be placed
+         immediately after the control sidebar -->
+    <div class="control-sidebar-bg" style="position: fixed; height: auto;"></div>
+</div><!-- ./wrapper -->
+<!-- AdminLTE App -->
+<script src="../../static/js/app.min.js"></script>
+<!-- AdminLTE for demo purposes -->
+<script src="../../static/js/sidebar.js"></script>
+</body>
+</html>
 \ No newline at end of file
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <title>审核云平台</title>
+
+    <style>
+        html, body {
+            height: 100%;
+        }
+
+        body {
+            margin: 0;
+            padding: 0;
+            width: 100%;
+            display: table;
+            font-weight: 100;
+            font-family: 'Lato', sans-serif;
+        }
+
+        .container {
+            text-align: center;
+            display: table-cell;
+            vertical-align: middle;
+        }
+
+        .content {
+            text-align: center;
+            display: inline-block;
+        }
+
+        .title {
+            font-size: 40px;
+        }
+        .remind {
+            font-size: 20px;
+        }
+    </style>
+</head>
+<body>
+<div class="container">
+    <div class="content">
+        <div class="title" th:utext="${errorMessage}">出错了，请稍后再试！</div>
+        <br>
+        <div class="remind" th:utext="${remindMessage}">出错了，请稍后再试！</div>
+    </div>
+</div>
+</body>
+</html>
+
@@ -36,7 +36,7 @@
 <body>
 <div class="container">
     <div class="content">
-        <div class="title">抱歉!你没有审核云权限,请与视讯云用户中心管理员联系!</div>
+        <div class="title">抱歉!你没有审核云账户未激活,请与视讯云用户中心管理员联系!</div>
     </div>
 </div>
 </body>