1.修改redis模块dubbo配置; 2.更新版本至V1.0.0,进行稳定开发;

Humsen · May 26, 2018 · a14621f · a14621f
1 parent efcaa89
commit a14621f
Show file tree

Hide file tree

Showing 35 changed files with 47 additions and 58 deletions.
diff --git a/highdsa-api-dubbo/pom.xml b/highdsa-api-dubbo/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>pers.husen</groupId>
 		<artifactId>highdsa</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<groupId>pers.husen.highdsa</groupId>

diff --git a/highdsa-common-parent/highdsa-common-entity/pom.xml b/highdsa-common-parent/highdsa-common-entity/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>pers.husen.highdsa</groupId>
 		<artifactId>highdsa-common-parent</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<artifactId>highdsa-common-entity</artifactId>

diff --git a/highdsa-common-parent/highdsa-common-exception/pom.xml b/highdsa-common-parent/highdsa-common-exception/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>pers.husen.highdsa</groupId>
 		<artifactId>highdsa-common-parent</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<artifactId>highdsa-common-exception</artifactId>

diff --git a/highdsa-common-parent/highdsa-common-log4j2/pom.xml b/highdsa-common-parent/highdsa-common-log4j2/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>pers.husen.highdsa</groupId>
 		<artifactId>highdsa-common-parent</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<artifactId>highdsa-common-log4j2</artifactId>

diff --git a/highdsa-common-parent/highdsa-common-utility/pom.xml b/highdsa-common-parent/highdsa-common-utility/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>pers.husen.highdsa</groupId>
 		<artifactId>highdsa-common-parent</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<artifactId>highdsa-common-utility</artifactId>

diff --git a/highdsa-common-parent/pom.xml b/highdsa-common-parent/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>pers.husen</groupId>
 		<artifactId>highdsa</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<groupId>pers.husen.highdsa</groupId>

diff --git a/highdsa-common/pom.xml b/highdsa-common/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>pers.husen</groupId>
 		<artifactId>highdsa</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<groupId>pers.husen.highdsa</groupId>

diff --git a/highdsa-restful-app/pom.xml b/highdsa-restful-app/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>pers.husen</groupId>
 		<artifactId>highdsa</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<groupId>pers.husen.highdsa</groupId>

diff --git a/highdsa-restful-email/pom.xml b/highdsa-restful-email/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>pers.husen</groupId>
 		<artifactId>highdsa</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 	<groupId>pers.husen.highdsa</groupId>
 	<artifactId>highdsa-restful-email</artifactId>

diff --git a/highdsa-restful-fastdfs/pom.xml b/highdsa-restful-fastdfs/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>pers.husen</groupId>
 		<artifactId>highdsa</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<groupId>pers.husen.highdsa</groupId>

diff --git a/highdsa-restful-message/pom.xml b/highdsa-restful-message/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>pers.husen</groupId>
 		<artifactId>highdsa</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<groupId>pers.husen.highdsa</groupId>

diff --git a/highdsa-restful-redis/pom.xml b/highdsa-restful-redis/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>pers.husen</groupId>
 		<artifactId>highdsa</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<groupId>pers.husen.highdsa</groupId>

diff --git a/highdsa-restful-test/pom.xml b/highdsa-restful-test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>pers.husen</groupId>
 		<artifactId>highdsa</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<groupId>pers.husen.highdsa</groupId>

diff --git a/highdsa-security-cas/highdsa-cas-manager/pom.xml b/highdsa-security-cas/highdsa-cas-manager/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>pers.husen.highdsa</groupId>
 		<artifactId>highdsa-security-cas</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<artifactId>highdsa-cas-manager</artifactId>

diff --git a/highdsa-security-cas/highdsa-cas-server/pom.xml b/highdsa-security-cas/highdsa-cas-server/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>pers.husen.highdsa</groupId>
 		<artifactId>highdsa-security-cas</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<artifactId>highdsa-cas-server</artifactId>
@@ -27,30 +27,30 @@
 	</properties>
 
 	<dependencies>
