Merge branch 'master' of git@github.com:nutzam/nutzmore.git

nutzam · Jun 19, 2018 · 1cfd28d · 1cfd28d
2 parents 70f8a06 + 6e8057c
commit 1cfd28d
Show file tree

Hide file tree

Showing 106 changed files with 913 additions and 226 deletions.
diff --git a/nutz-integration-activiti/demo/pom.xml b/nutz-integration-activiti/demo/pom.xml
@@ -4,7 +4,7 @@
 	<groupId>net.wendal</groupId>
 	<artifactId>nutz-activiti-demo</artifactId>
 	<packaging>war</packaging>
-	<version>1.r.66-SNAPSHOT</version>
+	<version>1.r.67-SNAPSHOT</version>
 	<name>nutzdemo Maven Webapp</name>
 	<url>http://maven.apache.org</url>
 	<properties>
@@ -58,7 +58,7 @@
 		<dependency>
 			<groupId>org.nutz</groupId>
 			<artifactId>nutz-integration-activiti</artifactId>
-			<version>1.r.66-SNAPSHOT</version>
+			<version>1.r.67-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>

diff --git a/nutz-integration-activiti/pom.xml b/nutz-integration-activiti/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.nutz</groupId>
 		<artifactId>nutzmore</artifactId>
-		<version>1.r.66-SNAPSHOT</version>
+		<version>1.r.67-SNAPSHOT</version>
 	</parent>
 	<artifactId>nutz-integration-activiti</artifactId>
 	<url>https://nutzam.com</url>
