Merge branch 'master' of http://114.215.100.48:3000/ipu/android-share

Conflicts:
	multiple-server/etc/memcache.properties

multiple-server/etc/memcache.properties.bak

@@ -0,0 +1,10 @@
#hashing_alg:native_hash,new_compat_hash,old_compat_hash,consistent_hash
#
#memcache.session_cache.hashing_alg=native_hash
#memcache.session_cache.init_conn=5
#memcache.session_cache.min_conn=5
#memcache.session_cache.max_conn=50
#memcache.session_cache.max_idle=60000
#memcache.session_cache.maint_sleep=30
memcache.session_cache.cluster=192.168.128.77:10001

multiple-server/etc/memcache.xml

@@ -0,0 +1,12 @@
<?xml version = '1.0' encoding = 'UTF-8'?>
<memcache>
    <default-datacenter>center1</default-datacenter>
    <datacenter name="center1" >
        <cluster name="SSN_CACHE">
            <heartbeat-second>2</heartbeat-second>
            <pool-size>16</pool-size>
            <address master="127.0.0.1:11211"/>
        </cluster>
    </datacenter>
</memcache>

multiple-server/etc/server-config.xml

@@ -11,7 +11,7 @@
	<!-- 服务端应用编码 -->
	<config name="encode" value="UTF-8"/>
	<!-- 缓存类型,目前支持mem和jvm -->
	<config name="cache" value="jvm"/>
	<config name="cache" value="mem"/>
	<!-- 初始页 -->
	<config name="indexPage" value="Login"/>
	<!-- 文件是否加密 -->