添加用户管理

刘基城
1 parent 88ce3564
Showing 7 changed files with 15 additions and 21 deletions
src/main/java/com/cnlive/mz/live/action/HttpPostArgumentTest2.java
src/main/java/com/cnlive/mz/live/action/VideoAction.java
src/main/java/com/cnlive/mz/live/aspect/AuthFilter.java
src/main/resources/log4j.properties
src/main/webapp/static/assets/cnlive/js/global.js
target/classes/com/cnlive/mz/live/aspect/AuthFilter.class
target/m2e-wtp/web-resources/META-INF/maven/com.cnlive.mz.live.web/cnlive_live_web/pom.properties
@@ -67,7 +67,7 @@ public class HttpPostArgumentTest2 {
 		NameValuePair[] param = { new NameValuePair("relation_id", "283645"), new NameValuePair("video_type", "3"),
 				new NameValuePair("user_access_key", user_access_key),
 				new NameValuePair("app_access_key", app_access_key) };
-		String c = HttpReq.postRequestWidthResult("http://localhost:8080/cnlive_live_web/api/video/redirect", param);
+		String c = HttpReq.postRequestWidthResult("http://bc.cnlive.com/api/video/redirect", param);
 		System.out.println(c);
 	}
@@ -84,12 +84,12 @@ public class HttpPostArgumentTest2 {
 	public static void supload() {
 		NameValuePair[] param = { new NameValuePair("app_access_key", app_access_key),
-				new NameValuePair("user_access_key", user_access_key), new NameValuePair("video_type", "2"),
+				new NameValuePair("user_access_key", user_access_key), new NameValuePair("video_type", "3"),
 				new NameValuePair("upload_type", "0"), new NameValuePair("direct", "1"), new NameValuePair("md5", md5),
 				new NameValuePair("title", "tit三道恩le1"), new NameValuePair("relation_id", "615207"),
 				new NameValuePair("custom_args", "custom_args1"), new NameValuePair("name", "VID_20151224_105421.mp4"),
 				new NameValuePair("server_access_key", "3830ce241dad4b9f844d131c890231ae") };
-		String c = HttpReq.postRequestWidthResult("http://bc.cnlive.com/api/video/supload", param);
+		String c = HttpReq.postRequestWidthResult("http://localhost:8080/cnlive_live_web/api/video/supload", param);
 		System.out.println(c);
 	}
@@ -117,7 +117,7 @@ public class HttpPostArgumentTest2 {
 	public static void main(String[] args) {
 		// new HttpPostArgumentTest2().delete();
 		//HttpPostArgumentTest2.all();
-		 HttpPostArgumentTest2.redirect();
+		 HttpPostArgumentTest2.supload();
 		// HttpReq.postRequestWidthResult("http://120.132.76.51:9696/cnlive_encoding_job/task",
 		// "json", "jsonjsonjsonjson");r
 	}
@@ -73,9 +73,10 @@ public class VideoAction {
 			title = title.substring(0, 50);
 		}
 		String description = params.getString("description");
-		FilteredResult resTitle = WordFilterUtil.filterHtml(title, '*');
+		WordFilterUtil wf =new WordFilterUtil();
+		FilteredResult resTitle =wf.filterHtml(title, '*');
 		title=resTitle.getFilteredContent().toString();
-		FilteredResult resDescr= WordFilterUtil.filterHtml(description, '*');
+		FilteredResult resDescr= wf.filterHtml(description, '*');
 		description=resDescr.getFilteredContent().toString();
 		String direct = params.getString("direct");
@@ -52,12 +52,14 @@ public class AuthFilter implements Filter {
 		String requestUrl = request.getRequestURI();
 		HttpSession session = request.getSession();
 		String webUrl =  ConfigHelper.getString("website.url");
-		if (session.getAttribute(LiveUtils.SESSION_KEY_NAME) == null) {
+		String a=(String) session.getAttribute(LiveUtils.SESSION_KEY_NAME) ;
+		if (a== null) {
 			boolean authEnable = ConfigHelper.getBoolean("auth.enable");
 			String loginUrl = ConfigHelper.getString("auth.login.url");
 			if (authEnable) {
 				//去登录认证
-				response.sendRedirect(loginUrl + webUrl+"/login/success");
+				String url=loginUrl + webUrl+"/login/success";
+				response.sendRedirect(url);
 				return;
 			} else {
 				String userName = "liujicheng";
 log4j.rootLogger=INFO,console,file,action,content,video,httpreq
-
 #Console  
-log4j.appender.Threshold=INFO
 log4j.appender.console.Target=System.out 
 log4j.appender.console=org.apache.log4j.ConsoleAppender
 log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d %-5p [%c] (%t:%x) %m%n
+log4j.appender.console.layout.ConversionPattern=%m%n
 log4j.appender.file=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.file.File=${catalina.base}/logs/cnlive_live_web/log
+log4j.appender.file.File=${catalina.home}/logs/cnlive_live_web/log
 log4j.appender.file.DatePattern='_'yyyyMMdd
 log4j.appender.file.encoding=UTF-8
 log4j.appender.file.layout=org.apache.log4j.PatternLayout
@@ -20,6 +18,7 @@ log4j.logger.org.smart4j=DEBUG
 #action
+
 log4j.appender.action=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.action.File=${catalina.home}/logs/action.log
 log4j.appender.action.layout=org.apache.log4j.PatternLayout
 var BASE; // Context Path（在 script.jsp 中初始化）
 function next_page(pageNum){
 	window.location.href = "" + pageNum+window.location.search;
-	alert(window.location.search);
 }
 var Smart = {
     /* -------------------------------------------------- 函数 -------------------------------------------------- */
 #Generated by Maven Integration for Eclipse
-#Mon Jun 27 14:02:38 CST 2016
+#Fri Jul 08 14:51:31 CST 2016
 version=0.0.1-SNAPSHOT
 groupId=com.cnlive.mz.live.web
 m2e.projectName=cnlive_live_web
 m2e.projectLocation=D\:\\1_CNLIVE_JAVA_CODE\\cnlive_live_web
 artifactId=cnlive_live_web
-#Generated by Maven Integration for Eclipse
-#Fri Jun 24 09:13:59 CST 2016
-version=0.0.1-SNAPSHOT
-groupId=com.cnlive.mz.live.web
-m2e.projectName=cnlive_live_web
-m2e.projectLocation=C\:\\Users\\Administrator\\git\\cnlive_live_web
-artifactId=cnlive_live_web