Merge branch 'master' of http://git.huxiukeji.com/lizhen/xiaoshan

application/api/controller/UniversityCourse.php

@@ -137,7 +137,7 @@ class UniversityCourse extends Api
             return $this->error('订单创建失败');
         }
         // 抵扣券
-        if (!Db::name('vip_coupon_user')->where('id',$params['course_id'])->update(['order_id'=>$apply_id,'status' => 2,'use_time' => time()])) {
+        if (!Db::name('vip_coupon_user')->where('id',$coupon['id'])->update(['order_id'=>$apply_id,'status' => 2,'use_time' => time()])) {
             Db::rollback();
             return $this->error('订单创建失败');
         }

application/api/library/ExceptionHandle.php

@@ -39,7 +39,7 @@ class ExceptionHandle extends Handle
             }else{
                 //记录app异常返回结果
                 if(defined('API_REQUEST_ID')) { //记录app正常返回结果
-                    db('api_request_log')->where('id',API_REQUEST_ID)->update(['result'=>json_encode($result)]);
+                    db('api_request_log')->where('id',API_REQUEST_ID)->update(['result'=>json_encode($result,JSON_UNESCAPED_UNICODE)]);
                 }
             }
             $result['msg'] = '网络开小差了';

application/common/controller/Api.php

@@ -411,14 +411,14 @@ class Api
 
             LogUtil::info('uid', 'Api-Middleware-Log', 'request_log', $this->auth->id);
             LogUtil::info('api', 'Api-Middleware-Log', 'request_log', $modulename . '/' . $controllername . '/' . $actionname);
-            LogUtil::info('params', 'Api-Middleware-Log', 'request_log', json_encode($params));
+            LogUtil::info('params', 'Api-Middleware-Log', 'request_log', $params);
             LogUtil::info('ip', 'Api-Middleware-Log', 'request_log', request()->ip());
 
         }else{
             $data = [
                 'uid'   => $this->auth->id,
                 'api'   => $modulename.'/'.$controllername.'/'.$actionname,
-                'params' => json_encode($params),
+                'params' => json_encode($params,JSON_UNESCAPED_UNICODE),
                 'addtime'  => time(),
                 'adddatetime'  => date('Y-m-d H:i:s'),
                 'ip'   => request()->ip(),
@@ -440,7 +440,7 @@ class Api
                 if(strlen(json_encode($log_result['data'])) > 1000) {
                     $log_result['data'] = '数据太多，不记录';
                 }
-                db('api_request_log')->where('id',API_REQUEST_ID)->update(['result'=>json_encode($log_result)]);
+                db('api_request_log')->where('id',API_REQUEST_ID)->update(['result'=>json_encode($log_result,JSON_UNESCAPED_UNICODE)]);
             }
         }
     }