From 0e84d17f8e72f010c1c420cddf296c72a0c85e02 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 5 Jan 2023 12:42:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=89=8B=E6=9C=BA=E5=8F=B7?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=20=E6=96=B0=E5=A2=9E=E5=86=9C=E7=A7=91?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/Auth.php      | 43 +++++++++++++++++++++++++++++---
 app/controller/api/user/User.php |  5 ++--
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index eed78c03..21cb1b43 100644
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -329,11 +329,48 @@ class Auth extends BaseController
     {
         $data = $this->request->params(['phone', 'sms_code', 'spread', 'auth_token',['user_type','h5']]);
         $validate->sceneSmslogin()->check($data);
-        $sms_code = app()->make(SmsService::class)->checkSmsCode($data['phone'], $data['sms_code'], 'login');
-        if (!$sms_code) return app('json')->fail('验证码不正确');
+//        $sms_code = app()->make(SmsService::class)->checkSmsCode($data['phone'], $data['sms_code'], 'login');
+//        if (!$sms_code) return app('json')->fail('验证码不正确');
         $user = $repository->accountByUser($data['phone']);
         $auth = $this->parseAuthToken($data['auth_token']);
-        if (!$user) $user = $repository->registr($data['phone'], null, $data['user_type']);
+        if (!$user) {
+            $user = $repository->registr($data['phone'], null, $data['user_type']);
+            $msg=Db::connect('nongke')->name('szxc_information_usermsg')->where('phone',$data['phone'])->find();
+            if ($msg){
+                $nk_user=Db::name('nk_user')->where('n_user_id',$msg['user_id'])->find();
+                $users=Db::connect('nongke')->name('user')->where('id',$msg['user_id'])->find();
+                if (!$nk_user){
+                    $datas=[
+                        'user_id'=>$user['uid'],
+                        'n_user_id'=>$msg['user_id'],
+                        'group_id'=>$users['group_id']
+                    ];
+                    Db::name('nk_user')->insert($datas);
+                }else{
+                    Db::name('nk_user')->where('id',$nk_user['id'])->update(['user_id'=>$user['uid'],'group_id'=>$users['group_id']]);
+                }
+            }else{
+                $time=time();
+                $user_data=[
+                    'openid'=>'wx'.$time,
+                    'group_id'=>1,
+                    'username'=>'wx'.$time,
+                    'nickname'=>'微信用户'.$time,
+                    'avatar'=>'https://lihai001.oss-cn-chengdu.aliyuncs.com/uploads/20230104/32a639be4ee32349705e947fbbd1e114.png',
+                    'level'=>1,
+                    'createtime'=>$time,
+                    'updatetime'=>$time,
+                    'status'=>'normal'
+                ];
+                $n_user_id= Db::connect('nongke')->name('user')->insertGetId($user_data);
+                $datas=[
+                    'user_id'=>$user['uid'],
+                    'n_user_id'=>$n_user_id,
+                    'group_id'=>1
+                ];
+                Db::name('nk_user')->insert($datas);
+            }
+        }
         if ($auth && !$user['wechat_user_id']){
             $repository->syncBaseAuth($auth, $user);
         }
diff --git a/app/controller/api/user/User.php b/app/controller/api/user/User.php
index 4e17f72c..0e5b0af7 100644
--- a/app/controller/api/user/User.php
+++ b/app/controller/api/user/User.php
@@ -226,7 +226,6 @@ class User extends BaseController
                     Db::name('nk_user')->insert($datas);
                 }else{
                     Db::name('nk_user')->where('id',$nk_user['id'])->update(['n_user_id'=>$users['id'],'group_id'=>$users['group_id']]);
-
                 }
 
             }
@@ -239,7 +238,7 @@ class User extends BaseController
                     'group_id'=>1,
                     'username'=>'wx'.$time,
                     'nickname'=>'微信用户'.$time,
-                    'avatar'=>'https://t7.baidu.com/it/u=2531125946,3055766435&fm=193&f=GIF',
+                    'avatar'=>'https://lihai001.oss-cn-chengdu.aliyuncs.com/uploads/20230104/32a639be4ee32349705e947fbbd1e114.png',
                     'level'=>1,
                     'createtime'=>$time,
                     'updatetime'=>$time,
@@ -275,7 +274,7 @@ class User extends BaseController
                         'group_id'=>1,
                         'username'=>'wx'.$time,
                         'nickname'=>'微信用户'.$time,
-                        'avatar'=>'https://t7.baidu.com/it/u=2531125946,3055766435&fm=193&f=GIF',
+                        'avatar'=>'https://lihai001.oss-cn-chengdu.aliyuncs.com/uploads/20230104/32a639be4ee32349705e947fbbd1e114.png',
                         'level'=>1,
                         'createtime'=>$time,
                         'updatetime'=>$time,