Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into lyz

application/models/Business/User/ShareService.php

@@ -106,11 +106,13 @@ class ShareServiceModel extends \Business\AbstractModel
                         $this->memberDb0Redis->tableCacheSet($fileName,$url,ApiConst::zero);
                         return $url;
                     }else{
-                        return PathConst::wxDefaultPath;
+                        return $this->getQrUrl($data['id']);
+                        //return PathConst::wxDefaultPath;
                     }
             }else{
                 //不是微信分享就是普通下载的二维码图片
-                return PathConst::downLoadQrcode;
+                return $this->getQrUrl($data['id']);
+              //  return PathConst::downLoadQrcode;
             }
         }
         if($data['type']==\Our\ApiConst::sharePlat){

application/models/DAO/Member.php

@@ -6,6 +6,7 @@ use Error\CodeConfigModel;
 use Error\ErrorModel;
 use Our\Common;
 use Our\ImageConst;
+use Our\Log;
 use Our\NameConst;
 use Our\ApiConst;
 use Our\PathConst;
@@ -55,8 +56,10 @@ class MemberModel extends \DAO\AbstractModel
         $fileName=Common::format(ImageConst::memberAvatarPrefix."{0}".'.jpg',$memberId);
         $file=$basePath.$memberPath.$fileName;
         if(file_exists($file)){
+            Log::getInstance()->write($file,"/data/log/test");
             $avatar=\Our\Common::getStaticFile($fileName, \Our\ImageConst::memberAvatar);
         }else{
+            Log::getInstance()->write($file,"/data/log/test");
             $memerAvatar = $this->getInfo($memberId, 'member_avatar');
             $avatar = $this->getMemberAvatarUrl($memberId, $memerAvatar);
         }

conf/application.ini

@@ -243,7 +243,7 @@ push.open=1
 [ccwdevelop : common]
 ; 数据库配置
 resources.database.params.driver   = "pdo_mysql"
-resources.database.params.hostname = "192.168.1.201"
+resources.database.params.hostname = "192.168.80.18"
 resources.database.params.port     = 3306
 resources.database.params.database = "qmcs"
 resources.database.params.username = "root"
@@ -253,7 +253,7 @@ resources.database.params.driver_options.1002 = "SET NAMES utf8"
 
 ; 从库配置
 resources.database.slave.params.driver   = "pdo_mysql"
-resources.database.slave.params.hostname = "192.168.1.201"
+resources.database.slave.params.hostname = "192.168.80.18"
 resources.database.slave.params.port     = 3306
 resources.database.slave.params.database = "qmcs"
 resources.database.slave.params.username = "root"
@@ -263,7 +263,7 @@ resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
 
 ; 从库配置
 resources.database.drawSource.params.driver   = "pdo_mysql"
-resources.database.drawSource.params.hostname = "192.168.1.201"
+resources.database.drawSource.params.hostname = "192.168.80.18"
 resources.database.drawSource.params.port     = 3306
 resources.database.drawSource.params.database = "drawSource"
 resources.database.drawSource.params.username = "root"

conf/url.ini

@@ -89,7 +89,7 @@ config.url.ossHost = "http://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
 ;推送域名
 config.url.pushHost="127.0.0.1:9503";
 
-config.url.source="E:/WAMP/www/www.qm.com/data/upload/"
+;config.url.source="E:/WAMP/www/www.qm.com/data/upload/"
 ; 文件目录
 ;店铺图片报错目录
 ;config.url.storePath = '/data/upload/mall/store';