..

AJLoveChina · Apr 2, 2016 · db6fd8c · db6fd8c
1 parent 1fa134e
commit db6fd8c
Show file tree

Hide file tree

Showing 85 changed files with 6,499 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,4 +18,6 @@ java_demo3/.metadata
 *.lock
 java_demo3/.recommenders
 *.properties
-*.properties
+*.properties
+*.class
+*.jdb
diff --git a/java_demo/Pengfu/.project b/java_demo/Pengfu/.project
@@ -35,8 +35,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>com.genuitec.eclipse.springframework.springbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>com.genuitec.eclipse.springframework.springnature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
 		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>

diff --git a/java_demo/Pengfu/.settings/org.eclipse.wst.common.component b/java_demo/Pengfu/.settings/org.eclipse.wst.common.component
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
     <wb-module deploy-name="Pengfu">
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-        <wb-resource deploy-path="/" source-path="/WebRoot"/>
+        <wb-resource deploy-path="/" source-path="/target/m2e-jee/web-resources"/>
+        <wb-resource deploy-path="/" source-path="/WebRoot" tag="defaultRootSource"/>
         <property name="context-root" value="Pengfu"/>
         <property name="java-output-path" value="/Pengfu/WebRoot/WEB-INF/classes"/>
     </wb-module>

diff --git a/java_demo/Pengfu/WebRoot/WEB-INF/web.xml b/java_demo/Pengfu/WebRoot/WEB-INF/web.xml
@@ -9,12 +9,14 @@
     <servlet-name>main</servlet-name>
     <servlet-class>ajax.controller.DemoController</servlet-class>
   </servlet>
+
   <servlet>
     <description>This is the description of my J2EE component</description>
     <display-name>This is the display name of my J2EE component</display-name>
     <servlet-name>GetByType</servlet-name>
     <servlet-class>ajax.controller.GetByType</servlet-class>
   </servlet>
+
   <servlet>
     <description>This is the description of my J2EE component</description>
     <display-name>This is the display name of my J2EE component</display-name>

diff --git a/java_demo/Pengfu/WebRoot/views/includes/jokeTypeChoice.jsp b/java_demo/Pengfu/WebRoot/views/includes/jokeTypeChoice.jsp
@@ -52,7 +52,7 @@
 	
 	})
 </script>
-<div id="aj-top-type-choice" class="clearfix">
+<div id="aj-top-type-choice" class="clearfix aj-phone-only">
 	<div class="one">
 		<a class="atag" href="<%=Joke.getHrefByJokeType(JokeType.ALL) %>">
 			<span class="icon glyphicon glyphicon-th"></span>

diff --git a/java_demo/Pengfu/WebRoot/views/item/oneZdm.jsp b/java_demo/Pengfu/WebRoot/views/item/oneZdm.jsp
@@ -20,7 +20,7 @@
                 </span>
 	    	</c:if>
 
-                <span class="a-stamps">${item.getStamps() }</span>
+                <span class="a-stamps">标签 : ${item.getStamps() }</span>
             </div>
             <div class="a-l-c-body">
                 <span>

diff --git a/java_demo/Pengfu/WebRoot/web/css/index.css b/java_demo/Pengfu/WebRoot/web/css/index.css
@@ -19,7 +19,13 @@ body {
   font-size: 1.2em;
 }
 
+.aj-phone-only{
+	display: none;
+}
 @media(max-width:1050px) {
+	.aj-phone-only{
+		display: block;
+	}
 	div#aj-body{
 		min-height:450px;
 	}
