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

application/controllers/Index.php

@@ -111,10 +111,14 @@ class IndexController extends \Our\Controller_Abstract  {
     }
     public function getInvateHtmlAction(){
         $req=$this->getRequest()->getQuery();
-        if(empty($req['params'] )){
+        //echo $req['cacheKey'];exit;
+        if(empty($req['cacheKey'] )){
             echo 'error';exit;
         }
-        $params=base64_decode($req['params']);
+        $this->memberDb0Redis=\Redis\Db0\MemberRedisModel::getInstance();
+        $res= $this->memberDb0Redis->tableCacheGet($req['cacheKey']);
+        $params=unserialize($res);
+        $params=base64_decode($params);
 //        $params['name']='陈传文4';
 //        $params['telephone']='18305954587';
 //        $params['qrcodeUrl']='//static.shenbd.com/www/index/2018/img/card/code.jpg';

conf/application.ini

@@ -148,7 +148,7 @@ resources.database.mongo.params.driver_options.1002 = "SET NAMES utf8"
 redis.database.params.host = "127.0.0.1"
 redis.database.params.port = "6379"
 redis.database.params.prefix = "qm_"
-;redis.database.params.password = "23456ertyu"
+;redis.database.params.password = ""
 out.config="/data/config"
 
 password.key='~!@#$`1234qwertasdfgzxcvb';
@@ -319,7 +319,7 @@ password.key='~!@#$`1234qwertasdfgzxcvb';
 redis.database.params.host = "127.0.0.1"
 redis.database.params.port = "6379"
 redis.database.params.prefix = "qm_"
-redis.database.params.password = ""
+redis.database.params.password = "23456ertyu"
 
 out.config="/data/config";
 ;锁文件