Merge branch 'colonel' of https://git.yidian-inc.com:8021/bp/goods into colonel

application/services/user/UserService.php

@@ -3,6 +3,7 @@
 
 namespace App\Services\user;
 
+use Api\PhpUtils\Mon\MonUtil;
 use App\Models\user\mysql\UserWechatBind;
 use Api\PhpUtils\Http\Request;
 use App\Services\user\Weixin\WxBizDataCrypt;;
@@ -29,7 +30,7 @@ class UserService
         $code = !empty($params['code']) ? $params['code'] : '';//小程序授权code
         $openid = !empty($params['openid']) ? $params['openid'] : '';//小程序授权code
         if (empty($code) && empty($openid)) {
-            FileLog::error("wechatLogin:获取参数为空", json_encode($params, JSON_UNESCAPED_UNICODE),'','jianghaiming@yidian-inc.com');
+            FileLog::error("wechatLogin:获取参数为空", json_encode($params, JSON_UNESCAPED_UNICODE), '', 'jianghaiming@yidian-inc.com');
             throw new UserException(['cus' => 0]);
         }
 
@@ -46,15 +47,21 @@ class UserService
             'js_code' => $code,
             'grant_type' => $grant_type,
         ];
+        $begin = microtime(true);
         $response = (new Request())->post($loginUrl, $params);
 
+        $end = microtime(true);
+        $totalTime = round(($end - $begin), 4) * 1000;
         if ($response['code'] == 0) {
             $response = $response['response'];
         }
+        //mon打点
+        $env = Application::app()->environ() ?? "dev";
+        MonUtil::proxyMon($loginUrl, $response['code'], 'weixin_'.$env, $totalTime);
 
         if (empty($response) || array_key_exists('errcode', $response)) {
             //throw new \Exception('获取openid失败:' . $response['errcode']);
-                FileLog::error("wechatLogin：获取openid失败", json_encode($params, JSON_UNESCAPED_UNICODE),'','jianghaiming@yidian-inc.com');
+            FileLog::error("wechatLogin：获取openid失败", json_encode($params, JSON_UNESCAPED_UNICODE), '', 'jianghaiming@yidian-inc.com');
             throw new UserException(['cus' => 1]);
         }
         //检查系统是已注册
@@ -75,30 +82,30 @@ class UserService
             $sessionKey = !empty($response['session_key']) ? $response['session_key'] : '';
 
             //$newWechatId = UserWechatBind::save($insert);
-            $newWechatId =UserWechatBind::insertDuplicate($insert, ['session_key' => $sessionKey,'create_time' => date("Y-m-d H:i:s")]);
+            $newWechatId = UserWechatBind::insertDuplicate($insert, ['session_key' => $sessionKey, 'create_time' => date("Y-m-d H:i:s")]);
             if (!$newWechatId) {
-                FileLog::error("wechatLogin：登陆创建用户失败", json_encode($params, JSON_UNESCAPED_UNICODE),'','jianghaiming@yidian-inc.com');
-                FileLog::error("wechatLogin：登陆创建用户失败--insert", json_encode($insert, JSON_UNESCAPED_UNICODE),'','jianghaiming@yidian-inc.com');
+                FileLog::error("wechatLogin：登陆创建用户失败", json_encode($params, JSON_UNESCAPED_UNICODE), '', 'jianghaiming@yidian-inc.com');
+                FileLog::error("wechatLogin：登陆创建用户失败--insert", json_encode($insert, JSON_UNESCAPED_UNICODE), '', 'jianghaiming@yidian-inc.com');
                 throw new UserException(['cus' => 2]);
             }
 
             $user['wechat_id'] = $newWechatId;
             $user['openid'] = $response['openid'];
             $user['session_key'] = $response['session_key'];
-        }else{
+        } else {
             if (empty($user)) {
-                FileLog::error("wechatLogin：登陆创建用户失败-- 微信response", json_encode($response, JSON_UNESCAPED_UNICODE),'','jianghaiming@yidian-inc.com');
+                FileLog::error("wechatLogin：登陆创建用户失败-- 微信response", json_encode($response, JSON_UNESCAPED_UNICODE), '', 'jianghaiming@yidian-inc.com');
                 throw new UserException(['cus' => 2]);
             }
 
-            if (empty($response)){
-                FileLog::error("wechatLogin：登陆创建用户失败-- 微信response 获取失败", json_encode($params, JSON_UNESCAPED_UNICODE),'','jianghaiming@yidian-inc.com');
+            if (empty($response)) {
+                FileLog::error("wechatLogin：登陆创建用户失败-- 微信response 获取失败", json_encode($params, JSON_UNESCAPED_UNICODE), '', 'jianghaiming@yidian-inc.com');
                 throw new UserException(['cus' => 2]);
             }
             $insert = [
                 'session_key' => !empty($response['session_key']) ? $response['session_key'] : '',
             ];
-            $newWechatId = UserWechatBind::save($insert,['openid' => $openid]);
+            $newWechatId = UserWechatBind::save($insert, ['openid' => $openid]);
         }
 
         $user['third_session'] = self::generate3rdSession($openid);