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

application/library/Order/OrderConfirmUtil.php

@@ -741,7 +741,7 @@ class OrderConfirmUtil {
      * Date: 2018/12/27 0027
      * Time: 下午 3:15
      */
-    private function getLitAccesstoken(){
+    private function gigetLitAccesstoken(){
         $model_wx  = \DAO\MbWxModel::getInstance();
         $weixin = $model_wx->getOne('id,lit_appid,lit_appsecret,lit_accesstoken,lit_expirestime', 'id=1');
         $access_token = '';

application/library/Our/ArrayConst.php

@@ -82,7 +82,7 @@ class ArrayConst
     //小程序账号
     const wechatInfo = array(
         'appid' => 'wxab22edc34913554b',
-        'secret' => '938b33cfa0bb756a7cbb1e2b454c99f0',
+        'secret' => '63df6bf0bb37862893bde46e7db218d0',
         'grant_type' => 'authorization_code',
     );
 
@@ -169,4 +169,4 @@ class ArrayConst
         \Our\ApiConst::plus  => '+',
         \Our\ApiConst::set => '='
     );
-}
\ No newline at end of file
+}

application/models/DAO/ShortMessage.php

@@ -103,7 +103,7 @@ class ShortMessageModel {
             if($result['status']){
                 return true;
             }
-            \Our\Log::getInstance()->write($result['msg'],'/data/log/apptest');
+            \Our\Log::getInstance()->write($result['msg']);
         }
         return false;
     }