提交

application/api/controller/Approve.php

@@ -10,7 +10,7 @@ use think\Exception;
 /**
  * @Apidoc\Title("审批")
  * @Apidoc\Group("api")
- * @Apidoc\Sort("0")
+ * @Apidoc\Sort("12")
  */
 class Approve extends Base
 {

application/api/controller/Approveflow.php

@@ -8,7 +8,7 @@ use hg\apidoc\annotation as Apidoc;
 /**
  * @Apidoc\Title("审批流程")
  * @Apidoc\Group("api")
- * @Apidoc\Sort("0")
+ * @Apidoc\Sort("10")
  */
 class Approveflow extends Base
 {

application/api/controller/Approveinfo.php

@@ -10,7 +10,7 @@ use think\Exception;
 /**
  * @Apidoc\Title("审批申请")
  * @Apidoc\Group("api")
- * @Apidoc\Sort("0")
+ * @Apidoc\Sort("11")
  */
 class Approveinfo extends Base
 {

application/api/controller/Area.php

@@ -19,7 +19,6 @@ use think\Db;
 use hg\apidoc\annotation as Apidoc;
 /**
  * @Apidoc\Title("地址库")
- * @Apidoc\Group("api")
  */
 class Area extends Base
 {

application/api/controller/Common.php

@@ -14,7 +14,7 @@ use hg\apidoc\annotation as Apidoc;
 /**
  * @Apidoc\Title("公用")
  * @Apidoc\Group("api")
- * @Apidoc\Sort("0")
+ * @Apidoc\Sort("4")
  */
 class Common extends Base
 {

application/api/controller/Contract.php

@@ -9,7 +9,6 @@ use hg\apidoc\annotation as Apidoc;
 
 /**
  * @Apidoc\Title("合同管理")
- * @Apidoc\Group("api")
  */
 class Contract extends Base
 {

application/api/controller/Evection.php

@@ -13,7 +13,6 @@ use think\Exception;
 
 /**
  * @Apidoc\Title("员工出差")
- * @Apidoc\Group("api")
  */
 class Evection extends Base
 {

application/api/controller/General.php

@@ -12,7 +12,6 @@ use hg\apidoc\annotation as Apidoc;
 use think\Db;
 /**
  * @Apidoc\Title("我的审批")
- * @Apidoc\Group("api")
  */
 class General extends Base
 {

application/api/controller/Login.php

@@ -10,7 +10,7 @@ use hg\apidoc\annotation as Apidoc;
 /**
  * @Apidoc\Title("登录")
  * @Apidoc\Group("api")
- * @Apidoc\Sort("0")
+ * @Apidoc\Sort("1")
  */
 class Login extends Base
 {

application/api/controller/Maintain.php

@@ -8,7 +8,6 @@ use hg\apidoc\annotation as Apidoc;
 
 /**
  * @Apidoc\Title("员工维修管理")
- * @Apidoc\Group("api")
  */
 class Maintain extends Base
 {

application/api/controller/Member.php

@@ -1,11 +1,15 @@
 <?php
+
 namespace app\api\controller;
+
 use think\Db;
 use app\common\model\User;
 use hg\apidoc\annotation as Apidoc;
+
 /**
  * @Apidoc\Title("个人中心")
  * @Apidoc\Group("api")
+ * @Apidoc\Sort("2")
  */
 class Member extends Base
 {
@@ -16,11 +20,9 @@ class Member extends Base
     }
 
     /**
-     * @Apidoc\Title("获取个人信息")
-     * @Apidoc\Desc("个人信息")
-     * @Apidoc\Method("GET")
-     * @Apidoc\Author("HG")
-     * @Apidoc\Tag("")
+     * 获取个人信息
+     *
+     * @Apidoc\Method("POST")
      * @Apidoc\Returned("phone", type="int", desc="手机号")
      * @Apidoc\Returned("name", type="string", desc="姓名")
      * @Apidoc\Returned("nickname", type="string", desc="昵称")
@@ -31,21 +33,18 @@ class Member extends Base
      */
     public function user_info()
     {
-        $uid = $this->user_id;
-        $field = 'phone,name,nickname,headimg,title,department,signature';
-        $info = Db::name('store_member')->field($field)->where('id',$uid)->find();
-        $this->success('获取成功',$info);
+        $user = $this->user;
+        $this->success('获取成功',$user);
     }
+
     /**
-     * @Apidoc\Title("编辑个人信息")
-     * @Apidoc\Desc("个人信息")
+     * 编辑个人信息
+     *
      * @Apidoc\Method("POST")
-     * @Apidoc\Author("HG")
-     * @Apidoc\Tag("")
-     * @Apidoc\Query("type", type="int", require=true, desc="修改的类型（1：昵称，2：签名，3：手机号）")
-     * @Apidoc\Query("nickname", type="string", desc="昵称")
-     * @Apidoc\Query("signature", type="string", desc="签名")
-     * @Apidoc\Query("phone", type="string", desc="手机号")
+     * @Apidoc\Param("type", type="int", require=true, desc="修改的类型（1：昵称，2：签名，3：手机号）")
+     * @Apidoc\Param("nickname", type="string", desc="昵称")
+     * @Apidoc\Param("signature", type="string", desc="签名")
+     * @Apidoc\Param("phone", type="string", desc="手机号")
      */
     public function edit()
     {

application/api/controller/Offer.php

@@ -8,7 +8,6 @@ use app\common\service\ApproveService;
 use hg\apidoc\annotation as Apidoc;
 /**
  * @Apidoc\Title("员工呈批管理")
- * @Apidoc\Group("api")
  */
 class Offer extends Base
 {

application/api/controller/Schoolfile.php

@@ -8,7 +8,6 @@ use hg\apidoc\annotation as Apidoc;
 
 /**
  * @Apidoc\Title("学校文件")
- * @Apidoc\Group("api")
  */
 class Schoolfile extends Base
 {

application/api/controller/Subscribe.php

@@ -6,7 +6,6 @@ use think\Db;
 use hg\apidoc\annotation as Apidoc;
 /**
  * @Apidoc\Title("申购模块")
- * @Apidoc\Group("api")
  */
 class Subscribe extends Base
 {

application/api/controller/Upload.php

@@ -1,25 +1,14 @@
 <?php
 
-// +----------------------------------------------------------------------
-// | ThinkAdmin
-// +----------------------------------------------------------------------
-// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
-// +----------------------------------------------------------------------
-// | 官方网站: http://demo.thinkadmin.top
-// +----------------------------------------------------------------------
-// | 开源协议 ( https://mit-license.org )
-// +----------------------------------------------------------------------
-// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
-// +----------------------------------------------------------------------
-
 namespace app\api\controller;
-use library\File;
 
+use library\File;
 use hg\apidoc\annotation as Apidoc;
+
 /**
  * @Apidoc\Title("上传文件")
  * @Apidoc\Group("api")
+ * @Apidoc\Sort("3")
  */
 class Upload extends Base
 {
@@ -35,9 +24,6 @@ class Upload extends Base
     /**
      * @Apidoc\Title("上传文件接口（上传到本地（导入模板需要））")
      * @Apidoc\Desc("获取配置")
-     * @Apidoc\Method("GET")
-     * @Apidoc\Author("HG")
-     * @Apidoc\Tag("")
      * @Apidoc\Query("file", type="string",require=true, desc="表达提交的文件信息")
      * @Apidoc\Returned("url", type="string", desc="上传后的文件路径")
      */
@@ -64,6 +50,7 @@ class Upload extends Base
             $this->error('文件处理失败，请稍候再试！');
         }
     }
+
     private function getUploadFile()
     {
         try {
@@ -72,6 +59,7 @@ class Upload extends Base
             $this->error(lang($e->getMessage()));
         }
     }
+
     private function getUploadType()
     {
         $this->uptype = input('uptype');
@@ -80,13 +68,11 @@ class Upload extends Base
         }
         return $this->uptype;
     }
+
     /**
      * @Apidoc\Title("获取OSS配置（用于上传文件到OSS使用）")
      * @Apidoc\Desc("获取配置")
-     * @Apidoc\Method("GET")
-     * @Apidoc\Author("HG")
-     * @Apidoc\Tag("")
-     * @Apidoc\Query("type", type="string",require=true, desc="文件要保存的目录名称（需前端创建好）")
+     * @Apidoc\Param("type", type="string",require=true, desc="文件要保存的目录名称（需前端创建好）")
      * @Apidoc\Returned("OSSAccessKeyId", type="string", desc="keyId")
      * @Apidoc\Returned("policy", type="string", desc="规则")
      * @Apidoc\Returned("Signature", type="string", desc="签名")
@@ -128,6 +114,7 @@ class Upload extends Base
         $response['key'] = $path;
         return $response;
     }
+
     protected function _gmt_iso8601($time) {
         $dtStr = date("c", $time);
         $mydatetime = new \DateTime($dtStr);

application/api/controller/UserCar.php

@@ -9,7 +9,6 @@ use think\Db;
 use hg\apidoc\annotation as Apidoc;
 /**
  * @Apidoc\Title("用车管理")
- * @Apidoc\Group("api")
  */
 class UserCar extends Base
 {

application/api/controller/UserLeave.php

@@ -11,7 +11,6 @@ use app\common\model\User;
 use hg\apidoc\annotation as Apidoc;
 /**
  * @Apidoc\Title("员工请假管理")
- * @Apidoc\Group("api")
  */
 class UserLeave extends Base
 {