modelwechat

app/controller/Base.php

@@ -43,7 +43,7 @@ class Base extends \app\BaseController{
             'data' => $data,
         ];
         // 如果未设置类型则自动判断
-        $type = $type ?:  'jsonp';
+        $type = $type ?:  'json';
 
         $code = 200;
         if (isset($header['statuscode'])) {

app/controller/User.php

@@ -150,19 +150,34 @@ class User extends Base
         ]);
         if ($validate->check($post) == false) $this->error($validate->getError(),1004);
 
-        $acc = $this->model->withJoin(["userinfo","accountitem"],"left")->where(['username' => $post['username']])->findOrEmpty();
+        $acc = $this->model->withJoin(["userinfo","accountitem"],"left")
+        ->where(['username' => $post['username']])
+        ->findOrEmpty();
         if ($acc->isEmpty() == false) return json_show(1003, '账户名不存在');
 
         if ($acc['status'] == Account::$account_end)$this->error('账户已禁用',1003);
         $sha1 = sha1($post['password'] . $acc['salt']);
         if ($sha1 != $acc['password']) $this->error('账户或密码错误',1003);
-
-        $token = makeToken($acc);
+        $userinfo=[
+        	"id"=>$acc->id,
+        	"username"=>$acc->username,
+        	"mobile"=>$acc->mobile,
+        	"source"=>$acc->source,
+        	"nickname"=>$acc->nickname,
+        	"sex"=>$acc->userinfo->sex,
+        	"email"=>$acc->userinfo->email,
+        	"level"=>$acc->level,
+        	"itemid"=>$acc->accountitem->itemid,
+        	"position"=>$acc->accountitem->position,
+        	"depart_name"=>$acc->depart_name,
+        	"company_relaton"=>$acc->company_relaton,
+        	];
+        $token = makeToken($userinfo);
         if ($token == "") $this->error('token生成失败',1003);
-        $cache = Cache::store("redis")->set("user:info:{$token}", $acc->toArray(), $this->token_time);
+        $cache = Cache::store("redis")->set("user:info:{$token}", $userinfo, $this->token_time);
         if ($cache == false)$this->error('token保存失败',1003);
-        $acc['token'] = $token;
-        $this->success("登录成功", $acc);
+        $userinfo['token'] = $token;
+        $this->success("登录成功", $userinfo);
     }
 
     /**

app/model/Account.php

@@ -3,7 +3,7 @@ declare (strict_types = 1);
 
 namespace app\model;
 
-use app\account\model\AccountItem;use app\account\model\User;use think\Model;
+use think\Model;
 
 /**
  * @mixin \think\Model

app/model/AccountItem.php

@@ -10,5 +10,7 @@ use think\Model;
  */
 class AccountItem extends Model
 {
-    //
+      public function depart(){
+    	return $this->belongsTo(CompanyItem::class,'itemid','id')->bind(['depart_name'=>'name']);
+    }
 }