刘基城 / cnlive_live_web · Commits

Commit 33bf5af7cac4f7b4fb8e45fe0440314762f03afc

Authored by 张宗朋
1 parent d73a1ace

socket

Inline Side-by-side
Showing 10 changed files with 26 additions and 43 deletions
.classpath
  View file @33bf5af
... ... @@ -24,7 +24,7 @@
24 24 <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
25 25 </attributes>
26 26 </classpathentry>
27   - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
  27 + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
28 28 <attributes>
29 29 <attribute name="maven.pomderived" value="true"/>
30 30 </attributes>
... ...
.settings/org.eclipse.core.resources.prefs
  View file @33bf5af
1   -eclipse.preferences.version=1
2   -encoding//src/main/java=UTF-8
3   -encoding//src/main/resources=UTF-8
4   -encoding/<project>=UTF-8
  1 +eclipse.preferences.version=1
  2 +encoding//src/main/java=UTF-8
  3 +encoding//src/main/resources=UTF-8
  4 +encoding//src/test/java=UTF-8
  5 +encoding/<project>=UTF-8
... ...
.settings/org.eclipse.jdt.core.prefs
  View file @33bf5af
1 1 eclipse.preferences.version=1
2 2 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3 3 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
4   -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
  4 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
5 5 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
6   -org.eclipse.jdt.core.compiler.compliance=1.6
  6 +org.eclipse.jdt.core.compiler.compliance=1.7
7 7 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
8 8 org.eclipse.jdt.core.compiler.debug.localVariable=generate
9 9 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
10 10 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
11 11 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
12 12 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
13   -org.eclipse.jdt.core.compiler.source=1.6
  13 +org.eclipse.jdt.core.compiler.source=1.7
... ...
.settings/org.eclipse.wst.common.component
  View file @33bf5af
1 1 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
2 2 <wb-module deploy-name="cnlive_live_web">
3   -<<<<<<< HEAD
4   - <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
5   - <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
6   - <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
7   - <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
8   -=======
9 3 <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
10 4 <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
11 5 <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
12   - <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
13 6 <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
14   ->>>>>>> b4b2ebc4ecf2a7e345294fae4376bf39cbfa9732
15 7 <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources/i18n"/>
16 8 <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">
17 9 <dependency-type>uses</dependency-type>
18 10 </dependent-module>
19   -<<<<<<< HEAD
20 11 <dependent-module archiveName="smart-framework-4.0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-framework/smart-framework">
21 12 <dependency-type>uses</dependency-type>
22 13 </dependent-module>
23   -=======
24   - <dependent-module archiveName="cnlive_ks3-1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/cnlive_ks3/cnlive_ks3">
25   - <dependency-type>uses</dependency-type>
26   - </dependent-module>
27   - <dependent-module archiveName="smart-framework-4.0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-framework/smart-framework">
28   - <dependency-type>uses</dependency-type>
29   - </dependent-module>
30   - <dependent-module archiveName="smart-plugin-job-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-plugin-job/smart-plugin-job">
31   - <dependency-type>uses</dependency-type>
32   - </dependent-module>
33   ->>>>>>> b4b2ebc4ecf2a7e345294fae4376bf39cbfa9732
34 14 <dependent-module archiveName="smart-plugin-dbcp-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-plugin-dbcp/smart-plugin-dbcp">
35 15 <dependency-type>uses</dependency-type>
36 16 </dependent-module>
... ...
.settings/org.eclipse.wst.common.project.facet.core.xml
  View file @33bf5af
... ... @@ -3,5 +3,5 @@
3 3 <installed facet="jst.web" version="3.0"/>
4 4 <installed facet="wst.jsdt.web" version="1.0"/>
5 5 <installed facet="jst.jaxrs" version="1.1"/>
6   - <installed facet="java" version="1.6"/>
  6 + <installed facet="java" version="1.7"/>
7 7 </faceted-project>
... ...
... ... @@ -24,8 +24,8 @@
24 24 <artifactId>maven-compiler-plugin</artifactId>
25 25 <version>2.5.1</version>
26 26 <configuration>
27   - <source>1.6</source>
28   - <target>1.6</target>
  27 + <source>1.7</source>
  28 + <target>1.7</target>
29 29 </configuration>
30 30 </plugin>
31 31 </plugins>
... ...
src/main/java/com/cnlive/mz/live/action/UgcLiveAction.java
  View file @33bf5af
