diff --git a/app/controller/AreaController.php b/app/controller/AreaController.php
index 349ebc2..9c05547 100644
--- a/app/controller/AreaController.php
+++ b/app/controller/AreaController.php
@@ -58,13 +58,15 @@ class AreaController
 //        }
 
         $list = Country::get()->toArray();
-        $language = 'en_addr';
-        if($request->user['language'] == 'zh_CN'){
-            $language = 'cn_addr';
+        $name = 'en_addr';
+        //$language = $request->user['language'];
+        $language = 'zh_CN';
+        if($language == 'zh_CN'){
+            $name = 'cn_addr';
         }
 
         foreach ($list as &$row) {
-            $row['name'] = $row[$language];
+            $row['name'] = $row[$name];
         }
         return Util::success($list);
     }
diff --git a/app/controller/CarTypeController.php b/app/controller/CarTypeController.php
index 1dec007..a8442ca 100644
--- a/app/controller/CarTypeController.php
+++ b/app/controller/CarTypeController.php
@@ -17,11 +17,13 @@ class CarTypeController
     {
         $list = CarType::getAll();
 
-        if($request->user['language'] != 'zh_CN'){
+        //$language = $request->user['language'];
+        $language = 'zh_CN';
+        if($language == 'en'){
             foreach ($list as &$value) {
                 $value['name'] = $value['name_en'];
             }
-        }elseif ($request->user['language'] == 'ru'){
+        }elseif ($language == 'ru'){
             foreach ($list as &$value) {
                 $value['name'] = $value['name_ru'];
             }
diff --git a/app/controller/CustomerController.php b/app/controller/CustomerController.php
index 9b098d1..dddcedd 100644
--- a/app/controller/CustomerController.php
+++ b/app/controller/CustomerController.php
@@ -31,9 +31,12 @@ class CustomerController
     {
         $grade = [];
         $gradeConstants = Constants::GRADE_EN;
-        if($request->user['language'] == 'zh_CN'){
+
+        //$language = $request->user['language'];
+        $language = 'zh_CN';
+        if($language == 'zh_CN'){
             $gradeConstants = Constants::GRADE;
-        }elseif ($request->user['language'] == 'ru'){
+        }elseif ($language == 'ru'){
             $gradeConstants = Constants::GRADE_RU;
         }
         foreach ($gradeConstants as $key => $value) {
@@ -54,9 +57,11 @@ class CustomerController
     {
         $grade = [];
         $magnitudeConstants = Constants::MAGNITUDE_EN;
-        if($request->user['language'] == 'zh_CN'){
+        //$language = $request->user['language'];
+        $language = 'zh_CN';
+        if($language == 'zh_CN'){
             $magnitudeConstants = Constants::MAGNITUDE;
-        }elseif ($request->user['language'] == 'ru'){
+        }elseif ($language == 'ru'){
             $magnitudeConstants = Constants::MAGNITUDE_RU;
         }
         foreach ($magnitudeConstants as $key => $value) {
@@ -77,11 +82,13 @@ class CustomerController
     {
         $list = Channel::getAll();
 
-        if($request->user['language'] != 'zh_CN'){
+        //$language = $request->user['language'];
+        $language = 'zh_CN';
+        if($language != 'zh_CN'){
             foreach ($list as &$value) {
                 $value['name'] = $value['name_en'];
             }
-        }elseif ($request->user['language'] == 'ru'){
+        }elseif ($language == 'ru'){
             foreach ($list as &$value) {
                 $value['name'] = $value['name_ru'];
             }
@@ -178,7 +185,7 @@ class CustomerController
 
         // 执行分页查询  //关联标签tags //关联标签及分组tags.group
         $query = Customer::with('tags')->where($where)
-            ->orderBy('customer.id', 'desc');
+            ->orderBy('crm_customer.id', 'desc');
         if(!empty($tagId)){
 //            $query->with(['tags' => function($query) use ($tagId){
 //                $query->where('tag.id', $tagId);
diff --git a/app/controller/FollowController.php b/app/controller/FollowController.php
index fd6aa72..49e9621 100644
--- a/app/controller/FollowController.php
+++ b/app/controller/FollowController.php
@@ -55,9 +55,7 @@ class FollowController
         if(Util::isEmpty($userId)){
             return Util::fail(['user_id'=>$userId],trans('user_none'));
         }
-        if($request->user['role']!=1){
-            $where['user_id'] = $userId;
-        }
+        $where['user_id'] = $userId;
 
         //跟进id
         $id = Util::getParam($request,'id');
diff --git a/app/controller/TagGroupController.php b/app/controller/TagGroupController.php
index 135e70d..e91eb82 100644
--- a/app/controller/TagGroupController.php
+++ b/app/controller/TagGroupController.php
@@ -16,7 +16,8 @@ class TagGroupController
     {
         $list = TagGroup::with('tags')->get();
         $languageArr = Constants::LANGUAGE;
-        $language = $request->user['language'];
+//        $language = $request->user['language'];
+        $language = 'zh_CN';
         foreach ($list as &$item) {
             $item['names'] = unserialize($item['names']);
             if (in_array($language, $languageArr)) {
diff --git a/app/controller/UserController.php b/app/controller/UserController.php
index f6556bf..a325f4a 100644
--- a/app/controller/UserController.php
+++ b/app/controller/UserController.php
@@ -6,12 +6,14 @@ use app\model\Country;
 use app\model\FeishuUser;
 use app\model\User;
 use app\model\UserSn;
+use app\service\AuthService;
 use app\service\MailService;
 use app\service\UserService;
 use app\util\HttpClient;
 use app\util\JwtUtil;
 use app\util\Util;
 use config\constants\Constants;
+use support\exception\BusinessException;
 use support\Log;
 use support\Redis;
 use support\Request;
@@ -35,10 +37,14 @@ class UserController
             return Util::fail([], trans('required_not_null'));
         }
 
-        $user = User::select(['id', 'name', 'sex', 'role', 'avatar', 'email', 'password'])
-            ->where('status', 0)
-            ->where('email', $request->post('email'))
+        $user = User::where('status', 0)
+//            ->where('email', $request->post('email'))
+            ->OrWhere(['email' => $request->post('email'),'phone' => $request->post('email')])
             ->first();
+//        $builder = User::where('status', 0)
+//            ->where('email', $request->post('email'));
+//        $sql = str_replace(['?'], ['\'%s\''], $builder->toSql());
+//        $fullSql = vsprintf($sql, $builder->getBindings());
         if (!$user) {
             return Util::fail(['user' => $user], trans('user_none'));
         }
@@ -52,10 +58,15 @@ class UserController
         //验证密码
 //        if (!password_verify($userPassword, $hashedPassword)) {
 //        if ($userPassword == $hashedPassword) {
+
         if (!password_verify($password, $userPassword)) {
             locale($language);
             return Util::fail([], trans('password_error'));
         }
+
+        if ($user['status'] != 1) {
+            return Util::fail([], '账号已禁用',403);
+        }
         $userId = $user['id']; // 实际从数据库获取
 
 
@@ -66,7 +77,7 @@ class UserController
         $result = $user;
         unset($result['password']);
         $result['token'] = $token;
-        $result['feishu_openid'] = FeishuUser::where('user_id', $userId)->value('open_id');
+//        $result['feishu_openid'] = FeishuUser::where('user_id', $userId)->value('open_id');
 
         if (!Util::isEmpty($language)) {
             User::where('id', $userId)
@@ -77,6 +88,17 @@ class UserController
         return Util::success($result, trans('login_success'));
     }
 
+    public function loginNew(Request $request)
+    {
+        try {
+            $authService = new AuthService();
+            $result = $authService->uPwdLogin($request->all());
+            return Util::success($result, '登录成功');
+        } catch (\Throwable $e) {
+            Util::fail([],$e->getMessage());
+        }
+    }
+
     /**
      * 发送邮箱验证码
      * @param Request $request
@@ -152,14 +174,13 @@ class UserController
         $hashedPassword = password_hash($password, PASSWORD_DEFAULT);
 
         $data = [
-            'mobile' => $mobile,
+            'phone' => $mobile,
             'email' => $email,
             'name' => '用户_'.rand(111111, 999999),
             'sex' => $sex,
-            'role' => 1,
             'password' => $hashedPassword,
-            'status' => 0,
-            'avatar' => 'lingke_crm/logo.png'
+            'status' => 1,
+            'avatar' => ''
         ];
 
 
diff --git a/app/middleware/AuthMiddleware.php b/app/middleware/AuthMiddleware.php
index 8306cc3..584e5b4 100644
--- a/app/middleware/AuthMiddleware.php
+++ b/app/middleware/AuthMiddleware.php
@@ -77,17 +77,17 @@ class AuthMiddleware implements MiddlewareInterface
             }
 
             $userId = $decoded->sub;
-            $user = User::select(['id','name','sex','role','avatar','email','password','language','created_at'])
-                ->find($userId);
+            $user = User::find($userId);
             if(!$user){
-                return Util::fail(['user'=>$user],trans('user_none'));
+                return Util::fail(['user'=>$userId],trans('user_none'));
             }
             $user = $user->toArray();
 
             // 将用户ID存入请求对象，供后续使用
 //            $request->user = ['id' => $userId];
             $request->user = $user;
-            locale($user['language']);
+//            locale($user['language']);
+            locale('zh_CN');
             return $handler($request);
         } catch (BusinessException $e) {
             return json(['code' => 401, 'msg' => $e->getMessage()]);
diff --git a/app/model/Customer.php b/app/model/Customer.php
index 9df2cfa..b0a6e88 100644
--- a/app/model/Customer.php
+++ b/app/model/Customer.php
@@ -17,7 +17,7 @@ class Customer extends Model
      *
      * @var string
      */
-    protected $table = 'customer';
+    protected $table = 'crm_customer';
 
     /**
      * The primary key associated with the table.
@@ -67,7 +67,8 @@ class Customer extends Model
      */
     public static function getCustomer($customer, $request, $tag = false)
     {
-        $language = $request->user['language'] ?: 'en';
+        //$language = $request->user['language'] ?: 'en';
+        $language = 'zh_CN';
         $customer['grade_txt'] = Util::language($language, Constants::GRADE_EN[$customer['grade']], Constants::GRADE[$customer['grade']], Constants::GRADE_RU[$customer['grade']]);
         $customer['magnitude_txt'] = Util::language($language, Constants::MAGNITUDE_EN[$customer['magnitude']], Constants::MAGNITUDE[$customer['magnitude']], Constants::MAGNITUDE_RU[$customer['magnitude']]);
         $customer['sex_txt'] = Util::language($language, Constants::SEX_EN[$customer['sex']], Constants::SEX[$customer['sex']], Constants::SEX_RU[$customer['sex']]);
@@ -118,7 +119,7 @@ class Customer extends Model
      */
     public function tags()
     {
-        return $this->belongsToMany(Tag::class, 'customer_tag', 'customer_id', 'tag_id')
+        return $this->belongsToMany(Tag::class, 'crm_customer_tag', 'customer_id', 'tag_id')
             ->withTimestamps(); // 如果需要记录关联时间
     }
 
diff --git a/app/model/CustomerHis.php b/app/model/CustomerHis.php
index 9301b66..b6850c1 100644
--- a/app/model/CustomerHis.php
+++ b/app/model/CustomerHis.php
@@ -17,7 +17,7 @@ class CustomerHis extends Model
      *
      * @var string
      */
-    protected $table = 'customer_his';
+    protected $table = 'crm_customer_his';
 
     /**
      * The primary key associated with the table.
diff --git a/app/model/CustomerTag.php b/app/model/CustomerTag.php
index f3f96a3..d4ca561 100644
--- a/app/model/CustomerTag.php
+++ b/app/model/CustomerTag.php
@@ -14,7 +14,7 @@ class CustomerTag extends Model
      *
      * @var string
      */
-    protected $table = 'customer_tag';
+    protected $table = 'crm_customer_tag';
 
     /**
      * The primary key associated with the table.
diff --git a/app/model/Follow.php b/app/model/Follow.php
index 4298133..7e10d85 100644
--- a/app/model/Follow.php
+++ b/app/model/Follow.php
@@ -16,7 +16,7 @@ class Follow extends Model
      *
      * @var string
      */
-    protected $table = 'follow';
+    protected $table = 'crm_follow';
 
     /**
      * The primary key associated with the table.
@@ -57,8 +57,8 @@ class Follow extends Model
         }else {
             $follow['oss_picture'] = '';
         }
-        $follow['created_at'] = date('Y-m-d H:i:s',strtotime($follow['created_at'])+(3600*8));
-        $follow['updated_at'] = date('Y-m-d H:i:s',strtotime($follow['updated_at'])+(3600*8));
+        $follow['created_at'] = (!empty($follow['created_at']))?date('Y-m-d H:i:s',strtotime($follow['created_at'])+(3600*8)):'';
+        $follow['updated_at'] = (!empty($follow['updated_at']))?date('Y-m-d H:i:s',strtotime($follow['updated_at'])+(3600*8)):'';
 //        $follow = Util::formatDate($follow);
         return $follow;
     }
diff --git a/app/model/Tag.php b/app/model/Tag.php
index 6117650..a701ed0 100644
--- a/app/model/Tag.php
+++ b/app/model/Tag.php
@@ -17,7 +17,7 @@ class Tag extends Model
      *
      * @var string
      */
-    protected $table = 'tag';
+    protected $table = 'crm_tag';
 
     /**
      * The primary key associated with the table.
diff --git a/app/model/TagGroup.php b/app/model/TagGroup.php
index fbba597..3dbb670 100644
--- a/app/model/TagGroup.php
+++ b/app/model/TagGroup.php
@@ -17,7 +17,7 @@ class TagGroup extends Model
      *
      * @var string
      */
-    protected $table = 'tag_group';
+    protected $table = 'crm_tag_group';
 
     /**
      * The primary key associated with the table.