socket

张宗朋
1 parent d73a1ace
Showing 10 changed files with 26 additions and 43 deletions
.classpath
.settings/org.eclipse.core.resources.prefs
.settings/org.eclipse.jdt.core.prefs
.settings/org.eclipse.wst.common.component
.settings/org.eclipse.wst.common.project.facet.core.xml
pom.xml
src/main/java/com/cnlive/mz/live/action/UgcLiveAction.java
src/main/java/com/cnlive/socket/SocketServer.java
target/m2e-wtp/web-resources/META-INF/maven/com.cnlive.mz.live.web/cnlive_live_web/pom.properties
target/m2e-wtp/web-resources/META-INF/maven/com.cnlive.mz.live.web/cnlive_live_web/pom.xml
@@ -24,7 +24,7 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding/<project>=UTF-8
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding/<project>=UTF-8
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
     <wb-module deploy-name="cnlive_live_web">
-<<<<<<< HEAD
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-=======
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
->>>>>>> b4b2ebc4ecf2a7e345294fae4376bf39cbfa9732
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources/i18n"/>
         <dependent-module archiveName="cnlive_live_model-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/cnlive_live_model/cnlive_live_model">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-<<<<<<< HEAD
         <dependent-module archiveName="smart-framework-4.0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-framework/smart-framework">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-=======
-        <dependent-module archiveName="cnlive_ks3-1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/cnlive_ks3/cnlive_ks3">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="smart-framework-4.0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-framework/smart-framework">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="smart-plugin-job-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-plugin-job/smart-plugin-job">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
->>>>>>> b4b2ebc4ecf2a7e345294fae4376bf39cbfa9732
         <dependent-module archiveName="smart-plugin-dbcp-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-plugin-dbcp/smart-plugin-dbcp">
             <dependency-type>uses</dependency-type>
         </dependent-module>
@@ -3,5 +3,5 @@
   <installed facet="jst.web" version="3.0"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
   <installed facet="jst.jaxrs" version="1.1"/>
-  <installed facet="java" version="1.6"/>
+  <installed facet="java" version="1.7"/>
 </faceted-project>
@@ -24,8 +24,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.5.1</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.7</source>
+					<target>1.7</target>
 				</configuration>
 			</plugin>
 		</plugins>
@@ -81,7 +81,7 @@ public class UgcLiveAction {
 	 */
 	@Request.Post("/live/epg/createActivity")
 	public ResultBean create(Params params) {
-		log.info(params);
+		log.info("打印参数开始....."+params+"......打印参数结束");
 		ResultBean rb = new ResultBean();
 		String appId = params.getString("appId");
 		String activityId = params.getString("activityId");
@@ -135,7 +135,7 @@ public class UgcLiveAction {
 	@Request.Get("/live/epg/startActivity")
 	public ResultBean start(Params params) {
 		ResultBean rb = new ResultBean();
-		log.info(params);
+		log.info("打印参数开始....."+params+"......打印参数结束");
 		String appId = params.getString("appId");
 		String activityid = params.getString("activityId");
 		if (StringUtils.isEmpty(appId) || StringUtils.isEmpty(activityid)) {
@@ -165,7 +165,7 @@ public class UgcLiveAction {
 	 */
 	@Request.Get("/live/epg/stopActivity")
 	public ResultBean stop(Params params) {
-		log.info(params);
+		log.info("打印参数开始....."+params+"......打印参数结束");
 		ResultBean rb = new ResultBean();
 		String appId = params.getString("appId");
 		String activityid = params.getString("activityId");
@@ -208,6 +208,7 @@ public class UgcLiveAction {
 	 */
 	@Request.Get("/live/epg/getActivity")
 	public ResultBean getActivities(Params params) {
+		log.info("打印参数开始....."+params+"......打印参数结束");
 		ResultBean rb = new ResultBean();
 		String appId = params.getString("appId");
 		String pageNo = params.getString("pageNo");
@@ -242,6 +243,7 @@ public class UgcLiveAction {
 	 */
 	@Request.Get("/live/epg/getActivityVodInfo")
 	public ResultBean getActivityVodInfo(Params params) {
+		log.info("打印参数开始....."+params+"......打印参数结束");
 		ResultBean rb = new ResultBean();
 		String appId = params.getString("appId");
 		String activityid = params.getString("activityId");
@@ -277,7 +279,7 @@ public class UgcLiveAction {
 	 */
 	@Request.Get("/live/epg/liveplayByAPP")
 	public ResultBean liveplayByAPP(Params params) {
-		log.info(params);
+		log.info("打印参数开始....."+params+"......打印参数结束");
 		ResultBean rb = new ResultBean();
 		String appId = params.getString("appId");
 		String activityid = params.getString("activityId");
@@ -314,7 +316,7 @@ public class UgcLiveAction {
 	 */
 	@Request.Get("/live/epg/play/app")
 	public Redirect appURL(Params params) throws IOException {
-		log.info(params);
+		log.info("打印参数开始....."+params+"......打印参数结束");
 		Redirect r = new Redirect();
 		String c = "http://wideo03.cnlive.com/video/data1/2016/0821/143844/800/8352b125fc404807851daa21d7e8f417_143844_800.m3u8";
 		String appId = params.getString("appId");
@@ -367,6 +369,7 @@ public class UgcLiveAction {
 	 */
 	@Request.Get("/live/epg/play/h5")
 	public ResultBean h5URL(Params params) {
+		log.info("打印参数开始....."+params+"......打印参数结束");
 		HttpServletResponse response = DataContext.getResponse();
 		ResultBean rb = new ResultBean();
 		String appId = params.getString("appId");
@@ -416,6 +419,7 @@ public class UgcLiveAction {
 	 */
 	@Request.Get("/live/epg/play/swf")
 	public ResultBean swfURL(Params params) {
+		log.info("打印参数开始....."+params+"......打印参数结束");
 		HttpServletResponse response = DataContext.getResponse();
 		ResultBean rb = new ResultBean();
 		String appId = params.getString("appId");
@@ -110,10 +110,8 @@ public class SocketServer {
 									String data = new String(recData);
 									System.out.println("读取到客户端发送的来数据：" + data);
 									String[] str = data.split("#");
-									String app = str[0];
-									String activity = str[1];
-									appId = app.substring(app.indexOf("=")+1);
-									activityId = activity.substring(activity.indexOf("=")+1);
+									appId = str[0];
+									activityId = str[1];
 									System.out.println(appId+"  ：    "+activityId);
 								}
 							}
 #Generated by Maven Integration for Eclipse
-#Mon Aug 22 16:01:42 CST 2016
+#Mon Aug 22 16:38:17 CST 2016
 version=0.0.1-SNAPSHOT
 groupId=com.cnlive.mz.live.web
 m2e.projectName=cnlive_live_web
@@ -24,8 +24,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.5.1</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.7</source>
+					<target>1.7</target>
 				</configuration>
 			</plugin>
 		</plugins>