From 4f0c37d281e7aa2e107c3b57c202dd484c178ef8 Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Mon, 21 Sep 2020 08:06:24 +0800
Subject: [PATCH] =?UTF-8?q?add:=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 catch/monitor/controller/Service.php          | 10 ----
 catch/permissions/controller/User.php         | 12 +++++
 .../20200920130201_add_user_avatar.php        | 51 +++++++++++++++++++
 catch/permissions/model/Users.php             |  1 +
 catch/permissions/route.php                   |  1 +
 5 files changed, 65 insertions(+), 10 deletions(-)
 delete mode 100644 catch/monitor/controller/Service.php
 create mode 100644 catch/permissions/database/migrations/20200920130201_add_user_avatar.php

diff --git a/catch/monitor/controller/Service.php b/catch/monitor/controller/Service.php
deleted file mode 100644
index ef90e0a..0000000
--- a/catch/monitor/controller/Service.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | CatchAdmin [Just Like ～ ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~2020 http://catchadmin.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
-// +----------------------------------------------------------------------
-// | Author: JaguarJack [ njphper@gmail.com ]
-// +----------------------------------------------------------------------
diff --git a/catch/permissions/controller/User.php b/catch/permissions/controller/User.php
index b1710e0..2318668 100644
--- a/catch/permissions/controller/User.php
+++ b/catch/permissions/controller/User.php
@@ -243,4 +243,16 @@ class User extends CatchController
     {
         return CatchResponse::success($excel->save($userExport, Utils::publicPath('export/users')));
     }
+
+    /**
+     * 更新个人信息
+     *
+     * @time 2020年09月20日
+     * @param Request $request
+     * @return \think\response\Json
+     */
+    public function profile(Request $request)
+    {
+       return CatchResponse::success($this->user->updateBy($request->user()->id, $request->param()));
+    }
 }
diff --git a/catch/permissions/database/migrations/20200920130201_add_user_avatar.php b/catch/permissions/database/migrations/20200920130201_add_user_avatar.php
new file mode 100644
index 0000000..fefaf81
--- /dev/null
+++ b/catch/permissions/database/migrations/20200920130201_add_user_avatar.php
@@ -0,0 +1,51 @@
+<?php
+// +----------------------------------------------------------------------
+// | CatchAdmin [Just Like ～ ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
+// +----------------------------------------------------------------------
+// | Author: JaguarJack [ njphper@gmail.com ]
+// +----------------------------------------------------------------------
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+
+class AddUserAvatar extends Migrator
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
+     *
+     * The following commands can be used in this method and Phinx will
+     * automatically reverse them when rolling back:
+     *
+     *    createTable
+     *    renameTable
+     *    addColumn
+     *    renameColumn
+     *    addIndex
+     *    addForeignKey
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change()
+    {
+        if ($this->hasTable('users')) {
+            $table = $this->table('users');
+
+            $table->addColumn('avatar', 'string', [
+                'limit' => 255,
+                'default' => '',
+                'comment' => '用户头像',
+                'after' => 'email'])
+                ->update();
+        }
+    }
+}
diff --git a/catch/permissions/model/Users.php b/catch/permissions/model/Users.php
index 060390b..4235388 100644
--- a/catch/permissions/model/Users.php
+++ b/catch/permissions/model/Users.php
@@ -19,6 +19,7 @@ class Users extends CatchModel
 			'username', // 用户名
 			'password', // 用户密码
 			'email', // 邮箱 登录
+            'avatar', // 头像
             'creator_id', // 创建者ID
             'department_id', // 部门ID
 			'status', // 用户状态 1 正常 2 禁用
diff --git a/catch/permissions/route.php b/catch/permissions/route.php
index a3c1c4e..c888dd8 100644
--- a/catch/permissions/route.php
+++ b/catch/permissions/route.php
@@ -21,6 +21,7 @@ $router->group(function () use ($router){
     // 切换状态
     $router->put('users/switch/status/<id>', '\catchAdmin\permissions\controller\User@switchStatus');
     $router->put('users/recover/<id>', '\catchAdmin\permissions\controller\User@recover');
+    $router->put('users/profile', '\catchAdmin\permissions\controller\User@profile');
     $router->get('users/get/roles', '\catchAdmin\permissions\controller\User@getRoles');
     $router->get('user/info', '\catchAdmin\permissions\controller\User@info');
     $router->get('user/export', '\catchAdmin\permissions\controller\User@export');