@@ -125,14 +125,14 @@
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
-			<version>1.4.193</version>
+			<version>${h2.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.7.24</version>
+			<version>${slf4j-log4j12.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-</project>
+</project>
diff --git a/nutz-integration-autoloadcache/pom.xml b/nutz-integration-autoloadcache/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.nutz</groupId>
 		<artifactId>nutzmore</artifactId>
-		<version>1.r.66-SNAPSHOT</version>
+		<version>1.r.67-SNAPSHOT</version>
 	</parent>
 	<artifactId>nutz-integration-autoloadcache</artifactId>
 	<properties>

diff --git a/nutz-integration-bex5/pom.xml b/nutz-integration-bex5/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>nutzmore</artifactId>
         <groupId>org.nutz</groupId>
-        <version>1.r.66-SNAPSHOT</version>
+        <version>1.r.67-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/nutz-integration-cxf/pom.xml b/nutz-integration-cxf/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.nutz</groupId>
 		<artifactId>nutzmore</artifactId>
-		<version>1.r.66-SNAPSHOT</version>
+		<version>1.r.67-SNAPSHOT</version>
 	</parent>
 	<artifactId>nutz-integration-cxf</artifactId>
 

diff --git a/nutz-integration-dubbo/pom.xml b/nutz-integration-dubbo/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.nutz</groupId>
 		<artifactId>nutzmore</artifactId>
-		<version>1.r.66-SNAPSHOT</version>
+		<version>1.r.67-SNAPSHOT</version>
 	</parent>
 	<artifactId>nutz-integration-dubbo</artifactId>
 
@@ -56,8 +56,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.1</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 					<compilerArgs>
 						<arg>-parameters</arg>
 					</compilerArgs>
@@ -138,8 +138,8 @@
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
-			<version>1.2.17</version>
+			<version>${log4j.version}</version>
 			<optional>true</optional>
 		</dependency>
 	</dependencies>
-</project>
+</project>
diff --git a/nutz-integration-dwr/pom.xml b/nutz-integration-dwr/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.nutz</groupId>
 		<artifactId>nutzmore</artifactId>
-		<version>1.r.66-SNAPSHOT</version>
+		<version>1.r.67-SNAPSHOT</version>
 	</parent>
 	<artifactId>nutz-integration-dwr</artifactId>
 	<url>https://nutzam.com</url>

diff --git a/nutz-integration-grpc/pom.xml b/nutz-integration-grpc/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.nutz</groupId>
 		<artifactId>nutzmore</artifactId>
-		<version>1.r.66-SNAPSHOT</version>
+		<version>1.r.67-SNAPSHOT</version>
 	</parent>
 	<artifactId>nutz-integration-grpc</artifactId>
 

diff --git a/nutz-integration-hasor/demo/pom.xml b/nutz-integration-hasor/demo/pom.xml
@@ -63,7 +63,7 @@
             <dependency>
                 <groupId>org.nutz</groupId>
                 <artifactId>nutz-integration-hasor</artifactId>
-                <version>1.r.66-SNAPSHOT</version>
+                <version>1.r.67-SNAPSHOT</version>
             </dependency>
 
             <!-- Hasor -->

diff --git a/nutz-integration-hasor/pom.xml b/nutz-integration-hasor/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.nutz</groupId>
 		<artifactId>nutzmore</artifactId>
-		<version>1.r.66-SNAPSHOT</version>
+		<version>1.r.67-SNAPSHOT</version>
 	</parent>
 	<artifactId>nutz-integration-hasor</artifactId>
 	<name>nutz-integration-hasor</name>

diff --git a/nutz-integration-hasor/src/main/java/org/nutz/integration/hasor/HasorFactoryIocLoader.java b/nutz-integration-hasor/src/main/java/org/nutz/integration/hasor/HasorFactoryIocLoader.java
@@ -14,7 +14,11 @@
  * limitations under the License.
  */
 package org.nutz.integration.hasor;
-import net.hasor.core.*;
+
+import java.io.IOException;
+import java.util.Map.Entry;
+import java.util.Set;
+
 import org.nutz.integration.hasor.annotation.HasorConfiguration;
 import org.nutz.ioc.Ioc;
 import org.nutz.ioc.impl.PropertiesProxy;
@@ -24,9 +28,12 @@
 import org.nutz.log.Log;
 import org.nutz.log.Logs;
 
-import java.io.IOException;
-import java.util.Map.Entry;
-import java.util.Set;
+import net.hasor.core.ApiBinder;
+import net.hasor.core.AppContext;
+import net.hasor.core.BindInfo;
+import net.hasor.core.Hasor;
+import net.hasor.core.LifeModule;
+import net.hasor.core.Module;
 /**
  * 用法：ioc.get(HasorFactoryIocLoader.class, "hasor");
  * @version : 2017年02月20日
@@ -145,4 +152,4 @@ public void onStart(AppContext appContext) throws Throwable {
     public void onStop(AppContext appContext) throws Throwable {
         //
     }
-}
+}
diff --git a/nutz-integration-hessian/pom.xml b/nutz-integration-hessian/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.nutz</groupId>
 		<artifactId>nutzmore</artifactId>
-		<version>1.r.66-SNAPSHOT</version>
+		<version>1.r.67-SNAPSHOT</version>
 	</parent>
 	<artifactId>nutz-integration-hessian</artifactId>
 	<url>https://nutzam.com</url>

diff --git a/nutz-integration-jcache/pom.xml b/nutz-integration-jcache/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.nutz</groupId>
 		<artifactId>nutzmore</artifactId>
-		<version>1.r.66-SNAPSHOT</version>
+		<version>1.r.67-SNAPSHOT</version>
 	</parent>
 	<artifactId>nutz-integration-jcache</artifactId>
 	<url>https://nutzam.com</url>

diff --git a/nutz-integration-jedis/pom.xml b/nutz-integration-jedis/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.nutz</groupId>
 		<artifactId>nutzmore</artifactId>
-		<version>1.r.66-SNAPSHOT</version>
+		<version>1.r.67-SNAPSHOT</version>
 	</parent>
 	<artifactId>nutz-integration-jedis</artifactId>
 
@@ -56,7 +56,7 @@
 		<dependency>
 			<groupId>redis.clients</groupId>
 			<artifactId>jedis</artifactId>
-			<version>2.9.0</version>
+			<version>${jedis.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -74,7 +74,7 @@
 		<dependency>
 			<groupId>javax.websocket</groupId>
 			<artifactId>javax.websocket-api</artifactId>
-			<version>1.1</version>
+			<version>${javax.websocket-api.version}</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
@@ -95,4 +95,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
+</project>
diff --git a/nutz-integration-jedisque/pom.xml b/nutz-integration-jedisque/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.nutz</groupId>
 		<artifactId>nutzmore</artifactId>
-		<version>1.r.66-SNAPSHOT</version>
+		<version>1.r.67-SNAPSHOT</version>
 	</parent>
 	<artifactId>nutz-integration-jedisque</artifactId>
 
@@ -62,7 +62,7 @@
 		<dependency>
 			<groupId>redis.clients</groupId>
 			<artifactId>jedis</artifactId>
-			<version>2.9.0</version>
+			<version>${jedis.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -95,4 +95,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
+</project>
diff --git a/nutz-integration-jsch/pom.xml b/nutz-integration-jsch/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.nutz</groupId>
 		<artifactId>nutzmore</artifactId>
-		<version>1.r.66-SNAPSHOT</version>
+		<version>1.r.67-SNAPSHOT</version>
 	</parent>
 	<artifactId>nutz-integration-jsch</artifactId>
 	<url>https://nutzam.com</url>

diff --git a/nutz-integration-jsf/pom.xml b/nutz-integration-jsf/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.nutz</groupId>
 		<artifactId>nutzmore</artifactId>
-		<version>1.r.66-SNAPSHOT</version>
+		<version>1.r.67-SNAPSHOT</version>
 	</parent>
 	<artifactId>nutz-integration-jsf</artifactId>
 	<url>https://nutzam.com</url>

diff --git a/nutz-integration-json4excel/pom.xml b/nutz-integration-json4excel/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.nutz</groupId>
 		<artifactId>nutzmore</artifactId>
-		<version>1.r.66-SNAPSHOT</version>
+		<version>1.r.67-SNAPSHOT</version>
 	</parent>
 	<artifactId>nutz-integration-json4excel</artifactId>
 	<name>nutz-integration-json4excel</name>
@@ -37,7 +37,6 @@
 	</scm>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<poi.version>3.17</poi.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -49,13 +48,13 @@
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.40</version>
+			<version>${mysql-connector-java.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>druid</artifactId>
-			<version>1.0.26</version>
+			<version>${druid.version}</version>
 			<scope>test</scope>
 			<exclusions>
 				<exclusion>
@@ -71,7 +70,7 @@
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
-			<version>1.2.17</version>
+			<version>${log4j.version}</version>
 			<optional>true</optional>
 			<scope>provided</scope>
 		</dependency>