From a5bc417c694e2cc489db8df309d67cf139e49400 Mon Sep 17 00:00:00 2001
From: wh <382379437@qq.com>
Date: Wed, 17 Jul 2024 15:49:10 +0800
Subject: [PATCH] fixed

---
 .../api/controller/{Users.php => Usersty.php} | 36 ++++++++++++++++---
 digital_doctor/application/common.php         |  2 +-
 .../src/api/BaseUserLogic.php                 |  2 +-
 .../src/wechat/WechatMsgPushLogicDemo.php     |  4 +--
 4 files changed, 35 insertions(+), 9 deletions(-)
 rename digital_doctor/application/api/controller/{Users.php => Usersty.php} (69%)

diff --git a/digital_doctor/application/api/controller/Users.php b/digital_doctor/application/api/controller/Usersty.php
similarity index 69%
rename from digital_doctor/application/api/controller/Users.php
rename to digital_doctor/application/api/controller/Usersty.php
index a8266db..5e59ed6 100644
--- a/digital_doctor/application/api/controller/Users.php
+++ b/digital_doctor/application/api/controller/Usersty.php
@@ -26,14 +26,14 @@ use wanghua\general_utility_tools_php\wechat\UserAuth;
  * Class Users
  * @package app\api\controller
  */
-class Users extends BaseHttpApi
+class Usersty extends BaseHttpApi
 {
 
 
     /**
      * desc：听译-授权，登录
      *
-     * /api/users/login
+     * /api/Usersty/login
      *
      * 参数:clientid 客户端标识
      * username 用户名
@@ -57,7 +57,7 @@ class Users extends BaseHttpApi
             if(empty($password)){
                 return Tools::set_fail('参数错误:2');
             }
-            $user = Db::table(TabConf::$fa_users)
+            $user = Db::table('fa_ty_users')
                 ->where('username',$username)
                 ->find();
             if(empty($user)){
@@ -78,17 +78,43 @@ class Users extends BaseHttpApi
             $ticketstr = md5($user['username'].$expires);
 
             //修改有效期
-            Db::table(TabConf::$fa_users)
+            Db::table('fa_ty_users')
                 ->data([
                     'ticket'=>$ticketstr,
                     'expires'=>$expires,//7天
-                    'clientid'=>$clientid,
                 ])
                 ->where('username',$username)
                 ->update();
+
+
             return Tools::set_ok('登录成功',['ticket'=>$ticketstr]);
         });
     }
 
 
+    /**
+     * desc： 绑定设备（选择角色时调用）
+     *
+     * api/Usersty/bindDevice
+     *
+     * 参数：username
+     * clientid
+     * type 用户类型:user=用户,doc=医生
+     */
+    function bindDevice(){
+        return Mmodel::catchJson(function (){
+            //绑定设备
+            $devidata = [
+                'username'=>input('username'),
+                'clientid'=>input('clientid'),
+                'type'=>input('type'),
+                'login_time'=>Tools::get_now_date(),
+            ];
+            Mmodel::existsUpdateInsert('fa_device',[
+                'username'=>input('username'),
+                'clientid'=>input('clientid'),
+            ],$devidata);
+            return Tools::set_ok('绑定成功');
+        });
+    }
 }
\ No newline at end of file
diff --git a/digital_doctor/application/common.php b/digital_doctor/application/common.php
index a617dba..ae79f49 100644
--- a/digital_doctor/application/common.php
+++ b/digital_doctor/application/common.php
@@ -1355,6 +1355,6 @@ function api_user_info($field = '')
     if($api_user_info){
         return $api_user_info;
     }
-    $api_user_info = Db::table(TabConf::$fa_users)->where('openid',$openid2)->find();
+    $api_user_info = Db::table('fa_ty_users')->where('openid',$openid2)->find();
     return $field?$api_user_info[$field]:$api_user_info;
 }
diff --git a/digital_doctor_admin/vendor/wanghua/general-utility-tools-php/src/api/BaseUserLogic.php b/digital_doctor_admin/vendor/wanghua/general-utility-tools-php/src/api/BaseUserLogic.php
index 7e21765..8cbf003 100644
--- a/digital_doctor_admin/vendor/wanghua/general-utility-tools-php/src/api/BaseUserLogic.php
+++ b/digital_doctor_admin/vendor/wanghua/general-utility-tools-php/src/api/BaseUserLogic.php
@@ -133,7 +133,7 @@ class BaseUserLogic
             Tools::log_to_write_txt(['title'=>'业务ticket字段不存在','input'=>input()]);
             return false;
         }
-        $user = Db::table(TabConf::$fa_users)
+        $user = Db::table('fa_ty_users')
             ->where('ticket',$ticket)
             ->find();
         if(empty($user)){
diff --git a/digital_doctor_admin/vendor/wanghua/general-utility-tools-php/src/wechat/WechatMsgPushLogicDemo.php b/digital_doctor_admin/vendor/wanghua/general-utility-tools-php/src/wechat/WechatMsgPushLogicDemo.php
index 4eb0322..c8d64fe 100644
--- a/digital_doctor_admin/vendor/wanghua/general-utility-tools-php/src/wechat/WechatMsgPushLogicDemo.php
+++ b/digital_doctor_admin/vendor/wanghua/general-utility-tools-php/src/wechat/WechatMsgPushLogicDemo.php
@@ -135,7 +135,7 @@ class WechatMsgPushLogic
                     ]);
                     continue;//不发
                 }
-                $users = Db::table(TabConf::$fa_users)
+                $users = Db::table('fa_ty_users')
                     ->where('openid',$ToUserOpenid)
                     ->find();
                 if(empty($users)){
@@ -145,7 +145,7 @@ class WechatMsgPushLogic
                     continue;
                 }
                 //礼包入账
-                Db::table(TabConf::$fa_users)
+                Db::table('fa_ty_users')
                     ->where('openid',$ToUserOpenid)
                     ->setInc('score',$prize['val'] * $item['Num']);
             }