wugg 9 months ago
parent
commit
ec238f0478
3 changed files with 25 additions and 2 deletions
  1. 1 1
      app/bug/controller/Action.php
  2. 2 1
      app/user/controller/Login.php
  3. 22 0
      config/note.php

+ 1 - 1
app/bug/controller/Action.php

@@ -6,7 +6,7 @@ namespace app\bug\controller;
 use app\bug\model\ActionList;use think\App;use think\facade\Validate;
 class Action extends Base
 {
-	protected $noLogin=['ActionList'];
+	protected $noLogin=[];
     public function __construct(App $app)
     {
     	parent::__construct($app);

+ 2 - 1
app/user/controller/Login.php

@@ -22,13 +22,14 @@ class Login extends Base{
 		if($valid->check($param)==false)return error($valid->getError());
 		$info = $this->model->with(['accountItem'=>['itemName'],'company_relaton','userInfo'])->where
 		(["username"=>$param['username'],"is_del"=>0])->findOrEmpty();
+		  $info->hidden(['userInfo','password','salt','accountItem','openId']);
 		if($info->isEmpty()) return error("账户不存在");
 		$sha1 = sha1($param['password'] .$info->salt);
 		if ($sha1 != $info->password) return error("密码错误");
 		if ($info->status==0) return error("账户已禁用");
 		$info->system_version = (new AccountPlat())->where(['account_id'=>$info->id])->column('system_version','plat_code');
 		$token = makeToken($info->username);
-		\app\common\User::instance()->LoginUserInfo($info,$token,$this->keepTime);
+		\app\common\User::instance()->LoginUserInfo($info->toArray(),$token,$this->keepTime);
 		return success("登录成功",$info);
 	}
 }

+ 22 - 0
config/note.php

@@ -0,0 +1,22 @@
+<?php
+return [
+    'field'=>[
+        "title"=>'标题',
+        "level"=>'优先级',
+        "status"=>'处理状态',
+        "remark"=>'描述',
+        "type"=>'需求类型',
+        "noteNo"=>'业务编号',
+        "model_id"=>"功能区",
+        "deal_name"=>'处理人'
+    ],
+    "field_value"=>[
+        "type"=>[
+            '缺陷(Bug)','任务(Task)','需求(Story)'
+        ],
+        "level"=>[ 1=>'高',2=>'中',3=>'低'],
+        "status"=>["待处理","进行中","已解决","测试中","已拒绝","已关闭","延后处理"],
+        "company_type"=>[1=>"结算系统",2=>'516系统',3=>'订单系统'],
+    ]
+
+];