+		<dependency>
+			<groupId>pers.husen.highdsa</groupId>
+			<artifactId>highdsa-common</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-log4j12</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 		<!-- 和maven-war-plugin里配置的overlays配合使用 -->
 		<dependency>
 			<groupId>org.apereo.cas</groupId>
 			<artifactId>cas-server-webapp${app.server}</artifactId>
 			<version>${cas.version}</version>
 			<type>war</type>
-			<scope>runtime</scope>
 		</dependency>
 		<!-- restful -->
-		<!-- <dependency>
-			<groupId>org.apereo.cas</groupId>
-			<artifactId>cas-server-support-rest</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>org.apache.logging.log4j</groupId>
-					<artifactId>*</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency> -->
+		<!-- <dependency> <groupId>org.apereo.cas</groupId> <artifactId>cas-server-support-rest</artifactId> <exclusions> <exclusion> <groupId>org.apache.logging.log4j</groupId> <artifactId>*</artifactId> </exclusion> 
+			</exclusions> </dependency> -->
 		<!-- 单独导入cas的配置依赖到项目中 -->
 		<dependency>
 			<groupId>org.apereo.cas</groupId>
 			<artifactId>cas-server-core-configuration</artifactId>
-			<scope>runtime</scope>
 			<exclusions>
 				<exclusion>
 					<groupId>org.apache.logging.log4j</groupId>
@@ -91,7 +91,6 @@
 		<dependency>
 			<groupId>org.apereo.cas</groupId>
 			<artifactId>cas-server-webapp-config</artifactId>
-			<scope>provided</scope>
 			<exclusions>
 				<exclusion>
 					<groupId>org.apache.logging.log4j</groupId>
@@ -111,16 +110,6 @@
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-api</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>pers.husen.highdsa</groupId>
-			<artifactId>highdsa-common</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>slf4j-log4j12</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/highdsa-security-cas/pom.xml b/highdsa-security-cas/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>pers.husen</groupId>
 		<artifactId>highdsa</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<groupId>pers.husen.highdsa</groupId>

diff --git a/highdsa-security-shiro/highdsa-shiro-client/highdsa-client-cas/pom.xml b/highdsa-security-shiro/highdsa-shiro-client/highdsa-client-cas/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>pers.husen.highdsa</groupId>
 		<artifactId>highdsa-shiro-client</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<artifactId>highdsa-client-cas</artifactId>

diff --git a/highdsa-security-shiro/highdsa-shiro-client/highdsa-client-pac4j/pom.xml b/highdsa-security-shiro/highdsa-shiro-client/highdsa-client-pac4j/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>pers.husen.highdsa</groupId>
 		<artifactId>highdsa-shiro-client</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<artifactId>highdsa-client-pac4j</artifactId>

diff --git a/highdsa-security-shiro/highdsa-shiro-client/highdsa-client-restful/pom.xml b/highdsa-security-shiro/highdsa-shiro-client/highdsa-client-restful/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>pers.husen.highdsa</groupId>
 		<artifactId>highdsa-shiro-client</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<artifactId>highdsa-client-restful</artifactId>

diff --git a/highdsa-security-shiro/highdsa-shiro-client/pom.xml b/highdsa-security-shiro/highdsa-shiro-client/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>pers.husen.highdsa</groupId>
 		<artifactId>highdsa-security-shiro</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<artifactId>highdsa-shiro-client</artifactId>

diff --git a/highdsa-security-shiro/highdsa-shiro-manage/highdsa-manage-customer/pom.xml b/highdsa-security-shiro/highdsa-shiro-manage/highdsa-manage-customer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>pers.husen.highdsa</groupId>
 		<artifactId>highdsa-shiro-manage</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<artifactId>highdsa-manage-customer</artifactId>

diff --git a/highdsa-security-shiro/highdsa-shiro-manage/highdsa-manage-sysuser/pom.xml b/highdsa-security-shiro/highdsa-shiro-manage/highdsa-manage-sysuser/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>pers.husen.highdsa</groupId>
 		<artifactId>highdsa-shiro-manage</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<artifactId>highdsa-manage-sysuser</artifactId>