@@ -92,6 +98,7 @@ body {
 	max-width:710px;
 	width:100%;
 	float:left;
+	padding-top: 10px;
 }
 .aj-body-right{
 	width:300px;

diff --git a/java_demo/Pengfu/pom.xml b/java_demo/Pengfu/pom.xml
@@ -4,6 +4,9 @@
   <artifactId>Pengfu</artifactId>
   <version>0.0.1-SNAPSHOT</version>
   <packaging>war</packaging>
+
+
+
   <build>
     <sourceDirectory>src</sourceDirectory>
     <resources>
@@ -95,6 +98,36 @@
 			<artifactId>httpclient</artifactId>
 			<version>4.5.2</version>
 		</dependency>
+
+		<dependency>
+		    <groupId>us.codecraft</groupId>
+		    <artifactId>webmagic-core</artifactId>
+		    <version>0.5.3</version>
+		</dependency>
+		<dependency>
+		    <groupId>us.codecraft</groupId>
+		    <artifactId>webmagic-extension</artifactId>
+		    <version>0.5.3</version>
+		</dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>4.1.4.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>4.1.4.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>taglibs</groupId>
+            <artifactId>standard</artifactId>
+            <version>1.1.2</version>
+            <scope>runtime</scope>
+        </dependency>        	
 
 	  </dependencies>
 </project>
diff --git a/java_demo/Pengfu/src/ajax/controller/HelloSpring.java b/java_demo/Pengfu/src/ajax/controller/HelloSpring.java
@@ -0,0 +1,37 @@
+package ajax.controller;
+
+import java.util.concurrent.atomic.AtomicLong;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class HelloSpring {
+
+    private static final String template = "Hello, %s!";
+    private final AtomicLong counter = new AtomicLong();
+
+    @RequestMapping("/greeting")
+    public void greeting() {
+    	System.out.println(123);
+    }
+}
+
+class Greeting {
+
+    private final long id;
+    private final String content;
+
+    public Greeting(long id, String content) {
+        this.id = id;
+        this.content = content;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public String getContent() {
+        return content;
+    }
+}
diff --git a/java_demo/Pengfu/target/m2e-jee/web-resources/META-INF/maven/Pengfu/Pengfu/pom.properties b/java_demo/Pengfu/target/m2e-jee/web-resources/META-INF/maven/Pengfu/Pengfu/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Thu Mar 31 17:08:06 CST 2016
+#Sat Apr 02 16:49:08 CST 2016
 version=0.0.1-SNAPSHOT
 groupId=Pengfu
 m2e.projectName=Pengfu

diff --git a/java_demo/Pengfu/target/m2e-jee/web-resources/META-INF/maven/Pengfu/Pengfu/pom.xml b/java_demo/Pengfu/target/m2e-jee/web-resources/META-INF/maven/Pengfu/Pengfu/pom.xml
@@ -4,6 +4,9 @@
   <artifactId>Pengfu</artifactId>
   <version>0.0.1-SNAPSHOT</version>
   <packaging>war</packaging>
+
+
+
   <build>
     <sourceDirectory>src</sourceDirectory>
     <resources>
@@ -95,6 +98,36 @@
 			<artifactId>httpclient</artifactId>
 			<version>4.5.2</version>
 		</dependency>
+
+		<dependency>
+		    <groupId>us.codecraft</groupId>
+		    <artifactId>webmagic-core</artifactId>
+		    <version>0.5.3</version>
+		</dependency>
+		<dependency>
+		    <groupId>us.codecraft</groupId>
+		    <artifactId>webmagic-extension</artifactId>
+		    <version>0.5.3</version>
+		</dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>4.1.4.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>4.1.4.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>taglibs</groupId>
+            <artifactId>standard</artifactId>
+            <version>1.1.2</version>
+            <scope>runtime</scope>
+        </dependency>        	
 
 	  </dependencies>
 </project>
diff --git a/...Pengfu/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/...Pengfu/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -40,7 +40,6 @@ ajax\model\entity\Item$1.class
 org\json\JSONObject.class
 org\json\HTTPTokener.class
 ajax\controller\GrabImageFromUrlOfJokeContent.class
-ajax\controller\OneJoke.class
 ajax\spider\Spiders.class
 ajax\spider\auto\DealWithSource.class
 ajax\spider\ZhihuAnswerSpider$1$1.class

diff --git a/...o/Pengfu/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/...o/Pengfu/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -1,6 +1,7 @@
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\org\json\JSONTokener.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\model\Question.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\model\PageType.java
+G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\model\entity\ImagesContainer.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\controller\Index.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\model\ItemStatus.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\model\JokeType.java
@@ -13,11 +14,13 @@ G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\controller\GetJokes.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\controller\DemoController.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\model\UrlRoute.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\org\json\JSONStringer.java
+G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\spider\auto\ItemImageGenerator.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\controller\SaveJoke.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\org\json\JSONML.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\org\json\JSONException.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\spider\auto\GrabImages.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\tools\Tools.java
+G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\model\QueryParams.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\controller\GetItem.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\model\Topic.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\org\json\JSONString.java
@@ -29,11 +32,12 @@ G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\org\json\JSONObject.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\controller\GrabImageFromUrlOfJokeContent.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\spider\Spider.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\spider\SpiderAction.java
-G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\controller\OneJoke.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\spider\auto\ZhihuAnswerSource.java
+G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\controller\OneItem.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\model\entity\Source.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\spider\rules\RulesTag.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\model\Answer.java
+G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\spider\auto\UpdateItem.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\model\JokeAdapter.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\spider\ZhihuSpider.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\tools\Mysql.java
@@ -46,12 +50,14 @@ G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\spider\rules\ZhihuAnswer
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\org\json\HTTP.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\org\json\CDL.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\org\json\Property.java
+G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\task\MoveJokeToItem.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\org\json\XML.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\spider\Spiders.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\model\JokeStatus.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\tools\FileTools.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\controller\GrabJokes.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\spider\auto\DealWithSource.java
+G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\spider\auto\SummaryGenerator.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\model\entity\Item.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\ajax\model\JokeRules.java
 G:\XAMPP\htdocs\Github\meAjax\java_demo\Pengfu\src\org\json\XMLTokener.java

diff --git a/java_demo/Test2/.classpath b/java_demo/Test2/.classpath
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="com.genuitec.runtime.library/com.genuitec.generic_6.0">
+		<attributes>
+			<attribute name="owner.project.facets" value="jst.web"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="con" path="com.genuitec.runtime.library/com.genuitec.jstl_1.2.1">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="WEB-INF/lib"/>
+			<attribute name="owner.project.facets" value="jst.web.jstl"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="WebRoot/WEB-INF/classes"/>
+</classpath>
diff --git a/java_demo/Test2/.project b/java_demo/Test2/.project
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Test2</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.genuitec.eclipse.j2eedt.core.DeploymentDescriptorValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+	</natures>
+</projectDescription>
diff --git a/java_demo/Test2/.settings/.jsdtscope b/java_demo/Test2/.settings/.jsdtscope
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="WebRoot"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary/StandardBrowser/html5"/>
+	<classpathentry kind="output" path=""/>
+</classpath>
diff --git a/java_demo/Test2/.settings/org.eclipse.wst.common.component b/java_demo/Test2/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="Test2">
+        <wb-resource deploy-path="/" source-path="/WebRoot" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+        <property name="context-root" value="Test2"/>
+        <property name="java-output-path" value="/Test2/WebRoot/WEB-INF/classes"/>
+    </wb-module>
+</project-modules>
diff --git a/java_demo/Test2/.settings/org.eclipse.wst.common.project.facet.core.xml b/java_demo/Test2/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <runtime name="com.genuitec.runtime.generic.jee60"/>
+  <fixed facet="jst.web"/>
+  <fixed facet="wst.jsdt.web"/>
+  <fixed facet="java"/>
+  <installed facet="java" version="1.6"/>
+  <installed facet="jst.web" version="3.0"/>
+  <installed facet="jst.web.jstl" version="1.2.1"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
diff --git a/java_demo/Test2/.settings/org.eclipse.wst.jsdt.ui.superType.container b/java_demo/Test2/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
diff --git a/java_demo/Test2/.settings/org.eclipse.wst.jsdt.ui.superType.name b/java_demo/Test2/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,7 @@ @@
                     </span>
     	    	</c:if>
-                    <span class="a-stamps">${item.getStamps() }</span>
+                    <span class="a-stamps">标签 : ${item.getStamps() }</span>
                 </div>
                 <div class="a-l-c-body">
                     <span>
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		org.eclipse.wst.jsdt.launching.baseBrowserLibrary