... ... @@ -81,7 +81,7 @@ public class UgcLiveAction {
81 81 */
82 82 @Request.Post("/live/epg/createActivity")
83 83 public ResultBean create(Params params) {
84   - log.info(params);
  84 + log.info("打印参数开始....."+params+"......打印参数结束");
85 85 ResultBean rb = new ResultBean();
86 86 String appId = params.getString("appId");
87 87 String activityId = params.getString("activityId");
... ... @@ -135,7 +135,7 @@ public class UgcLiveAction {
135 135 @Request.Get("/live/epg/startActivity")
136 136 public ResultBean start(Params params) {
137 137 ResultBean rb = new ResultBean();
138   - log.info(params);
  138 + log.info("打印参数开始....."+params+"......打印参数结束");
139 139 String appId = params.getString("appId");
140 140 String activityid = params.getString("activityId");
141 141 if (StringUtils.isEmpty(appId) || StringUtils.isEmpty(activityid)) {
... ... @@ -165,7 +165,7 @@ public class UgcLiveAction {
165 165 */
166 166 @Request.Get("/live/epg/stopActivity")
167 167 public ResultBean stop(Params params) {
168   - log.info(params);
  168 + log.info("打印参数开始....."+params+"......打印参数结束");
169 169 ResultBean rb = new ResultBean();
170 170 String appId = params.getString("appId");
171 171 String activityid = params.getString("activityId");
... ... @@ -208,6 +208,7 @@ public class UgcLiveAction {
208 208 */
209 209 @Request.Get("/live/epg/getActivity")
210 210 public ResultBean getActivities(Params params) {
  211 + log.info("打印参数开始....."+params+"......打印参数结束");
211 212 ResultBean rb = new ResultBean();
212 213 String appId = params.getString("appId");
213 214 String pageNo = params.getString("pageNo");
... ... @@ -242,6 +243,7 @@ public class UgcLiveAction {
242 243 */
243 244 @Request.Get("/live/epg/getActivityVodInfo")
244 245 public ResultBean getActivityVodInfo(Params params) {
  246 + log.info("打印参数开始....."+params+"......打印参数结束");
245 247 ResultBean rb = new ResultBean();
246 248 String appId = params.getString("appId");
247 249 String activityid = params.getString("activityId");
... ... @@ -277,7 +279,7 @@ public class UgcLiveAction {
277 279 */
278 280 @Request.Get("/live/epg/liveplayByAPP")
279 281 public ResultBean liveplayByAPP(Params params) {
280   - log.info(params);
  282 + log.info("打印参数开始....."+params+"......打印参数结束");
281 283 ResultBean rb = new ResultBean();
282 284 String appId = params.getString("appId");
283 285 String activityid = params.getString("activityId");
... ... @@ -314,7 +316,7 @@ public class UgcLiveAction {
314 316 */
315 317 @Request.Get("/live/epg/play/app")
316 318 public Redirect appURL(Params params) throws IOException {
317   - log.info(params);
  319 + log.info("打印参数开始....."+params+"......打印参数结束");
318 320 Redirect r = new Redirect();
319 321 String c = "http://wideo03.cnlive.com/video/data1/2016/0821/143844/800/8352b125fc404807851daa21d7e8f417_143844_800.m3u8";
320 322 String appId = params.getString("appId");
... ... @@ -367,6 +369,7 @@ public class UgcLiveAction {
367 369 */
368 370 @Request.Get("/live/epg/play/h5")
369 371 public ResultBean h5URL(Params params) {
  372 + log.info("打印参数开始....."+params+"......打印参数结束");
370 373 HttpServletResponse response = DataContext.getResponse();
371 374 ResultBean rb = new ResultBean();
372 375 String appId = params.getString("appId");
... ... @@ -416,6 +419,7 @@ public class UgcLiveAction {
416 419 */
417 420 @Request.Get("/live/epg/play/swf")
418 421 public ResultBean swfURL(Params params) {
  422 + log.info("打印参数开始....."+params+"......打印参数结束");
419 423 HttpServletResponse response = DataContext.getResponse();
420 424 ResultBean rb = new ResultBean();
421 425 String appId = params.getString("appId");
... ...
src/main/java/com/cnlive/socket/SocketServer.java
  View file @33bf5af
... ... @@ -110,10 +110,8 @@ public class SocketServer {
110 110 String data = new String(recData);
111 111 System.out.println("读取到客户端发送的来数据：" + data);
112 112 String[] str = data.split("#");
113   - String app = str[0];
114   - String activity = str[1];
115   - appId = app.substring(app.indexOf("=")+1);
116   - activityId = activity.substring(activity.indexOf("=")+1);
  113 + appId = str[0];
  114 + activityId = str[1];
117 115 System.out.println(appId+" ： "+activityId);
118 116 }
119 117 }
... ...
target/m2e-wtp/web-resources/META-INF/maven/com.cnlive.mz.live.web/cnlive_live_web/pom.properties
  View file @33bf5af
1 1 #Generated by Maven Integration for Eclipse
2   -#Mon Aug 22 16:01:42 CST 2016
  2 +#Mon Aug 22 16:38:17 CST 2016
3 3 version=0.0.1-SNAPSHOT
4 4 groupId=com.cnlive.mz.live.web
5 5 m2e.projectName=cnlive_live_web
... ...
target/m2e-wtp/web-resources/META-INF/maven/com.cnlive.mz.live.web/cnlive_live_web/pom.xml
  View file @33bf5af
... ... @@ -24,8 +24,8 @@
24 24 <artifactId>maven-compiler-plugin</artifactId>
25 25 <version>2.5.1</version>
26 26 <configuration>
27   - <source>1.6</source>
28   - <target>1.6</target>
  27 + <source>1.7</source>
  28 + <target>1.7</target>
29 29 </configuration>
30 30 </plugin>
31 31 </plugins>
... ...