diff --git a/highdsa-security-shiro/highdsa-shiro-manage/pom.xml b/highdsa-security-shiro/highdsa-shiro-manage/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>pers.husen.highdsa</groupId>
 		<artifactId>highdsa-security-shiro</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<artifactId>highdsa-shiro-manage</artifactId>

diff --git a/highdsa-security-shiro/pom.xml b/highdsa-security-shiro/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>pers.husen</groupId>
 		<artifactId>highdsa</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<groupId>pers.husen.highdsa</groupId>

diff --git a/highdsa-service-activemq/highdsa-service-mqproducer/pom.xml b/highdsa-service-activemq/highdsa-service-mqproducer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>pers.husen.highdsa</groupId>
 		<artifactId>highdsa-service-activemq</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<artifactId>highdsa-service-mqproducer</artifactId>

diff --git a/highdsa-service-activemq/highdsa-service-mqreceiver/pom.xml b/highdsa-service-activemq/highdsa-service-mqreceiver/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>pers.husen.highdsa</groupId>
 		<artifactId>highdsa-service-activemq</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<artifactId>highdsa-service-mqreceiver</artifactId>

diff --git a/highdsa-service-activemq/pom.xml b/highdsa-service-activemq/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>pers.husen</groupId>
 		<artifactId>highdsa</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<groupId>pers.husen.highdsa</groupId>

diff --git a/highdsa-service-email/pom.xml b/highdsa-service-email/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>pers.husen</groupId>
 		<artifactId>highdsa</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<groupId>pers.husen.highdsa</groupId>

diff --git a/highdsa-service-fastdfs/pom.xml b/highdsa-service-fastdfs/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>pers.husen</groupId>
 		<artifactId>highdsa</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<groupId>pers.husen.highdsa</groupId>

diff --git a/highdsa-service-message/pom.xml b/highdsa-service-message/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>pers.husen</groupId>
 		<artifactId>highdsa</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<groupId>pers.husen.highdsa</groupId>

diff --git a/highdsa-service-mybatis/pom.xml b/highdsa-service-mybatis/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>pers.husen</groupId>
 		<artifactId>highdsa</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<groupId>pers.husen.highdsa</groupId>

diff --git a/highdsa-service-mybatis/src/main/resources/dubbo.properties b/highdsa-service-mybatis/src/main/resources/dubbo.properties
@@ -1,7 +1,7 @@
 dubbo.container=spring,druidJetty
 
 # 配置 jetty 启动端口
-dubbo.jetty.port=8000
+dubbo.jetty.port=8001
 # 配置可通过 jetty 直接访问的目录，用于存放静态文件
 dubbo.jetty.directory=/
 # 配置显示的页面，缺省加载所有页面

diff --git a/highdsa-service-redis/pom.xml b/highdsa-service-redis/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>pers.husen</groupId>
 		<artifactId>highdsa</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<groupId>pers.husen.highdsa</groupId>

diff --git a/highdsa-service-redis/src/main/resources/spring/dubbo-service-redis.xml b/highdsa-service-redis/src/main/resources/spring/dubbo-service-redis.xml
@@ -12,7 +12,7 @@
 	<dubbo:registry address="zookeeper://223.3.89.104:2181" />
 
 	<!-- 用dubbo协议在20880端口暴露服务 -->
-	<dubbo:protocol name="dubbo" port="20885" dispatcher="connection" threadpool="fixed" threads="100" />
+	<dubbo:protocol name="dubbo" port="20885" dispatcher="connection" threadpool="limited" threads="500" accepts="1000" />
 
 	<!-- 定义 redis缓存接口和实现类,实现类通过注解声明 接口.超时单位：毫秒 -->
 	<dubbo:service interface="pers.husen.highdsa.service.redis.RedisPools" ref="redisPools" protocol="dubbo" timeout="100000" />

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>pers.husen</groupId>
 	<artifactId>highdsa</artifactId>
-	<version>1.0.2-SNAPSHOT</version>
+	<version>1.0.0</version>
 	<packaging>pom</packaging>
 
 	<name>highdsa</name>