重新分了模块，并添加了readme

zhangyingwei · zhangyingwei · commit 01e14fbacc0a · 2018-02-26T10:45:02.000+08:00
diff --git a/cockroach-annotation/README.md b/cockroach-annotation/README.md
@@ -0,0 +1,3 @@
+# cockroach-core
+
+cockroach 核心部分，主要包含了核心的爬虫代码，包括： 队列、http客户端、解析器 等等
diff --git a/cockroach-annotation/cockroach-annotation.iml b/cockroach-annotation/cockroach-annotation.iml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
@@ -23,7 +22,6 @@
     <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.11.2" level="project" />
     <orderEntry type="library" name="Maven: cn.wanghaomiao:JsoupXpath:0.3.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.3.2" level="project" />
-    <orderEntry type="module" module-name="cockroach-common" />
     <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
   </component>
 </module>
diff --git a/cockroach-common/cockroach-common.iml b/cockroach-common/cockroach-common.iml
diff --git a/cockroach-common/pom.xml b/cockroach-common/pom.xml
diff --git a/cockroach-core/README.md b/cockroach-core/README.md
@@ -0,0 +1,3 @@
+# cockroach-annotation
+
+cockroach 注解部分，主要实现了注解的定义以及注解的解析
diff --git a/cockroach-core/cockroach-core.iml b/cockroach-core/cockroach-core.iml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
@@ -22,7 +21,6 @@
     <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.11.2" level="project" />
     <orderEntry type="library" name="Maven: cn.wanghaomiao:JsoupXpath:0.3.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.3.2" level="project" />
-    <orderEntry type="module" module-name="cockroach-common" />
     <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
   </component>
 </module>
diff --git a/cockroach-core/pom.xml b/cockroach-core/pom.xml
@@ -36,11 +36,6 @@
             <artifactId>JsoupXpath</artifactId>
             <version>0.3.2</version>
         </dependency>
-        <dependency>
-            <groupId>com.github.zhangyingwei</groupId>
-            <artifactId>cockroach-common</artifactId>
-            <version>1.0.5.03-Beta</version>
-        </dependency>
     </dependencies>
 
 </project>
diff --git a/cockroach-core/src/main/java/com/zhangyingwei/cockroach/common/exception/HttpException.java b/cockroach-core/src/main/java/com/zhangyingwei/cockroach/common/exception/HttpException.java
@@ -1,4 +1,4 @@
-package com.zhangyingwei.cockroach.exception;
+package com.zhangyingwei.cockroach.common.exception;
 
 import com.zhangyingwei.cockroach.common.utils.CockroachUtils;
 
diff --git a/cockroach-core/src/main/java/com/zhangyingwei/cockroach/common/utils/CockroachUtils.java b/cockroach-core/src/main/java/com/zhangyingwei/cockroach/common/utils/CockroachUtils.java
diff --git a/cockroach-core/src/main/java/com/zhangyingwei/cockroach/executer/response/TaskResponse.java b/cockroach-core/src/main/java/com/zhangyingwei/cockroach/executer/response/TaskResponse.java
@@ -2,7 +2,7 @@
 
 import cn.wanghaomiao.xpath.exception.XpathSyntaxErrorException;
 import cn.wanghaomiao.xpath.model.JXDocument;
-import com.zhangyingwei.cockroach.exception.HttpException;
+import com.zhangyingwei.cockroach.common.exception.HttpException;
 import com.zhangyingwei.cockroach.executer.task.Task;
 import com.zhangyingwei.cockroach.queue.CockroachQueue;
 import com.zhangyingwei.cockroach.common.utils.CockroachUtils;
diff --git a/cockroach-samples/README.md b/cockroach-samples/README.md
@@ -0,0 +1,3 @@
+# cockroach-samples
+
+cockroach 实例部分
diff --git a/cockroach-samples/cockroach-samples.iml b/cockroach-samples/cockroach-samples.iml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="cockroach-core" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.13.0" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.5" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.6" level="project" />
+    <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.11.2" level="project" />
+    <orderEntry type="library" name="Maven: cn.wanghaomiao:JsoupXpath:0.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.3.2" level="project" />
+    <orderEntry type="library" name="Maven: com.github.zhangyingwei:cockroach-annotation:1.0.5.03-Beta" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+  </component>
+</module>
diff --git a/cockroach-samples/pom.xml b/cockroach-samples/pom.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>cockroach</artifactId>
+        <groupId>com.github.zhangyingwei</groupId>
+        <version>1.0.5.03-Beta</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>cockroach-samples</artifactId>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>com.github.zhangyingwei</groupId>
+            <artifactId>cockroach-core</artifactId>
+            <version>1.0.5.03-Beta</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.zhangyingwei</groupId>
+            <artifactId>cockroach-annotation</artifactId>
+            <version>1.0.5.03-Beta</version>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/cockroach-test/README.md b/cockroach-test/README.md
@@ -0,0 +1,3 @@
+# cockroach-test
+
+cockroach 测试部分，主要包含了所有测试用例，当然，写的很垃圾
diff --git a/cockroach-test/cockroach-test.iml b/cockroach-test/cockroach-test.iml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
@@ -23,8 +22,7 @@
     <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.11.2" level="project" />
     <orderEntry type="library" name="Maven: cn.wanghaomiao:JsoupXpath:0.3.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.3.2" level="project" />
-    <orderEntry type="module" module-name="cockroach-common" />
-    <orderEntry type="module" module-name="cockroach-annotation" />
+    <orderEntry type="library" name="Maven: com.github.zhangyingwei:cockroach-annotation:1.0.5.03-Beta" level="project" />
     <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
diff --git a/cockroach-test/hello.txt b/cockroach-test/hello.txt
@@ -0,0 +1,10 @@
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
diff --git a/cockroach-test/src/test/java/com/zhangyingwei/cockroach/common/utils/FileUtilsTest.java b/cockroach-test/src/test/java/com/zhangyingwei/cockroach/common/utils/FileUtilsTest.java
@@ -37,6 +37,6 @@ public void getOrCreateTest() throws IOException {
             FileUtils.append(file,i+"\n");
         }
         FileUtils.closeWriters();
-        Assert.assertTrue(FileUtils.delete(file));
+//        Assert.assertTrue(FileUtils.delete(file));
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
         <module>cockroach-core</module>
         <module>cockroach-annotation</module>
         <module>cockroach-test</module>
-        <module>cockroach-common</module>
+        <module>cockroach-samples</module>
     </modules>
 
     <!-- push to maven rep -->

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# cockroach-core`
	`2`	`+`
	`3`	`+cockroach 核心部分，主要包含了核心的爬虫代码，包括：队列、http客户端、解析器等等`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# cockroach-annotation`
	`2`	`+`
	`3`	`+cockroach 注解部分，主要实现了注解的定义以及注解的解析`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.zhangyingwei.cockroach.exception;`
	`1`	`+package com.zhangyingwei.cockroach.common.exception;`
`2`	`2`
`3`	`3`	`import com.zhangyingwei.cockroach.common.utils.CockroachUtils;`
`4`	`4`