Merge branch 'master' of http://git.shenbd.com/api-project-dev/api.shenbd.com into ccw

application/library/Lock/RedisLock.php

@@ -23,8 +23,14 @@ class RedisLock implements \Lock\ILock{
 
     public function getLock($key, $timeout=self::EXPIRE)
     {
+
         $currMicroTime = $this->getMicrotime();
         $is_lock = $this->lockRedis->tableSetnx($key, $currMicroTime+10);
+        $i = 0;
+        while($is_lock==false&&$i<3){
+            $is_lock = $this->lockRedis->tableSetnx($key, $currMicroTime+10);
+            $i++;
+        }
         // 不能获取锁
         if(!$is_lock){
             //判断锁是否过期

application/library/Order/OrderConfirmUtil.php

@@ -383,7 +383,7 @@ class OrderConfirmUtil {
                 }
                 $deliveryFee = \Our\ApiConst::zero;
             }
-            if($deliveryFee!=$requestData['deliveryFee']){
+            if(intval($deliveryFee)!=$requestData['deliveryFee']){
                 \Error\ErrorModel::throwException(\Error\CodeConfigModel::wrongStoreDeliveryFeeForOrder);
             }
             $delivery = array();

conf/application.ini

@@ -390,21 +390,21 @@ elastic.master.scheme="http";
 [lyztest : common]
 ; 数据库配置
 resources.database.params.driver   = "pdo_mysql"
-resources.database.params.hostname = "192.168.134.18"
+resources.database.params.hostname = "106.14.14.233"
 resources.database.params.port     = 3306
 resources.database.params.database = "qmcs"
 resources.database.params.username = "root"
-resources.database.params.password = "123456"
+resources.database.params.password = "!@#$%12345werty"
 resources.database.params.charset  = "UTF8"
 resources.database.params.driver_options.1002 = "SET NAMES utf8"
 
 ; 从库配置
 resources.database.slave.params.driver   = "pdo_mysql"
-resources.database.slave.params.hostname = "192.168.134.18"
+resources.database.slave.params.hostname = "106.14.14.233"
 resources.database.slave.params.port     = 3306
 resources.database.slave.params.database = "qmcs"
 resources.database.slave.params.username = "root"
-resources.database.slave.params.password = "123456"
+resources.database.slave.params.password = "!@#$%12345werty"
 resources.database.slave.params.charset  = "UTF8"
 resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
 
@@ -412,7 +412,7 @@ resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
 
 password.key='~!@#$`1234qwertasdfgzxcvb'
 
-redis.database.params.host = "127.0.0.1"
+redis.database.params.host = "192.168.134.18"
 redis.database.params.port = "6379"
 redis.database.params.prefix = "qm_"
 ;redis.database.params.password = "23456ertyu"