Commit 112ad4b3 by guanchen

调整淘宝分成比例, 修复连接mysql超时bug, 修改redis host

parent ead9435b
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
<mysql.password>cScdKw%ZKC1i$C!1uAz3Kg$c</mysql.password> <mysql.password>cScdKw%ZKC1i$C!1uAz3Kg$c</mysql.password>
<!--<mysql.username>apihu</mysql.username>--> <!--<mysql.username>apihu</mysql.username>-->
<!--<mysql.password>tqH9clYRAxZ@LV4x</mysql.password>--> <!--<mysql.password>tqH9clYRAxZ@LV4x</mysql.password>-->
<redis.host>10.9.186.167</redis.host> <redis.host>10.9.105.101</redis.host>
<redis.password>passwdredis</redis.password> <redis.password>passwdredis</redis.password>
<spring.profiles.active>dev</spring.profiles.active> <spring.profiles.active>dev</spring.profiles.active>
<logfile_path>/Users/chen/Develop/workspace/partner/data/release/dev/logs</logfile_path> <logfile_path>/Users/chen/Develop/workspace/partner/data/release/dev/logs</logfile_path>
......
...@@ -149,8 +149,8 @@ public class Constants { ...@@ -149,8 +149,8 @@ public class Constants {
/** /**
* 自购省 * 自购省
*/ */
AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SELF_ORDER).put(0, new BigDecimal("0.009")); AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SELF_ORDER).put(0, new BigDecimal("0.008"));
AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SELF_ORDER).put(1, new BigDecimal("0.009")); AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SELF_ORDER).put(1, new BigDecimal("0.008"));
AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SELF_ORDER + JD_OFFSET).put(0, new BigDecimal("0.0087")); AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SELF_ORDER + JD_OFFSET).put(0, new BigDecimal("0.0087"));
AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SELF_ORDER + JD_OFFSET).put(1, new BigDecimal("0.0087")); AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SELF_ORDER + JD_OFFSET).put(1, new BigDecimal("0.0087"));
AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SELF_ORDER + MT_OFFSET).put(0, new BigDecimal("0.01")); AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SELF_ORDER + MT_OFFSET).put(0, new BigDecimal("0.01"));
...@@ -168,8 +168,8 @@ public class Constants { ...@@ -168,8 +168,8 @@ public class Constants {
/** /**
* 分享赚 * 分享赚
*/ */
AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SHARE_ORDER).put(0, new BigDecimal("0.009")); AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SHARE_ORDER).put(0, new BigDecimal("0.008"));
AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SHARE_ORDER).put(1, new BigDecimal("0.009")); AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SHARE_ORDER).put(1, new BigDecimal("0.008"));
AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SHARE_ORDER + JD_OFFSET).put(0, new BigDecimal("0.0087")); AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SHARE_ORDER + JD_OFFSET).put(0, new BigDecimal("0.0087"));
AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SHARE_ORDER + JD_OFFSET).put(1, new BigDecimal("0.0087")); AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SHARE_ORDER + JD_OFFSET).put(1, new BigDecimal("0.0087"));
AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SHARE_ORDER + HHYX_OFFSET).put(0, new BigDecimal("0.07")); AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SHARE_ORDER + HHYX_OFFSET).put(0, new BigDecimal("0.07"));
......
...@@ -18,7 +18,7 @@ spring: ...@@ -18,7 +18,7 @@ spring:
max-pool-prepared-statement-per-connection-size: 20 max-pool-prepared-statement-per-connection-size: 20
max-open-prepared-statements: 20 max-open-prepared-statements: 20
validation-query: SELECT 1 validation-query: SELECT 1
validation-query-timeout: 1200000 validation-query-timeout: 120000
test-on-borrow: false test-on-borrow: false
test-on-return: false test-on-return: false
test-while-idle: true test-while-idle: true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment