Merge branch 'pre'

@@ -28,7 +28,7 @@
 		select
 		<include refid="Base_Column_List" />
 		from unions_active_record
-		where udid=#{udid} and app=#{app} limit 1
+		where udid=#{udid} and app=#{app} and create_time + 7776000 >= UNIX_TIMESTAMP() limit 1
 	</select>
 	<insert id="insert" parameterType="com.yoho.unions.dal.model.UnionsActiveRecord">
 		insert into unions_active_record (union_name, app,udid, callbackurl, create_time, update_time, type)

@@ -18,7 +18,7 @@
 
 
 	<build>
-		<finalName>yohobuy-unions</finalName>
+		<finalName>yohobuy-union</finalName>
 		<plugins>
 			<plugin>
 				<groupId>com.yoho.tools</groupId>
@@ -61,7 +61,7 @@
 						<phase>package</phase>
 						<configuration>
 							<tasks>
-								<unzip src="target/yohobuy-unions.zip" dest="target" />
+								<unzip src="target/yohobuy-union.zip" dest="target" />
 							</tasks>
 						</configuration>
 						<goals>

@@ -3,7 +3,7 @@
 <config>
     <group>
 		<!--yohobuy.resources-autoconfig-env--> 
-		<property name="yoho.unions.env.webapphome" defaultValue="/home/test/yohobuy-unions/deploy" description="应用根目录"/>
+		<property name="yoho.unions.env.webapphome" defaultValue="/home/test/yohobuy-union/deploy" description="应用根目录"/>
         <property name="yoho.unions.env.serverport" defaultValue="8" description="应用端口"/>
 	</group>
     <script>

@@ -16,4 +16,4 @@ activeTime=3600
 
 zkAddress=192.168.102.162:32806
 # web context
-web.context=unions
\ No newline at end of file
+web.context=union
\ No newline at end of file

@@ -4,7 +4,7 @@
 	<group>
 
 		<!-- ************************** web namespace ******************************* -->
-		<property name="yoho.unions.env.namespace" defaultValue="unions" description="应用命名空间" />
+		<property name="yoho.unions.env.namespace" defaultValue="union" description="应用命名空间" />
 
 		<property name="jdbc.mysql.readonlyinslave" defaultValue="true" description="读操作是否只在从库" />
 

@@ -12,10 +12,7 @@ rabbit.mq.virtualHost=${rabbit.mq.virtualHost}
 #激活有效期（秒）
 activeTime=${activeTime}
 
-yoho.unions.env.namespace=unions
-
-
 #zookeeper地址
 zkAddress=${zkAddress}
 # web context
-web.context=unions
\ No newline at end of file
+web.context=union
\ No newline at end of file