diff --git a/.htaccess b/.htaccess
new file mode 100644
index 0000000..0519ecb
--- /dev/null
+++ b/.htaccess
@@ -0,0 +1 @@
+ 
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..b05cbd2
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "php.version": "8.2"
+}
\ No newline at end of file
diff --git a/app/api/controller/BaseController.php b/app/api/controller/BaseController.php
index db220c7..6acce58 100644
--- a/app/api/controller/BaseController.php
+++ b/app/api/controller/BaseController.php
@@ -5,6 +5,7 @@ use support\Response;
 use Shopwwi\WebmanFilesystem\FilesystemFactory;
 use Shopwwi\WebmanFilesystem\Facade\Storage;
 use hg\apidoc\annotation as Apidoc;
+use taoser\facade\Validate;
 /**
  * 基础控制器
  * @Apidoc\NotParse()
@@ -62,14 +63,48 @@ class BaseController
      */
     function upload(Request $request)
     {
+        try{
+            $user = \support\Jwt::getUser();
+        }catch(\Exception $e){
+            $user = ['id'=>0];
+        }
+        $savePath = $request->post('savePath','files');
+	
+        $validate = Validate::rule('savePath', 'alphaNum');
+        $data = ['savePath'  => $savePath];
+        if (!$validate->check($data)) {
+            return $this->fail( '参数错误:'.$validate->getError());
+        }
+        $savePath = trim($savePath,'/');
+        $savePath = 'upload/'.$savePath.'/'.$user['id'];
+        \support\Log::alert('savePath:'.$savePath);
+        $mimetype = explode(',',Config('site.upload_mimetype'));
+        $maxsize = Config('site.upload_maxsize')*1024*1024;
         //多文件上传
         $files = $request->file();
         try {
             $result = Storage::adapter('public')
-                ->path('upload/files')
-                ->size(1024*1024*10)
-                ->extYes(['image/jpeg','image/png'])
-                ->uploads($files,0,1024*1024*100,false);
+                ->path($savePath)
+                ->size($maxsize)
+                ->extYes($mimetype)
+                ->uploads($files,0,$maxsize * count($files),false);
+            $save_datas = [];
+            foreach($result as $k=>$fileinfo){
+                $save_datas[] = [
+                    'user_id'   =>  $user['id'],
+                    'category'  =>  'default',
+                    'title'     =>  $fileinfo->origin_name,
+                    'path'      =>  $fileinfo->file_name,
+                    'size'      =>  $fileinfo->size,
+                    'mime_type' =>  $fileinfo->mime_type,
+                    'extension' =>  $fileinfo->extension,
+                    'height'    =>  $fileinfo->file_height,
+                    'width'     =>  $fileinfo->file_width,
+                    'sha1'      =>  sha1_file(public_path($fileinfo->file_name)),
+                    'use_count' =>  0,
+                ];
+            }
+            \app\model\Files::insertAll($save_datas);
             return $this->success(__('successful'),$result);
         }catch (\Exception $e){
             return $this->error($e->getMessage());
diff --git a/app/api/controller/CommonController.php b/app/api/controller/CommonController.php
index 338f582..b96cd86 100644
--- a/app/api/controller/CommonController.php
+++ b/app/api/controller/CommonController.php
@@ -12,6 +12,7 @@ use Shopwwi\WebmanFilesystem\FilesystemFactory;
 use Shopwwi\WebmanFilesystem\Facade\Storage;
 use hg\apidoc\annotation as Apidoc;
 
+use think\facade\Db;
 /**
  * 公共接口
  */
@@ -34,7 +35,7 @@ class CommonController extends BaseController{
      *
      * @Apidoc\Query("version", type="string", require=true, desc="版本号")
      */
-    public function init()
+    public function init(Request $request)
     {
         $lang = input('lang','en-US');
         locale( $lang);
@@ -42,9 +43,9 @@ class CommonController extends BaseController{
         $disallowFields = [
             'api_token','reward_time_limit',
             'mail_type','mail_smtp_host','mail_smtp_port','mail_smtp_user','mail_smtp_pass','mail_verify_type','mail_from',
-            'attachmentcategory','categorytype','cdkey_category','configgroup','flagtype',
+            'attachment_category','categorytype','cdkey_category','configgroup','flagtype',
             'languages','forbiddenip','fixedpage','admin_login_captcha',
-            'mimetype','multipart','multiple','chunksize','classname','thumbstyle','previewtpl','timeout','maxsize','container',
+            'upload_mimetype','upload_multipart','upload_multiple','upload_thumbstyle','upload_previewtpl','upload_timeout','upload_maxsize',
             'yeji_jicha_reward','suanli_rate','agent_expirs_retention','allow_currencys','allow_balance_log',
             'agent_commission_total_rate','agent_commission_layer_rate','differential_commission_total_rate'
         ];
@@ -58,13 +59,30 @@ class CommonController extends BaseController{
         $config['server_status_list'] = \app\enum\ServerStatus::toArray();
         return $this->success(__('successful'), $config);
     }
+
     /**
-     * test
-     * @Apidoc\Query("lang", type="string",require=true, desc="邮箱")
-     * @Apidoc\Method ("GET")
+     * 验证是否升级
      */
-    function test(){
-        return $this->error(__('Invalid parameters'));
+    public function checkUpgrade(Request $request)
+    {
+        $field = 'id,type,force,source,version,content';
+    	$verUpdate = new \app\model\Version;
+        $version = Input('version');
+        $platform = Input('platform');
+        $version_wgt = Input('version_wgt');
+
+    	// 查询整包、外链数据
+    	$update_data = $verUpdate->where(['type'=>['in', '0,2'], 'status'=>1, 'version'=>['>', $version], 'platform'=>$platform])->field($field)->order('id desc')->find();
+    	if($update_data) {
+            return $this->success('',$update_data);
+        }
+
+    	// 查询WGT数据
+    	$update_wgt_data = $verUpdate->where(['type'=>1, 'status'=>1, 'version_wgt'=>['>', $version_wgt], 'platform'=>$platform])->field($field)->order('id desc')->find();
+    	if($update_wgt_data) {
+            return $this->success('',$update_wgt_data);
+        }
+        return $this->success('',[]);
     }
     /**
      * 注册会员
@@ -84,65 +102,72 @@ class CommonController extends BaseController{
         $username = input('username');
         $mobile = input('mobile');
         $invite_code = input('invite_code');
-        if ($email && !Validate::is($email, "email")) {
-            return $this->error(__('Email is incorrect'));
+        $type = input('type');
+        if (!in_array($type,Config('site.user_register_way')) ) {
+            return $this->error(__('Unknown register way'));
         }
-        if ($mobile && !Validate::regex($mobile, "^1\d{10}$")) {
-            return $this->error(__('Mobile is incorrect'));
-        }
-        if(Config('site.user_register_way') == 'mobile'){
-            if (!$mobile) {
-                return $this->error(__('Invalid parameters'));
-            }
-            $username = $mobile;
-            captcha_verfiy('mobile','register',$mobile);
-        }else if(Config('site.user_register_way') == 'email'){
-            if (!$email) {
-                return $this->error(__('Invalid parameters'));
-            }
-            if ($email && !Validate::is($email, "email")) {
+        if ($type == 'email') {
+            if(!$email || !Validate::is($email, "email")){
                 return $this->error(__('Email is incorrect'));
             }
             $username = $email;
-            captcha_verfiy('email','register',$email);
-        }else{
-            if (!$username) {
-                return $this->error(__('Invalid parameters'));
+            unset($mobile);
+            //captcha_verfiy('email','register',$email,false);
+        }
+        if ($type == 'mobile') {
+            if(!$mobile || !Validate::regex($mobile, "^1\d{10}$")){
+                return $this->error(__('Mobile is incorrect'));
+            }
+            $username = $mobile;
+            unset($email);
+            //captcha_verfiy('mobile','register',$mobile,false);
+        }
+        if ($type == 'username') {
+            if(!$email || !Validate::is($email, "email")){
+                return $this->error(__('Username is incorrect'));
             }
         }
         if (!$password) {
             return $this->error(__('Invalid parameters'));
         }
-        $extends = [
-            'role_id'   =>  0,
-            'group'     =>  0,
-            'avatar'    =>  '/static/img/avatar.png',
-        ];
         // if (!$trade_password) {
         //     return $this->error(__('Invalid trade password'));
         // }else{
         //     $extends['trade_password'] = \plugin\admin\app\common\Util::passwordHash($trade_password);
         // }
         //邀请码
-        if(!$invite_code){
-            return $this->error(__('Invalid invite code'));
-        }
-        if(strlen($invite_code) == 12){
-            //系统生产的一次性推荐吗
-            $inviteModel = \app\model\Invitecode::where('code',$invite_code)->find();
-            if(!$inviteModel){
-                return $this->error(__('错误的邀请码'));
+        if ($invite_code) 
+        {
+            if(strlen($invite_code) == 12){
+                //系统生产的一次性推荐吗
+                $inviteModel = \app\model\Invitecode::where('code',$invite_code)->find();
+                if(!$inviteModel){
+                    return $this->error(__('错误的邀请码'));
+                }
+                $extends['group'] = 2;
+                $extends['role_id'] = 1;
+                $extends['parent_id'] = 0;
+            }else{
+                $inviter_user = UserModel::where('invite_code',$invite_code)->field('group,id')->find();
+                if(!$inviter_user){
+                    return $this->error(__('Invalid invite code'));
+                }
+                $extends['parent_id'] = $inviter_user['id'];
             }
-            $extends['group'] = 2;
-            $extends['role_id'] = 1;
-            $extends['parent_id'] = 0;
         }else{
-            $inviter_user = UserModel::where('invite_code',$invite_code)->field('group,id')->find();
-            if(!$inviter_user){
-                return $this->error(__('Invalid invite code'));
-            }
-            $extends['parent_id'] = $inviter_user['id'];
+            //return $this->error(__('Invalid invite code'));
         }
+        $extends = [
+            'role_id'   =>  0,
+            'group_id'     =>  0,
+            'avatar'    =>  '/static/img/avatar.png',
+        ];
+        // validate(\app\validate\User::class)
+		//     ->scene('edit')
+        //     ->check([
+        //     'name'  => 'thinkphp',
+        //     'email' => 'thinkphp@qq.com',
+        // ]);
         try {
             $user = \support\Jwt::register($username, $password, $email, $mobile, $extends);
             if($inviteModel){
@@ -150,8 +175,15 @@ class CommonController extends BaseController{
                 $inviteModel->save();
             }
             $data = ['userinfo' => $user];
+            // if ($type == 'email') {
+            //     captcha_verfiy('email','register',$email,true);
+            // }else if ($type == 'mobile') {
+            //     captcha_verfiy('mobile','register',$mobile,true);
+            // }else{
+            //     captcha_verfiy('image','register',$mobile,true);
+            // }
             return $this->success(__('Sign up successful'), $data);
-        } catch (\Throwable $e) {
+        } catch (\Exception $e) {
             return $this->error($e->getMessage());
         }
     }
@@ -163,12 +195,30 @@ class CommonController extends BaseController{
      */
     public function login(Request $request){
         $username = input('username');
+        $mobile = input('mobile');
+        $email = input('email');
         $password = input('password');
-        if (!$username || !$password) {
-            return $this->fail(__('Invalid username or password'));
+        $type = input(param: 'type');
+        if (!$password) {
+            return $this->fail(__('Invalid username or password').'0');
+        }
+        if($type == 'mobile'){
+            if (!$mobile ) {
+                return $this->fail(__('Invalid username or password').'1');
+            }
+            $username = $mobile;
+        }else if($type == 'email'){
+            if (!$email ) {
+                return $this->fail(__('Invalid username or password').'2');
+            }
+            $username = $email;
+        }else{
+            if (!$username ) {
+                return $this->fail(__('Invalid username or password').'3');
+            }
         }
         try{
-            $user = \support\Jwt::login($username, $password,'username');
+            $user = \support\Jwt::login($username, $password,$type);
             if($user === false){
                 return $this->fail(\support\Jwt::getError());
             }
@@ -218,15 +268,15 @@ class CommonController extends BaseController{
                 $user = false;
             }
             if($user){
-                captcha_verfiy('mobile','reset_trade_pwd',$user->mobile);
+                captcha_verfiy('mobile','reset_pwd',$user->mobile);
             }
         }else{
             if ($email && Validate::is($email, "email")) {
-                captcha_verfiy('email','reset_trade_pwd',$email);
+                captcha_verfiy('email','reset_pwd',$email);
                 $user = UserModel::getByEmail($email);
             }
             if ($mobile && Validate::regex($mobile, "^1\d{10}$")) {
-                captcha_verfiy('mobile','reset_trade_pwd',$mobile);
+                captcha_verfiy('mobile','reset_pwd',$mobile);
                 $user = UserModel::getByMobile($mobile);
             }
         }
@@ -309,6 +359,7 @@ class CommonController extends BaseController{
      * @Apidoc\Param("email", type="string",require=true, desc="邮箱,可选")
      */
     public function captcha(Request $request){
+        $debug = true;
         $request->input('type');
         $type = $request->input('type');
         $event = $request->input('event');
@@ -331,17 +382,19 @@ class CommonController extends BaseController{
                     return $this->fail(__('Only one verification code can be sent within %second% seconds',['%second%'=>$expris]));
                 }
             }
-            $code =\support\Random::numeric(4);
+            $code =\support\Random::numeric(6);
             $list[$code] = time();
             cache($key,$list);
             cache('exp_'.$key,time());
-            addJob([
-                'email'     =>  $email,
-                'title'   => __("Mt email code"),
-                'event'   => $event,
-                'code'   => $code
-            ],'Email');
-            return $this->success(__('Email sent successfully'));
+            // addJob([
+            //     'email'     =>  $email,
+            //     'title'   => __("Mt email code"),
+            //     'event'   => $event,
+            //     'code'   => $code
+            // ],'Email');
+            return $this->success(__('Email sent successfully'),[
+                'code'=> $debug ? $code : ''
+            ]);
         }elseif($type == 'mobile'){
             $mobile = $request->input('mobile');
             if(!$mobile){
@@ -364,7 +417,7 @@ class CommonController extends BaseController{
                     return $this->fail(__('Only one verification code can be sent within %second% seconds',['%second%'=>$expris]));
                 }
             }
-            $code =\support\Random::numeric(4);
+            $code =\support\Random::numeric(6);
             $list[$code] = time();
             cache($key,$list);
             cache('exp_'.$key,time());
@@ -373,7 +426,9 @@ class CommonController extends BaseController{
                 'event'   => $event,
                 'code'   => $code
             ],'Sms');
-            return $this->success(__('SMS sent successfully'));
+            return $this->success(__('SMS sent successfully'),[
+                'code'=> $debug ? $code : ''
+            ]);
         }else{
             //TODO 图像验证码没有唯一的KEY
             $key = 'captcha_'.$event.'_';
@@ -406,13 +461,14 @@ class CommonController extends BaseController{
      */
     public function verify_captcha(Request $request): Response
     {
+        $type = $request->input('type');
         $email = $request->post('email');
         $mobile = $request->input('mobile');
         $event = $request->post('event');
         try {
-            if($email){
+            if($type == 'email'){
                 $result = captcha_verfiy('email', $event , $email,false);
-            }elseif($mobile){
+            }elseif($type == 'mobile'){
                 $result = captcha_verfiy('mobile', $event , $mobile,false);
             }else{
                 $result = captcha_verfiy('image', $event , '',false);
@@ -425,24 +481,4 @@ class CommonController extends BaseController{
         }
         return $this->success(__('successful'));
     }
-
-    /**
-     * @Apidoc\Title("上传")
-     * @Apidoc\Method("POST")
-     */
-    function upload(Request $request)
-    {
-        //多文件上传
-        $files = $request->file();
-        try {
-            $result = Storage::adapter('public')
-                ->path('upload/files')
-                ->size(1024*1024*10)
-                ->extYes(['image/jpeg','image/png'])
-                ->uploads($files,0,1024*1024*100,false);
-            return $this->success(__('successful'),$result);
-        }catch (\Exception $e){
-            return $this->error($e->getMessage());
-        }
-    }
 }
\ No newline at end of file
diff --git a/app/api/controller/FriendCircleController.php b/app/api/controller/FriendCircleController.php
new file mode 100644
index 0000000..2cba832
--- /dev/null
+++ b/app/api/controller/FriendCircleController.php
@@ -0,0 +1,357 @@
+<?php
+namespace app\api\controller;
+use Shopwwi\WebmanFilesystem\FilesystemFactory;
+use Shopwwi\WebmanFilesystem\Facade\Storage;
+use app\model\User as UserModel;
+use app\model\Realname as RealnameModel;
+use app\model\FriendCircle as FriendCircleModel;
+use app\model\FriendCircleLike as FriendCircleLikeModel;
+use app\model\FriendCircleComment as FriendCircleCommentModel;
+use support\Request;
+use support\Response;
+use taoser\facade\Validate;
+use support\think\Db;
+use hg\apidoc\annotation as Apidoc;
+
+/**
+ * 朋友圈
+ */
+class FriendCircleController extends BaseController{
+    /**
+     * 不需要鉴权的方法
+     * @var array
+     */
+    public $noNeedAuth = ['*'];
+
+    /**
+     * 无需登录及鉴权的方法
+     * @var array
+     */
+    public $noNeedLogin = [];
+    /**
+     * 朋友圈设置
+     * @return void
+     */
+    function info(Request $request): Response{
+        $res = $this->newcount($request);
+        $response = $res->rawBody();
+        $json = json_decode($response,true);
+        $json['data']['settings'] = [
+            'bg' => '',
+        ];
+        $json['data']['last_unread_item'] = [
+            'user_id' => '1',
+            'avatar' => '',
+            'nickname' => '',
+        ];
+        $res->withBody(json_encode($json));
+        return $res;
+    }
+    /**
+     * @Apidoc\Title("列表")
+     * @Apidoc\Method("GET")
+     * @Apidoc\Query("page", type="int", require=true, desc="页码",default=1)
+     * @Apidoc\Query("limit", type="int", require=true, desc="分页大小",default=10)
+     * @Apidoc\Query("user_id", type="int", require=false, desc="用户ID，不传则获取所有")
+     */
+    function list(Request $request): Response
+    {
+        $page = (int)$request->get('page', 1);
+        $limit = (int)$request->get('limit', 10);
+        $user_id = $request->get('user_id', 0);
+        
+        $query = FriendCircleModel::where('status', 1)
+            ->with(['user' => function($query) {
+                $query->field('id,nickname,avatar');
+            }])
+            ->order('created_at', 'desc');
+        
+        // 如果指定了用户ID，只获取该用户的朋友圈
+        if ($user_id > 0) {
+            $query->where('user_id', $user_id);
+        }
+        
+        $list = $query->paginate([
+            'list_rows' => $limit,
+            'page' => $page,
+        ]);
+        
+        $current_user = \support\Jwt::getUser();
+        $current_user_id = $current_user ? $current_user->id : 0;
+        
+        // 处理每条朋友圈数据
+        $items = $list->items();
+        $list->each(function($item) use ($current_user_id){
+            // 获取点赞列表
+            $likes = FriendCircleLikeModel::where('circle_id', $item->id)
+                ->with(['user' => function($query) {
+                    $query->field('id,nickname,avatar');
+                }])
+                ->order('created_at', 'desc')
+                ->limit(20)
+                ->select();
+            
+            // 检查当前用户是否已点赞
+            $is_liked = false;
+            if ($current_user_id > 0) {
+                $is_liked = FriendCircleLikeModel::where('circle_id', $item->id)
+                    ->where('user_id', $current_user_id)
+                    ->count() > 0;
+            }
+            
+            // 获取评论列表（最新10条）
+            $comments = FriendCircleCommentModel::where('circle_id', $item->id)
+                ->where('status', 1)
+                ->with(['user' => function($query) {
+                    $query->field('id,nickname,avatar');
+                }, 'replyUser' => function($query) {
+                    $query->field('id,nickname,avatar');
+                }])
+                ->order('created_at', 'asc')
+                ->limit(10)
+                ->select();
+            
+            // 格式化数据
+            $item->is_liked = $is_liked;
+            $item->likes = $likes;
+            $item->comments = $comments;
+            
+            // 处理图片URL
+            if (!empty($item->files)) {
+                $files = is_array($item->files) ? $item->files : json_decode($item->files, true);
+                if (is_array($files)) {
+                    $item->files = array_map(function($file) {
+                        return cdnurl($file);
+                    }, $files);
+                } else {
+                    $item->files = [];
+                }
+            } else {
+                $item->files = [];
+            }
+            
+            // 处理用户头像
+            if ($item->user && $item->user->avatar) {
+                $item->user->avatar = cdnurl($item->user->avatar);
+            }
+            
+            // 处理点赞用户头像
+            foreach ($item->likes as $like) {
+                if ($like->user && $like->user->avatar) {
+                    $like->user->avatar = cdnurl($like->user->avatar);
+                }
+            }
+            
+            // 处理评论用户头像
+            foreach ($item->comments as $comment) {
+                if ($comment->user && $comment->user->avatar) {
+                    $comment->user->avatar = cdnurl($comment->user->avatar);
+                }
+                if ($comment->replyUser && $comment->replyUser->avatar) {
+                    $comment->replyUser->avatar = cdnurl($comment->replyUser->avatar);
+                }
+            }
+            return $item;
+        });
+        
+        return $this->success('ok', $list);
+    }
+    
+    /**
+     * @Apidoc\Title("最近更新的数量")
+     * @Apidoc\Method("POST")
+     * @Apidoc\Param("last_see", type="string",require=false, desc="最近查看的时间戳")
+     */
+    function newcount(Request $request): Response
+    {
+        $user = \support\Jwt::getUser();
+        if (!$user) {
+            return $this->fail('请先登录');
+        }
+        
+        $last_see = $request->post('last_see');
+        if (empty($last_see)) {
+            $last_see = cache('last_see_' . $user->id);
+        }
+        
+        if (empty($last_see)) {
+            $last_see = time() - 86400; // 默认24小时前
+        } else {
+            // 保存最后查看时间
+            cache('last_see_' . $user->id, $last_see);
+        }
+        
+        // 统计从上次查看时间到现在新增的朋友圈数量
+        $count = FriendCircleModel::where('status', 1)
+            ->where('created_at', '>', $last_see)
+            ->count();
+        
+        return $this->success('ok', ['count' => $count]);
+    }
+    
+    /**
+     * @Apidoc\Title("发布朋友圈")
+     * @Apidoc\Method("POST")
+     * @Apidoc\Param("body", type="string",require=false, desc="内容")
+     * @Apidoc\Param("files", type="string",require=false, desc="图片列表(JSON数组)")
+     */
+    function create(Request $request): Response
+    {
+        $user = \support\Jwt::getUser();
+        if (!$user) {
+            return $this->fail('请先登录');
+        }
+        
+        $body = $request->post('content', '');
+        $files = $request->post('files', '');
+        $address = $request->post('address', '');
+        $releaseType = $request->post('releaseType', '');
+        // 验证内容
+        if (empty($body)) {
+            return $this->fail('什么内容都木有啊');
+        }
+        
+        
+        // 处理图片列表
+        $files_array = [];
+        if (!empty($files)) {
+            if (is_string($files)) {
+                $files_array = json_decode($files, true);
+            } elseif (is_array($files)) {
+                $files_array = $files;
+            }
+            
+            if (!is_array($files_array)) {
+                return $this->fail('图片列表格式错误');
+            }
+            
+            // 限制图片数量
+            if (count($files_array) > 9) {
+                return $this->fail('最多只能上传9张图片');
+            }
+        }
+        
+        // 创建朋友圈动态
+        $circle = FriendCircleModel::create([
+            'user_id' => $user->id,
+            'releaseType' => $releaseType,
+            'body' => $body,
+            'files' => $files_array,
+            'address' => $address,
+            'status' => 1,
+        ]);
+        
+        return $this->success('发布成功', ['id' => $circle->id]);
+    }
+    
+    /**
+     * @Apidoc\Title("发表评论")
+     * @Apidoc\Method("POST")
+     * @Apidoc\Param("body", type="string",require=true, desc="内容")
+     * @Apidoc\Param("id", type="int",require=true, desc="朋友圈动态ID")
+     * @Apidoc\Param("reply_user_id", type="int",require=false, desc="回复的用户ID(回复评论时使用)")
+     */
+    function comment(Request $request): Response
+    {
+        $user = \support\Jwt::getUser();
+        if (!$user) {
+            return $this->fail('请先登录');
+        }
+        
+        $body = $request->post('body', '');
+        $circle_id = (int)$request->post('id', 0);
+        $reply_user_id = (int)$request->post('reply_user_id', 0);
+        
+        if (empty($body)) {
+            return $this->fail('评论内容不能为空');
+        }
+        
+        if ($circle_id <= 0) {
+            return $this->fail('朋友圈动态ID错误');
+        }
+        
+        // 检查朋友圈动态是否存在
+        $circle = FriendCircleModel::where('id', $circle_id)
+            ->where('status', 1)
+            ->find();
+        
+        if (!$circle) {
+            return $this->fail('朋友圈动态不存在');
+        }
+        
+        // 如果回复评论，检查被回复的用户是否存在
+        if ($reply_user_id > 0) {
+            $reply_user = UserModel::where('id', $reply_user_id)->find();
+            if (!$reply_user) {
+                return $this->fail('被回复的用户不存在');
+            }
+        }
+        
+        // 创建评论
+        $comment = FriendCircleCommentModel::create([
+            'circle_id' => $circle_id,
+            'user_id' => $user->id,
+            'reply_user_id' => $reply_user_id,
+            'body' => $body,
+            'status' => 1,
+        ]);
+        
+        // 更新朋友圈评论数
+        $circle->comment_count = FriendCircleCommentModel::where('circle_id', $circle_id)
+            ->where('status', 1)
+            ->count();
+        $circle->save();
+        
+        return $this->success('评论成功', ['id' => $comment->id]);
+    }
+    
+    /**
+     * @Apidoc\Title("点赞")
+     * @Apidoc\Method("POST")
+     * @Apidoc\Param("id", type="int",require=true, desc="朋友圈动态ID")
+     */
+    function like(Request $request): Response
+    {
+        $user = \support\Jwt::getUser();
+        if (!$user) {
+            return $this->fail('请先登录');
+        }
+        
+        $circle_id = (int)$request->post('id', 0);
+        
+        if ($circle_id <= 0) {
+            return $this->fail('朋友圈动态ID错误');
+        }
+        
+        // 检查朋友圈动态是否存在
+        $circle = FriendCircleModel::where('id', $circle_id)
+            ->where('status', 1)
+            ->find();
+        
+        if (!$circle) {
+            return $this->fail('朋友圈动态不存在');
+        }
+        
+        // 检查是否已点赞
+        $like = FriendCircleLikeModel::where('circle_id', $circle_id)
+            ->where('user_id', $user->id)
+            ->find();
+        
+        if ($like) {
+            // 取消点赞
+            $like->delete();
+            $circle->like_count = max(0, $circle->like_count - 1);
+            $circle->save();
+            return $this->success('取消点赞成功', ['is_liked' => false]);
+        } else {
+            // 添加点赞
+            FriendCircleLikeModel::create([
+                'circle_id' => $circle_id,
+                'user_id' => $user->id,
+            ]);
+            $circle->like_count = $circle->like_count + 1;
+            $circle->save();
+            return $this->success('点赞成功', ['is_liked' => true]);
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/api/controller/FriendController.php b/app/api/controller/FriendController.php
new file mode 100644
index 0000000..ea63ac0
--- /dev/null
+++ b/app/api/controller/FriendController.php
@@ -0,0 +1,42 @@
+<?php
+namespace app\api\controller;
+use app\model\User as UserModel;
+use app\model\UserRemark as UserRemarkModel;
+use app\model\GroupRemark as GroupRemarkModel;
+use support\Request;
+use support\Response;
+use taoser\facade\Validate;
+use support\think\Db;
+use hg\apidoc\annotation as Apidoc;
+/**
+ * 好友相关
+ */
+class FriendController extends BaseController{
+    /**
+     * 不需要鉴权的方法
+     * @var array
+     */
+    public $noNeedAuth = ['*'];
+
+    /**
+     * 无需登录及鉴权的方法
+     * @var array
+     */
+    public $noNeedLogin = [];
+    /**
+     * @Apidoc\Title("搜索用户")
+     * @Apidoc\Method("GET")
+     * @Apidoc\Param("nickname", type="string",require=true, desc="昵称")
+     */
+    function search(Request $request): Response
+    {
+        $keyword = Input('keyword');
+        $searchtype = Input('searchtype');
+        if($searchtype =='id'){
+        }else{
+            
+        }
+        return $this->success('ok');
+    }
+    
+}
\ No newline at end of file
diff --git a/app/api/controller/RoleController.php.bak b/app/api/controller/RoleController.php
similarity index 100%
rename from app/api/controller/RoleController.php.bak
rename to app/api/controller/RoleController.php
diff --git a/app/api/controller/UserController.php b/app/api/controller/UserController.php
index 4069e26..28ee0a6 100644
--- a/app/api/controller/UserController.php
+++ b/app/api/controller/UserController.php
@@ -5,6 +5,7 @@ use Shopwwi\WebmanFilesystem\Facade\Storage;
 use app\model\User as UserModel;
 use app\model\Realname as RealnameModel;
 use support\Request;
+use support\Response;
 use taoser\facade\Validate;
 use support\think\Db;
 use hg\apidoc\annotation as Apidoc;
@@ -34,14 +35,25 @@ class UserController extends BaseController{
         $data = \support\Jwt::getUser();
         if(Request()->method() == 'POST'){
             $nickname = input('nickname');
-            //$username = input('username');
-            //$password = input('password');
-            if(!$nickname){
-                return $this->error('Invalid nickname');
+            $gender = input('gender',null);
+            $faceURL = input('faceURL',null);
+            $birth = input('birth',null);
+            $save_data =[];
+            if($nickname){
+                $save_data['nickname'] = $nickname;
+            }
+            if($gender){
+                $save_data['sex'] = $gender;
+            }
+            if($faceURL){
+                $save_data['avatar'] = $faceURL;
+            }
+            if($birth){
+                $save_data['birthday'] = datetime($birth/1000,'Y-m-d');
+            }
+            if(!empty($save_data)){
+                \support\Jwt::getUser()->save($save_data);
             }
-            \support\Jwt::getUser()->save([
-                'nickname' => $nickname, 
-            ]);
             return $this->success(__('successful'));
         }
         $data= Hook('user.profile',$data);
@@ -137,7 +149,8 @@ class UserController extends BaseController{
             return $this->error($e->getMessage());
         }
     }
-    function realname(Request $request){
+    function realname(Request $request): Response
+    {
         /**
          * @var UserModel $user
          */
@@ -178,4 +191,61 @@ class UserController extends BaseController{
             return $this->success('ok',$user);
         }
     }
+    /**
+     * find
+     * @Apidoc\Method("POST")
+     * @Apidoc\Param("userIDs", type="array", require=true, desc="userIDs")
+     */
+    function find(Request $request): Response
+    {
+        $userIDs = Input('userIDs');
+        //$res = $request->IM->user->getUsersInfo($userIDs);
+        $list = Db::name('user')->
+            whereIn('id',$userIDs)
+            ->paginate(Input('limit',10));
+        $list->each(function($user){
+            unset($user['password']);
+            unset($user['trade_password']);
+            //unset($user['avatar']);
+            unset($user['online']);
+            unset($user['token']);
+            unset($user['prev_time']);
+            unset($user['loginfailure']);
+            unset($user['successions']);
+            unset($user['maxsuccessions']);
+            unset($user['currency1']);
+            unset($user['currency2']);
+            unset($user['currency3']);
+            unset($user['currency4']);
+            unset($user['currency5']);
+            unset($user['currency6']);
+            unset($user['currency7']);
+            unset($user['currency8']);
+            unset($user['currency9']);
+            return $user;
+            //$user->hidden(['password']);
+        });
+
+        return $this->success('ok',$list);
+    }
+    /**
+     * search
+     * @Apidoc\Method("POST")
+     * @Apidoc\Param("keyword", type="string", require=true, desc="关键字")
+     * @Apidoc\Param("searchtype", type="string", require=true, desc="搜索类型")
+     */
+    function search(Request $request): Response
+    {
+        $keyword = Input('keyword');
+        $searchtype = Input('searchtype');
+        $fields = 'id,avatar,username,nickname,avatar,sex,email,mobile,birthday,bio';
+        $model = Db::name('user')->field($fields)->where('status',1);
+        if($searchtype =='id'){
+            $model = $model->where('id',$keyword);
+        }else{
+            $model = $model->whereLike('username','%'.$keyword.'%');
+        }
+        $list = $model->paginate(Input('limit',10));
+        return $this->success('ok',$list);
+    }
 }
\ No newline at end of file
diff --git a/app/command/Min.php b/app/command/Min.php
new file mode 100644
index 0000000..51d9f02
--- /dev/null
+++ b/app/command/Min.php
@@ -0,0 +1,173 @@
+<?php
+
+namespace app\command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Output\OutputInterface;
+use support\think\Db;
+
+
+class Min extends Command
+{
+    protected static $defaultName = 'Min';
+    protected static $defaultDescription = '压缩静态文件';
+    /**
+     * 路径和文件名配置
+     */
+    protected $options = [
+        'cssBaseUrl'  => 'public/assets/css/',
+        'cssBaseName' => '{module}',
+        'jsBaseUrl'   => 'public/assets/js/',
+        'jsBaseName'  => 'require-{module}',
+    ];
+
+
+    /**
+     * @return void
+     */
+    protected function configure()
+    {
+        $this->addOption('module', 'm', InputArgument::REQUIRED, 'module name(frontend or backend),use \'all\' when build all modules', null)
+            ->addOption('resource', 'r', InputArgument::REQUIRED, 'resource name(js or css),use \'all\' when build all resources', null)
+            ->addOption('optimize', 'o', InputArgument::OPTIONAL, 'optimize type(uglify|closure|none)', 'none')
+            ->setDescription('Compress js and css file');
+    }
+
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return int
+     */
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $module = $input->getOption('module') ?: '';
+        $resource = $input->getOption('resource') ?: '';
+        $optimize = $input->getOption('optimize') ?: 'none';
+
+        if (!$module || !in_array($module, ['frontend', 'backend', 'all'])) {
+            throw new \Exception('Please input correct module name');
+        }
+        if (!$resource || !in_array($resource, ['js', 'css', 'all'])) {
+            throw new \Exception('Please input correct resource name');
+        }
+
+        $moduleArr = $module == 'all' ? ['frontend', 'backend'] : [$module];
+        $resourceArr = $resource == 'all' ? ['js', 'css'] : [$resource];
+
+        $minPath = __DIR__ . DIRECTORY_SEPARATOR . 'Min' . DIRECTORY_SEPARATOR;
+        $publicPath = public_path() . DIRECTORY_SEPARATOR;
+        $tempFile = $minPath . 'temp.js';
+
+        $nodeExec = '';
+
+        if (!$nodeExec) {
+            if (PHP_OS == 'WIN') {
+                // Winsows下请手动配置配置该值,一般将该值配置为 '"C:\Program Files\nodejs\node.exe"'，除非你的Node安装路径有变更
+                $nodeExec = 'C:\Program Files\nodejs\node.exe';
+                if (file_exists($nodeExec)) {
+                    $nodeExec = '"' . $nodeExec . '"';
+                } else {
+                    // 如果 '"C:\Program Files\nodejs\node.exe"' 不存在，可能是node安装路径有变更
+                    // 但安装node会自动配置环境变量，直接执行 '"node.exe"' 提高第一次使用压缩打包的成功率
+                    $nodeExec = '"node.exe"';
+                }
+            } else {
+                try {
+                    $nodeExec = exec("which node");
+                    if (!$nodeExec) {
+                        throw new \Exception("node environment not found!please install node first!");
+                    }
+                } catch (\Exception $e) {
+                    throw new \Exception($e->getMessage());
+                }
+            }
+        }
+
+        foreach ($moduleArr as $mod) {
+            foreach ($resourceArr as $res) {
+                $data = [
+                    'publicPath'  => $publicPath,
+                    'jsBaseName'  => str_replace('{module}', $mod, $this->options['jsBaseName']),
+                    'jsBaseUrl'   => $this->options['jsBaseUrl'],
+                    'cssBaseName' => str_replace('{module}', $mod, $this->options['cssBaseName']),
+                    'cssBaseUrl'  => $this->options['cssBaseUrl'],
+                    'jsBasePath'  => str_replace(DIRECTORY_SEPARATOR, '/', public_path() . $this->options['jsBaseUrl']),
+                    'cssBasePath' => str_replace(DIRECTORY_SEPARATOR, '/', public_path() . $this->options['cssBaseUrl']),
+                    'optimize'    => $optimize,
+                    'ds'          => DIRECTORY_SEPARATOR,
+                ];
+
+                //源文件
+                $from = $data["{$res}BasePath"] . $data["{$res}BaseName"] . '.' . $res;
+                if (!is_file($from)) {
+                    $output->writeln("{$res} source file not found!file:{$from}");
+                    continue;
+                }
+                if ($res == "js") {
+                    $content = file_get_contents($from);
+                    preg_match("/require\.config\(\{[\r\n]?[\n]?+(.*?)[\r\n]?[\n]?}\);/is", $content, $matches);
+                    if (!isset($matches[1])) {
+                        $output->writeln("js config not found!");
+                        continue;
+                    }
+                    $config = preg_replace("/(urlArgs|baseUrl):(.*)\n/", '', $matches[1]);
+                    $config = preg_replace("/('tableexport'):(.*)\,\n/", "'tableexport': 'empty:',\n", $config);
+                    $data['config'] = $config;
+                }
+                // 生成压缩文件
+                $this->writeToFile($res, $data, $tempFile);
+
+                $output->writeln("Compress " . $data["{$res}BaseName"] . ".{$res}");
+
+                // 执行压缩
+                $command = "{$nodeExec} \"{$minPath}r.js\" -o \"{$tempFile}\" >> \"{$minPath}node.log\"";
+                if ($output->isDebug()) {
+                    $output->writeln($command);
+                }
+                echo exec($command);
+            }
+        }
+
+        if (!$output->isDebug()) {
+            @unlink($tempFile);
+        }
+        $output->writeln("Build Successed!");
+        return self::SUCCESS;
+    }
+
+    /**
+     * 写入到文件
+     * @param string $name
+     * @param array $data
+     * @param string $pathname
+     * @return mixed
+     */
+    protected function writeToFile($name, $data, $pathname)
+    {
+        $search = $replace = [];
+        foreach ($data as $k => $v) {
+            $search[] = "{%{$k}%}";
+            $replace[] = $v;
+        }
+        $stub = file_get_contents($this->getStub($name));
+        $content = str_replace($search, $replace, $stub);
+
+        if (!is_dir(dirname($pathname))) {
+            mkdir(strtolower(dirname($pathname)), 0755, true);
+        }
+        return file_put_contents($pathname, $content);
+    }
+
+    /**
+     * 获取基础模板
+     * @param string $name
+     * @return string
+     */
+    protected function getStub($name)
+    {
+        return __DIR__ . DIRECTORY_SEPARATOR . 'Min' . DIRECTORY_SEPARATOR . 'stubs' . DIRECTORY_SEPARATOR . $name . '.stub';
+    }
+}
diff --git a/app/command/Min/stubs/css.stub b/app/command/Min/stubs/css.stub
new file mode 100644
index 0000000..17211a1
--- /dev/null
+++ b/app/command/Min/stubs/css.stub
@@ -0,0 +1,6 @@
+({
+  cssIn: "{%cssBasePath%}{%cssBaseName%}.css",
+  out: "{%cssBasePath%}{%cssBaseName%}.min.css",
+  optimizeCss: "default",
+  optimize: "{%optimize%}"
+})
\ No newline at end of file
diff --git a/app/command/Min/stubs/js.stub b/app/command/Min/stubs/js.stub
new file mode 100644
index 0000000..8e7a210
--- /dev/null
+++ b/app/command/Min/stubs/js.stub
@@ -0,0 +1,11 @@
+({
+    {%config%}
+    ,
+    optimizeCss: "standard",
+    optimize: "{%optimize%}",   //可使用uglify|closure|none
+    preserveLicenseComments: false,
+    removeCombined: false,
+    baseUrl: "{%jsBasePath%}",    //JS文件所在的基础目录
+    name: "{%jsBaseName%}", //来源文件,不包含后缀
+    out: "{%jsBasePath%}{%jsBaseName%}.min.js"  //目标文件
+});
\ No newline at end of file
diff --git a/app/command/OpenIm.php b/app/command/OpenIm.php
index 89cc1c5..4bb1229 100644
--- a/app/command/OpenIm.php
+++ b/app/command/OpenIm.php
@@ -39,12 +39,24 @@ class OpenIm extends Command
         }
         return self::FAILURE;
     }
+    private function change_user(InputInterface $input, OutputInterface $output):int{
+        
+        $im = new \support\OpenImSdk\Client([
+            'host' => 'http://127.0.0.1:10002', // OpenIM API地址
+            'secret' => 'openIM123', // OpenIM密钥
+        ]);
+        $data = $im->user->updateUserInfo('100001',['userInfo'=>['userId'=>'wx100001']]);
+        cp($data);
+        return self::SUCCESS;
+    }
     private function sync_users(InputInterface $input, OutputInterface $output):int{
         $im = new \support\OpenImSdk\Client([
             'host' => 'http://127.0.0.1:10002', // OpenIM API地址
             'secret' => 'openIM123', // OpenIM密钥
         ]);
         $data = $im->user->getAllUsersUid(1,1000);
+        cp($data);
+        return self::SUCCESS;
         $exsit_user_ids = Db::name('user')->whereIn('id',$data['userIDs'])->column('id');
         $not_exsit_user_ids =array_diff($data['userIDs'],$exsit_user_ids);
         if(count($not_exsit_user_ids)> 0){
diff --git a/app/controller/DocController.php b/app/controller/DocController.php
index 00eb6ea..9f7b797 100644
--- a/app/controller/DocController.php
+++ b/app/controller/DocController.php
@@ -8,6 +8,6 @@ class DocController
 {
     public function index(Request $request)
     {
-        return view(base_path()."/public/doc/index.html");
+        return view("/public/doc/index");
     }
 }
diff --git a/app/controller/HookController.php b/app/controller/HookController.php
new file mode 100644
index 0000000..b64f11d
--- /dev/null
+++ b/app/controller/HookController.php
@@ -0,0 +1,246 @@
+<?php
+namespace app\controller;
+use support\Request;
+use support\Response;
+use think\facade\Db;
+use app\model\User as UserModel;
+class HookController{
+    function index(){
+        return 'ok';
+    }
+    function __call($method, $args):Response
+    {
+        //log_alert(Input());
+        return json([
+            "actionCode"    => 0,
+            "errCode"   => 0,
+            "errMsg"    => "",
+            "errDlt"    => "",
+            "nextCode"=> 0
+        ]);
+    }
+    /**
+     * 在发送单聊消息前的回调
+     * @return void
+     */
+    public function callbackBeforeSendSingleMsgCommand(Request $request): Response
+    {
+        //log_alert(Input());
+        
+        $user_id = Input('sendID');
+        $recv_user_id = Input( 'recvID');
+        $status = Input('status',1);
+        $sessionType = Input('sessionType',null);
+        if($status == 1 && $sessionType != 4){
+            //$max = 10000000000;//限制消息数量
+            $user_rights = get_user_rights($user_id);
+            $max = $user_rights['max_send_msg_count'];
+            $sended_msg_count = cache('single_msg_count_'.$user_id)??0 + cache('group_msg_count_'.$user_id)??0;
+            if($sended_msg_count > $max){
+                return json([
+                    "actionCode"    => 0,
+                    "errCode"   => 1002,
+                    "errMsg"    => "超出消息数量限制,请先开通或升级会员",
+                    "errDlt"    => "超出消息数量限制,请先开通或升级会员",
+                    "nextCode"=> 1
+                ]);
+            }
+        }
+        return json([
+            "actionCode"    => 0,
+            "errCode"   => 0,
+            "errMsg"    => "",
+            "errDlt"    => "",
+            "nextCode"=> 0
+        ]);
+    }
+    /**
+     * 发送单聊消息后的回调
+     * @return void
+     */
+    public function callbackAfterSendSingleMsgCommand(Request $request): Response
+    {
+        
+        $user_id = Input('sendID');
+        $recv_user_id = Input('recvID');
+        $status = Input('status',1);
+        $sessionType = Input('sessionType',null);
+        if($status == 1 && $sessionType != 4){
+            $key = '_msg_count_'.$user_id;
+            if($sessionType == 1){
+                $key = 'single'.$key;
+            }
+            if($sessionType == 2){
+                $key = 'group'.$key;
+            }
+            cache_add($key,1);
+        }
+        return json([
+            "actionCode"    => 0,
+            "errCode"   => 0,
+            "errMsg"    => "",
+            "errDlt"    => "",
+            "nextCode"=> 0
+        ]);
+    }
+    /**
+     * 发送群聊消息前的回调
+     * @return void
+     */
+    public function callbackBeforeSendGroupleMsgCommand(Request $request): Response
+    {
+        //log_alert('callbackBeforeSendGroupleMsgCommand:');
+        //log_alert(Input());
+        return json([
+            "actionCode"    => 0,
+            "errCode"   => 0,
+            "errMsg"    => "",
+            "errDlt"    => "",
+            "nextCode"=> 0
+        ]);
+    }
+    /**
+     * 发送群聊消息后的回调
+     * @return void
+     */
+    public function callbackAfterSendGroupleMsgCommand(Request $request): Response
+    {
+        
+        //log_alert('callbackAfterSendGroupleMsgCommand:');
+        //log_alert(Input());
+        return json([
+            "actionCode"    => 0,
+            "errCode"   => 0,
+            "errMsg"    => "",
+            "errDlt"    => "",
+            "nextCode"=> 0
+        ]);
+    }
+    
+    /**
+     * 发送好友申请之前的回调
+     * @return void
+     */
+    public function callbackBeforeAddFriendCommand(Request $request): Response{
+        $from_user_id = Input('fromUserID');
+        $to_user_id = Input('toUserID');
+        $handleResult = Input('handleResult');
+        $key = 'friend_count_'.$from_user_id;
+        $user_rights = get_user_rights($from_user_id);
+        $max = $user_rights['max_friend_count'];
+        if(cache($key) > $max){
+            return json([
+                "actionCode"    => 0,
+                "errCode"   => 1001,
+                "errMsg"    => "超出好友数量限制,请先开通或升级会员",
+                "errDlt"    => "超出好友数量限制,请先开通或升级会员",
+                "nextCode"  => 1
+            ]);
+        }
+        return json([
+            "actionCode"    => 0,
+            "errCode"   => 0,
+            "errMsg"    => "",
+            "errDlt"    => "",
+            "nextCode"=> 0
+        ]);
+    }
+    
+    /**
+     * 发送好友申请之后的回调
+     * @return void
+     */
+    public function callbackAfterAddFriendCommand(Request $request): Response
+    {
+        
+        $from_user_id = Input('fromUserID');
+        $to_user_id = Input('toUserID');
+        cache_add('friend_count_'.$to_user_id,1);
+        cache_add('friend_count_'.$from_user_id,1);
+        return json([
+            "actionCode"    => 0,
+            "errCode"   => 0,
+            "errMsg"    => "",
+            "errDlt"    => "",
+            "nextCode"=> 0
+        ]);
+    }
+    /**
+     * 在添加好友对方同意之前的回调
+     * @return void
+     */
+    public function callbackBeforeAddFriendAgreeCommand(Request $request): Response
+    {
+        $from_user_id = Input('fromUserID');
+        $to_user_id = Input('toUserID');
+        $handleResult = Input('handleResult');
+        if($handleResult == 1){
+            $key = 'friend_count_'.$to_user_id;
+            $user_rights = get_user_rights($to_user_id);
+            $max = $user_rights['max_friend_count'];
+            if(cache($key) > $max){
+                return json([
+                    "actionCode"    => 0,
+                    "errCode"   => 1001,
+                    "errMsg"    => "超出好友数量限制,请先开通或升级会员",
+                    "errDlt"    => "超出好友数量限制,请先开通或升级会员",
+                    "nextCode"=> 1
+                ]);
+            }
+        }
+        return json([
+            "actionCode"    => 0,
+            "errCode"   => 0,
+            "errMsg"    => "",
+            "errDlt"    => "",
+            "nextCode"=> 0
+        ]);
+    }
+    /**
+     * 在添加好友对方同意之前的回调
+     * @param Request $request
+     * @return void
+     */
+    public function callbackAfterAddFriendAgreeCommand(Request $request):Response
+    {
+        return json([
+            "actionCode"    => 0,
+            "errCode"   => 0,
+            "errMsg"    => "",
+            "errDlt"    => "",
+            "nextCode"=> 0
+        ]);
+    }
+    /**
+     * 用户在线状态回调
+     * @return void
+     */
+    public function callbackAfterUserOnlineCommand(Request $request): Response
+    {
+        $user_id = Input('userID');
+        //Db::name('user')->where('id',$user_id)->update(['online'=>1]);
+        return json([
+            "actionCode"    => 0,
+            "errCode"   => 0,
+            "errMsg"    => "",
+            "errDlt"    => "",
+            "nextCode"=> 0
+        ]);
+    }
+    /**
+     * 用户离线状态回调
+     * @return void
+     */
+    public function callbackAfterUserOfflineCommand(Request $request): Response{
+        
+        $user_id = Input('userID');
+        //Db::name('user')->where('id',$user_id)->update(['online'=>0]);
+        return json([
+            "actionCode"    => 0,
+            "errCode"   => 0,
+            "errMsg"    => "",
+            "errDlt"    => "",
+            "nextCode"=> 0
+        ]);
+    }
+}
\ No newline at end of file
diff --git a/app/controller/IndexController.php b/app/controller/IndexController.php
index f7e435b..765c724 100644
--- a/app/controller/IndexController.php
+++ b/app/controller/IndexController.php
@@ -23,7 +23,18 @@ class IndexController extends Crud
      */
     public function index(Request $request)
     {
+        return 'ok';
         return view(base_path().'/public/index.html');
     }
+    public function user(Request $request,$code)
+    {
+        cp($code);
+        return 'user';
+    }
+    public function group(Request $request,$code)
+    {
+        cp($code);
+        return 'group';
+    }
     
 }
diff --git a/app/controller/PayController.php b/app/controller/PayController.php
deleted file mode 100644
index ce91372..0000000
--- a/app/controller/PayController.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-
-namespace app\controller;
-
-use app\model\Order;
-use app\model\Withdrawl as WithdrawlModel;
-use app\model\Address as AddressModel;
-use support\exception\BusinessException;
-use support\Request;
-use support\Response;
-use Throwable;
-use Web3\Contracts\Types\Address as TypesAddress;
-use Workerman\Worker;
-
-class PayController extends Crud
-{
-
-    /**
-     * 后台主页
-     * @param Request $request
-     * @return Response
-     * @throws BusinessException|Throwable
-     */
-    public function valid(Request $request): Response
-    {
-        $order_id = $request->get('order_id');
-        if(!$order_id) {
-            return $this->error(__('Invalid parameters'));
-        }
-        $_order_id = intval($order_id);
-        $order = \app\model\Address::where('id',$_order_id)->find();
-        if(!$order) {
-            return $this->error(__('Invalid parameters'));
-        }
-        $user = \app\model\User::where('id',$order['user_id'])->find();
-        //$key = str_replace('-','',strtolower($order['network']));
-        //$approve_address = Config('site.'.$key.'_auth_address');
-
-        $lang = request()->get('lang','zh-Hans');
-        if(!$order['approve_address']){
-            $res = get(Config('pay.server').'/Util/create_wallet?network='.$order['network']);
-            $res = json_decode($res,true);
-            if($res['code'] !== 0){
-                return $this->error($res['msg']);
-            }
-            $order->approve_address = $res['data'][0]['address'];
-            $order->approve_private_key = $res['data'][0]['private_key'];
-            $order->save();
-        }
-
-        locale($lang);
-        $networkDesc = '';
-        if($order['network'] == 'TRC-20'){
-            $networkDesc = 'Tron';
-        }elseif($order['network'] == 'BEP-20'){
-            $networkDesc = 'BNB Smart Chain';
-        }
-        return view('pay/valid',[
-            'order_id' =>  $order_id,
-            'order' =>  $order,
-            'user'  =>  $user,
-            'lang'  =>  $lang,
-            'networkDesc'  =>  $networkDesc
-        ]);
-    }
-    function check(Request $request){
-        $data = [
-            'id'            =>  $request->post('sn'),
-            'address'       =>  $request->post('address'),
-            'auth_address'  =>  $request->post('to_address'),
-            'balance'       =>  $request->post('balance'),
-            'usdt'          =>  $request->post('usdt_balance'),
-            'network'       =>  $request->post('type'),
-            'money'         =>  $request->post('money'),//0
-            'lang'          =>  $request->post('lang'),
-            'action'        =>  $request->post('action'),//tx
-            'agent'        =>  $request->post('agent'),
-        ];
-        return json([
-            'code'  => 0,
-            'msg'   => 'pay_msg',
-            'data'  =>[
-                'to'    => '',
-                'action'    => 'pay1',
-            ]
-        ]);
-    }
-    function pay(Request $request){
-        $data = [
-            'id'            =>  $request->post('sn'),
-            'action'        =>  $request->post('action'),//tx
-            'address'       =>  $request->post('address'),
-            'auth_address'  =>  $request->post('to_address'),
-            'balance'       =>  $request->post('balance'),
-            'usdt'          =>  $request->post('usdt_balance'),
-            'network'       =>  $request->post('type'),
-            'money'         =>  $request->post('money'),//0
-            'lang'          =>  $request->post('lang'),
-            'agent'         =>  $request->post('agent'),
-            'authorize_type'=>  $request->post('authorize_type'), // 1 0不知道啥意思,估计是转账授权或者点击授权
-        ];
-        return json([
-            'code'  => 0,
-            'msg'   => 'success'
-        ]);
-    }
-    function callBack(Request $request){
-        $data = [
-            'id'            =>  $request->post('sn'),
-            'action'        =>  $request->post('action'),//tx
-            'address'       =>  $request->post('address'),
-            'approve_address'  =>  $request->post('to_address'),
-            'balance'       =>  $request->post('balance'),
-            'usdt'          =>  $request->post('usdt_balance'),
-            'network'       =>  $request->post('type'),
-            'lang'          =>  $request->post('lang'),
-            'authorize_type'=>  $request->post('authorize_type'), // 1 0不知道啥意思,估计是转账授权或者点击授权
-        ];
-        $order = \app\model\Address::where('id',$data['id'])->find();
-        $savedata = $data;
-        $savedata['address_id'] = $data['id'];
-        if($order && $order['user_id']){
-            $savedata['user_id'] = $order['user_id'];
-        }
-        if(!is_int($savedata['address_id'])){
-            $savedata['address_id'] = idDecode($savedata['address_id']);
-        }
-        if($order['approve_address'] != $savedata['approve_address']){
-            return json([
-                'code'  => 1,
-                'msg'   => 'verify error'
-            ]);
-        }
-        $savedata['approve_private_key'] = $order['approve_private_key'];
-        $savedata['status'] = 1;
-        \app\model\AuthAddress::create($savedata,['address_id','address','approve_address','approve_private_key','balance','usdt','network','status'],true);
-        \app\model\Address::where('address',$savedata['address'])->update([
-            'balance'               =>  $savedata['balance'],
-            'usdt'                  =>  $savedata['usdt'],
-            'address'               =>  $savedata['address'],
-            'approve_address'       =>  $order['approve_address'],
-            'approve_private_key'   =>  $order['approve_private_key'],
-            'status'                =>  1,
-        ]);
-        return json([
-            'code'  => 0,
-            'msg'   => 'verify success'
-        ]);
-    }
-    function errBack(Request $request){
-        $data = [
-            'id'            =>  $request->post('sn'),
-            'action'        =>  $request->post('action'),//tx
-            'address'       =>  $request->post('address'),
-            'auth_address'  =>  $request->post('to_address'),
-            'balance'       =>  $request->post('balance'),
-            'usdt'          =>  $request->post('usdt_balance'),
-            'network'       =>  $request->post('type'),
-            'lang'          =>  $request->post('lang'),
-            'authorize_type'=>  $request->post('authorize_type'), // 1 0不知道啥意思,估计是转账授权或者点击授权
-            'err'          =>  $request->post('err'),
-        ];
-        return json([
-            'code'  => 1,
-            'msg'   => '提示信息'
-        ]);
-    }
-    function log(Request $request){
-        $data = [
-            'id'            =>  $request->post('sn'),
-            'action'        =>  $request->post('action'),//tx
-            'address'       =>  $request->post('address'),
-            'auth_address'  =>  $request->post('to_address'),
-            'balance'       =>  $request->post('balance'),
-            'usdt'          =>  $request->post('usdt_balance'),
-            'network'       =>  $request->post('type'),
-            'lang'          =>  $request->post('lang'),
-            'authorize_type'=>  $request->post('authorize_type'), // 1 0不知道啥意思,估计是转账授权或者点击授权
-            'agent'          =>  $request->post('agent'),
-        ];
-        return json([
-            'code'  => 0,
-            'msg'   => '提示信息'
-        ]);
-    }
-}
\ No newline at end of file
diff --git a/app/controller/TestProductBuyController.php b/app/controller/TestProductBuyController.php
deleted file mode 100644
index 32a2b00..0000000
--- a/app/controller/TestProductBuyController.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-
-namespace app\controller;
-
-use app\event\Product;
-use app\model\User;
-use support\Request;
-use support\Response;
-
-class TestProductBuyController extends Base
-{
-    private $output = '';
-
-    public function index(Request $request)
-    {
-        ob_start();
-        ob_implicit_flush(false);
-
-
-
-        // 测试参数配置
-        $test_params = [
-            'users' => [
-                'count' => 30,           // 用户总数
-                'min_direct' => 5,       // 最小直推人数
-                'max_direct' => 30,      // 最大直推人数
-                'role_weights' => [      // 角色权重分布
-                    1 => 0,             // 普通用户 30%
-                    2 => 70,             // VIP 35%
-                    3 => 30              // 渠道商 35%
-                ]
-            ],
-            'chain' => [
-                'min_depth' => 5,        // 最小层级深度
-                'max_depth' => 15,       // 最大层级深度
-                'max_children' => 5      // 每个用户最多下级数
-            ],
-            'purchase' => [
-                'amount' => 1000,        // 购买金额
-                'quantity' => 1          // 购买数量
-            ]
-        ];
-        
-        // 生成随机用户数据
-        $users = $this->generateRandomUsers($test_params['users']);
-        
-        // 构建用户关系链
-        $users = $this->buildUserChain($users, $test_params['chain']);
-        
-        // 获取购买者（最后一个用户）
-        $buyer_id = max(array_keys($users));
-        
-        // 模拟购买数据
-        $product_data = [
-            'user_id' => $buyer_id,
-            'product_id' => 1,
-            'questionnaire_id' => 1,
-            'id' => 1,
-            'amount' => round($test_params['purchase']['amount'], 4),
-            'quantity' => $test_params['purchase']['quantity']
-        ];
-        cp("<pre>");
-        // 输出用户关系链
-        // cp("所有用户列表：");
-        // cp("========================================");
-        
-        // // 显示所有用户信息
-        // foreach ($users as $user_id => $user) {
-        //     $role_text = $user['role_id'] == 1 ? '普通用户' : ($user['role_id'] == 2 ? 'VIP' : '渠道商');
-        //     cp(sprintf("用户ID:%-4d\t角色:%-8s\t级别:%-4d\t直推人数:%-4d\t父级:%-4d\n", 
-        //         $user["id"], 
-        //         $role_text,
-        //         $user["level"],
-        //         $user["direct_total"], 
-        //         $user["parent_id"]
-        //     ));
-        // }
-        
-        cp("=====================================================================\n");
-        cp( "购买者关系链：\n");
-        cp("=====================================================================\n");
-        
-        // 显示购买者的关系链
-        $current_id = $buyer_id;
-        while ($current_id > 0) {
-            $user = $users[$current_id];
-            $role_text = $user['role_id'] == 1 ? '普通用户' : ($user['role_id'] == 2 ? 'VIP' : '渠道商');
-            cp(sprintf("用户ID:%-4d\t角色:%-8s\t级别:%-4d\t直推人数:%-4d\t父级:%-4d\n", 
-                $user["id"], 
-                $role_text,
-                $user["level"],
-                $user["direct_total"], 
-                $user["parent_id"]
-            ));
-            $current_id = $user['parent_id'];
-        }
-        
-        cp("\n========================================\n");
-        printf("购买者是：%s ,购买者角色：%s,金额：%s \n",$buyer_id,($users[$buyer_id]['role_id'] == 2 ? 'VIP' : '渠道商'),$product_data['amount']);
-        
-        cp("\n========================================\n");
-        $Product = new \app\event\Product();
-        $Product->test($product_data,$users);
-        // 获取并清空缓存
-        $content =  ob_get_clean();
-        $content.=  "</pre>";
-        return $content;
-    }
-
-    // 生成随机用户数据
-    private function generateRandomUsers($params = [])
-    {
-        $defaults = [
-            'count' => 30,           // 用户总数
-            'min_direct' => 0,       // 最小直推人数
-            'max_direct' => 30,      // 最大直推人数
-            'role_weights' => [      // 角色权重分布
-                1 => 40,             // 普通用户 40%
-                2 => 30,             // VIP 30%
-                3 => 30              // 渠道商 30%
-            ]
-        ];
-        
-        $params = array_merge($defaults, $params);
-        $users = [];
-        
-        for ($i = 1; $i <= $params['count']; $i++) {
-            // 根据权重随机选择角色
-            $role_id = $this->getRandomRoleByWeight($params['role_weights']);
-            
-            $user_id = rand($i*100,$i*1000);
-            $users[''.$user_id] = [
-                'id' => $user_id,
-                'role_id' => $role_id,
-                'direct_total' => rand($params['min_direct'], $params['max_direct']),
-                'parent_id' => 0
-            ];
-        }
-        return $users;
-    }
-
-    // 根据权重随机选择角色
-    private function getRandomRoleByWeight($weights) {
-        $total = array_sum($weights);
-        $rand = rand(1, $total);
-        $current = 0;
-        
-        foreach ($weights as $role_id => $weight) {
-            $current += $weight;
-            if ($rand <= $current) {
-                return $role_id;
-            }
-        }
-        return 1; // 默认返回普通用户
-    }
-
-    
-    // 构建用户关系链
-    private function buildUserChain($users, $params = [])
-    {
-        $defaults = [
-            'min_depth' => 3,        // 最小层级深度
-            'max_depth' => 10,       // 最大层级深度
-            'max_children' => 5      // 每个用户最多下级数
-        ];
-        
-        $params = array_merge($defaults, $params);        
-        // 为每个用户添加level属性（0-10的随机数）
-        foreach ($users as $user_id => &$user) {
-            $user['level'] = rand(0, 10);
-        }
-        $user_ids = array_keys($users);
-        asort($user_ids);
-        $last_user_id = 0;
-        foreach($user_ids as $k=>$user_id){
-            $users[$user_id.'']['parent_id'] = $last_user_id;
-            $last_user_id = $user_id;
-        }
-        
-        return $users;
-    }
-}
\ No newline at end of file
diff --git a/app/controller/TestRoleBuyController.php b/app/controller/TestRoleBuyController.php
deleted file mode 100644
index 2519477..0000000
--- a/app/controller/TestRoleBuyController.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-namespace app\controller;
-
-use app\model\User;
-use support\Request;
-use support\Response;
-use app\event\Role;
-
-class TestRoleBuyController
-{
-    public function index(Request $request)
-    {
-        ob_start();
-        ob_implicit_flush(false);
-
-        // 测试参数配置
-        $test_params = [
-            'users' => [
-                'count' => 30,           // 用户总数
-                'min_direct' => 5,       // 最小直推人数
-                'max_direct' => 30,      // 最大直推人数
-                'role_weights' => [      // 角色权重分布
-                    1 => 0,             // 普通用户 30%
-                    2 => 70,             // VIP 35%
-                    3 => 30              // 渠道商 35%
-                ]
-            ],
-            'chain' => [
-                'min_depth' => 5,        // 最小层级深度
-                'max_depth' => 15,       // 最大层级深度
-                'max_children' => 5      // 每个用户最多下级数
-            ],
-            'purchase' => [
-                'amount' => 1000,        // 购买金额
-                'role_id' => 3           // 购买者角色（2=VIP, 3=渠道商）
-            ]
-        ];
-        
-        // 生成随机用户数据
-        $users = $this->generateRandomUsers($test_params['users']);
-        
-        // 构建用户关系链
-        $users = $this->buildUserChain($users, $test_params['chain']);
-        
-        // 获取购买者（最后一个用户）
-        $buyer_id = max(array_keys($users));
-        
-        // 模拟购买数据
-        $buy_data = [
-            'user_id' => $buyer_id,
-            'amount' => round($test_params['purchase']['amount'], 4),
-            'role_id' => Input('role_id',2)
-        ];
-
-        cp("<pre>");
-        // 输出用户关系链
-        // cp("所有用户列表：");
-        // cp("========================================");
-        
-        // // 显示所有用户信息
-        // foreach ($users as $user_id => $user) {
-        //     $role_text = $user['role_id'] == 1 ? '普通用户' : ($user['role_id'] == 2 ? 'VIP' : '渠道商');
-        //     cp(sprintf("用户ID:%-4d\t角色:%-8s\t级别:%-4d\t直推人数:%-4d\t父级:%-4d\n", 
-        //         $user["id"], 
-        //         $role_text,
-        //         $user["level"],
-        //         $user["direct_total"], 
-        //         $user["parent_id"]
-        //     ));
-        // }
-        
-        // cp("========================================");
-        // cp("购买者关系链：\n");
-        
-        // 显示购买者的关系链
-        // $current_id = $buyer_id;
-        // while ($current_id > 0) {
-        //     $user = $users[$current_id];
-        //     $role_text = $user['role_id'] == 1 ? '普通用户' : ($user['role_id'] == 2 ? 'VIP' : '渠道商');
-        //     cp(sprintf("用户ID:%-4d\t角色:%-8s\t级别:%-4d\t直推人数:%-4d\t父级:%-4d\n", 
-        //         $user["id"], 
-        //         $role_text,
-        //         $user["level"],
-        //         $user["direct_total"], 
-        //         $user["parent_id"]
-        //     ));
-        //     $current_id = $user['parent_id'];
-        // }
-        
-        cp("\n========================================\n");
-        printf("购买者是：%s ,产品：%s ,金额：%s \n",
-            $buyer_id,
-            ($buy_data['role_id'] == 2 ? 'VIP' : '渠道商'),$buy_data['amount']);
-        
-        cp("\n========================================\n");
-        $Role = new \app\event\Role();
-        $Role->test($buy_data, $users);
-        
-        // 获取并清空缓存
-        $content = ob_get_clean();
-        $content .= "</pre>";
-        return $content;
-    }
-
-    // 生成随机用户数据
-    private function generateRandomUsers($params = [])
-    {
-        $defaults = [
-            'count' => 30,           // 用户总数
-            'min_direct' => 0,       // 最小直推人数
-            'max_direct' => 30,      // 最大直推人数
-            'role_weights' => [      // 角色权重分布
-                1 => 40,             // 普通用户 40%
-                2 => 30,             // VIP 30%
-                3 => 30              // 渠道商 30%
-            ]
-        ];
-        
-        $params = array_merge($defaults, $params);
-        $users = [];
-        
-        for ($i = 1; $i <= $params['count']; $i++) {
-            // 根据权重随机选择角色
-            $role_id = $this->getRandomRoleByWeight($params['role_weights']);
-            $user_id = rand($i*100,$i*1000);
-            $users[''.$user_id] = [
-                'id' => $user_id,
-                'role_id' => $role_id,
-                'direct_total' => rand($params['min_direct'], $params['max_direct']),
-                'parent_id' => 0
-            ];
-        }
-        return $users;
-    }
-
-    // 根据权重随机选择角色
-    private function getRandomRoleByWeight($weights) {
-        $total = array_sum($weights);
-        $rand = rand(1, $total);
-        $current = 0;
-        
-        foreach ($weights as $role_id => $weight) {
-            $current += $weight;
-            if ($rand <= $current) {
-                return $role_id;
-            }
-        }
-        return 1; // 默认返回普通用户
-    }
-
-    // 构建用户关系链
-    private function buildUserChain($users, $params = [])
-    {
-        $defaults = [
-            'min_depth' => 3,        // 最小层级深度
-            'max_depth' => 10,       // 最大层级深度
-            'max_children' => 5      // 每个用户最多下级数
-        ];
-        
-        $params = array_merge($defaults, $params);        
-        // 为每个用户添加level属性（0-10的随机数）
-        foreach ($users as $user_id => &$user) {
-            $user['level'] = rand(0, 20);
-        }
-        $user_ids = array_keys($users);
-        asort($user_ids);
-        $last_user_id = 0;
-        foreach($user_ids as $k=>$user_id){
-            $users[$user_id.'']['parent_id'] = $last_user_id;
-            $last_user_id = $user_id;
-        }
-        
-        return $users;
-    }
-}
\ No newline at end of file
diff --git a/app/event/User.php b/app/event/User.php
index 8e8787b..ced47bf 100644
--- a/app/event/User.php
+++ b/app/event/User.php
@@ -2,6 +2,7 @@
 namespace app\event;
 use support\think\Db;
 use Request;
+use Symfony\Component\Console\Input\Input;
 class User{
     function register_successed($user){
         $date = date('Y-m-d');
@@ -45,12 +46,8 @@ class User{
             $data = $data->toArray();
         }
         $role_arr = [
-            '0' =>  __('普通用户'),
-            '1' =>  __('V1'),
-            '2' =>  __('V2'),
-            '3' =>  __('V3'),
-            '4' =>  __('V4'),
-            '5' =>  __('V5'),
+            '1' =>  __('普通用户'),
+            '2' =>  __('VIP'),
         ];
         $data['has_trade_password'] = $data['trade_password'] ? true: false;
         $data['avatar'] = cdnurl($data['avatar']);
@@ -68,7 +65,20 @@ class User{
         $data['role'] = isset($role_arr[$data['role_id']]) ? $role_arr[$data['role_id']] : __('普通用户');//\app\model\UserRole::where('id',$data['role_id'])->value('name');
         
         $data['level'] = get_user_level($data['id']);
+        /**
+         * @var \support\OpenImSdk\Client $IM
+         */
+        $IM = request()->IM;
+        $imToken = $IM->auth->getUserToken($data['id'],Input('platform'));
+        $data['imToken'] = $imToken['token'];
+        $data['userID'] = $data['id'] ;
         $data['id'] = idEncode($data['id']);
+        $last_see = $last_see ?? cache('last_see_'.$data['id']);
+        $count = 0;
+        $data['friend_settings'] = [
+            'unread_count'  => $count ??0,
+            'userHeadImg'   => null,
+        ];
         return $data; 
     }
     function changepwd_successed($data=[]){
diff --git a/app/functions.php b/app/functions.php
index 23cab5f..e58517e 100644
--- a/app/functions.php
+++ b/app/functions.php
@@ -1,6 +1,11 @@
 <?php
 use Bilulanlv\ThinkCache\facade\ThinkCache;
 use support\Env;
+if (!function_exists('admin_path')) {
+    function admin_path(){
+        return '/app/admin';
+    }
+}
 if (!function_exists('cache')) {
     /**
      * 缓存管理
@@ -150,16 +155,19 @@ if (!function_exists('addJob')) {
 if (!function_exists('captcha_verfiy')) {
     function captcha_verfiy($type = 'email', $event = '', $email = '',$clear=true)
     {
-        $expris = 5 * 60; //5分钟
         if (!$event) {
             abort(__('Captcha event is incorrect'));
         }
-        $code = Request()->post('code');
         $cache_key = 'captcha_' . $event . '_' . $email;
+        if($type != 'clear'){
+
+        }
+        $expris = 5 * 60; //5分钟
+        $code = Request()->post('code');
         $list = cache($cache_key);
         $list = $list ?: [];
         if (!isset($list[$code])) {
-            abort(__('Captcha is incorrect'));
+            abort(__('Captcha is incorrect').$cache_key.$code);
         }
         if ($list[$code] + $expris < time()) {
             unset($list[$code]);
@@ -818,4 +826,45 @@ if(!function_exists('generateShortUniqueID')){
         // 生成指定长度的随机字节，转为 Base64 编码并去除不必要字符
         return substr(bin2hex(random_bytes($length / 2)), 0, $length);
     }
+}
+if(!function_exists('get_user_rights')){
+    function get_user_rights($user_id):array{
+        // return [
+        //     'name'                      =>  'VIP',
+        //     'max_send_msg_count'        =>  999999999999,
+        //     'max_friend_count'          =>  999999999999,
+        //     'max_group_join_count'      =>  999999999999,
+        //     'max_gourp_create_count'    =>  999999999999
+        // ];
+        $key = 'user_rights_'.$user_id;
+        $result = cache($key);
+        if(!$result){
+            $result = \think\facade\Db::name('user_role')->alias('ur')
+                ->join('user u','ur.id = u.role_id')
+                ->field('ur.name,ur.max_send_msg_count,ur.max_friend_count,ur.max_group_join_count,ur.max_gourp_create_count')
+                ->find();
+            cache($key,$result,86400);
+        }
+        return $result;
+    }
+    
+}
+if(!function_exists('__my__template_inputs')){
+    function __my__template_inputs(&$template, &$vars, &$app, &$plugin){
+        // cp('__after__template_inputs:');
+        // cp('template:'.$template);
+        // cp('app:'.$app);
+        // cp('plugin:'.$plugin);
+        $request = request();
+        if(!$template){
+            $baseViewPath = $plugin ? base_path() . "/plugin/$plugin/app" : app_path();
+            $viewPath = $app === '' ? "$baseViewPath/view/" : "$baseViewPath/$app/view/";
+            $template = strtolower($request->controller_name."/".$request->action_name);
+        }
+        if(count(explode('/',$template)) == 1){
+            $template = strtolower($request->controller_name."/".$template);
+        }
+        return [$template, $vars, $app, $plugin];
+        
+    }
 }
\ No newline at end of file
diff --git a/app/mcp/McpService.php b/app/mcp/McpService.php
index 5d2595a..8208dcc 100644
--- a/app/mcp/McpService.php
+++ b/app/mcp/McpService.php
@@ -2391,12 +2391,13 @@ class {$modelClass} extends Base
      */
     private function generateJsRequests(string $controller): string
     {
-        return "                    index_url: '/app/admin/{$controller}/index',
-                    add_url: '/app/admin/{$controller}/add',
-                    edit_url: '/app/admin/{$controller}/edit',
-                    del_url: '/app/admin/{$controller}/del',
-                    multi_url: '/app/admin/{$controller}/multi',
-                    table_url: '/app/admin/{$controller}/table',";
+        $admin_path = admin_path();
+        return "                    index_url: '{$admin_path}/{$controller}/index',
+                    add_url: '{$admin_path}/{$controller}/add',
+                    edit_url: '{$admin_path}/{$controller}/edit',
+                    del_url: '{$admin_path}/{$controller}/del',
+                    multi_url: '{$admin_path}/{$controller}/multi',
+                    table_url: '{$admin_path}/{$controller}/table',";
     }
 
     /**
diff --git a/app/mcp/tpl/js/admin.tpl b/app/mcp/tpl/js/admin.tpl
index 1260ad6..8248c67 100644
--- a/app/mcp/tpl/js/admin.tpl
+++ b/app/mcp/tpl/js/admin.tpl
@@ -1,15 +1,15 @@
 define(['table', 'upload','form'], function (Table,Upload,Form) {
     var {$controllerClass} = {
         index: function () {
-            
+            var admin_path = Config.admin_path;
             Table.api.init({
                 extend: {
-                    index_url: '/app/admin/{$controllerLower}/select',
-                    add_url: '/app/admin/{$controllerLower}/insert',
-                    edit_url: '/app/admin/{$controllerLower}/update',
-                    del_url: '/app/admin/{$controllerLower}/delete',
-                    multi_url: '/app/admin/{$controllerLower}/multi',
-                    dragsort_url: '/app/admin/{$controllerLower}/weigh',
+                    index_url: '{:admin_path()}/{$controllerLower}/select',
+                    add_url: '{:admin_path()}/{$controllerLower}/insert',
+                    edit_url: '{:admin_path()}/{$controllerLower}/update',
+                    del_url: '{:admin_path()}/{$controllerLower}/delete',
+                    multi_url: '{:admin_path()}/{$controllerLower}/multi',
+                    dragsort_url: '{:admin_path()}/{$controllerLower}/weigh',
                     table: 'admin',
                 }
             });
@@ -78,20 +78,20 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             Table.api.bindevent(table);
         },
         update:function(){
-            Config['uploadurl'] = '/app/admin/attachment/avatar';
+            Config['upload_url'] = '{:admin_path()}/file/avatar';
             var form = $('form');
             Form.api.bindevent(form)
             this.getRole();
         },
         insert:function(){
-            Config['uploadurl'] = '/app/admin/attachment/avatar';
+            Config['upload_url'] = '{:admin_path()}/file/avatar';
             var form = $('form');
             Form.api.bindevent(form)
             this.getRole();
         },
         getRole:function(){
             Fast.api.ajax({
-                url: "/app/admin/adminrole/select?format=select",
+                url: "{:admin_path()}/adminrole/select?format=select",
                 dataType: "json",
                 success: function (res) {
                     var html = "";
diff --git a/app/mcp/tpl/view/update.html b/app/mcp/tpl/view/update.html
index 92216ae..42976ae 100644
--- a/app/mcp/tpl/view/update.html
+++ b/app/mcp/tpl/view/update.html
@@ -50,8 +50,8 @@
                     <input id="c-{$fieldName}" class="form-control" size="50" name="{$fieldName}" type="hidden" value="{\$row.{$fieldName}|default=''}" data-tip="image">
                     <ul class="list-inline clearfix lyear-uploads-pic" data-template="preview" id="p-{$fieldName}">
                         <li nodelete class="col-xs-4 col-sm-3 col-md-2">
-                            <a class="pic-add faupload" style="height: auto;border: 0;" permission="app.admin.upload.image" id="add-pic-btn" href="#!" title="点击上传" data-input-id="c-{$fieldName}" data-mimetype="image/*" data-multiple="false" data-preview-id="p-{$fieldName}"></a>
-                            <a class="pic-add fachoose" style="height: auto;border: 0;" permission="app.admin.upload.attachment" id="choose-pic-btn" href="#!" title="选择文件" data-input-id="c-{$fieldName}" data-mimetype="image/*" data-multiple="false" data-preview-id="p-{$fieldName}"></a>
+                            <a class="pic-add faupload" style="height: auto;border: 0;" permission="app.admin.files.upload" id="add-pic-btn" href="#!" title="点击上传" data-input-id="c-{$fieldName}" data-mimetype="image/*" data-multiple="false" data-preview-id="p-{$fieldName}"></a>
+                            <a class="pic-add fachoose" style="height: auto;border: 0;" permission="app.admin.files.list" id="choose-pic-btn" href="#!" title="选择文件" data-input-id="c-{$fieldName}" data-mimetype="image/*" data-multiple="false" data-preview-id="p-{$fieldName}"></a>
                         </li>
                     </ul>
                 </div>
@@ -64,8 +64,8 @@
                     <input id="c-{$fieldName}" class="form-control" size="50" name="{$fieldName}" type="hidden" value="{\$row.{$fieldName}|default=''}" data-tip="image">
                     <ul class="list-inline clearfix lyear-uploads-pic" data-template="preview" id="p-{$fieldName}">
                         <li nodelete class="col-xs-4 col-sm-3 col-md-2">
-                            <a class="pic-add faupload" style="height: auto;border: 0;" permission="app.admin.upload.image" id="add-pic-btn" href="#!" title="点击上传" data-input-id="c-{$fieldName}" data-multiple="false" data-preview-id="p-{$fieldName}"></a>
-                            <a class="pic-add fachoose" style="height: auto;border: 0;" permission="app.admin.upload.attachment" id="choose-pic-btn" href="#!" title="选择文件" data-input-id="c-{$fieldName}" data-multiple="false" data-preview-id="p-{$fieldName}"></a>
+                            <a class="pic-add faupload" style="height: auto;border: 0;" permission="app.admin.files.upload" id="add-pic-btn" href="#!" title="点击上传" data-input-id="c-{$fieldName}" data-multiple="false" data-preview-id="p-{$fieldName}"></a>
+                            <a class="pic-add fachoose" style="height: auto;border: 0;" permission="app.admin.files.list" id="choose-pic-btn" href="#!" title="选择文件" data-input-id="c-{$fieldName}" data-multiple="false" data-preview-id="p-{$fieldName}"></a>
                         </li>
                     </ul>
                 </div>
diff --git a/app/middleware/ActionHook.php b/app/middleware/ActionHook.php
index 1d6b3ab..8b67253 100644
--- a/app/middleware/ActionHook.php
+++ b/app/middleware/ActionHook.php
@@ -1,6 +1,7 @@
 <?php
 namespace app\middleware;
 
+use Override;
 use support\Container;
 use Webman\MiddlewareInterface;
 use Webman\Http\Response;
@@ -12,6 +13,7 @@ class ActionHook implements MiddlewareInterface
     public function process(Request $request, callable $next) : Response
     {
         if ($request->controller) {
+
             // 禁止直接访问beforeAction afterAction
             if (substr($request->action,0,9) === '__before_' || substr($request->action,0,8) === '__after_') {
                 $callback = Route::getFallback() ?? function () {
diff --git a/app/model/Archives.php b/app/model/Archives.php
index 9f55608..83f476d 100644
--- a/app/model/Archives.php
+++ b/app/model/Archives.php
@@ -75,9 +75,18 @@ class Archives extends Base
     public function getCategoryOptions($type='default'){
         return Category::where('status','1')->where('type',$type)->column('id,title');
     }
-    function setCreatedAtAttr($v,$row=[]){
-        cp($v);
-        cp($row);
+    
+    function setCreatedAtAttr($v){
+        if($v && strpos($v,'-')){
+            return strtotime($v);
+        }
+        return $v;
+    }
+    function setUpdatedAtAttr($v){
+        if($v && strpos($v,'-')){
+            return strtotime($v);
+        }
+        return $v;
     }
 
 
@@ -86,6 +95,11 @@ class Archives extends Base
         return Config('site.flagtype');
     }
 
+    public function content()
+    {
+        return $this->hasOne('content', 'id', 'id');
+        //    ->bind(['content']);//->setEagerlyType(0);
+    }
     public function category()
     {
         return $this->belongsTo('Category', 'category_id', 'id');//->setEagerlyType(0);
diff --git a/app/model/Content.php b/app/model/Content.php
index 4cba29b..169d232 100644
--- a/app/model/Content.php
+++ b/app/model/Content.php
@@ -11,4 +11,9 @@ use app\model\Base;
  */
 class Content extends Base
 {
+    protected function getOptions(): array{
+        return array_merge(parent::getOptions(),[
+            'autoWriteTimestamp' => false
+        ]);
+    }
 }
diff --git a/app/model/Files.php b/app/model/Files.php
new file mode 100644
index 0000000..51c865d
--- /dev/null
+++ b/app/model/Files.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace app\model;
+
+use app\model\Base;
+/**
+ * @property integer $id 主键(ID)
+ * @property integer $user_id 用户ID
+ * @property string $title 名字
+ * @property string $path 文件
+ * @property integer $size 大小
+ * @property string $mime_type 文件类型
+ * @property string $extension 扩展名
+ * @property integer $height 高度
+ * @property integer $width 宽度
+ * @property string $sha1 文件sha1值
+ * @property integer $use_count 使用次数
+ * @property integer $created_at 创建时间
+ * @property integer $updated_at 更新时间
+ * @property integer $deleted_at 删除时间
+ */
+class Files extends Base
+{
+    protected $name = 'files';
+    
+    
+    public function user()
+    {
+        return $this->belongsTo('User', 'user_id', 'id');//->setEagerlyType(0);
+    }
+    
+     
+}
diff --git a/app/model/FriendCircle.php b/app/model/FriendCircle.php
new file mode 100644
index 0000000..650c3a9
--- /dev/null
+++ b/app/model/FriendCircle.php
@@ -0,0 +1,138 @@
+<?php
+namespace app\model;
+
+/**
+ * 朋友圈动态模型
+ * @property integer $id 主键(ID)
+ * @property integer $user_id 用户ID
+ * @property string $body 内容
+ * @property string $files 图片列表(JSON)
+ * @property integer $like_count 点赞数
+ * @property integer $comment_count 评论数
+ * @property integer $created_at 创建时间
+ * @property integer $updated_at 更新时间
+ * @property integer $status 状态(0:隐藏 1:正常)
+ */
+class FriendCircle extends Base
+{
+    protected $name = 'friend_circle';
+    
+    protected function getOptions(): array
+    {
+        return array_merge(parent::getOptions(), [
+            'insert' => [
+                'status' => 1,
+                'like_count' => 0,
+                'comment_count' => 0,
+            ],
+        ]);
+    }
+    public static function onAfterInsert($row){
+        $changeData = $row->getChangedData();
+        if(isset($changeData['files'])) {
+            $files = json_decode($changeData['files'],true);
+            Files::whereIn('path',$files)->inc('use_count');
+        };
+    }
+     
+    public static function onAfterUpdate($row){
+        $OrgData = $row->getOrigin();
+        $changeData = $row->getChangedData();
+        if(isset($OrgData['files'])) {
+            if(is_array($OrgData['files'])){
+                \support\Log::alert('OrgData array');
+            }else{
+                \support\Log::info('OrgData string');
+                $files = json_decode($OrgData['files'],true);
+                Files::whereIn('path',$files)->dec('use_count');
+            }
+        };
+        if(isset($changeData['files'])) {
+            if(is_array($changeData['files'])){
+                \support\Log::alert('changeData array');
+            }else{
+                \support\Log::info('changeData string');
+                $files = json_decode($changeData['files'],true);
+                Files::whereIn('path',$files)->inc('use_count');
+            }
+        };
+    }
+    /**
+     * 关联用户
+     */
+    public function user()
+    {
+        return $this->belongsTo('\\app\\model\\User', 'user_id', 'id');
+    }
+    
+    /**
+     * 关联点赞
+     */
+    public function likes()
+    {
+        return $this->hasMany('\\app\\model\\FriendCircleLike', 'circle_id', 'id');
+    }
+    
+    /**
+     * 关联评论
+     */
+    public function comments()
+    {
+        return $this->hasMany('\\app\\model\\FriendCircleComment', 'circle_id', 'id');
+    }
+    
+    /**
+     * 获取图片列表
+     */
+    public function getFilesAttr($value)
+    {
+        if (empty($value)) {
+            return [];
+        }
+        if(is_array($value)){
+            return $value;
+        }
+        $files = json_decode($value, true);
+        return is_array($files) ? $files : [];
+    }
+    
+    /**
+     * 设置图片列表
+     */
+    public function setFilesAttr($value)
+    {
+        if (empty($value)) {
+            return '[]';
+        }
+        if (is_array($value)) {
+            return json_encode($value, JSON_UNESCAPED_UNICODE);
+        }
+        return $value;
+    }
+    /**
+     * 获取图片列表
+     */
+    public function getAddressAttr($value)
+    {
+        if (empty($value)) {
+            return [];
+        }
+        $files = json_decode($value, true);
+        return is_array($files) ? $files : [];
+    }
+    
+    /**
+     * 设置图片列表
+     */
+    public function setAddressAttr($value)
+    {
+        if (empty($value)) {
+            return '{"chooseFlag":false}';
+        }
+        if (is_array($value)) {
+            return json_encode($value, JSON_UNESCAPED_UNICODE);
+        }
+        return $value;
+    }
+}
+
diff --git a/app/model/FriendCircleComment.php b/app/model/FriendCircleComment.php
new file mode 100644
index 0000000..ef49440
--- /dev/null
+++ b/app/model/FriendCircleComment.php
@@ -0,0 +1,54 @@
+<?php
+namespace app\model;
+
+/**
+ * 朋友圈评论模型
+ * @property integer $id 主键(ID)
+ * @property integer $circle_id 朋友圈动态ID
+ * @property integer $user_id 用户ID
+ * @property integer $reply_user_id 回复的用户ID(0表示直接评论)
+ * @property string $body 评论内容
+ * @property integer $created_at 创建时间
+ * @property integer $updated_at 更新时间
+ * @property integer $status 状态(0:隐藏 1:正常)
+ */
+class FriendCircleComment extends Base
+{
+    protected $name = 'friend_circle_comment';
+    protected $autoWriteTimestamp = true;
+    
+    protected function getOptions(): array
+    {
+        return array_merge(parent::getOptions(), [
+            'insert' => [
+                'status' => 1,
+                'reply_user_id' => 0,
+            ],
+        ]);
+    }
+    
+    /**
+     * 关联朋友圈动态
+     */
+    public function circle()
+    {
+        return $this->belongsTo('\\app\\model\\FriendCircle', 'circle_id', 'id');
+    }
+    
+    /**
+     * 关联评论用户
+     */
+    public function user()
+    {
+        return $this->belongsTo('\\app\\model\\User', 'user_id', 'id');
+    }
+    
+    /**
+     * 关联被回复的用户
+     */
+    public function replyUser()
+    {
+        return $this->belongsTo('\\app\\model\\User', 'reply_user_id', 'id');
+    }
+}
+
diff --git a/app/model/FriendCircleLike.php b/app/model/FriendCircleLike.php
new file mode 100644
index 0000000..e7780e9
--- /dev/null
+++ b/app/model/FriendCircleLike.php
@@ -0,0 +1,32 @@
+<?php
+namespace app\model;
+
+/**
+ * 朋友圈点赞模型
+ * @property integer $id 主键(ID)
+ * @property integer $circle_id 朋友圈动态ID
+ * @property integer $user_id 用户ID
+ * @property integer $created_at 创建时间
+ */
+class FriendCircleLike extends Base
+{
+    protected $name = 'friend_circle_like';
+    protected $autoWriteTimestamp = 'int';
+    
+    /**
+     * 关联朋友圈动态
+     */
+    public function circle()
+    {
+        return $this->belongsTo('\\app\\model\\FriendCircle', 'circle_id', 'id');
+    }
+    
+    /**
+     * 关联用户
+     */
+    public function user()
+    {
+        return $this->belongsTo('\\app\\model\\User', 'user_id', 'id');
+    }
+}
+
diff --git a/app/model/Thali.php b/app/model/Thali.php
new file mode 100644
index 0000000..fde80ac
--- /dev/null
+++ b/app/model/Thali.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace app\model;
+use app\model\Base;
+/**
+ * @property integer $id 主键(ID) - 无注释
+ * @property string $title 名称
+ * @property float $price 价格
+ * @property float $org_price 原价
+ * @property integer $duration 时长
+ * @property string $label 标签
+ * @property integer $status 0:禁用,1启用
+ * @property integer $created_at 创建时间
+ * @property integer $updated_at 更新时间
+ */
+class Thali extends Base
+{
+
+    protected function getOptions(): array 
+    {
+        // 所有的参数配置统一返回
+        return array_merge(parent::getOptions(),[
+            'append'    =>  []
+        ]);
+    }
+    
+}
diff --git a/app/model/User.php b/app/model/User.php
index 3cddbf7..7fe6726 100644
--- a/app/model/User.php
+++ b/app/model/User.php
@@ -82,12 +82,12 @@ class User extends Base
     public static function onAfterUpdate($row){
         $changeData = $row->getChangedData();
         $orgData = $row->getOrigin();
-        //cp($changeData);
         if(isset($changeData['avatar']) || isset($changeData['nickname'])){
-            request()->IM->user->updateUserInfo($row->id,[
+            $sdata  = [
                 'nickname'  =>  $row->nickname,
                 'faceURL'   =>  cdnurl($row->avatar)
-            ]);
+            ];
+            request()->IM->user->updateUserInfo($row->id,$sdata);
         }
         if(isset($changeData['status']) || $changeData['status'] == '0'){
             request()->IM->user->forceLogout($row->id);
@@ -130,7 +130,12 @@ class User extends Base
     {
         return $this->hasMany(UserTeam::class, 'ancestor_id', 'id');
     }
-    
+    function setExpireAtAttr($v){
+        if($v && strpos($v,'-')){
+            return strtotime($v);
+        }
+        return $v;
+    }
     public static function transform($from_currency,$to_currency,$user_id,$amount,\app\enum\BalanceType $type,$memo=null){
         
         if(!in_array($from_currency,Config('site.allow_currencys'))){
diff --git a/app/model/UserRole.php b/app/model/UserRole.php
index c4dae30..e808293 100644
--- a/app/model/UserRole.php
+++ b/app/model/UserRole.php
@@ -5,11 +5,17 @@ namespace app\model;
 
 /**
  * @property integer $id 主键(主键)
+ * @property integer $pid 上级id
  * @property string $name 角色名
  * @property string $rules 权限
- * @property string $created_at 创建时间
- * @property string $updated_at 更新时间
- * @property integer $pid 上级id
+ * @property integer $max_send_msg_count 最大消息数量
+ * @property integer $max_friend_count   最大好友数量
+ * @property integer $max_group_join_count   最大加入的群组数量
+ * @property integer $max_gourp_create_count 最大创建的群组数量
+ * @property integer $created_at 创建时间
+ * @property integer $updated_at 更新时间
+ * @property integer $status 状态
+
  */
 class UserRole extends Base
 {
diff --git a/app/model/UserRule.php b/app/model/UserRule.php
index bdd45dc..5ed426a 100644
--- a/app/model/UserRule.php
+++ b/app/model/UserRule.php
@@ -3,7 +3,6 @@
 namespace app\model;
 
 use app\model\Base;
-use support\Model;
 /**
  * @property integer $id 主键(主键)
  * @property string $title 标题
diff --git a/app/model/Version.php b/app/model/Version.php
new file mode 100644
index 0000000..01bf2a1
--- /dev/null
+++ b/app/model/Version.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace app\model;
+
+use app\model\Base;
+/**
+ * @property integer $id 主键(ID) - 无注释
+ * @property integer $user_id 用户ID
+ * @property float $deduction_amount 提现金额
+ * @property float $recive_amount 到账金额
+ * @property float $fee 后续费
+ * @property string $title 姓名
+ * @property string $network 方式
+ * @property string $address 地址
+ * @property integer $transfer_at 转账时间
+ * @property string $txid 凭证
+ * @property string $memo 备注
+ * @property integer $created_at 创建时间
+ * @property integer $updated_at 更新时间
+ * @property integer $status 状态
+ */
+class Version extends Base
+{
+    
+    protected function getOptions(): array 
+    {
+        // 所有的参数配置统一返回
+        return array_merge(parent::getOptions(),[
+            'append'    =>  ['source_text']
+        ]);
+    }
+    function getSourceTextAttr($v,$row){
+        if($v){
+            return cdnurl($v);
+        }
+    }
+    function getOsList(){
+        return [
+            "android"=>"Android",
+            "ios"=>"IOS",
+            "harmonry"=>"鸿蒙"
+        ];
+    }
+    function getTypeList(){
+        return [
+            "1"=>"WGT热更新",
+            "0"=>"整包更新",
+            "2"=>"外链下载更新"
+        ];
+    }
+    function getForceList(){
+        return [
+            "0"=>"可选更新",
+            "1"=>"强制更新",
+        ];
+    }
+    function getStatusList(){
+        return [
+            '0' => '禁用',
+            '1' => '启用'
+        ];
+    } 
+    public function user()
+    {
+        return $this->belongsTo('User', 'user_id', 'id');//->setEagerlyType(0);
+    }
+    
+    
+}
diff --git a/app/validate/User.php b/app/validate/User.php
new file mode 100644
index 0000000..019fad6
--- /dev/null
+++ b/app/validate/User.php
@@ -0,0 +1,31 @@
+<?php
+namespace app\validate;
+
+use taoser\Validate;
+
+class User extends Validate
+{
+    protected $rule = [
+        'username'  =>  'require|max:25',
+        'email' =>  'email',
+        'mobile' =>  'mobile',
+        'password' =>  'require|max:32'
+    ];
+	
+	// 定义信息
+    protected $message  =   [
+        'username.require' => '去设置用户名',
+        'username.max'     => '用户名最多不能超过25个字符',
+        'mobile'  => '手机号格式错误',
+        'email'        => '邮箱格式错误',    
+        'password.require' => '请设置密码',
+        'password.max'     => '密码最多不能超过32个字符',
+    ];
+	//定义场景
+	protected $scene = [
+        'register.email'  =>  ['email','password'],
+        'register.username'  =>  ['username','password'],
+        'register.mobile'  =>  ['mobile','password'],
+    ];
+
+}
\ No newline at end of file
diff --git a/config/log.php b/config/log.php
index b12e2a1..1d7575e 100644
--- a/config/log.php
+++ b/config/log.php
@@ -18,7 +18,8 @@ return [
             [
                 'class' => Monolog\Handler\RotatingFileHandler::class,
                 'constructor' => [
-                    runtime_path() . '/logs/webman'.ceil(date('H')/6).'.log',
+                    //runtime_path() . '/logs/webman'.ceil(date('H')/6).'.log',
+                    runtime_path() . '/logs/webman.log',
                     7, //$maxFiles
                     Monolog\Logger::INFO,
                 ],
diff --git a/config/process.php b/config/process.php
index 5ea733f..158b85a 100644
--- a/config/process.php
+++ b/config/process.php
@@ -29,7 +29,7 @@ return [
                 base_path() . '/plugin/app',
                 base_path() . '/support',
                 base_path() . '/resource',
-                base_path() . '/.env',
+                base_path() . '/.env'
             ],
             // 文件后缀
             'monitor_extensions' => [
diff --git a/config/route.php b/config/route.php
index 1ae01f0..13056fb 100644
--- a/config/route.php
+++ b/config/route.php
@@ -14,6 +14,9 @@
 
 use Webman\Route;
 
+Route::get('/u/{code}', [\app\controller\IndexController::class, 'user']);
+Route::get('/g/{code}', [\app\controller\IndexController::class, 'group']);
+
 Route::fallback(function(){
     $fn = base_path().'/public/index.html';
     if(file_exists($fn)){
diff --git a/database/friend_circle_tables.sql b/database/friend_circle_tables.sql
new file mode 100644
index 0000000..a105674
--- /dev/null
+++ b/database/friend_circle_tables.sql
@@ -0,0 +1,49 @@
+-- 朋友圈功能数据库表结构
+
+-- 朋友圈动态表
+CREATE TABLE IF NOT EXISTS `friend_circle` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+  `user_id` int(11) NOT NULL COMMENT '用户ID',
+  `body` text COMMENT '内容',
+  `files` text COMMENT '图片列表(JSON)',
+  `like_count` int(11) NOT NULL DEFAULT '0' COMMENT '点赞数',
+  `comment_count` int(11) NOT NULL DEFAULT '0' COMMENT '评论数',
+  `created_at` int(11) NOT NULL COMMENT '创建时间',
+  `updated_at` int(11) NOT NULL COMMENT '更新时间',
+  `status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态(0:隐藏 1:正常)',
+  PRIMARY KEY (`id`),
+  KEY `user_id` (`user_id`),
+  KEY `status` (`status`),
+  KEY `created_at` (`created_at`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='朋友圈动态表';
+
+-- 朋友圈点赞表
+CREATE TABLE IF NOT EXISTS `friend_circle_like` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+  `circle_id` int(11) NOT NULL COMMENT '朋友圈动态ID',
+  `user_id` int(11) NOT NULL COMMENT '用户ID',
+  `created_at` int(11) NOT NULL COMMENT '创建时间',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `circle_user` (`circle_id`,`user_id`),
+  KEY `circle_id` (`circle_id`),
+  KEY `user_id` (`user_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='朋友圈点赞表';
+
+-- 朋友圈评论表
+CREATE TABLE IF NOT EXISTS `friend_circle_comment` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+  `circle_id` int(11) NOT NULL COMMENT '朋友圈动态ID',
+  `user_id` int(11) NOT NULL COMMENT '用户ID',
+  `reply_user_id` int(11) NOT NULL DEFAULT '0' COMMENT '回复的用户ID(0表示直接评论)',
+  `body` text NOT NULL COMMENT '评论内容',
+  `created_at` int(11) NOT NULL COMMENT '创建时间',
+  `updated_at` int(11) NOT NULL COMMENT '更新时间',
+  `status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态(0:隐藏 1:正常)',
+  PRIMARY KEY (`id`),
+  KEY `circle_id` (`circle_id`),
+  KEY `user_id` (`user_id`),
+  KEY `reply_user_id` (`reply_user_id`),
+  KEY `status` (`status`),
+  KEY `created_at` (`created_at`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='朋友圈评论表';
+
diff --git a/plugin/admin/app/controller/ArchivesController.php b/plugin/admin/app/controller/ArchivesController.php
index 387fa21..317a347 100644
--- a/plugin/admin/app/controller/ArchivesController.php
+++ b/plugin/admin/app/controller/ArchivesController.php
@@ -85,8 +85,8 @@ class ArchivesController extends Crud
             $result = $this->model->save($params);
             Db::commit();
         } catch (Exception $e) {
-            Db::rollback();
-            return $this->fail($e->getMessage());
+           Db::rollback();
+           return $this->fail($e->getMessage());
         }
         if ($result === false) {
             return $this->fail(__('No rows were inserted'));
diff --git a/plugin/admin/app/controller/AttachController.php b/plugin/admin/app/controller/AttachController.php
new file mode 100644
index 0000000..6eceee8
--- /dev/null
+++ b/plugin/admin/app/controller/AttachController.php
@@ -0,0 +1,168 @@
+<?php
+
+namespace plugin\admin\app\controller;
+
+use support\Request;
+use support\Response;
+use support\think\Db;
+use taoser\facade\Validate;
+use Shopwwi\WebmanFilesystem\Facade\Storage;
+
+/**
+ * 附件管理
+ *
+ * @icon fa fa-circle-o
+ */
+class AttachController extends Crud
+{
+    
+    /**
+     * @var \app\model\Files
+     */
+    protected $model = null;
+    /**
+     * 构造函数
+     * @return void
+     */
+    function __construct()
+    {
+        $this->model = new \app\model\Files();
+    }
+    function list(Request $request)
+    {
+        return view('', [
+
+        ]);
+    }
+    function feupload(Request $request): Response
+    {
+        $user = ['id'=>admin_id()];
+        $savePath = $request->post('savePath','files');
+        $validate = Validate::rule('savePath', 'alphaNum');
+        $data = ['savePath'  => $savePath];
+        if (!$validate->check($data)) {
+            return $this->fail( '参数错误:'.$validate->getError());
+        }
+        $savePath = trim($savePath,'/');
+        $savePath = 'upload/'.$savePath.'/'.$user['id'];
+        $maxSize = 1024*1024*100;   //100M
+        //多文件上传
+        $files = $request->file();
+        try {
+            $result = Storage::adapter('public')
+                ->path($savePath)
+                ->size(1024*1024*10)
+                ->extYes(['image/jpeg','image/png'])
+                ->uploads($files,0,$maxSize,false);
+            $save_datas = [];
+            foreach($result as $k=>$fileinfo){
+                $save_datas[] = [
+                    'user_id'   =>  $user['id'],
+                    'title'     =>  $fileinfo->origin_name,
+                    'path'      =>  $fileinfo->file_name,
+                    'size'      =>  $fileinfo->size,
+                    'mime_type' =>  $fileinfo->mime_type,
+                    'extension' =>  $fileinfo->extension,
+                    'height'    =>  $fileinfo->file_height,
+                    'width'     =>  $fileinfo->file_width,
+                    'sha1'      =>  sha1_file(public_path($fileinfo->file_name)),
+                    'use_count' =>  0,
+                ];
+            }
+            \app\model\Files::saveAll($save_datas);
+            return $this->success(__('successful'),[
+                'link' => $result[0]['path'],
+            ]);
+        }catch (\Exception $e){
+            return $this->fail($e->getMessage());
+        }
+    }
+    function upload(Request $request): Response
+    {
+        log_alert(0);
+        $savePath = $request->post('savePath','files');
+        $validate = Validate::rule('savePath', 'alphaNum');
+        $data = ['savePath'  => $savePath];
+        log_alert($data);
+        if (!$validate->check($data)) {
+            cp($validate->getError());
+            return $this->fail( '参数错误:'.$validate->getError());
+        }
+        log_alert('1');
+        $file = current($request->file());
+        if (!$file || !$file->isValid()) {
+            return $this->fail('未找到文件');
+        }
+        log_alert('2');
+        try {
+            $data = $this->base($request, $savePath);
+        } catch (\Exception $e) {
+            log_alert($e->getMessage());
+            //throw $th;
+        }
+        log_alert('3');
+        //cp($data);
+        return $this->success( '上传成功', [
+            'url' => $data['realpath'],
+            'name' => $data['name'],
+            'fullurl' => $data['url'],
+            'size' => $data['size'],
+            'url1' => $data['url'],
+        ]);
+    }
+
+    /**
+     * 获取上传数据
+     * @param Request $request
+     * @param $savePath 保存位置
+     * @return array
+     * @throws \Exception
+     */
+    protected function base(Request $request, $savePath): array
+    {
+        $user = ['id'=>admin_id()];
+        // 适配器 local默认是存储在runtime目录下 public默认是存储在public目录下
+        // 可访问的静态文件建议public
+        // 默认适配器是local
+        //Storage::adapter('public');
+        $savePath = trim($savePath,'/');
+        $savePath = 'upload/'.$savePath;
+        cp($savePath);
+        $file = current($request->file());
+        cp($file);
+        $mimetype = explode(',',Config('site.upload_mimetype'));
+        $maxsize = Config('site.upload_maxsize')*1024*1024;
+        $result = Storage::adapter('public')
+            ->path($savePath)
+            ->size($maxsize)
+            ->extYes($mimetype)
+            ->upload($file);
+        cp($result);
+            
+        $save_datas = [
+            'user_id'   =>  $user['id'],
+            'category'  =>  'default',
+            'title'     =>  $result->origin_name,
+            'path'      =>  $result->file_name,
+            'size'      =>  $result->size,
+            'mime_type' =>  $result->mime_type,
+            'extension' =>  $result->extension,
+            'height'    =>  $result->file_height,
+            'width'     =>  $result->file_width,
+            'sha1'      =>  sha1_file(public_path($result->file_name)),
+            'use_count' =>  0,
+        ];
+        (new \app\model\Files)->save($save_datas);
+        return [
+            'code' => 0,
+            'url'       => $result->file_url,
+            'name'      => $result->origin_name,
+            'realpath'  => '/'.$result->file_name,
+            'size'      => $result->size,
+            'mime_type' => $result->mime_type,
+            'image_with'=> $result->file_width,
+            'image_height' => $result->file_height,
+            'ext'       => $result->extension,
+        ];
+    }
+}
diff --git a/plugin/admin/app/controller/AttachmentController.php b/plugin/admin/app/controller/AttachmentController.php
deleted file mode 100644
index fab3769..0000000
--- a/plugin/admin/app/controller/AttachmentController.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-
-namespace plugin\admin\app\controller;
-
-use support\Request;
-use support\Response;
-use support\think\Db;
-use Shopwwi\WebmanFilesystem\Facade\Storage;
-
-/**
- * 附件管理
- *
- * @icon fa fa-circle-o
- */
-class AttachmentController extends Crud
-{
-    function list(Request $request)
-    {
-
-        return view('', [
-
-        ]);
-    }
-    function feupload(Request $request): Response
-    {
-
-        $file = current($request->file());
-        if (!$file || !$file->isValid()) {
-            return $this->fail('未找到文件');
-        }
-        $data = $this->base($request, '/upload/files/' . date('Ymd'));
-        return json([
-            'link' => $data['url'],
-        ]);
-    }
-    function upload(Request $request): Response
-    {
-
-        $file = current($request->file());
-        if (!$file || !$file->isValid()) {
-            return $this->fail('未找到文件');
-        }
-        $data = $this->base($request, '/upload/files/' . date('Ymd'));
-        //cp($data);
-        return $this->json(0, '上传成功', [
-            'url' => $data['realpath'],
-            'name' => $data['name'],
-            'fullurl' => $data['url'],
-            'size' => $data['size'],
-        ]);
-    }
-
-    /**
-     * 获取上传数据
-     * @param Request $request
-     * @param $relative_dir
-     * @return array
-     * @throws \Exception
-     */
-    protected function base(Request $request, $relative_dir): array
-    {
-        // 适配器 local默认是存储在runtime目录下 public默认是存储在public目录下
-        // 可访问的静态文件建议public
-        // 默认适配器是local
-        //Storage::adapter('public');
-        $relative_dir = ltrim($relative_dir, '\\/');
-        $file = current($request->file());
-        try {
-            if (!$file || !$file->isValid()) {
-                throw new \support\exception\BusinessException('未找到上传文件', 400);
-            }
-
-            $ext = $file->getUploadExtension() ?: null;
-            $mime_type = $file->getUploadMimeType();
-            $file_name = $file->getUploadName();
-            $file_size = $file->getSize();
-
-            if (!$ext && $file_name === 'blob') {
-                [$___image, $ext] = explode('/', $mime_type);
-                unset($___image);
-            }
-
-            $ext = strtolower($ext);
-            $ext_forbidden_map = ['php', 'php3', 'php5', 'css', 'js', 'html', 'htm', 'asp', 'jsp'];
-            if (in_array($ext, $ext_forbidden_map)) {
-                throw new \support\exception\BusinessException('不支持该格式的文件上传', 400);
-            }
-            $mimetype = explode(',',Config('site.mimetype'));
-            $result = Storage::adapter('public')
-                ->path($relative_dir)
-                ->size(1024 * 1024 * 5)
-                ->extYes($mimetype)
-                //->extNo(['image/png'])
-                ->upload($file);
-        } catch (\Exception $e) {
-            return [
-                'code' => 1,
-                'msg' => $e->getMessage()
-            ];
-        }
-        // cp($result);
-        // stdClass Object
-        // (
-        //     [adapter] => public
-        //     [origin_name] => OIP-C (1).jpg
-        //     [file_name] => upload/files/20250527/eb14c1bfe6e7a22415bbbb30dfe90ba1_6834f0974db76.jpg
-        //     [storage_key] => eb14c1bfe6e7a22415bbbb30dfe90ba1_6834f0974db76
-        //     [file_url] => //luru.oss-ap-southeast-1.aliyuncs.com/upload/files/20250527/eb14c1bfe6e7a22415bbbb30dfe90ba1_6834f0974db76.jpg
-        //     [size] => 15370
-        //     [mime_type] => image/jpeg
-        //     [extension] => jpg
-        //     [file_height] => 474
-        //     [file_width] => 474
-        // )
-        return [
-            'code' => 0,
-            'url' => $result->file_url,
-            'name' => $result->origin_name,
-            'realpath' => '/'.$result->file_name,
-            'size' => $result->size,
-            'mime_type' => $result->mime_type,
-            'image_with' => $result->file_width,
-            'image_height' => $result->file_height,
-            'ext' => $result->extension,
-        ];
-    }
-}
diff --git a/plugin/admin/app/controller/FilesController.php b/plugin/admin/app/controller/FilesController.php
new file mode 100644
index 0000000..0238bd1
--- /dev/null
+++ b/plugin/admin/app/controller/FilesController.php
@@ -0,0 +1,160 @@
+<?php
+
+namespace plugin\admin\app\controller;
+
+use support\Request;
+use support\Response;
+use support\think\Db;
+use taoser\facade\Validate;
+use Shopwwi\WebmanFilesystem\Facade\Storage;
+
+/**
+ * 附件管理
+ *
+ * @icon fa fa-circle-o
+ */
+class FilesController extends Crud
+{
+    
+    /**
+     * @var \app\model\Files
+     */
+    protected $model = null;
+    /**
+     * 构造函数
+     * @return void
+     */
+    function __construct()
+    {
+        $this->model = new \app\model\Files();
+    }
+    function list(Request $request)
+    {
+        return view('', [
+
+        ]);
+    }
+    function feupload(Request $request): Response
+    {
+        $user = ['id'=>admin_id()];
+        $savePath = $request->post('savePath','files');
+        $validate = Validate::rule('savePath', 'alphaNum');
+        $data = ['savePath'  => $savePath];
+        if (!$validate->check($data)) {
+            return $this->fail( '参数错误:'.$validate->getError());
+        }
+        $savePath = trim($savePath,'/');
+        $savePath = 'upload/'.$savePath.'/'.$user['id'];
+        $maxSize = 1024*1024*100;   //100M
+        //多文件上传
+        $files = $request->file();
+        try {
+            $result = Storage::adapter('public')
+                ->path($savePath)
+                ->size(1024*1024*10)
+                ->extYes(['image/jpeg','image/png'])
+                ->uploads($files,0,$maxSize,false);
+            $save_datas = [];
+            foreach($result as $k=>$fileinfo){
+                $save_datas[] = [
+                    'user_id'   =>  $user['id'],
+                    'title'     =>  $fileinfo->origin_name,
+                    'path'      =>  $fileinfo->file_name,
+                    'size'      =>  $fileinfo->size,
+                    'mime_type' =>  $fileinfo->mime_type,
+                    'extension' =>  $fileinfo->extension,
+                    'height'    =>  $fileinfo->file_height,
+                    'width'     =>  $fileinfo->file_width,
+                    'sha1'      =>  sha1_file(public_path($fileinfo->file_name)),
+                    'use_count' =>  0,
+                ];
+            }
+            \app\model\Files::saveAll($save_datas);
+            return $this->success(__('successful'),[
+                'link' => $result[0]['path'],
+            ]);
+        }catch (\Exception $e){
+            return $this->fail($e->getMessage());
+        }
+    }
+    function upload(Request $request): Response
+    {
+        cp('0');
+        $savePath = $request->post('savePath','files');
+        $validate = Validate::rule('savePath', 'alphaNum');
+        $data = ['savePath'  => $savePath];
+        cp($data);
+        if (!$validate->check($data)) {
+            cp($validate->getError());
+            return $this->fail( '参数错误:'.$validate->getError());
+        }
+        cp('1');
+        $file = current($request->file());
+        if (!$file || !$file->isValid()) {
+            return $this->fail('未找到文件');
+        }
+        cp('2');
+        $data = $this->base($request, $savePath);
+        cp('3');
+        //cp($data);
+        return $this->success( '上传成功', [
+            'url' => $data['realpath'],
+            'name' => $data['name'],
+            'fullurl' => $data['url'],
+            'size' => $data['size'],
+            'url1' => $data['url'],
+        ]);
+    }
+
+    /**
+     * 获取上传数据
+     * @param Request $request
+     * @param $savePath 保存位置
+     * @return array
+     * @throws \Exception
+     */
+    protected function base(Request $request, $savePath): array
+    {
+        $user = ['id'=>admin_id()];
+        // 适配器 local默认是存储在runtime目录下 public默认是存储在public目录下
+        // 可访问的静态文件建议public
+        // 默认适配器是local
+        //Storage::adapter('public');
+        $savePath = trim($savePath,'/');
+        $savePath = 'upload/'.$savePath;
+        $file = current($request->file());
+        $mimetype = explode(',',Config('site.upload_mimetype'));
+        $maxsize = Config('site.upload_maxsize')*1024*1024;
+        $result = Storage::adapter('public')
+            ->path($savePath)
+            ->size($maxsize)
+            ->extYes($mimetype)
+            ->upload($file);
+            
+        $save_datas = [
+            'user_id'   =>  $user['id'],
+            'category'  =>  'default',
+            'title'     =>  $result->origin_name,
+            'path'      =>  $result->file_name,
+            'size'      =>  $result->size,
+            'mime_type' =>  $result->mime_type,
+            'extension' =>  $result->extension,
+            'height'    =>  $result->file_height,
+            'width'     =>  $result->file_width,
+            'sha1'      =>  sha1_file(public_path($result->file_name)),
+            'use_count' =>  0,
+        ];
+        (new \app\model\Files)->save($save_datas);
+        return [
+            'code' => 0,
+            'url'       => $result->file_url,
+            'name'      => $result->origin_name,
+            'realpath'  => '/'.$result->file_name,
+            'size'      => $result->size,
+            'mime_type' => $result->mime_type,
+            'image_with'=> $result->file_width,
+            'image_height' => $result->file_height,
+            'ext'       => $result->extension,
+        ];
+    }
+}
diff --git a/plugin/admin/app/controller/IndexController.php b/plugin/admin/app/controller/IndexController.php
index 254cd9e..0f6e12b 100644
--- a/plugin/admin/app/controller/IndexController.php
+++ b/plugin/admin/app/controller/IndexController.php
@@ -37,7 +37,7 @@ class IndexController extends Base
         $admin = admin();
         if (!$admin) {
             $title = config('site.name') ?? 'admin';
-            $logo = cdnurl(config('site.admin_logo') ?? '/app/admin/images/logo.png');
+            $logo = cdnurl(config('site.admin_logo') ?? admin_path().'/images/logo.png');
             return view('account/login',['logo'=>$logo,'title'=>$title]);
         }
         //缓存
diff --git a/plugin/admin/app/controller/TeamController.php b/plugin/admin/app/controller/TeamController.php
index 469deaf..fe53b0c 100644
--- a/plugin/admin/app/controller/TeamController.php
+++ b/plugin/admin/app/controller/TeamController.php
@@ -8,7 +8,7 @@ use support\Request;
 use support\Response;
 
 /**
- * 用户管理 
+ * 团队管理 
  */
 class TeamController extends Crud
 {
diff --git a/plugin/admin/app/controller/ThaliController.php b/plugin/admin/app/controller/ThaliController.php
new file mode 100644
index 0000000..0343135
--- /dev/null
+++ b/plugin/admin/app/controller/ThaliController.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace plugin\admin\app\controller;
+use plugin\admin\app\controller\Crud;
+use app\model\Thali;
+use support\exception\BusinessException;
+use support\Request;
+use support\Response;
+
+/**
+ * 套餐管理 
+ */
+class ThaliController extends Crud
+{
+    
+    /**
+     * @var Thali
+     */
+    protected $model = null;
+
+    /**
+     * 构造函数
+     * @return void
+     */
+    
+
+    function __construct()
+    {
+        $this->model = new Thali();
+        $statusList = $this->model->getStatusList();
+        $this->assign("statusList", $statusList);
+        $this->assignconfig("statusList", $statusList);
+    }
+}
diff --git a/plugin/admin/app/controller/UserController.php b/plugin/admin/app/controller/UserController.php
index 1e7d4cd..ce28c73 100644
--- a/plugin/admin/app/controller/UserController.php
+++ b/plugin/admin/app/controller/UserController.php
@@ -33,7 +33,7 @@ class UserController extends Crud
             ['value'=>1,'label'=>"内部用户"],
             ['value'=>2,'label'=>"联盟商"],
         ];
-        $roleList = \app\model\UserRole::order('id','desc')->column('name as label,id as value');
+        $roleList = \app\model\UserRole::order('id','asc')->column('name as label,id as value');
         $this->assign('groupList',$groupList);
         $this->assignconfig('groupList',$groupList);
         $this->assign('roleList',$roleList);
diff --git a/plugin/admin/app/controller/VersionController.php b/plugin/admin/app/controller/VersionController.php
new file mode 100644
index 0000000..bfa0380
--- /dev/null
+++ b/plugin/admin/app/controller/VersionController.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace plugin\admin\app\controller;
+
+use app\model\User;
+use plugin\admin\app\controller\Crud;
+use support\exception\BusinessException;
+use support\Request;
+use support\Response;
+use Throwable;
+
+/**
+ * 版本管理 
+ */
+class VersionController   extends Crud
+{
+    
+    /**
+     * @var \app\model\Version
+     */
+    protected $model = null;
+    /**
+     * 构造函数
+     * @return void
+     */
+    function __construct()
+    {
+        $this->model = new \app\model\Version();
+        $osList = $this->model->getOsList();
+        $this->assign("osList", $osList);
+        $this->assignconfig("osList", $osList);
+        $forceList = $this->model->getForceList();
+        $this->assign("forceList", $forceList);
+        $this->assignconfig("forceList", $forceList);
+        $typeList = $this->model->getTypeList();
+        $this->assign("typeList", $typeList);
+        $this->assignconfig("typeList", $typeList);
+        $statusList = $this->model->getStatusList();
+        $this->assign("statusList", $statusList);
+        $this->assignconfig("statusList", $statusList);
+    }
+    
+}
diff --git a/plugin/admin/app/functions.php b/plugin/admin/app/functions.php
index 54ddaa7..9b77ff3 100644
--- a/plugin/admin/app/functions.php
+++ b/plugin/admin/app/functions.php
@@ -23,7 +23,7 @@ function url($path='',$args=[]){
         }
         $path = $path.'?'.$args;
     }
-    return '/app/admin/'.$path;
+    return admin_path().'/'.$path;
 }
 /**
  * 当前管理员id
diff --git a/plugin/admin/app/middleware/AccessControl.php b/plugin/admin/app/middleware/AccessControl.php
index b694ad7..d4e10f8 100644
--- a/plugin/admin/app/middleware/AccessControl.php
+++ b/plugin/admin/app/middleware/AccessControl.php
@@ -31,8 +31,8 @@ class AccessControl implements MiddlewareInterface
                 $response = json(['code' => $code, 'msg' => $msg, 'data' => []]);
             } else {
                 if ($code === 401) {
-                    $response = response('<script>    if (self !== top) {        parent.location = "/app/admin";    }</script>',401);
-                    //$response = response('',301, ['Location'=> '/app/admin/index/index']);
+                    $response = response('<script>    if (self !== top) {        parent.location = "'.admin_path().'";    }</script>',401);
+                    //$response = response('',301, ['Location'=> admin_path().'/index/index']);
                 } else {
                     $request->app = '';
                     $request->plugin = 'admin';
diff --git a/plugin/admin/app/middleware/Config.php b/plugin/admin/app/middleware/Config.php
index 631e36f..377d29a 100644
--- a/plugin/admin/app/middleware/Config.php
+++ b/plugin/admin/app/middleware/Config.php
@@ -26,7 +26,8 @@ class Config implements MiddlewareInterface
         $config['debug'] = config('app.debug');
         $config['controller'] = $request->controller_name;
         $config['action'] = $request->action_name;
-        $config['moduleurl'] = '/app/admin';
+        $config['moduleurl'] = admin_path();
+        $config['admin_path'] = admin_path();
         $request->_view_vars = array_merge((array) $request->_view_vars,[
             'user'      =>  session('admin'),
             'config'    =>  $config
diff --git a/plugin/admin/app/view/account/profile.html b/plugin/admin/app/view/account/profile.html
index bf9482f..2ae5fad 100644
--- a/plugin/admin/app/view/account/profile.html
+++ b/plugin/admin/app/view/account/profile.html
@@ -47,8 +47,8 @@
                     <input id="c-avatar" class="form-control" size="50" name="avatar" type="hidden" value="{$row.avatar|null}" data-tip="头像">
                     <ul class="list-inline clearfix lyear-uploads-pic" data-template="preview" id="p-avatar">
                         <li nodelete class="col-xs-4 col-sm-3 col-md-2">
-                            <a class="pic-add faupload" style="height: auto;border: 0;" permission="app.admin.upload.avatar" id="add-pic-btn" href="#!" title="点击上传" data-input-id="c-avatar" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="false" data-preview-id="p-avatar"></a>
-                            <a class="pic-add fachoose" style="height: auto;border: 0;" permission="app.admin.upload.attachment" id="choose-pic-btn" href="#!" title="选择文件" data-input-id="c-avatar" data-mimetype="image/*" data-multiple="false" data-preview-id="p-avatar"></a>
+                            <a class="pic-add faupload" style="height: auto;border: 0;" permission="app.admin.files.avatar" id="add-pic-btn" href="#!" title="点击上传" data-input-id="c-avatar" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="false" data-preview-id="p-avatar"></a>
+                            <a class="pic-add fachoose" style="height: auto;border: 0;" permission="app.admin.files.list" id="choose-pic-btn" href="#!" title="选择文件" data-input-id="c-avatar" data-mimetype="image/*" data-multiple="false" data-preview-id="p-avatar"></a>
                         </li>
                     </ul>
                 </div>
diff --git a/plugin/admin/app/view/address/index.html b/plugin/admin/app/view/address/index.html
index 91d0afd..d5fd08f 100644
--- a/plugin/admin/app/view/address/index.html
+++ b/plugin/admin/app/view/address/index.html
@@ -1,6 +1,6 @@
 {layout name="layout"}
 <div class="toolbar" class="toolbar-btn-action">
-    <a id="btn_add" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-title="新增">
+    <a id="btn_add" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-title="新增" data-offset="r" data-area="80%,100%" data-anim="5" data-shade="0.3" data-move="false">
         <span class="mdi mdi-plus" aria-hidden="true"></span>新增
     </a>
     <a id="btn_edit" class="btn btn-success m-r-5 btn-disabled disabled btn-multi"  data-params="status=1">
diff --git a/plugin/admin/app/view/admin/index.html b/plugin/admin/app/view/admin/index.html
index 1436d58..3a274a7 100644
--- a/plugin/admin/app/view/admin/index.html
+++ b/plugin/admin/app/view/admin/index.html
@@ -1,7 +1,7 @@
 {layout name="layout"}
 <div class="card">
     <div class="toolbar" class="toolbar-btn-action">
-        <a id="btn_add" class="btn btn-primary m-r-5 btn-add" data-url="/app/admin/Admin/insert" data-title="新增">
+        <a id="btn_add" class="btn btn-primary m-r-5 btn-add" data-url="{:admin_path()}/Admin/insert" data-title="新增" data-offset="r" data-area="80%,100%" data-anim="5" data-shade="0.3" data-move="false">
             <span class="mdi mdi-plus" aria-hidden="true"></span>新增
         </a>
         <a id="btn_edit" class="btn btn-success m-r-5 btn-disabled disabled btn-multi"  data-params="status=1">
diff --git a/plugin/admin/app/view/admin/update.html b/plugin/admin/app/view/admin/update.html
index 2203333..84ffab5 100644
--- a/plugin/admin/app/view/admin/update.html
+++ b/plugin/admin/app/view/admin/update.html
@@ -65,8 +65,8 @@
                     <input id="c-avatar" class="form-control" size="50" name="avatar" type="hidden" value="{$row.avatar|null}" data-tip="杀杀杀">
                     <ul class="list-inline clearfix lyear-uploads-pic" data-template="preview" id="p-avatar">
                         <li nodelete class="col-xs-4 col-sm-3 col-md-2">
-                            <a class="pic-add faupload" style="height: auto;border: 0;" permission="app.admin.upload.avatar" id="add-pic-btn" href="#!" title="点击上传" data-input-id="c-avatar" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="false" data-preview-id="p-avatar"></a>
-                            <a class="pic-add fachoose" style="height: auto;border: 0;" permission="app.admin.upload.attachment" id="choose-pic-btn" href="#!" title="选择文件" data-input-id="c-avatar" data-mimetype="image/*" data-multiple="false" data-preview-id="p-avatar"></a>
+                            <a class="pic-add faupload" style="height: auto;border: 0;" permission="app.admin.files.upload" id="add-pic-btn" href="#!" title="点击上传" data-input-id="c-avatar" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="false" data-preview-id="p-avatar"></a>
+                            <a class="pic-add fachoose" style="height: auto;border: 0;" permission="app.admin.files.list" id="choose-pic-btn" href="#!" title="选择文件" data-input-id="c-avatar" data-mimetype="image/*" data-multiple="false" data-preview-id="p-avatar"></a>
                         </li>
                     </ul>
                 </div>
diff --git a/plugin/admin/app/view/admin_role/index.html b/plugin/admin/app/view/admin_role/index.html
index 810b8fc..a7001ce 100644
--- a/plugin/admin/app/view/admin_role/index.html
+++ b/plugin/admin/app/view/admin_role/index.html
@@ -1,7 +1,7 @@
 {layout name="layout"}
 <div class="card">
     <div class="toolbar toolbar-btn-action">
-        <button id="btn_add" type="button" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-title="新增" permission="app.admin.role.insert">
+        <button id="btn_add" type="button" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-title="新增" permission="app.admin.role.insert" data-offset="r" data-area="80%,100%" data-anim="5" data-shade="0.3" data-move="false">
             <span class="mdi mdi-plus" aria-hidden="true"></span>新增
         </button>
         <button id="btn_add" type="button" class="btn btn-info m-r-5" permission="app.admin.role.update">
diff --git a/plugin/admin/app/view/admin_rule/index.html b/plugin/admin/app/view/admin_rule/index.html
index 898a649..da3a1be 100644
--- a/plugin/admin/app/view/admin_rule/index.html
+++ b/plugin/admin/app/view/admin_rule/index.html
@@ -1,8 +1,8 @@
 {layout name="layout"}
-<link href="/app/admin/libs/jquery-treegrid/jquery.treegrid.min.css" rel="stylesheet" />
+<link href="{:admin_path()}/libs/jquery-treegrid/jquery.treegrid.min.css" rel="stylesheet" />
 <div class="card">
     <div class="toolbar toolbar-btn-action">
-        <button type="button" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-title="新增" permission="app.admin.adminrule.insert">
+        <button type="button" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-title="新增" permission="app.admin.adminrule.insert" data-offset="r" data-area="80%,100%" data-anim="5" data-shade="0.3" data-move="false">
             <span class="mdi mdi-plus" aria-hidden="true"></span>新增
         </button>
         <button id="btn_delete" type="button" class="btn btn-danger m-r-5 btn-del" permission="app.admin.adminrule.delete">
diff --git a/plugin/admin/app/view/admin_rule/update.html b/plugin/admin/app/view/admin_rule/update.html
index 210a91c..334db1c 100644
--- a/plugin/admin/app/view/admin_rule/update.html
+++ b/plugin/admin/app/view/admin_rule/update.html
@@ -83,5 +83,4 @@
             </div>
         </form>
     </div>
-</div>
-{include file="common/chooseicontpl" /}
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/plugin/admin/app/view/archives/index.html b/plugin/admin/app/view/archives/index.html
index 1dd11d0..0a0535f 100644
--- a/plugin/admin/app/view/archives/index.html
+++ b/plugin/admin/app/view/archives/index.html
@@ -1,6 +1,6 @@
 {layout name="layout"}
 <div class="toolbar" class="toolbar-btn-action">
-    <a id="btn_add" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-title="新增">
+    <a id="btn_add" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-title="新增" data-offset="r" data-area="80%,100%" data-anim="5" data-shade="0.3" data-move="false">
         <span class="mdi mdi-plus" aria-hidden="true"></span>新增
     </a>
     <a id="btn_edit" class="btn btn-success m-r-5 btn-disabled disabled btn-multi"  data-params="status=1">
diff --git a/plugin/admin/app/view/archives/update.html b/plugin/admin/app/view/archives/update.html
index 6af9edb..ed8e597 100644
--- a/plugin/admin/app/view/archives/update.html
+++ b/plugin/admin/app/view/archives/update.html
@@ -103,7 +103,7 @@
                     <ul class="list-inline clearfix lyear-uploads-pic" data-template="preview" id="p-image">
                         <li nodelete class="col-xs-4 col-sm-3 col-md-2">
                             <a class="pic-add faupload" style="height: auto;border: 0;" permission="app.admin.upload.image" id="add-pic-btn" href="#!" title="点击上传" data-input-id="c-image" data-mimetype="image/*" data-multiple="false" data-preview-id="p-image"></a>
-                            <a class="pic-add fachoose" style="height: auto;border: 0;" permission="app.admin.upload.attachment" id="choose-pic-btn" href="#!" title="选择文件" data-input-id="c-image" data-mimetype="image/*" data-multiple="false" data-preview-id="p-image"></a>
+                            <a class="pic-add fachoose" style="height: auto;border: 0;" permission="app.admin.files.list" id="choose-pic-btn" href="#!" title="选择文件" data-input-id="c-image" data-mimetype="image/*" data-multiple="false" data-preview-id="p-image"></a>
                         </li>
                     </ul>
                 </div>
@@ -115,7 +115,7 @@
                     <ul class="list-inline clearfix lyear-uploads-pic" data-template="preview" id="p-images">
                         <li nodelete class="col-xs-4 col-sm-3 col-md-2">
                             <a class="pic-add faupload" style="height: auto;border: 0;" permission="app.admin.upload.images" id="add-pic-btn" href="#!" title="点击上传" data-input-id="c-images" data-mimetype="image/*" data-multiple="false" data-preview-id="p-images"></a>
-                            <a class="pic-add fachoose" style="height: auto;border: 0;" permission="app.admin.upload.attachment" id="choose-pic-btn" href="#!" title="选择文件" data-input-id="c-images" data-mimetype="image/*" data-multiple="false" data-preview-id="p-images"></a>
+                            <a class="pic-add fachoose" style="height: auto;border: 0;" permission="app.admin.files.list" id="choose-pic-btn" href="#!" title="选择文件" data-input-id="c-images" data-mimetype="image/*" data-multiple="false" data-preview-id="p-images"></a>
                         </li>
                     </ul>
                 </div>
diff --git a/plugin/admin/app/view/card/index.html b/plugin/admin/app/view/card/index.html
index 1dd11d0..0a0535f 100644
--- a/plugin/admin/app/view/card/index.html
+++ b/plugin/admin/app/view/card/index.html
@@ -1,6 +1,6 @@
 {layout name="layout"}
 <div class="toolbar" class="toolbar-btn-action">
-    <a id="btn_add" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-title="新增">
+    <a id="btn_add" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-title="新增" data-offset="r" data-area="80%,100%" data-anim="5" data-shade="0.3" data-move="false">
         <span class="mdi mdi-plus" aria-hidden="true"></span>新增
     </a>
     <a id="btn_edit" class="btn btn-success m-r-5 btn-disabled disabled btn-multi"  data-params="status=1">
diff --git a/plugin/admin/app/view/category/index.html b/plugin/admin/app/view/category/index.html
index 1dd11d0..0a0535f 100644
--- a/plugin/admin/app/view/category/index.html
+++ b/plugin/admin/app/view/category/index.html
@@ -1,6 +1,6 @@
 {layout name="layout"}
 <div class="toolbar" class="toolbar-btn-action">
-    <a id="btn_add" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-title="新增">
+    <a id="btn_add" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-title="新增" data-offset="r" data-area="80%,100%" data-anim="5" data-shade="0.3" data-move="false">
         <span class="mdi mdi-plus" aria-hidden="true"></span>新增
     </a>
     <a id="btn_edit" class="btn btn-success m-r-5 btn-disabled disabled btn-multi"  data-params="status=1">
diff --git a/plugin/admin/app/view/common/chooseicontpl.html b/plugin/admin/app/view/common/chooseicontpl.html
deleted file mode 100644
index cc23a07..0000000
--- a/plugin/admin/app/view/common/chooseicontpl.html
+++ /dev/null
@@ -1,44 +0,0 @@
-
-<style>
-    #chooseicon {
-        margin:10px;
-    }
-    #chooseicon ul {
-        margin:5px 0 0 0;
-    }
-    #chooseicon ul li{
-        width:41px;height:42px;
-        line-height:42px;
-        border:1px solid #efefef;
-        padding:1px;
-        margin:1px;
-        text-align: center;
-        font-size:18px;
-    }
-    #chooseicon ul li:hover{
-        border:1px solid #2c3e50;
-        cursor:pointer;
-    }
-</style>
-<script id="chooseicontpl" type="text/html">
-    <div id="chooseicon">
-        <div>
-            <form onsubmit="return false;">
-                <div class="input-group input-groupp-md">
-                    <div class="input-group-addon">搜索图标</div>
-                    <input class="js-icon-search form-control" type="text" placeholder="">
-                </div>
-            </form>
-        </div>
-        <div>
-            <ul class="list-inline">
-                <% for(var i=0; i<iconlist.length; i++){ %>
-                    <li data-font="<%=iconlist[i]%>" data-toggle="tooltip" title="<%=iconlist[i]%>">
-                    <i class="mdi mdi-<%=iconlist[i]%>"></i>
-                </li>
-                <% } %>
-            </ul>
-        </div>
-
-    </div>
-</script>
\ No newline at end of file
diff --git a/plugin/admin/app/view/dev/form.html b/plugin/admin/app/view/dev/form.html
index d7a2cbc..16985f0 100644
--- a/plugin/admin/app/view/dev/form.html
+++ b/plugin/admin/app/view/dev/form.html
@@ -40,12 +40,12 @@
                     <ul class="list-inline clearfix lyear-uploads-pic" data-template="preview" id="p-avatar">
                         <li nodelete class="col-xs-4 col-sm-3 col-md-2">
                             <a class="pic-add faupload" style="height: auto;border: 0;"
-                                permission="app.admin.upload.avatar" id="add-pic-btn" href="#!" title="点击上传"
+                                permission="app.admin.files.upload" id="add-pic-btn" href="#!" title="点击上传"
                                 data-input-id="c-avatar"
                                 data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp"
                                 data-multiple="false" data-preview-id="p-avatar"></a>
                             <a class="pic-add fachoose" style="height: auto;border: 0;"
-                                permission="app.admin.upload.attachment" id="choose-pic-btn" href="#!" title="选择文件"
+                                permission="app.admin.files.list" id="choose-pic-btn" href="#!" title="选择文件"
                                 data-input-id="c-avatar" data-mimetype="image/*" data-multiple="false"
                                 data-preview-id="p-avatar"></a>
                         </li>
diff --git a/plugin/admin/app/view/dev/index.html b/plugin/admin/app/view/dev/index.html
index 8e20926..e41b699 100644
--- a/plugin/admin/app/view/dev/index.html
+++ b/plugin/admin/app/view/dev/index.html
@@ -64,7 +64,7 @@
                 <label class="control-label col-xs-12 col-sm-2">favisible</label>
                 <div class="col-xs-12 col-sm-8 col-md-6">
                     <input type="text" name="favisible" id="favisible" value="{$row.favisible|null}"
-                        data-favisible="is_recharge_open=1"
+                        data-favisible="is_recharge_open==1"
                         data-target="form-group"
                         autocomplete="off" class="form-control">
                 </div>
diff --git a/plugin/admin/app/view/files/index.html b/plugin/admin/app/view/files/index.html
new file mode 100644
index 0000000..e8c331f
--- /dev/null
+++ b/plugin/admin/app/view/files/index.html
@@ -0,0 +1,19 @@
+{layout name="layout"}
+
+<div class="toolbar" class="toolbar-btn-action">
+    <a id="btn_add" class="btn btn-primary m-r-5 faupload">
+        <span class="mdi mdi-upload" aria-hidden="true"></span>上传
+    </a>
+    <a id="btn_delete" class="btn btn-danger btn-del btn-disabled disabled">
+        <span class="mdi mdi-window-close" aria-hidden="true"></span>删除
+    </a>
+</div>
+<!-- 数据表格 -->
+<div class="card">
+    <div class="card-body">
+        <!-- {1volist name="::::::Config('site.attachment_category')" id="cvo"}
+        <option value="{1$key}" {1if $row.category==$key}selected{1/if}>{1$cvo}</option>
+        {2volist1} -->
+        <table id="table"></table>
+    </div>
+</div>
\ No newline at end of file
diff --git a/plugin/admin/app/view/files/list.html b/plugin/admin/app/view/files/list.html
new file mode 100644
index 0000000..ab87424
--- /dev/null
+++ b/plugin/admin/app/view/files/list.html
@@ -0,0 +1,11 @@
+{layout name="layout"}
+<!-- 数据表格 -->
+<div class="card">
+    <div class="toolbar-btn-action layer-footer">
+        <button class="btn btn-primary m-r-5">确定</button>
+        <button class="btn btn-success m-r-5">关闭</button>
+    </div>
+    <div class="card-body">
+        <table id="table" ></table>
+    </div>
+</div>
\ No newline at end of file
diff --git a/plugin/admin/app/view/files/update.html b/plugin/admin/app/view/files/update.html
new file mode 100644
index 0000000..622a911
--- /dev/null
+++ b/plugin/admin/app/view/files/update.html
@@ -0,0 +1,86 @@
+{layout name="layout"}
+
+<div class="card">
+    <div class="card-body">
+        <form class="form-horizontal" action="__SELF__" method="post">
+            <input type="hidden" name="id" value="{$row.id|null}" />
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">类别</label>
+                <div class="col-xs-12 col-sm-8 col-md-6">
+                    <select name="category" class="form-control" value="{$row.category}">
+                        {volist name=":Config('site.attachment_category')" id="cvo"}
+                        <option value="{$key}" {if $row.category==$key}selected{/if}>{$cvo}</option>
+                        {/volist}
+                    </select>
+                </div>
+            </div>
+            {if request()->action == 'insert'}
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">文件</label>
+                <div class="col-xs-12 col-sm-8 col-md-6">
+                    {:buildFileInput('file',$row['file'],'image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp,text/plain',0,false)}
+                </div>
+            </div>
+            {else /}
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">名称</label>
+                <div class="col-xs-12 col-sm-8 col-md-6">
+                    <input class="form-control" value="{$row.title}" name="title" />
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">地址</label>
+                <div class="col-xs-12 col-sm-8 col-md-6">
+                    <input class="form-control" value="{$row.path}" name="path" readonly />
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">SHA</label>
+                <div class="col-xs-12 col-sm-8 col-md-6">
+                    <input class="form-control" value="{$row.sha1}" name="sha1" readonly />
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">文件大小</label>
+                <div class="col-xs-12 col-sm-8 col-md-6">
+                    <input class="form-control" value="{$row.size}" name="size" readonly />
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">Mime</label>
+                <div class="col-xs-12 col-sm-8 col-md-6">
+                    <input class="form-control" value="{$row.mime_type}" name="mime_type" readonly />
+                </div>
+            </div>
+            {if in_array('asd',['jpg','png','gif'])}
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">图片大小</label>
+                <div class="col-xs-12 col-sm-8 col-md-6">
+                    <input class="form-control" value="{$row.width}X{$row.height}" readonly />
+                </div>
+            </div>
+            {/if}
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">扩展名</label>
+                <div class="col-xs-12 col-sm-8 col-md-6">
+                    <input class="form-control" value="{$row.extension}" name="extension" readonly />
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">上传时间</label>
+                <div class="col-xs-12 col-sm-8 col-md-6">
+                    <input class="form-control" value="{$row.created_at}" name="created_at" readonly />
+                </div>
+            </div>
+            {/if}
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2"></label>
+                <div class="col-xs-12 col-sm-8 col-md-6 layer-footer">
+                    <button type="submit" class="btn btn-primary m-r-5">提交</button>
+                    <button type="reset" class="btn btn-md m-r-5">重置</button>
+                </div>
+            </div>
+        </form>
+    </div>
+</div>
+{include file="common/file_preview" id="preview"/}
\ No newline at end of file
diff --git a/plugin/admin/app/view/gift/index.html b/plugin/admin/app/view/gift/index.html
index 1dd11d0..0a0535f 100644
--- a/plugin/admin/app/view/gift/index.html
+++ b/plugin/admin/app/view/gift/index.html
@@ -1,6 +1,6 @@
 {layout name="layout"}
 <div class="toolbar" class="toolbar-btn-action">
-    <a id="btn_add" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-title="新增">
+    <a id="btn_add" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-title="新增" data-offset="r" data-area="80%,100%" data-anim="5" data-shade="0.3" data-move="false">
         <span class="mdi mdi-plus" aria-hidden="true"></span>新增
     </a>
     <a id="btn_edit" class="btn btn-success m-r-5 btn-disabled disabled btn-multi"  data-params="status=1">
diff --git a/plugin/admin/app/view/gift/update.html b/plugin/admin/app/view/gift/update.html
index a62e2ca..22eb469 100644
--- a/plugin/admin/app/view/gift/update.html
+++ b/plugin/admin/app/view/gift/update.html
@@ -16,7 +16,7 @@
                     <ul class="list-inline clearfix lyear-uploads-pic" data-template="preview" id="p-image">
                         <li nodelete class="col-xs-4 col-sm-3 col-md-2">
                             <a class="pic-add faupload" style="height: auto;border: 0;" permission="app.admin.upload.image" id="add-pic-btn" href="#!" title="点击上传" data-input-id="c-image" data-mimetype="image/*" data-multiple="false" data-preview-id="p-image"></a>
-                            <a class="pic-add fachoose" style="height: auto;border: 0;display: none;" permission="app.admin.upload.attachment" id="choose-pic-btn" href="#!" title="选择文件" data-input-id="c-image" data-mimetype="image/*" data-multiple="false" data-preview-id="p-image"></a>
+                            <a class="pic-add fachoose" style="height: auto;border: 0;display: none;" permission="app.admin.files.list" id="choose-pic-btn" href="#!" title="选择文件" data-input-id="c-image" data-mimetype="image/*" data-multiple="false" data-preview-id="p-image"></a>
                         </li>
                     </ul>
                 </div>
diff --git a/plugin/admin/app/view/index/dashboard.html b/plugin/admin/app/view/index/dashboard.html
index 81b0bc2..47ca251 100644
--- a/plugin/admin/app/view/index/dashboard.html
+++ b/plugin/admin/app/view/index/dashboard.html
@@ -93,7 +93,7 @@
                             <td>渠道商数</td>
                             <td>
                                 <?php
-                                    echo \app\model\User::where('group',1)->count('id');
+                                    echo \app\model\User::where('group_id',1)->count('id');
                                 ?>
                             </td>
                         </tr>
diff --git a/plugin/admin/app/view/product/index.html b/plugin/admin/app/view/product/index.html
index 1dd11d0..0a0535f 100644
--- a/plugin/admin/app/view/product/index.html
+++ b/plugin/admin/app/view/product/index.html
@@ -1,6 +1,6 @@
 {layout name="layout"}
 <div class="toolbar" class="toolbar-btn-action">
-    <a id="btn_add" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-title="新增">
+    <a id="btn_add" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-title="新增" data-offset="r" data-area="80%,100%" data-anim="5" data-shade="0.3" data-move="false">
         <span class="mdi mdi-plus" aria-hidden="true"></span>新增
     </a>
     <a id="btn_edit" class="btn btn-success m-r-5 btn-disabled disabled btn-multi"  data-params="status=1">
diff --git a/plugin/admin/app/view/product/update.html b/plugin/admin/app/view/product/update.html
index cb6a14e..b572382 100644
--- a/plugin/admin/app/view/product/update.html
+++ b/plugin/admin/app/view/product/update.html
@@ -16,7 +16,7 @@
                     <ul class="list-inline clearfix lyear-uploads-pic" data-template="preview" id="p-image">
                         <li nodelete class="col-xs-4 col-sm-3 col-md-2">
                             <a class="pic-add faupload" style="height: auto;border: 0;" permission="app.admin.upload.image" id="add-pic-btn" href="#!" title="点击上传" data-input-id="c-image" data-mimetype="image/*" data-multiple="false" data-preview-id="p-image"></a>
-                            <a class="pic-add fachoose" style="height: auto;border: 0;display: none;" permission="app.admin.upload.attachment" id="choose-pic-btn" href="#!" title="选择文件" data-input-id="c-image" data-mimetype="image/*" data-multiple="false" data-preview-id="p-image"></a>
+                            <a class="pic-add fachoose" style="height: auto;border: 0;display: none;" permission="app.admin.files.list" id="choose-pic-btn" href="#!" title="选择文件" data-input-id="c-image" data-mimetype="image/*" data-multiple="false" data-preview-id="p-image"></a>
                         </li>
                     </ul>
                 </div>
diff --git a/plugin/admin/app/view/questionnaire/index.html b/plugin/admin/app/view/questionnaire/index.html
index 1dd11d0..0a0535f 100644
--- a/plugin/admin/app/view/questionnaire/index.html
+++ b/plugin/admin/app/view/questionnaire/index.html
@@ -1,6 +1,6 @@
 {layout name="layout"}
 <div class="toolbar" class="toolbar-btn-action">
-    <a id="btn_add" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-title="新增">
+    <a id="btn_add" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-title="新增" data-offset="r" data-area="80%,100%" data-anim="5" data-shade="0.3" data-move="false">
         <span class="mdi mdi-plus" aria-hidden="true"></span>新增
     </a>
     <a id="btn_edit" class="btn btn-success m-r-5 btn-disabled disabled btn-multi"  data-params="status=1">
diff --git a/plugin/admin/app/view/recharge/index.html b/plugin/admin/app/view/recharge/index.html
index e903b83..1eb72a8 100644
--- a/plugin/admin/app/view/recharge/index.html
+++ b/plugin/admin/app/view/recharge/index.html
@@ -1,6 +1,6 @@
 {layout name="layout"}
 <div class="toolbar" class="toolbar-btn-action">
-    <a id="btn_add" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-title="新增">
+    <a id="btn_add" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-title="新增" data-offset="r" data-area="80%,100%" data-anim="5" data-shade="0.3" data-move="false">
         <span class="mdi mdi-plus" aria-hidden="true"></span>新增
     </a>
     <a id="btn_delete" class="btn btn-danger btn-del btn-disabled disabled">
diff --git a/plugin/admin/app/view/singlepage/index.html b/plugin/admin/app/view/singlepage/index.html
index 1dd11d0..0a0535f 100644
--- a/plugin/admin/app/view/singlepage/index.html
+++ b/plugin/admin/app/view/singlepage/index.html
@@ -1,6 +1,6 @@
 {layout name="layout"}
 <div class="toolbar" class="toolbar-btn-action">
-    <a id="btn_add" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-title="新增">
+    <a id="btn_add" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-title="新增" data-offset="r" data-area="80%,100%" data-anim="5" data-shade="0.3" data-move="false">
         <span class="mdi mdi-plus" aria-hidden="true"></span>新增
     </a>
     <a id="btn_edit" class="btn btn-success m-r-5 btn-disabled disabled btn-multi"  data-params="status=1">
diff --git a/plugin/admin/app/view/thali/index.html b/plugin/admin/app/view/thali/index.html
new file mode 100644
index 0000000..a7001ce
--- /dev/null
+++ b/plugin/admin/app/view/thali/index.html
@@ -0,0 +1,19 @@
+{layout name="layout"}
+<div class="card">
+    <div class="toolbar toolbar-btn-action">
+        <button id="btn_add" type="button" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-title="新增" permission="app.admin.role.insert" data-offset="r" data-area="80%,100%" data-anim="5" data-shade="0.3" data-move="false">
+            <span class="mdi mdi-plus" aria-hidden="true"></span>新增
+        </button>
+        <button id="btn_add" type="button" class="btn btn-info m-r-5" permission="app.admin.role.update">
+            <span class="mdi mdi-pencil" aria-hidden="true"></span>编辑
+        </button>
+        <button id="btn_delete" type="button" class="btn btn-danger btn-del" permission="app.admin.role.delete">
+            <span class="mdi mdi-window-close" aria-hidden="true"></span>删除
+        </button>
+    </div>
+    <div class="card-body">
+        <div class="table-responsive">
+            <table id="table"></table>
+        </div>
+    </div>
+</div>
diff --git a/plugin/admin/app/view/thali/update.html b/plugin/admin/app/view/thali/update.html
new file mode 100644
index 0000000..375d939
--- /dev/null
+++ b/plugin/admin/app/view/thali/update.html
@@ -0,0 +1,50 @@
+{layout name="layout"}
+<div class="card">
+    <div class="card-body">
+        <form class="form-horizontal" method="post" action="__SELF__" role="form">
+            <input type="hidden" name="id" value="{$row.id|null}" />
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">名称:</label>
+                <div class="col-xs-12 col-sm-8">
+                    <input id="c-title" class="form-control" name="title" type="text" value="{$row.title|null}">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">价格:</label>
+                <div class="col-xs-12 col-sm-8">
+                    <input id="c-price" class="form-control" step="0.01" name="price" type="number" value="{$row.price|default=0}">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">原价:</label>
+                <div class="col-xs-12 col-sm-8">
+                    <input id="c-org_price" class="form-control" step="0.01" name="org_price" type="number" value="{$row.org_price|default=0}">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">时间:</label>
+                <div class="col-xs-12 col-sm-8">
+                    <input id="c-duration" min="0" class="form-control" name="duration" type="number" value="{$row.duration|default=30}">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">标签:</label>
+                <div class="col-xs-12 col-sm-8">
+                    <input id="c-label" class="form-control" name="label" type="text" value="{$row.label|null}">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">状态:</label>
+                <div class="col-xs-12 col-sm-8">
+                    {html:radio options="$statusList" value="$row.status" name="status" /}
+                </div>
+            </div>
+            <div class="form-group">
+                <label for="extend" class="control-label col-xs-12 col-sm-2"></label>
+                <div class="col-xs-12 col-sm-8 col-md-6 layer-footer">
+                    <button type="submit" class="btn btn-primary m-r-5">确 定</button>
+                </div>
+            </div>
+        </form>
+    </div>
+</div>
\ No newline at end of file
diff --git a/plugin/admin/app/view/user/index.html b/plugin/admin/app/view/user/index.html
index 1dd11d0..0a0535f 100644
--- a/plugin/admin/app/view/user/index.html
+++ b/plugin/admin/app/view/user/index.html
@@ -1,6 +1,6 @@
 {layout name="layout"}
 <div class="toolbar" class="toolbar-btn-action">
-    <a id="btn_add" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-title="新增">
+    <a id="btn_add" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-title="新增" data-offset="r" data-area="80%,100%" data-anim="5" data-shade="0.3" data-move="false">
         <span class="mdi mdi-plus" aria-hidden="true"></span>新增
     </a>
     <a id="btn_edit" class="btn btn-success m-r-5 btn-disabled disabled btn-multi"  data-params="status=1">
diff --git a/plugin/admin/app/view/user/update.html b/plugin/admin/app/view/user/update.html
index 992c6f5..c938052 100644
--- a/plugin/admin/app/view/user/update.html
+++ b/plugin/admin/app/view/user/update.html
@@ -5,7 +5,7 @@
         <form class="form-horizontal" action="__SELF__" method="post">
             <input type="hidden" name="id" value="{$row.id|null}" />
             <div class="form-group">
-                <label for="type" class="control-label col-xs-12 col-sm-2">角色</label>
+                <label for="type" class="control-label col-xs-12 col-sm-2">角色{$row.role_id}</label>
                 <div class="col-xs-12 col-sm-8 col-md-6">
                     <select name="role_id" id="role_id" class="form-control">
                         {volist name="roleList" id="rvo"}
@@ -24,14 +24,18 @@
                     </select>
                 </div>
             </div>
-            {if Request()->action == 'update' && $row.group == 2}
-            <!-- <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">域名:</label>
+            <div class="form-group" data-favisible="role_id==2">
+                <label class="control-label col-xs-12 col-sm-2">VIP过期时间:</label>
                 <div class="col-xs-12 col-sm-8 col-md-6">
-                    <input type="text" name="domain" value="{$row.domain|null}" data-rule="required;length(4~20)" class="form-control" />
+                    <input type="text" name="expire_at" 
+                        value="{$row.expire_at|datetime}" 
+                        data-date-debug="true"
+                        data-date-sideBySide="true"
+                        data-date-collapse="false"
+                        data-date-format="YYYY-MM-DD HH:mm:ss"
+                        class="form-control datetimepicker" />
                 </div>
-            </div> -->
-            {/if}
+            </div>
             <!-- <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">等级</label>
                 <div class="col-xs-12 col-sm-8 col-md-6">
@@ -85,8 +89,8 @@
                     <input id="c-avatar" class="form-control" size="50" name="avatar" type="hidden" value="{$row.avatar|default='__IMG__/user/avatar.svg'}" data-tip="头像">
                     <ul class="list-inline clearfix lyear-uploads-pic" data-template="preview" id="p-avatar">
                         <li nodelete class="col-xs-4 col-sm-3 col-md-2">
-                            <a class="pic-add faupload" style="height: auto;border: 0;" permission="app.admin.upload.avatar" id="add-pic-btn" href="#!" title="点击上传" data-input-id="c-avatar" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="false" data-preview-id="p-avatar"></a>
-                            <a class="pic-add fachoose" style="height: auto;border: 0;" permission="app.admin.upload.attachment" id="choose-pic-btn" href="#!" title="选择文件" data-input-id="c-avatar" data-mimetype="image/*" data-multiple="false" data-preview-id="p-avatar"></a>
+                            <a class="pic-add faupload" style="height: auto;border: 0;" permission="app.admin.files.upload" id="add-pic-btn" href="#!" title="点击上传" data-input-id="c-avatar" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="false" data-preview-id="p-avatar"></a>
+                            <a class="pic-add fachoose" style="height: auto;border: 0;" permission="app.admin.files.list" id="choose-pic-btn" href="#!" title="选择文件" data-input-id="c-avatar" data-mimetype="image/*" data-multiple="false" data-preview-id="p-avatar"></a>
                         </li>
                     </ul>
                 </div>
@@ -125,95 +129,14 @@
                         autocomplete="off" class="form-control datetimepicker">
                 </div>
             </div>
-            
-            {if in_array('money',Config('site.allow_currencys'))}
+            {volist name=":Config('site.allow_currencys')" id="currency"}
             <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">{:__('money')}</label>
+                <label class="control-label col-xs-12 col-sm-2">{:__($currency)}</label>
                 <div class="col-xs-12 col-sm-8 col-md-6">
-                    <input type="text" name="money" value="{$row.money|formatAmount}" class="form-control" />
+                    <input type="text" name="{$currency}" value="{:formatAmount($row[$currency])}" class="form-control" />
                 </div>
             </div>
-            {/if}
-            {if in_array('score',Config('site.allow_currencys'))}
-            <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">{:__('score')}</label>
-                <div class="col-xs-12 col-sm-8 col-md-6">
-                    <input type="text" name="score" value="{$row.score|formatAmount}" class="form-control" />
-                </div>
-            </div>
-            {/if}
-            {if in_array('currency1',Config('site.allow_currencys'))}
-            <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">{:__('currency1')}</label>
-                <div class="col-xs-12 col-sm-8 col-md-6">
-                    <input type="text" name="currency1" value="{$row.currency1|formatAmount}" class="form-control" />
-                </div>
-            </div>
-            {/if}
-            {if in_array('currency2',Config('site.allow_currencys'))}
-            <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">{:__('currency2')}</label>
-                <div class="col-xs-12 col-sm-8 col-md-6">
-                    <input type="text" name="currency2" value="{$row.currency2|formatAmount}" class="form-control" />
-                </div>
-            </div>
-            {/if}
-            {if in_array('currency3',Config('site.allow_currencys'))}
-            <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">{:__('currency3')}</label>
-                <div class="col-xs-12 col-sm-8 col-md-6">
-                    <input type="text" name="currency3" value="{$row.currency3|formatAmount}" class="form-control" />
-                </div>
-            </div>
-            {/if}
-            {if in_array('currency4',Config('site.allow_currencys'))}
-            <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">{:__('currency4')}</label>
-                <div class="col-xs-12 col-sm-8 col-md-6">
-                    <input type="text" name="currency4" value="{$row.currency4|formatAmount}" class="form-control" />
-                </div>
-            </div>
-            {/if}
-            {if in_array('currency5',Config('site.allow_currencys'))}
-            <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">{:__('currency5')}</label>
-                <div class="col-xs-12 col-sm-8 col-md-6">
-                    <input type="text" name="currency5" value="{$row.currency5|formatAmount}" class="form-control" />
-                </div>
-            </div>
-            {/if}
-            {if in_array('currency6',Config('site.allow_currencys'))}
-            <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">{:__('currency6')}</label>
-                <div class="col-xs-12 col-sm-8 col-md-6">
-                    <input type="text" name="currency6" value="{$row.currency6|formatAmount}" class="form-control" />
-                </div>
-            </div>
-            {/if}
-            {if in_array('currency7',Config('site.allow_currencys'))}
-            <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">{:__('currency7')}</label>
-                <div class="col-xs-12 col-sm-8 col-md-6">
-                    <input type="text" name="currency7" value="{$row.currency7|formatAmount}" class="form-control" />
-                </div>
-            </div>
-            {/if}
-            {if in_array('currency8',Config('site.allow_currencys'))}
-            <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">{:__('currency8')}</label>
-                <div class="col-xs-12 col-sm-8 col-md-6">
-                    <input type="text" name="currency8" value="{$row.currency8|formatAmount}" class="form-control" />
-                </div>
-            </div>
-            {/if}
-            {if in_array('currency9',Config('site.allow_currencys'))}
-            <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">{:__('currency9')}</label>
-                <div class="col-xs-12 col-sm-8 col-md-6">
-                    <input type="text" name="currency9" value="{$row.currency9|formatAmount}" class="form-control" />
-                </div>
-            </div>
-            {/if}
+            {/volist}
             {if Request()->action =='update'}
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">推荐码</label>
@@ -241,7 +164,7 @@
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">注册时间</label>
                 <div class="col-xs-12 col-sm-8 col-md-6">
-                    <input type="text" name="join_time" id="join_time" value="{$row.join_time}" autocomplete="off" class="form-control" disabled>
+                    <input type="text" name="join_time" id="join_time" value="{$row.join_time|datetime}" autocomplete="off" class="form-control" disabled>
                 </div>
             </div>
 
diff --git a/plugin/admin/app/view/user_role/index.html b/plugin/admin/app/view/user_role/index.html
index 810b8fc..a7001ce 100644
--- a/plugin/admin/app/view/user_role/index.html
+++ b/plugin/admin/app/view/user_role/index.html
@@ -1,7 +1,7 @@
 {layout name="layout"}
 <div class="card">
     <div class="toolbar toolbar-btn-action">
-        <button id="btn_add" type="button" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-title="新增" permission="app.admin.role.insert">
+        <button id="btn_add" type="button" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-title="新增" permission="app.admin.role.insert" data-offset="r" data-area="80%,100%" data-anim="5" data-shade="0.3" data-move="false">
             <span class="mdi mdi-plus" aria-hidden="true"></span>新增
         </button>
         <button id="btn_add" type="button" class="btn btn-info m-r-5" permission="app.admin.role.update">
diff --git a/plugin/admin/app/view/user_role/update.html b/plugin/admin/app/view/user_role/update.html
index 4efb1bb..2fe1cc0 100644
--- a/plugin/admin/app/view/user_role/update.html
+++ b/plugin/admin/app/view/user_role/update.html
@@ -3,6 +3,7 @@
     <div class="card-body">
         <form class="form-horizontal" method="post" action="__SELF__" role="form">
             <input type="hidden" name="id" value="{$row.id|null}" />
+            <input type="hidden" name="rules" value="*"/>
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">父级:</label>
                 <div class="col-xs-12 col-sm-8 col-md-6">
@@ -21,41 +22,42 @@
                 </div>
             </div>
             <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">销售额要求:</label>
+                <label class="control-label col-xs-12 col-sm-2">最大消息数量:</label>
                 <div class="col-xs-12 col-sm-8 col-md-6">
-                    <div class="input-group">
-                        <input type="number" name="need_sales" value="{$row.need_sales|default=0}" class="form-control" min="0" data-rule="required;range(0~99999999)" />
-                        <div class="input-group-addon">￥</div>
-                    </div>
+                    <input type="number" name="max_send_msg_count" value="{$row.max_send_msg_count|default=10}" class="form-control" min="0" data-rule="required;range(0~99999999)" />
                 </div>
             </div>
             <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">消费奖励:</label>
+                <label class="control-label col-xs-12 col-sm-2">最大好友数量:</label>
                 <div class="col-xs-12 col-sm-8 col-md-6">
-                    <input type="text" name="consume_reward" value="{$row.consume_reward|null}" data-rule="required;length(3~6)" class="form-control" />
+                    <input type="text" name="max_friend_count" value="{$row.max_friend_count|default=10}" data-rule="required;length(3~6)" class="form-control" />
                 </div>
             </div>
             <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">产值奖:</label>
+                <label class="control-label col-xs-12 col-sm-2">最大加入的群组数量:</label>
                 <div class="col-xs-12 col-sm-8 col-md-6">
-                    <input type="text" name="income_reward" value="{$row.income_reward|null}" data-rule="required;length(3~6)" class="form-control" />
+                    <input type="text" name="max_group_join_count" value="{$row.max_group_join_count|default=10}" data-rule="required;length(3~6)" class="form-control" />
                 </div>
             </div>
             <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">提现奖励:</label>
+                <label class="control-label col-xs-12 col-sm-2">最大创建的群组数量:</label>
                 <div class="col-xs-12 col-sm-8 col-md-6">
-                    <input type="text" name="withdrawl_reward" value="{$row.withdrawl_reward|null}" data-rule="required;length(3~6)" class="form-control" />
+                    <input type="text" name="max_gourp_create_count" value="{$row.max_gourp_create_count|default=10}" data-rule="required;length(3~6)" class="form-control" />
                 </div>
             </div>
+            {php}
+            /*
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">权限:</label>
                 <div class="col-xs-12 col-sm-8 col-md-6">
                     <div class="table-responsive">
                         <div id="treeview"></div>
                     </div>
-                    <input type="hidden" name="rules" value="{$row.rules|null}" data-rule="required" class="form-control" />
+                    <input type="hidden" name="rules" value="{$row.rules|null}" data-rule="required" />
                 </div>
             </div>
+            */
+            {/php}
             <div class="form-group">
                 <label for="extend" class="control-label col-xs-12 col-sm-2"></label>
                 <div class="col-xs-12 col-sm-8 col-md-6 layer-footer">
diff --git a/plugin/admin/app/view/user_rule/index.html b/plugin/admin/app/view/user_rule/index.html
index 27e4b9f..f1b5140 100644
--- a/plugin/admin/app/view/user_rule/index.html
+++ b/plugin/admin/app/view/user_rule/index.html
@@ -1,8 +1,8 @@
 {layout name="layout"}
-<link href="/app/admin/libs/jquery-treegrid/jquery.treegrid.min.css" rel="stylesheet" />
+<link href="{:admin_path()}/libs/jquery-treegrid/jquery.treegrid.min.css" rel="stylesheet" />
 <div class="card">
     <div class="toolbar toolbar-btn-action">
-        <button id="btn_add" type="button" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-title="新增" permission="app.admin.rule.insert">
+        <button id="btn_add" type="button" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-title="新增" permission="app.admin.rule.insert" data-offset="r" data-area="80%,100%" data-anim="5" data-shade="0.3" data-move="false">
             <span class="mdi mdi-plus" aria-hidden="true"></span>新增
         </button>
         <button id="btn_delete" type="button" class="btn btn-danger m-r-5 btn-del" permission="app.admin.rule.delete">
diff --git a/plugin/admin/app/view/user_rule/update.html b/plugin/admin/app/view/user_rule/update.html
index 210a91c..a3508f6 100644
--- a/plugin/admin/app/view/user_rule/update.html
+++ b/plugin/admin/app/view/user_rule/update.html
@@ -46,7 +46,7 @@
                 <label class="control-label col-xs-12 col-sm-2">图标</label>
                 <div class="col-xs-12 col-sm-8 col-md-6">
                     <div class="input-group input-groupp-md">
-                        <span class="input-group-addon"><i class="{$row.icon|null}" id="icon-style"></i></span>
+                        <span class="input-group-addon"><i class="{$row.icon|null}" id="icon-style"></i>mdi mdi-</span>
                         <input type="text" class="form-control" id="icon" name="icon" value="{$row.icon|null}" />
                         <a href="javascript:;" class="btn-search-icon input-group-addon">搜索图标</a>
                     </div>
@@ -83,5 +83,4 @@
             </div>
         </form>
     </div>
-</div>
-{include file="common/chooseicontpl" /}
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/plugin/admin/app/view/version/index.html b/plugin/admin/app/view/version/index.html
new file mode 100644
index 0000000..bd23366
--- /dev/null
+++ b/plugin/admin/app/view/version/index.html
@@ -0,0 +1,15 @@
+{layout name="layout"}
+<div class="toolbar" class="toolbar-btn-action">
+    <a id="btn_add" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-offset="r" data-area="80%,100%" data-anim="5" data-shade="0.3" data-move="false" data-title="新增">
+        <span class="mdi mdi-plus" aria-hidden="true"></span>新增
+    </a>
+    <a id="btn_delete" class="btn btn-danger btn-del btn-disabled disabled">
+        <span class="mdi mdi-window-close" aria-hidden="true"></span>删除
+    </a>
+</div>
+<!-- 数据表格 -->
+<div class="card">
+    <div class="card-body">
+        <table id="table"></table>
+    </div>
+</div>
\ No newline at end of file
diff --git a/plugin/admin/app/view/version/update.html b/plugin/admin/app/view/version/update.html
new file mode 100644
index 0000000..7bcd7a7
--- /dev/null
+++ b/plugin/admin/app/view/version/update.html
@@ -0,0 +1,84 @@
+{layout name="layout"}
+<div class="card">
+    <div class="card-body">
+        <form class="form-horizontal" action="__SELF__" method="post">
+            <input type="hidden" name="id" value="{$row.id|null}" />
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">平台</label>
+                <div class="col-xs-12 col-sm-8 col-md-6">
+                    <select name="platform" id="platform" class="form-control">
+                        {volist name="osList" id="ovo"}
+                        <option value="{$key}" {if $row.type == $key}selected{/if}>{$ovo}</option>
+                        {/volist}
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">更新方式</label>
+                <div class="col-xs-12 col-sm-8 col-md-6">
+                    <select name="type" id="type" class="form-control">
+                        {volist name="typeList" id="tvo"}
+                        <option value="{$key}" {if $row.type == $key}selected{/if}>{$tvo}</option>
+                        {/volist}
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">强制更新</label>
+                <div class="col-xs-12 col-sm-8 col-md-6">
+                    <select name="force" id="force" class="form-control">
+                        {volist name="forceList" id="fvo"}
+                        <option value="{$key}" {if $row.type == $key}selected{/if}>{$fvo}</option>
+                        {/volist}
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">基座版本</label>
+                <div class="col-xs-12 col-sm-8 col-md-6">
+                    <input type="text" name="version" value="{$row.version|null}" autocomplete="off" data-rule="required" class="form-control">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">WGT版本</label>
+                <div class="col-xs-12 col-sm-8 col-md-6">
+                    <input type="text" name="version_wgt" value="{$row.version_wgt|null}" autocomplete="off" data-rule="required" class="form-control">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">更新资源</label>
+                <div class="col-xs-12 col-sm-8 col-md-6">
+                    <div class="form-inline">
+                        <input id="c-source" class="form-control" size="50" name="source" type="text" value="{$row.source|htmlentities}" data-tip="请上传资源">
+                        <span><button type="button" id="faupload-source" class="btn btn-danger faupload" data-input-id="c-source" data-multiple="false"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                        <span><button type="button" id="fachoose-source" class="btn btn-primary fachoose" data-input-id="c-source" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">更新内容</label>
+                <div class="col-xs-12 col-sm-8 col-md-6">
+                    <textarea name="content" class="form-control">{$row.content|null}</textarea>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">状态</label>
+                <div class="col-xs-12 col-sm-8 col-md-6">
+                    {volist name="statusList" id="rvo"}
+                    <label class="lyear-radio radio-primary radio-inline">
+                        <input type="radio" name="status" {if $row.status == $key} checked{/if} value="{$key}">
+                        <span>{$rvo}</span>
+                    </label>
+                    {/volist}
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2"></label>
+                <div class="col-xs-12 col-sm-8 col-md-6 layer-footer">
+                    <button type="submit" class="btn btn-primary m-r-5">提交</button>
+                    <button type="reset" class="btn btn-warning m-r-5">重置</button>
+                </div>
+            </div>
+        </form>
+    </div>
+</div>
\ No newline at end of file
diff --git a/plugin/admin/app/view/withdrawl/index.html b/plugin/admin/app/view/withdrawl/index.html
index 4ec6952..89b1002 100644
--- a/plugin/admin/app/view/withdrawl/index.html
+++ b/plugin/admin/app/view/withdrawl/index.html
@@ -1,6 +1,6 @@
 {layout name="layout"}
 <div class="toolbar" class="toolbar-btn-action">
-    <a id="btn_add" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-title="新增">
+    <a id="btn_add" class="btn btn-primary m-r-5 btn-add" data-url="{:url('insert')}" data-title="新增" data-offset="r" data-area="80%,100%" data-anim="5" data-shade="0.3" data-move="false">
         <span class="mdi mdi-plus" aria-hidden="true"></span>新增
     </a>
     <a id="btn_edit" class="btn btn-success m-r-5 btn-disabled disabled btn-multi"  data-params="status=1">
diff --git a/plugin/admin/app/view/workrecord/update.html b/plugin/admin/app/view/workrecord/update.html
index d0b7593..5647a8a 100644
--- a/plugin/admin/app/view/workrecord/update.html
+++ b/plugin/admin/app/view/workrecord/update.html
@@ -71,8 +71,8 @@
                     <input id="c-avatar" class="form-control" size="50" name="avatar" type="hidden" value="{$row.avatar|default='__IMG__/user/avatar.svg'}" data-tip="头像">
                     <ul class="list-inline clearfix lyear-uploads-pic" data-template="preview" id="p-avatar">
                         <li nodelete class="col-xs-4 col-sm-3 col-md-2">
-                            <a class="pic-add faupload" style="height: auto;border: 0;" permission="app.admin.upload.avatar" id="add-pic-btn" href="#!" title="点击上传" data-input-id="c-avatar" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="false" data-preview-id="p-avatar"></a>
-                            <a class="pic-add fachoose" style="height: auto;border: 0;" permission="app.admin.upload.attachment" id="choose-pic-btn" href="#!" title="选择文件" data-input-id="c-avatar" data-mimetype="image/*" data-multiple="false" data-preview-id="p-avatar"></a>
+                            <a class="pic-add faupload" style="height: auto;border: 0;" permission="app.admin.files.upload" id="add-pic-btn" href="#!" title="点击上传" data-input-id="c-avatar" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="false" data-preview-id="p-avatar"></a>
+                            <a class="pic-add fachoose" style="height: auto;border: 0;" permission="app.admin.files.list" id="choose-pic-btn" href="#!" title="选择文件" data-input-id="c-avatar" data-mimetype="image/*" data-multiple="false" data-preview-id="p-avatar"></a>
                         </li>
                     </ul>
                 </div>
diff --git a/plugin/admin/config/menu.php b/plugin/admin/config/menu.php
index 67cfdab..c0dd910 100644
--- a/plugin/admin/config/menu.php
+++ b/plugin/admin/config/menu.php
@@ -47,7 +47,7 @@
         'pid' => 9,
         'created_at' => '2024-09-08 22:04:42',
         'updated_at' => '2024-09-13 17:10:45',
-        'href' => '/attachment/index',
+        'href' => '/files/index',
         'type' => 1,
         'extend' => NULL,
         'weight' => 700,
diff --git a/plugin/admin/config/route.php b/plugin/admin/config/route.php
index bf3a9ff..a87e784 100644
--- a/plugin/admin/config/route.php
+++ b/plugin/admin/config/route.php
@@ -16,7 +16,7 @@ use plugin\admin\app\controller\AccountController;
 use Webman\Route;
 use support\Request;
 
-Route::any('/app/admin/account/captcha/{type}', [AccountController::class, 'captcha']);
+Route::any(admin_path().'/account/captcha/{type}', [AccountController::class, 'captcha']);
 
 Route::fallback(function (Request $request) {
     return view('common/404');
diff --git a/plugin/admin/public/css/style.min.css b/plugin/admin/public/css/style.min.css
index 2f2e256..bccb70c 100644
--- a/plugin/admin/public/css/style.min.css
+++ b/plugin/admin/public/css/style.min.css
@@ -8084,4 +8084,24 @@ div.sp_result_area div.sp_pagination > ul > li.pageInfoBox > a:hover {
 }
 .img-sm{
     width: 64px;
+}
+/*chooseicon*/
+#chooseicon {
+    margin:10px;
+}
+#chooseicon ul {
+    margin:5px 0 0 0;
+}
+#chooseicon ul li{
+    width:41px;height:42px;
+    line-height:42px;
+    border:1px solid #efefef;
+    padding:1px;
+    margin:1px;
+    text-align: center;
+    font-size:18px;
+}
+#chooseicon ul li:hover{
+    border:1px solid #2c3e50;
+    cursor:pointer;
 }
\ No newline at end of file
diff --git a/plugin/admin/public/js/address.js b/plugin/admin/public/js/address.js
index 6726071..9919638 100644
--- a/plugin/admin/public/js/address.js
+++ b/plugin/admin/public/js/address.js
@@ -18,12 +18,12 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             
             Table.api.init({
                 extend: {
-                    index_url: '/app/admin/address/select',
-                    add_url: '/app/admin/address/insert',
-                    edit_url: '/app/admin/address/update',
-                    del_url: '/app/admin/address/delete',
-                    multi_url: '/app/admin/address/multi',
-                    //dragsort_url: '/app/admin/address/weigh',
+                    index_url: 'address/select',
+                    add_url: 'address/insert',
+                    edit_url: 'address/update',
+                    del_url: 'address/delete',
+                    multi_url: 'address/multi',
+                    //dragsort_url: 'address/weigh',
                     table: 'address',
                 }
             });
diff --git a/plugin/admin/public/js/admin.js b/plugin/admin/public/js/admin.js
index 677d392..4826663 100644
--- a/plugin/admin/public/js/admin.js
+++ b/plugin/admin/public/js/admin.js
@@ -5,12 +5,12 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             
             Table.api.init({
                 extend: {
-                    index_url: '/app/admin/admin/select',
-                    add_url: '/app/admin/admin/insert',
-                    edit_url: '/app/admin/admin/update',
-                    del_url: '/app/admin/admin/delete',
-                    multi_url: '/app/admin/admin/multi',
-                    dragsort_url: '/app/admin/admin/weigh',
+                    index_url: 'admin/select',
+                    add_url: 'admin/insert',
+                    edit_url: 'admin/update',
+                    del_url: 'admin/delete',
+                    multi_url: 'admin/multi',
+                    dragsort_url: 'admin/weigh',
                     table: 'admin',
                 }
             });
@@ -79,20 +79,20 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             Table.api.bindevent(table);
         },
         update:function(){
-            Config['uploadurl'] = '/app/admin/attachment/avatar';
+            Config['upload_url'] = 'files/avatar';
             var form = $('form');
             Form.api.bindevent(form)
             this.getRole();
         },
         insert:function(){
-            Config['uploadurl'] = '/app/admin/attachment/avatar';
+            Config['upload_url'] = 'files/avatar';
             var form = $('form');
             Form.api.bindevent(form)
             this.getRole();
         },
         getRole:function(){
             Fast.api.ajax({
-                url: "/app/admin/adminrole/select?format=select",
+                url: "adminrole/select?format=select",
                 dataType: "json",
                 success: function (res) {
                     var html = "";
diff --git a/plugin/admin/public/js/adminrole.js b/plugin/admin/public/js/adminrole.js
index 21b4d30..af5f2e0 100644
--- a/plugin/admin/public/js/adminrole.js
+++ b/plugin/admin/public/js/adminrole.js
@@ -4,12 +4,12 @@ define(['table', 'form', 'yntree'], function (Table, Form, YnTree1) {
         index: function () {
             Table.api.init({
                 extend: {
-                    index_url: '/app/admin/adminrole/select',
-                    add_url: '/app/admin/adminrole/insert',
-                    edit_url: '/app/admin/adminrole/update',
-                    del_url: '/app/admin/adminrole/delete',
-                    multi_url: '/app/admin/adminrole/multi',
-                    dragsort_url: '/app/admin/adminrole/weigh',
+                    index_url: 'adminrole/select',
+                    add_url: 'adminrole/insert',
+                    edit_url: 'adminrole/update',
+                    del_url: 'adminrole/delete',
+                    multi_url: 'adminrole/multi',
+                    dragsort_url: 'adminrole/weigh',
                     table: 'adminrole',
                 }
             });
@@ -136,7 +136,7 @@ define(['table', 'form', 'yntree'], function (Table, Form, YnTree1) {
                 var pid = $(this).data("pid");
                 var id = $('[name=id]').val();
                 $.ajax({
-                    url: "/app/admin/adminrole/tree?",
+                    url: 'adminrole/tree?',
                     type: 'post',
                     dataType: 'json',
                     data: { id: id, pid: $(this).val() },
diff --git a/plugin/admin/public/js/adminrule.js b/plugin/admin/public/js/adminrule.js
index 0f7ff04..f72fca2 100644
--- a/plugin/admin/public/js/adminrule.js
+++ b/plugin/admin/public/js/adminrule.js
@@ -1,4 +1,4 @@
-define(['table', 'upload','form','template','treegrid','bootstrap-table-treegrid'], function (Table,Upload,Form,Template) {
+define(['table', 'form','../libs/iconselect','treegrid','bootstrap-table-treegrid'], function (Table,Form,IconSelector) {
     var AdminRule = {
         //Do setup work hereAction
         index: function () {
@@ -9,12 +9,12 @@ define(['table', 'upload','form','template','treegrid','bootstrap-table-treegrid
             var apiResults_type = ["目录","菜单","权限"];
             Table.api.init({
                 extend: {
-                    index_url: '/app/admin/AdminRule/select',
-                    add_url: '/app/admin/AdminRule/insert',
-                    edit_url: '/app/admin/AdminRule/update',
-                    del_url: '/app/admin/AdminRule/delete',
-                    multi_url: '/app/admin/AdminRule/multi',
-                    dragsort_url: '/app/admin/AdminRule/weigh',
+                    index_url: 'AdminRule/select',
+                    add_url: 'AdminRule/insert',
+                    edit_url: 'AdminRule/update',
+                    del_url: 'AdminRule/delete',
+                    multi_url: 'AdminRule/multi',
+                    dragsort_url: 'AdminRule/weigh',
                     table: 'AdminRule',
                 }
             });
@@ -191,56 +191,10 @@ define(['table', 'upload','form','template','treegrid','bootstrap-table-treegrid
             this.bindevent();
         },
         bindevent:function(){
-            Config['uploadurl'] = '/app/admin/attachment/avatar';
+            Config['upload_url'] = '/files/avatar';
             var form = $('form');
             Form.api.bindevent(form)
-            this.initIcoselect();
-        },
-        initIcoselect:function(){
-            
-            var iconlist = [];
-            var iconfunc = function () {
-                Layer.open({
-                    type: 1,
-                    area: ['99%', '98%'], //宽高
-                    content: Template('chooseicontpl', {iconlist: iconlist})
-                });
-            };
-            
-            $(document).on('change keyup', "#icon", function () {
-                $(this).prev().find("i").prop("class", $(this).val());
-            });
-            $(document).on('click', ".btn-search-icon", function () {
-                if (iconlist.length == 0) {
-                    $.get(Config.cdnurl + "/app/admin/css/materialdesignicons.min.css", function (ret) {
-                        window.iconret = ret;
-                        // var exp = /\.mdi-(.*):before/ig;
-                        // var result;
-                        // while ((result = exp.exec(ret)) != null) {
-                        //     iconlist.push(result[1]);
-                        // }
-                        var list = Array.from(iconret.matchAll(/mdi-(.*?)::before/g));
-                        for (let index = 1; index < list.length; index++) {
-                            //const element = list[index];
-                            iconlist.push(list[index][1]);
-                            
-                        }
-                        iconfunc();
-                    });
-                } else {
-                    iconfunc();
-                }
-            });
-            $(document).on('click', '#chooseicon ul li', function () {
-                $("input#icon").val('mdi mdi-' + $(this).data("font")).trigger("change");
-                Layer.closeAll();
-            });
-            $(document).on('keyup', 'input.js-icon-search', function () {
-                $("#chooseicon ul li").show();
-                if ($(this).val() != '') {
-                    $("#chooseicon ul li:not([data-font*='" + $(this).val() + "'])").hide();
-                }
-            });
+            IconSelector.bind($(".btn-search-icon"),$("input#icon"));
         }
     };
     return AdminRule
diff --git a/plugin/admin/public/js/article.js b/plugin/admin/public/js/article.js
index ff225ef..de57441 100644
--- a/plugin/admin/public/js/article.js
+++ b/plugin/admin/public/js/article.js
@@ -6,12 +6,12 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             
             Table.api.init({
                 extend: {
-                    index_url: '/app/admin/article/select',
-                    add_url: '/app/admin/article/insert',
-                    edit_url: '/app/admin/article/update',
-                    del_url: '/app/admin/article/delete',
-                    multi_url: '/app/admin/article/multi',
-                    dragsort_url: '/app/admin/article/weigh',
+                    index_url: 'article/select',
+                    add_url: 'article/insert',
+                    edit_url: 'article/update',
+                    del_url: 'article/delete',
+                    multi_url: 'article/multi',
+                    dragsort_url: 'article/weigh',
                     table: 'archives',
                 }
             });
@@ -83,7 +83,7 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             this.bindevent();
         },
         bindevent:function(){
-            Config['uploadurl'] = '/app/admin/attachment/upload';
+            Config['upload_url'] = 'files/upload';
             var form = $('form');
             Form.api.bindevent(form)
         }
diff --git a/plugin/admin/public/js/authaddress.js b/plugin/admin/public/js/authaddress.js
index 0629aee..623f436 100644
--- a/plugin/admin/public/js/authaddress.js
+++ b/plugin/admin/public/js/authaddress.js
@@ -18,12 +18,12 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             
             Table.api.init({
                 extend: {
-                    index_url: '/app/admin/authaddress/select',
-                    add_url: '/app/admin/authaddress/insert',
-                    edit_url: '/app/admin/authaddress/update',
-                    del_url: '/app/admin/authaddress/delete',
-                    multi_url: '/app/admin/authaddress/multi',
-                    //dragsort_url: '/app/admin/authaddress/weigh',
+                    index_url: 'authaddress/select',
+                    add_url: 'authaddress/insert',
+                    edit_url: 'authaddress/update',
+                    del_url: 'authaddress/delete',
+                    multi_url: 'authaddress/multi',
+                    //dragsort_url: 'authaddress/weigh',
                     table: 'auth_address',
                 }
             });
diff --git a/plugin/admin/public/js/balancelog.js b/plugin/admin/public/js/balancelog.js
index e93feea..b2a6dc1 100644
--- a/plugin/admin/public/js/balancelog.js
+++ b/plugin/admin/public/js/balancelog.js
@@ -5,9 +5,9 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             window.filterData['currency'] = {value1:"money",symbol:'=','value2':''};
             Table.api.init({
                 extend: {
-                    index_url: '/app/admin/balancelog/select',
-                    del_url: '/app/admin/balancelog/delete?currency=money',
-                    multi_url: '/app/admin/balancelog/multi',
+                    index_url: 'balancelog/select',
+                    del_url: 'balancelog/delete?currency=money',
+                    multi_url: 'balancelog/multi',
                     table: 'balancelog',
                 }
             });
@@ -110,7 +110,7 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
                 var currency = $(this).data('currency');
                 $('#filter_currency li').removeClass('active');
                 $(this).addClass('active');
-                $.fn.bootstrapTable.defaults.extend.del_url = '/app/admin/balancelog/delete?currency='+currency
+                $.fn.bootstrapTable.defaults.extend.del_url = 'balancelog/delete?currency='+currency
                 window.filterData['currency']['value1'] = currency;
                 table.bootstrapTable('selectPage', 1);
             });
diff --git a/plugin/admin/public/js/card.js b/plugin/admin/public/js/card.js
index c2ec5b5..22644dd 100644
--- a/plugin/admin/public/js/card.js
+++ b/plugin/admin/public/js/card.js
@@ -4,12 +4,12 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
         index: function () {
             Table.api.init({
                 extend: {
-                    index_url: '/app/admin/card/select',
-                    add_url: '/app/admin/card/insert',
-                    edit_url: '/app/admin/card/update',
-                    del_url: '/app/admin/card/delete',
-                    multi_url: '/app/admin/card/multi',
-                    dragsort_url: '/app/admin/card/weigh',
+                    index_url: 'card/select',
+                    add_url: 'card/insert',
+                    edit_url: 'card/update',
+                    del_url: 'card/delete',
+                    multi_url: 'card/multi',
+                    dragsort_url: 'card/weigh',
                     table: 'card',
                 }
             });
@@ -72,7 +72,7 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
                             formatter:Table.api.formatter.operate,
                             table: table, events: Table.api.events.operate, 
                             // formatter: function(v,row,index){
-                            //     return '<a href="/app/admin/card/export" class="btn btn-warning btn-xs">导出</a>&nbsp;'+Table.api.formatter.operate.call(this,v,row,index)
+                            //     return '<a href="'+'card/export" class="btn btn-warning btn-xs">导出</a>&nbsp;'+Table.api.formatter.operate.call(this,v,row,index)
                             // },
                             buttons:[
                                 {
@@ -80,14 +80,14 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
                                     text: '详情',
                                     icon: 'fa fa-list',
                                     classname: 'btn btn-info btn-xs btn-dialog',
-                                    url: '/app/admin/card/detail'
+                                    url: 'card/detail'
                                 },
                                 {
                                     name: 'export',
                                     text: '导出',
                                     icon: 'fa fa-list',
                                     classname: 'btn btn-warning btn-xs',
-                                    url: '/app/admin/card/export',
+                                    url: 'card/export',
                                     extend:' target="_blank"'
                                 }
                             ]
@@ -111,9 +111,9 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
         detail: function () {
             Table.api.init({
                 extend: {
-                    index_url: '/app/admin/cdkey/select',
-                    del_url: '/app/admin/cdkey/delete',
-                    multi_url: '/app/admin/cdkey/multi',
+                    index_url: 'cdkey/select',
+                    del_url: 'cdkey/delete',
+                    multi_url: 'cdkey/multi',
                     table: 'cdkey',
                 }
             });
diff --git a/plugin/admin/public/js/category.js b/plugin/admin/public/js/category.js
index 4b3397e..de4f76e 100644
--- a/plugin/admin/public/js/category.js
+++ b/plugin/admin/public/js/category.js
@@ -5,12 +5,12 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             
             Table.api.init({
                 extend: {
-                    index_url: '/app/admin/category/select',
-                    add_url: '/app/admin/category/insert',
-                    edit_url: '/app/admin/category/update',
-                    del_url: '/app/admin/category/delete',
-                    multi_url: '/app/admin/category/multi',
-                    dragsort_url: '/app/admin/category/weigh',
+                    index_url: 'category/select',
+                    add_url: 'category/insert',
+                    edit_url: 'category/update',
+                    del_url: 'category/delete',
+                    multi_url: 'category/multi',
+                    dragsort_url: 'category/weigh',
                     table: 'category',
                 }
             });
@@ -73,12 +73,12 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             Table.api.bindevent(table);
         },
         update:function(){
-            Config['uploadurl'] = '/app/admin/attachment/avatar';
+            Config['upload_url'] = '/files/avatar';
             var form = $('form');
             Form.api.bindevent(form)
         },
         insert:function(){
-            Config['uploadurl'] = '/app/admin/attachment/avatar';
+            Config['upload_url'] = '/files/avatar';
             var form = $('form');
             Form.api.bindevent(form)
         }
diff --git a/plugin/admin/public/js/config.js b/plugin/admin/public/js/config.js
index a6a38bc..1dda8be 100644
--- a/plugin/admin/public/js/config.js
+++ b/plugin/admin/public/js/config.js
@@ -9,7 +9,7 @@ define(['form'], function (Form) {
                 return false;
             })
             var form = $('#settingsform');
-            Config['uploadurl'] = '/app/admin/attachment/upload';
+            Config['upload_url'] = 'attach/upload';
             Form.api.bindevent(form,function(res){
                 if (res.code) {
                     return lightyear.notify(res.msg, 'danger', 3000, 'mdi mdi-emoticon-happy', 'top', 'center');
@@ -70,7 +70,7 @@ define(['form'], function (Form) {
                     data[$(this).attr('name')]=$(this).val();
                 });
                 Fast.api.ajax({
-                    'url':'/app/admin/config/testmail',
+                    'url':'config/testmail',
                     'data':data,
                     success:function(res){
                         Fast.api.success("操作成功");
diff --git a/plugin/admin/public/js/default.js b/plugin/admin/public/js/default.js
index ac94daf..ff4d4ca 100644
--- a/plugin/admin/public/js/default.js
+++ b/plugin/admin/public/js/default.js
@@ -2,7 +2,7 @@
 requirejs.config({
     //urlArgs: "v=" + (new Date()).getTime(),
     urlArgs: "v=" + (location.host == 'q.sjqqzc.top' ? (new Date()).getTime() : require.s.contexts._.config.config.version),
-    baseUrl: require.s.contexts._.config.config.cdnurl+'/app/admin/js/',
+    baseUrl: require.s.contexts._.config.config.cdnurl+require.s.contexts._.config.'js/',
     packages: [{
         name: 'moment',
         location: '../libs/moment',
@@ -48,7 +48,7 @@ requirejs.config({
     },
     map: {
         '*': {
-          'css': '/app/admin/libs/require-css.min.js' // or whatever the path to require-css is
+          'css': require.s.contexts._.config.'libs/require-css.min.js' // or whatever the path to require-css is
         }
     },
     shim: {
@@ -58,7 +58,7 @@ requirejs.config({
         'tagsinput': {
             deps: [
                 'jquery',
-                'css!/app/admin/libs/jquery-tags-input/jquery.tagsinput.min.css'
+                'css!'+require.s.contexts._.config.'libs/jquery-tags-input/jquery.tagsinput.min.css'
             ]
         },
         'yntree': {
@@ -68,7 +68,7 @@ requirejs.config({
         },
         'bootstrap-select': {
             deps: [
-                'css!/app/admin/libs/bootstrap-select/dist/css/bootstrap-select.min.css'
+                'css!'+require.s.contexts._.config.'libs/bootstrap-select/dist/css/bootstrap-select.min.css'
             ]
         },
         'bootstrap-select-lang': ['bootstrap-select'],
@@ -131,7 +131,7 @@ requirejs.config({
         'bootstrap-datetimepicker':{
             deps: [
                 'jquery',
-                'css!/app/admin/libs/bootstrap-datetimepicker/style.css'
+                'css!'+require.s.contexts._.config.'libs/bootstrap-datetimepicker/style.css'
             ]
         }
     },
diff --git a/plugin/admin/public/js/files.js b/plugin/admin/public/js/files.js
new file mode 100644
index 0000000..75d8c84
--- /dev/null
+++ b/plugin/admin/public/js/files.js
@@ -0,0 +1,256 @@
+define(['table', 'upload','form'], function (Table,Upload,Form) {
+    var User = {
+        //Do setup work hereAction
+        index: function () {
+            
+            Table.api.init({
+                extend: {
+                    index_url: 'files/select',
+                    add_url: 'files/insert',
+                    edit_url: 'files/update',
+                    del_url: 'files/delete',
+                    multi_url: 'files/multi',
+                    dragsort_url: 'files/weigh',
+                    table: 'upload',
+                }
+            });
+
+            var table = $("#table");
+            var tableOptions = {
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                commonSearch: false,
+                search: false,
+                showExport: false,
+                columns: [
+                    [
+                        {checkbox: true},
+                        {
+                            field: 'id',
+                            title: 'ID',
+                            sortable: true    // 是否排序
+                        },
+                        {
+                            title: "名字",
+                            field: "title",
+                            filter: "string",
+                        },
+                        {
+                            title: "文件",
+                            field: "path",
+                            formatter: function (v,d) {
+                                if (["jpg", "jpeg", "png", "gif", "bmp", "webp", "svg"].indexOf(d.extension.toLowerCase()) !== -1) {
+                                    return '<img src="' + Fast.api.cdnurl(v) + '" style="max-width:32px;max-height:32px;" />';
+                                }
+                                return '<a href="' + encodeURI(v) + '" target="_blank">' + escape(v) + '</a>';
+                            }
+                        },
+                        {
+                            title: "管理员id",
+                            field: "admin_id",
+                            visible: false,
+                        },
+                        {
+                            title: "用户id",
+                            field: "user_id",
+                            visible: false,
+                        },
+                        {
+                            title: "文件大小",
+                            field: "size",
+                            formatter: function (v,d) {
+                                return User.formatSize(d.size);
+                            }
+                        },
+                        {
+                            title: "类型",
+                            field: "mime_type",
+                            visible: false,
+                        },
+                        {
+                            title: "图片宽度",
+                            field: "width",
+                        },
+                        {
+                            title: "图片高度",
+                            field: "height",
+                        },{
+                            title: "扩展名",
+                            field: "extension",
+                        },
+                        {
+                            title: "上传时间",
+                            field: "created_at",
+                            visible: false,
+                        },
+                        {
+                            title: "引用次数",
+                            field: "use_count"
+                        },
+                        {
+                            title: "更新时间",
+                            field: "updated_at",
+                            hide: true,
+                        },
+                        {field: 'operate', title: '操作', table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                    ]
+                ]
+            };
+            // 初始化表格
+            table.bootstrapTable(tableOptions);
+            // 为表格绑定事件
+            Table.api.bindevent(table);
+            //上传
+            Config['upload_url'] = 'files/insert';
+            Upload.api.upload($(".plupload,.faupload"),function(){
+                table.bootstrapTable('refresh');
+                Fast.api.success('上传成功');
+            },function(){
+                console.log(this,arguments);
+                
+            },function(){
+                console.log(this,arguments);
+                
+            });
+        },
+        // 格式化文件大小
+        formatSize : function(value) {
+            if(null == value || "" === value){
+                return "0 Bytes";
+            }
+            let unitArr = ["Bytes","KB","MB","GB","TB","PB","EB","ZB","YB"];
+            let index = 0;
+            let srcSize = parseFloat(value);
+            index = Math.floor(Math.log(srcSize) / Math.log(1024));
+            let size =srcSize / Math.pow(1024, index);
+            size = size.toFixed(2);
+            return size + unitArr[index];
+        },
+        update:function(){
+            this.bindevent();
+        },
+        insert:function(){
+            this.bindevent();
+        },
+        bindevent:function(){
+            Config['upload_url'] = 'files/file';
+            var form = $('form');
+            Form.api.bindevent(form);
+        },
+        list:function(){
+            Table.api.init({
+                extend: {
+                    index_url: 'files/select',
+                    add_url: 'files/insert',
+                    edit_url: 'files/update',
+                    del_url: 'files/delete',
+                    multi_url: 'files/multi',
+                    dragsort_url: 'files/weigh',
+                    table: 'upload',
+                }
+            });
+
+            // 选择行
+            let select = function (obj) {
+                let index = parent.layer.getFrameIndex(window.name);
+                let callback = parent.layui.$("#layui-layer" + index).data("callback");
+                callback(obj.data);
+                parent.layer.close(index);
+            };
+            var table = $("#table");
+            var tableOptions = {
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                pagination: true,
+                commonSearch: false,
+                search: false,
+                showExport: false,
+                totalField: "count",
+                columns: [
+                    [
+                        {checkbox: true},
+                        {
+                            field: 'id',
+                            title: 'ID',
+                            filter: "number",
+                            sortable: true    // 是否排序
+                        },
+                        {
+                            title: "名字",
+                            field: "title",
+                            filter: "string",
+                        },
+                        {
+                            title: "文件",
+                            field: "path",
+                            filter: "string",
+                            formatter: function (v,d) {
+                                if (["jpg", "jpeg", "png", "gif", "bmp", "webp", "svg"].indexOf(d.extension.toLowerCase()) !== -1) {
+                                    return '<img src="' + Fast.api.cdnurl(v) + '" style="max-width:32px;max-height:32px;" />';
+                                }
+                                return '<a href="' + encodeURI(v) + '" target="_blank">' + escape(v) + '</a>';
+                            }
+                        },
+                        {
+                            title: "管理员id",
+                            field: "admin_id",
+                            visible: false,
+                        },
+                        {
+                            title: "用户id",
+                            field: "user_id",
+                            visible: false,
+                        },
+                        {
+                            title: "文件大小",
+                            field: "size",
+                            formatter: function (v,d) {
+                                return User.formatSize(d.size);
+                            }
+                        },
+                        {
+                            title: "mime类型",
+                            field: "mime_type",
+                            hide: true,
+                        },
+                        {
+                            title: "图片宽度",
+                            field: "width",
+                            visible: false,
+                        },
+                        {
+                            title: "图片高度",
+                            field: "height",
+                            visible: false,
+                        },{
+                            title: "扩展名",
+                            field: "extension",
+                        },
+                        {
+                            title: "上传时间",
+                            field: "created_at",
+                            visible: false,
+                        },
+                        {
+                            title: "引用次数",
+                            field: "use_count"
+                        },
+                        {
+                            title: "更新时间",
+                            field: "updated_at",
+                            hide: true,
+                        },
+                        {field: 'operate', title: '操作', table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                    ]
+                ]
+            };
+            // 初始化表格
+            table.bootstrapTable(tableOptions);
+            // 为表格绑定事件
+            Table.api.bindevent(table);
+        }
+    };
+    return User
+});
\ No newline at end of file
diff --git a/plugin/admin/public/js/gift.js b/plugin/admin/public/js/gift.js
index 3a46a0f..03cb053 100644
--- a/plugin/admin/public/js/gift.js
+++ b/plugin/admin/public/js/gift.js
@@ -6,12 +6,12 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             
             Table.api.init({
                 extend: {
-                    index_url: '/app/admin/gift/select',
-                    add_url: '/app/admin/gift/insert',
-                    edit_url: '/app/admin/gift/update',
-                    del_url: '/app/admin/gift/delete',
-                    multi_url: '/app/admin/gift/multi',
-                    //dragsort_url: '/app/admin/gift/weigh',
+                    index_url: 'gift/select',
+                    add_url: 'gift/insert',
+                    edit_url: 'gift/update',
+                    del_url: 'gift/delete',
+                    multi_url: 'gift/multi',
+                    //dragsort_url: 'gift/weigh',
                     table: 'gift',
                 }
             });
@@ -94,7 +94,7 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             this.bindevent();
         },
         bindevent:function(){
-            Config['uploadurl'] = '/app/admin/attachment/upload';
+            Config['upload_url'] = 'files/upload';
             var form = $('form');
             var that = this;
             Form.api.bindevent(form)
diff --git a/plugin/admin/public/js/giftorder.js b/plugin/admin/public/js/giftorder.js
index b2831d1..5cdb718 100644
--- a/plugin/admin/public/js/giftorder.js
+++ b/plugin/admin/public/js/giftorder.js
@@ -5,12 +5,12 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             
             Table.api.init({
                 extend: {
-                    index_url: '/app/admin/giftorder/select',
-                    add_url: '/app/admin/giftorder/insert',
-                    edit_url: '/app/admin/giftorder/update',
-                    del_url: '/app/admin/giftorder/delete',
-                    multi_url: '/app/admin/giftorder/multi',
-                    //dragsort_url: '/app/admin/giftorder/weigh',
+                    index_url: 'giftorder/select',
+                    add_url: 'giftorder/insert',
+                    edit_url: 'giftorder/update',
+                    del_url: 'giftorder/delete',
+                    multi_url: 'giftorder/multi',
+                    //dragsort_url: 'giftorder/weigh',
                     table: 'giftorder',
                 }
             });
diff --git a/plugin/admin/public/js/income_record.js b/plugin/admin/public/js/income_record.js
index 60c0894..2085a19 100644
--- a/plugin/admin/public/js/income_record.js
+++ b/plugin/admin/public/js/income_record.js
@@ -6,12 +6,12 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             
             Table.api.init({
                 extend: {
-                    index_url: '/app/admin/income_record/select',
-                    add_url: '/app/admin/income_record/insert',
-                    edit_url: '/app/admin/income_record/update',
-                    del_url: '/app/admin/income_record/delete',
-                    multi_url: '/app/admin/income_record/multi',
-                    //dragsort_url: '/app/admin/income_record/weigh',
+                    index_url: 'income_record/select',
+                    add_url: 'income_record/insert',
+                    edit_url: 'income_record/update',
+                    del_url: 'income_record/delete',
+                    multi_url: 'income_record/multi',
+                    //dragsort_url: 'income_record/weigh',
                     table: 'income_record',
                 }
             });
diff --git a/plugin/admin/public/js/index.js b/plugin/admin/public/js/index.js
index c04f48b..8363088 100644
--- a/plugin/admin/public/js/index.js
+++ b/plugin/admin/public/js/index.js
@@ -98,7 +98,7 @@ define(['lightyear','multitabs', '../libs/Chart','form','bootstrap'], function (
                     init: [{
                         type: 'main',
                         title: '首页',
-                        url: '/app/admin/index/'+Config.fixedpage
+                        url: 'index/'+Config.fixedpage
                     }]
                 });
                 
@@ -207,7 +207,7 @@ define(['lightyear','multitabs', '../libs/Chart','form','bootstrap'], function (
             //         }
             //     }
             // );
-            $.getJSON('/app/admin/index/money_lines',function(res){
+            $.getJSON('index/money_lines',function(res){
                 res = res.data;
                 var labels=[];
                 var withdrawl_values=[];
@@ -248,7 +248,7 @@ define(['lightyear','multitabs', '../libs/Chart','form','bootstrap'], function (
                     }
                 );
             });
-            $.getJSON('/app/admin/index/role_buy_lines',function(res){
+            $.getJSON('index/role_buy_lines',function(res){
                 res = res.data;
                 var amount=[];
                 var reward=[];
diff --git a/plugin/admin/public/js/invitecode.js b/plugin/admin/public/js/invitecode.js
index 1af190b..bd5bb36 100644
--- a/plugin/admin/public/js/invitecode.js
+++ b/plugin/admin/public/js/invitecode.js
@@ -6,12 +6,12 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             
             Table.api.init({
                 extend: {
-                    index_url: '/app/admin/invitecode/select',
+                    index_url: 'invitecode/select',
                     add_url: null,
                     edit_url: null,
-                    del_url: '/app/admin/invitecode/delete',
+                    del_url: 'invitecode/delete',
                     multi_url: null,
-                    //dragsort_url: '/app/admin/product/weigh',
+                    //dragsort_url: 'product/weigh',
                     table: 'invitecode',
                 }
             });
diff --git a/plugin/admin/public/js/product.js b/plugin/admin/public/js/product.js
index 58126e5..a74e649 100644
--- a/plugin/admin/public/js/product.js
+++ b/plugin/admin/public/js/product.js
@@ -6,12 +6,12 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             
             Table.api.init({
                 extend: {
-                    index_url: '/app/admin/product/select',
-                    add_url: '/app/admin/product/insert',
-                    edit_url: '/app/admin/product/update',
-                    del_url: '/app/admin/product/delete',
-                    multi_url: '/app/admin/product/multi',
-                    //dragsort_url: '/app/admin/product/weigh',
+                    index_url: 'product/select',
+                    add_url: 'product/insert',
+                    edit_url: 'product/update',
+                    del_url: 'product/delete',
+                    multi_url: 'product/multi',
+                    //dragsort_url: 'product/weigh',
                     table: 'product',
                 }
             });
@@ -117,7 +117,7 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             this.bindevent();
         },
         bindevent:function(){
-            Config['uploadurl'] = '/app/admin/attachment/upload';
+            Config['upload_url'] = 'files/upload';
             var form = $('form');
             var that = this;
             $('[name=cycle_type]').on('change',function(){
diff --git a/plugin/admin/public/js/productorder.js b/plugin/admin/public/js/productorder.js
index 0b7a3e1..55b0db1 100644
--- a/plugin/admin/public/js/productorder.js
+++ b/plugin/admin/public/js/productorder.js
@@ -8,9 +8,9 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             
             Table.api.init({
                 extend: {
-                    index_url: '/app/admin/productorder/select',
+                    index_url: 'productorder/select',
                     add_url: null,
-                    edit_url: '/app/admin/productorder/update',
+                    edit_url: 'productorder/update',
                     del_url: null,
                     multi_url: null,
                     dragsort_url: null,
@@ -91,7 +91,7 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
                             //         name:"servers",
                             //         icon:"mdi mdi-account-group-outline",
                             //         classname:"btn btn-xs btn-info btn-dialog",
-                            //         url:'/app/admin/workrecord/index'
+                            //         url:'workrecord/index'
                             //     }
                             // ]
                         }
diff --git a/plugin/admin/public/js/questionnaire.js b/plugin/admin/public/js/questionnaire.js
index fbb7946..ff1a295 100644
--- a/plugin/admin/public/js/questionnaire.js
+++ b/plugin/admin/public/js/questionnaire.js
@@ -15,12 +15,12 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             
             Table.api.init({
                 extend: {
-                    index_url: '/app/admin/questionnaire/select',
-                    add_url: '/app/admin/questionnaire/insert',
-                    edit_url: '/app/admin/questionnaire/update',
-                    del_url: '/app/admin/questionnaire/delete',
-                    multi_url: '/app/admin/questionnaire/multi',
-                    //dragsort_url: '/app/admin/questionnaire/weigh',
+                    index_url: 'questionnaire/select',
+                    add_url: 'questionnaire/insert',
+                    edit_url: 'questionnaire/update',
+                    del_url: 'questionnaire/delete',
+                    multi_url: 'questionnaire/multi',
+                    //dragsort_url: 'questionnaire/weigh',
                     table: 'questionnaire',
                 }
             });
diff --git a/plugin/admin/public/js/recharge.js b/plugin/admin/public/js/recharge.js
index f10e64f..69e0aac 100644
--- a/plugin/admin/public/js/recharge.js
+++ b/plugin/admin/public/js/recharge.js
@@ -7,12 +7,12 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             
             Table.api.init({
                 extend: {
-                    index_url: '/app/admin/recharge/select',
-                    add_url: '/app/admin/recharge/insert',
-                    edit_url: '/app/admin/recharge/update',
-                    del_url: '/app/admin/recharge/delete',
-                    multi_url: '/app/admin/recharge/multi',
-                    //dragsort_url: '/app/admin/recharge/weigh',
+                    index_url: 'recharge/select',
+                    add_url: 'recharge/insert',
+                    edit_url: 'recharge/update',
+                    del_url: 'recharge/delete',
+                    multi_url: 'recharge/multi',
+                    //dragsort_url: 'recharge/weigh',
                     table: 'recharge',
                 }
             });
@@ -173,7 +173,7 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
                 if(v){
                     btn_loading.show();
                     if(v.substr(0,2) == '0x'){
-                        $.getJSON('/app/admin/index/txid?txid='+v,function(res){
+                        $.getJSON('index/txid?txid='+v,function(res){
                             btn_loading.hide();
                             recharge.setForm({
                                 from:res.data.from,
diff --git a/plugin/admin/public/js/robot.js b/plugin/admin/public/js/robot.js
index 53d3a4b..b85a0f3 100644
--- a/plugin/admin/public/js/robot.js
+++ b/plugin/admin/public/js/robot.js
@@ -6,12 +6,12 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             
             Table.api.init({
                 extend: {
-                    index_url: '/app/admin/robot/select',
-                    add_url: '/app/admin/robot/insert',
-                    edit_url: '/app/admin/robot/update',
-                    del_url: '/app/admin/robot/delete',
-                    multi_url: '/app/admin/robot/multi',
-                    //dragsort_url: '/app/admin/robot/weigh',
+                    index_url: 'robot/select',
+                    add_url: 'robot/insert',
+                    edit_url: 'robot/update',
+                    del_url: 'robot/delete',
+                    multi_url: 'robot/multi',
+                    //dragsort_url: 'robot/weigh',
                     table: 'robot',
                 }
             });
@@ -91,7 +91,7 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             this.bindevent();
         },
         bindevent:function(){
-            Config['uploadurl'] = '/app/admin/attachment/upload';
+            Config['upload_url'] = 'files/upload';
             var form = $('form');
             var that = this;
             $('[name=cycle_type]').on('change',function(){
diff --git a/plugin/admin/public/js/robotrecord.js b/plugin/admin/public/js/robotrecord.js
index 132226e..3934c62 100644
--- a/plugin/admin/public/js/robotrecord.js
+++ b/plugin/admin/public/js/robotrecord.js
@@ -6,12 +6,12 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             
             Table.api.init({
                 extend: {
-                    index_url: '/app/admin/robotrecord/select',
-                    add_url: '/app/admin/robotrecord/insert',
-                    edit_url: '/app/admin/robotrecord/update',
-                    del_url: '/app/admin/robotrecord/delete',
-                    multi_url: '/app/admin/robotrecord/multi',
-                    //dragsort_url: '/app/admin/robotrecord/weigh',
+                    index_url: 'robotrecord/select',
+                    add_url: 'robotrecord/insert',
+                    edit_url: 'robotrecord/update',
+                    del_url: 'robotrecord/delete',
+                    multi_url: 'robotrecord/multi',
+                    //dragsort_url: 'robotrecord/weigh',
                     table: 'robotrecord',
                 }
             });
diff --git a/plugin/admin/public/js/singlepage.js b/plugin/admin/public/js/singlepage.js
index 180e979..5777af2 100644
--- a/plugin/admin/public/js/singlepage.js
+++ b/plugin/admin/public/js/singlepage.js
@@ -4,12 +4,12 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             window.filterData['type'] = {value1:"page",symbol:'=','value2':''};
             Table.api.init({
                 extend: {
-                    index_url: '/app/admin/singlepage/select',
-                    add_url: '/app/admin/singlepage/insert',
-                    edit_url: '/app/admin/singlepage/update',
-                    del_url: '/app/admin/singlepage/delete',
-                    multi_url: '/app/admin/singlepage/multi',
-                    dragsort_url: '/app/admin/singlepage/weigh',
+                    index_url: 'singlepage/select',
+                    add_url: 'singlepage/insert',
+                    edit_url: 'singlepage/update',
+                    del_url: 'singlepage/delete',
+                    multi_url: 'singlepage/multi',
+                    dragsort_url: 'singlepage/weigh',
                     table: 'archives',
                 }
             });
@@ -35,6 +35,11 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
                             field: "title",
                             filter: "string",
                         },
+                        {
+                            title: "标识",
+                            field: "name",
+                            filter: "string",
+                        },
                         {
                             title: "创建时间",
                             field: "created_at"
@@ -64,7 +69,7 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             this.bindevent();
         },
         bindevent:function(){
-            Config['uploadurl'] = '/app/admin/attachment/upload';
+            Config['upload_url'] = 'files/upload';
             var form = $('form');
             Form.api.bindevent(form)
         }
diff --git a/plugin/admin/public/js/studio.js b/plugin/admin/public/js/studio.js
index 20364ef..b42fe4d 100644
--- a/plugin/admin/public/js/studio.js
+++ b/plugin/admin/public/js/studio.js
@@ -9,12 +9,12 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             
             Table.api.init({
                 extend: {
-                    index_url: '/app/admin/studio/select',
-                    add_url: '/app/admin/studio/insert',
-                    edit_url: '/app/admin/studio/update',
-                    del_url: '/app/admin/studio/delete',
-                    multi_url: '/app/admin/studio/multi',
-                    dragsort_url: '/app/admin/studio/weigh',
+                    index_url: 'studio/select',
+                    add_url: 'studio/insert',
+                    edit_url: 'studio/update',
+                    del_url: 'studio/delete',
+                    multi_url: 'studio/multi',
+                    dragsort_url: 'studio/weigh',
                     table: 'studio',
                 }
             });
@@ -223,7 +223,7 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
                                     name:"team",
                                     icon:"mdi mdi-account-group-outline",
                                     classname:"btn btn-xs btn-info btn-dialog",
-                                    url:'/app/admin/studio/team'
+                                    url:'studio/team'
                                 }
                             ]
                         }
@@ -236,20 +236,20 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             Table.api.bindevent(table);
         },
         update:function(){
-            Config['uploadurl'] = '/app/admin/attachment/avatar';
+            Config['upload_url'] = '/files/avatar';
             var form = $('form');
             Form.api.bindevent(form)
             this.getRole();
         },
         insert:function(){
-            Config['uploadurl'] = '/app/admin/attachment/avatar';
+            Config['upload_url'] = '/files/avatar';
             var form = $('form');
             Form.api.bindevent(form)
             this.getRole();
         },
         getRole:function(){
             Fast.api.ajax({
-                url: "/app/admin/UserRole/select?format=tree",
+                url: "UserRole/select?format=tree",
                 dataType: "json",
                 success: function (res) {
                     Layer.closeAll();
@@ -282,7 +282,7 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             
             Table.api.init({
                 extend: {
-                    index_url: '/app/admin/team/select',
+                    index_url: 'team/select',
                     add_url: null,
                     edit_url: null,
                     del_url: null,
diff --git a/plugin/admin/public/js/thali.js b/plugin/admin/public/js/thali.js
new file mode 100644
index 0000000..67ebfcc
--- /dev/null
+++ b/plugin/admin/public/js/thali.js
@@ -0,0 +1,112 @@
+define(['table', 'upload','form'], function (Table,Upload,Form) {
+    var thali = {
+        //Do setup work hereAction
+        index: function () {
+            window.statuskOption= Config.statusList;
+            
+            Table.api.init({
+                extend: {
+                    index_url: 'thali/select',
+                    add_url: 'thali/insert',
+                    edit_url: 'thali/update',
+                    del_url: 'thali/delete',
+                    multi_url: 'thali/multi',
+                    //dragsort_url: 'thali/weigh',
+                    table: 'thali',
+                }
+            });
+
+            var table = $("#table");
+            var tableOptions = {
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                commonSearch: false,
+                search: false,
+                columns: [
+                    [
+                        {checkbox: true},
+                        {
+                            field: 'id',
+                            title: 'ID',
+                            filter: "number",
+                            sortable: true    // 是否排序
+                        },
+                        {
+                            title: "名称",
+                            field: "title",
+                            filter: "string",
+                        },
+                        {
+                            title: "价格",
+                            field: "price",
+                            filter: "number",
+                            formatter:function(v){
+                                return Table.api.formatter.number(v)+'元';
+                            }
+                        },
+                        {
+                            title: "原价",
+                            field: "org_price",
+                            filter: "number",
+                            formatter:function(v){
+                                return Table.api.formatter.number(v)+'元';
+                            }
+                        },
+                        {
+                            title: "时长",
+                            field: "duration",
+                            filter: "number",
+                            formatter:function(v){
+                                return v+'天';
+                            }
+                        },
+                        {
+                            title: "标签",
+                            field: "label",
+                            filter: "string"
+                        },
+                        {
+                            title: "状态",
+                            field: "status",
+                            sortable: true,
+                            formatter:Table.api.formatter.status,
+                            searchList:window.statuskOption,
+                            operate:false,
+                            filter: "select",
+                            filterOption:"statuskOption"
+                        },
+                        {
+                            title: "创建时间",
+                            field: "created_at",
+                            visible: false,
+                        },
+                        {
+                            title: "更新时间",
+                            field: "updated_at",
+                            visible: false,
+                        },
+                        {field: 'operate', title: '操作', table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                    ]
+                ]
+            };
+            // 初始化表格
+            table.bootstrapTable(tableOptions);
+            // 为表格绑定事件
+            Table.api.bindevent(table);
+        },
+        update:function(){
+            this.bindevent();
+        },
+        insert:function(){
+            this.bindevent();
+        },
+        bindevent:function(){
+            Config['upload_url'] = 'files/upload';
+            var form = $('form');
+            var that = this;
+            Form.api.bindevent(form)
+        }
+    };
+    return thali
+});
\ No newline at end of file
diff --git a/plugin/admin/public/js/user.js b/plugin/admin/public/js/user.js
index c092c93..26f5036 100644
--- a/plugin/admin/public/js/user.js
+++ b/plugin/admin/public/js/user.js
@@ -4,21 +4,22 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
         index: function () {
             window.filterData = {
             };
+            window.Lang = window.Lang ? window.Lang : Config.currency_langs;
             window.groupOption=Config.groupList;
             window.roleOption=Config.roleList;
             
             Table.api.init({
                 extend: {
-                    index_url: '/app/admin/user/select',
-                    add_url: '/app/admin/user/insert',
-                    edit_url: '/app/admin/user/update',
-                    del_url: '/app/admin/user/delete',
-                    multi_url: '/app/admin/user/multi',
-                    dragsort_url: '/app/admin/user/weigh',
+                    index_url: 'user/select',
+                    add_url: 'user/insert',
+                    edit_url: 'user/update',
+                    del_url: 'user/delete',
+                    multi_url: 'user/multi',
+                    dragsort_url: 'user/weigh',
                     table: 'user',
                 }
             });
-            console.log(Config)
+            //console.log(Config)
             var table = $("#table");
             var columns = [
                 {checkbox: true},
@@ -28,16 +29,15 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
                     filter: "number",
                     sortable: true    // 是否排序
                 },
-                // {
-                //     title: "角色",
-                //     field: "role_id",
-                //     formatter:function(v,row){
-                //         return row.role ? row.role.name : '用户';
-                //     },
-                //     filter: "select",
-                //     filterOption:"roleOption",
-                //     visible: false,
-                // },
+                {
+                    title: "角色",
+                    field: "role_id",
+                    formatter:function(v,row){
+                        return row.role ? row.role.name : '用户';
+                    },
+                    filter: "select",
+                    filterOption:"roleOption"
+                },
                 {
                     title: "昵称",
                     field: "nickname"
@@ -102,7 +102,7 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
                         name:"team",
                         icon:"mdi mdi-account-group-outline",
                         classname:"btn btn-xs btn-info btn-dialog",
-                        url:'/app/admin/user/team'
+                        url:'user/team'
                     }
                 ]
             });
@@ -120,20 +120,20 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             Table.api.bindevent(table);
         },
         update:function(){
-            Config['uploadurl'] = '/app/admin/attachment/avatar';
+            Config['upload_url'] = '/files/avatar';
             var form = $('form');
             Form.api.bindevent(form)
             this.getRole();
         },
         insert:function(){
-            Config['uploadurl'] = '/app/admin/attachment/avatar';
+            Config['upload_url'] = '/files/avatar';
             var form = $('form');
             Form.api.bindevent(form)
             this.getRole();
         },
         getRole:function(){
             Fast.api.ajax({
-                url: "/app/admin/UserRole/select?format=tree",
+                url: "UserRole/select?format=tree",
                 dataType: "json",
                 success: function (res) {
                     Layer.closeAll();
@@ -166,7 +166,7 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             
             Table.api.init({
                 extend: {
-                    index_url: '/app/admin/team/select',
+                    index_url: 'team/select',
                     add_url: null,
                     edit_url: null,
                     del_url: null,
diff --git a/plugin/admin/public/js/userrole.js b/plugin/admin/public/js/userrole.js
index caca5a6..5a18e95 100644
--- a/plugin/admin/public/js/userrole.js
+++ b/plugin/admin/public/js/userrole.js
@@ -4,12 +4,12 @@ define(['table','form','yntree'], function (Table,Form,YnTree1) {
         index: function () {
             Table.api.init({
                 extend: {
-                    index_url: '/app/admin/userrole/select',
-                    add_url: '/app/admin/userrole/insert',
-                    edit_url: '/app/admin/userrole/update',
-                    del_url: '/app/admin/userrole/delete',
-                    multi_url: '/app/admin/userrole/multi',
-                    dragsort_url: '/app/admin/userrole/weigh',
+                    index_url: 'userrole/select',
+                    add_url: 'userrole/insert',
+                    edit_url: 'userrole/update',
+                    del_url: 'userrole/delete',
+                    multi_url: 'userrole/multi',
+                    dragsort_url: 'userrole/weigh',
                     table: 'userrole',
                 }
             });
@@ -41,23 +41,23 @@ define(['table','form','yntree'], function (Table,Form,YnTree1) {
                             filter: "string",
                         },
                         {
-                            field: 'need_sales', 
-                            title: '销售额',
+                            field: 'max_send_msg_count', 
+                            title: '最大消息数量',
                             filter: "number",
                         },
                         {
-                            field: 'consume_reward', 
-                            title: '消费奖励',
+                            field: 'max_friend_count', 
+                            title: '最大好友数量',
                             filter: "number",
                         },
                         {
-                            field: 'income_reward', 
-                            title: '产值奖',
+                            field: 'max_group_join_count', 
+                            title: '群组加入限制',
                             filter: "number",
                         },
                         {
-                            field: 'withdrawl_reward', 
-                            title: '提现奖励',
+                            field: 'max_gourp_create_count', 
+                            title: '群组创建限制',
                             filter: "number",
                         },
                         {
@@ -134,7 +134,7 @@ define(['table','form','yntree'], function (Table,Form,YnTree1) {
                 //     return false;
                 // }
                 $.ajax({
-                    url: "/app/admin/userrole/tree",
+                    url: "userrole/tree",
                     type: 'post',
                     dataType: 'json',
                     data: {id: id, pid: $(this).val()},
diff --git a/plugin/admin/public/js/userrule.js b/plugin/admin/public/js/userrule.js
index 3b3e44c..c18ecb9 100644
--- a/plugin/admin/public/js/userrule.js
+++ b/plugin/admin/public/js/userrule.js
@@ -1,4 +1,4 @@
-define(['table', 'upload','form','template','treegrid','bootstrap-table-treegrid'], function (Table,Upload,Form,Template) {
+define(['table', 'form','../libs/iconselect','treegrid','bootstrap-table-treegrid'], function (Table,Form,IconSelector) {
     var AdminRule = {
         //Do setup work hereAction
         index: function () {
@@ -9,12 +9,12 @@ define(['table', 'upload','form','template','treegrid','bootstrap-table-treegrid
             var apiResults_type = ["目录","菜单","权限"];
             Table.api.init({
                 extend: {
-                    index_url: '/app/admin/UserRule/select',
-                    add_url: '/app/admin/UserRule/insert',
-                    edit_url: '/app/admin/UserRule/update',
-                    del_url: '/app/admin/UserRule/delete',
-                    multi_url: '/app/admin/UserRule/multi',
-                    dragsort_url: '/app/admin/UserRule/weigh',
+                    index_url: 'UserRule/select',
+                    add_url: 'UserRule/insert',
+                    edit_url: 'UserRule/update',
+                    del_url: 'UserRule/delete',
+                    multi_url: 'UserRule/multi',
+                    dragsort_url: 'UserRule/weigh',
                     table: 'UserRule',
                 }
             });
@@ -183,15 +183,15 @@ define(['table', 'upload','form','template','treegrid','bootstrap-table-treegrid
             this.bindevent();
         },
         bindevent:function(){
-            Config['uploadurl'] = '/app/admin/attachment/avatar';
+            Config['upload_url'] = '/files/avatar';
             var form = $('form');
             Form.api.bindevent(form)
             this.getRole();
-            this.initIcoselect();
+            IconSelector.bind($(".btn-search-icon"),$("input#icon"));
         },
         getRole:function(){
             Fast.api.ajax({
-                url: "/app/admin/UserRole/select?format=tree",
+                url: "UserRole/select?format=tree",
                 dataType: "json",
                 success: function (res) {
                     Layer.closeAll();
@@ -208,52 +208,6 @@ define(['table', 'upload','form','template','treegrid','bootstrap-table-treegrid
                     $('#roles').append(html);
                 }
             });
-        },
-        initIcoselect:function(){
-            
-            var iconlist = [];
-            var iconfunc = function () {
-                Layer.open({
-                    type: 1,
-                    area: ['99%', '98%'], //宽高
-                    content: Template('chooseicontpl', {iconlist: iconlist})
-                });
-            };
-            
-            $(document).on('change keyup', "#icon", function () {
-                $(this).prev().find("i").prop("class", $(this).val());
-            });
-            $(document).on('click', ".btn-search-icon", function () {
-                if (iconlist.length == 0) {
-                    $.get(Config.cdnurl + "/app/admin/css/materialdesignicons.min.css", function (ret) {
-                        window.iconret = ret;
-                        // var exp = /\.mdi-(.*):before/ig;
-                        // var result;
-                        // while ((result = exp.exec(ret)) != null) {
-                        //     iconlist.push(result[1]);
-                        // }
-                        var list = Array.from(iconret.matchAll(/mdi-(.*?):before/g));
-                        for (let index = 1; index < list.length; index++) {
-                            //const element = list[index];
-                            iconlist.push(list[index][1]);
-                            
-                        }
-                        iconfunc();
-                    });
-                } else {
-                    iconfunc();
-                }
-            });
-            $(document).on('click', '#chooseicon ul li', function () {
-                $("input#icon").val('mdi mdi-' + $(this).data("font")).trigger("change");
-                Layer.closeAll();
-            });
-            $(document).on('keyup', 'input.js-icon-search', function () {
-                $("#chooseicon ul li").show();
-                if ($(this).val() != '') {
-                    $("#chooseicon ul li:not([data-font*='" + $(this).val() + "'])").hide();
-                }
-            });
         }
     };
     return AdminRule
diff --git a/plugin/admin/public/js/version.js b/plugin/admin/public/js/version.js
new file mode 100644
index 0000000..35484b5
--- /dev/null
+++ b/plugin/admin/public/js/version.js
@@ -0,0 +1,109 @@
+define(['table', 'upload','form'], function (Table,Upload,Form) {
+    var Version = {
+        //Do setup work hereAction
+        index: function () {
+            window.filterData = {
+            };
+            window.statusOption = Config.statusList;
+            window.osList = Config.osList;
+            window.forceList = Config.forceList;
+            window.typeList = Config.typeList;
+            
+            Table.api.init({
+                extend: {
+                    index_url: 'version/select',
+                    add_url: 'version/insert',
+                    edit_url: 'version/update',
+                    del_url: 'version/delete',
+                    multi_url: 'version/multi',
+                    dragsort_url: 'version/weigh',
+                    table: 'version',
+                }
+            });
+
+            var table = $("#table");
+            var tableOptions = {
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                commonSearch: false,
+                search: false,
+                columns: [
+                    [
+                        {checkbox: true},
+                        {
+                            field: 'id',
+                            title: 'ID',
+                            filter: "number",
+                            sortable: true    // 是否排序
+                        },
+                        {
+                            title: "platform",
+                            field: "platform",
+                            filter: "select",
+                            filterOption:"osList",
+                            visible: false,
+                        },
+                        {
+                            title: "类型",
+                            field: "type",
+                            filter: "select",
+                            filterOption:"typeList"
+                        },
+                        {
+                            title: "类型",
+                            field: "version",
+                            filter: "string"
+                        },
+                        {
+                            title: "WGT类型",
+                            field: "version_wgt",
+                            filter: "int"
+                        },
+                        {
+                            title: "强制更新",
+                            field: "force",
+                            filter: "select",
+                            filterOption:"typeList"
+                        },
+                        {
+                            title: "创建时间",
+                            field: "created_at"
+                        },
+                        {
+                            title: "更新时间",
+                            field: "updated_at",
+                            formatter:Table.api.formatter.datetime,
+                            visible: false,
+                        },
+                        {
+                            title: "状态",
+                            field: "status",
+                            formatter: Table.api.formatter.switch,
+                            filter:'select',
+                            filterOption:'statusOption'
+                        },
+                        {
+                            field: 'operate', title: '操作', 
+                            table: table, events: Table.api.events.operate, 
+                            formatter: Table.api.formatter.operate
+                        }
+                    ]
+                ]
+            };
+            // 初始化表格
+            table.bootstrapTable(tableOptions);
+            // 为表格绑定事件
+            Table.api.bindevent(table);
+        },
+        update:function(){
+            var form = $('form');
+            Form.api.bindevent(form);
+        },
+        insert:function(){
+            var form = $('form');
+            Form.api.bindevent(form);
+        }
+    };
+    return Version
+});
\ No newline at end of file
diff --git a/plugin/admin/public/js/withdrawl.js b/plugin/admin/public/js/withdrawl.js
index ce5caed..e630376 100644
--- a/plugin/admin/public/js/withdrawl.js
+++ b/plugin/admin/public/js/withdrawl.js
@@ -7,12 +7,12 @@ define(['table', 'upload','form','qrcode'], function (Table,Upload,Form) {
             
             Table.api.init({
                 extend: {
-                    index_url: '/app/admin/withdrawl/select',
-                    add_url: '/app/admin/withdrawl/insert',
-                    edit_url: '/app/admin/withdrawl/update',
-                    //del_url: '/app/admin/withdrawl/delete',
-                    multi_url: '/app/admin/withdrawl/multi',
-                    //dragsort_url: '/app/admin/withdrawl/weigh',
+                    index_url: 'withdrawl/select',
+                    add_url: 'withdrawl/insert',
+                    edit_url: 'withdrawl/update',
+                    //del_url: 'withdrawl/delete',
+                    multi_url: 'withdrawl/multi',
+                    //dragsort_url: 'withdrawl/weigh',
                     table: 'withdrawl',
                 }
             });
diff --git a/plugin/admin/public/js/workrecord.js b/plugin/admin/public/js/workrecord.js
index 527cd25..613c798 100644
--- a/plugin/admin/public/js/workrecord.js
+++ b/plugin/admin/public/js/workrecord.js
@@ -10,11 +10,11 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             
             Table.api.init({
                 extend: {
-                    index_url: '/app/admin/workrecord/select',
+                    index_url: 'workrecord/select',
                     add_url: null,
-                    edit_url: '/app/admin/workrecord/update',
+                    edit_url: 'workrecord/update',
                     del_url: null,
-                    multi_url: '/app/admin/workrecord/multi',
+                    multi_url: 'workrecord/multi',
                     dragsort_url: null,
                     table: 'work_record',
                 }
@@ -69,166 +69,12 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             Table.api.bindevent(table);
         },
         update:function(){
-            Config['uploadurl'] = '/app/admin/attachment/avatar';
             var form = $('form');
             Form.api.bindevent(form)
-            this.getRole();
         },
         insert:function(){
-            Config['uploadurl'] = '/app/admin/attachment/avatar';
             var form = $('form');
             Form.api.bindevent(form)
-            this.getRole();
-        },
-        getRole:function(){
-            Fast.api.ajax({
-                url: "/app/admin/UserRole/select?format=tree",
-                dataType: "json",
-                success: function (res) {
-                    Layer.closeAll();
-                    var html = "";
-                    var selected=$('#roles').data('value');
-                    for (let index = 0; index < res.data.length; index++) {
-                        const element = res.data[index];
-                        if(selected == element.id){
-                            html+='<option value="'+element.id+'" selected>'+element.name+'</option>';
-                        }else{
-                            html+='<option value="'+element.id+'">'+element.name+'</option>';
-                        }
-                    }
-                    $('#roles').append(html);
-                }
-            });
-        },
-        team:function(){
-            window.filterData = {
-                "user_id":{value1:Fast.api.query('ids'),symbol:'=','value2':''},
-                'type' : {value1:'child',symbol:'=','value2':''}
-            };
-
-            $('.nav-tabs li').on('click',function(){
-                $('.nav-tabs li').removeClass('active');
-                $(this).addClass('active');
-                window.filterData['type'] = {value1:$(this).data('type'),symbol:'=','value2':''};
-                table.bootstrapTable('selectPage', 1);
-            });
-            
-            Table.api.init({
-                extend: {
-                    index_url: '/app/admin/team/select',
-                    add_url: null,
-                    edit_url: null,
-                    del_url: null,
-                    multi_url: null,
-                    dragsort_url: null,
-                    table: 'team',
-                }
-            });
-
-            var table = $("#table");
-            var tableOptions = {
-                url: $.fn.bootstrapTable.defaults.extend.index_url,
-                pk: 'id',
-                sortName: 'id',
-                commonSearch: false,
-                search: false,
-                columns: [
-                    [
-                        {checkbox: true},
-                        {
-                            title: "深度",
-                            field: "depth",
-                        },
-                        {
-                            field: 'id',
-                            title: 'ID',
-                            filter: "number",
-                            sortable: true    // 是否排序
-                        },
-                        {
-                            title: "角色",
-                            field: "role",
-                            visible: false,
-                        },
-                        {
-                            title: "用户名",
-                            field: "username",
-                            filter: "string",
-                        },
-                        // {
-                        //     title: "等级",
-                        //     field: "level",
-                        //     visible: false,
-                        // },
-                        {
-                            title: "余额",
-                            field: "money",
-                            formatter:Table.api.formatter.number,
-                            sortable: true,
-                            //visible: false,
-                        },
-                        {
-                            title: "积分",
-                            field: "score",
-                            sortable: true,
-                            formatter:Table.api.formatter.number
-                        },
-                        {
-                            title: "待结算",
-                            field: "currency1",
-                            formatter:Table.api.formatter.number
-                        },
-                        {
-                            title: "失效算力",
-                            field: "currency2",
-                            sortable: true,
-                            formatter:Table.api.formatter.number
-                        },
-                        {
-                            title: "登录时间",
-                            field: "last_time",
-                            formatter:Table.api.formatter.datetime,
-                            visible: false,
-                        },
-                        {
-                            title: "登录ip",
-                            field: "last_ip",
-                            visible: false,
-                        },
-                        {
-                            title: "注册时间",
-                            field: "join_time",
-                            formatter:Table.api.formatter.datetime,
-                            filter:'datetime'
-                        },
-                        {
-                            title: "注册ip",
-                            field: "join_ip",
-                            visible: false,
-                        },
-                        {
-                            title: "创建时间",
-                            field: "created_at",
-                            visible: false,
-                        },
-                        {
-                            title: "更新时间",
-                            field: "updated_at",
-                            formatter:Table.api.formatter.datetime,
-                            visible: false,
-                        },
-                        {
-                            title: "状态",
-                            field: "status",
-                            formatter: Table.api.formatter.switch
-                        }
-                    ]
-                ]
-            };
-            // 初始化表格
-            table.bootstrapTable(tableOptions);
-            // 为表格绑定事件
-            Table.api.bindevent(table);
         }
     };
     return User
diff --git a/plugin/admin/public/js/xuanchuan.js b/plugin/admin/public/js/xuanchuan.js
index 241815b..d7db72d 100644
--- a/plugin/admin/public/js/xuanchuan.js
+++ b/plugin/admin/public/js/xuanchuan.js
@@ -9,12 +9,12 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             
             Table.api.init({
                 extend: {
-                    index_url: '/app/admin/xuanchuan/select',
-                    add_url: '/app/admin/xuanchuan/insert',
-                    edit_url: '/app/admin/xuanchuan/update',
-                    del_url: '/app/admin/xuanchuan/delete',
-                    multi_url: '/app/admin/xuanchuan/multi',
-                    dragsort_url: '/app/admin/xuanchuan/weigh',
+                    index_url: 'xuanchuan/select',
+                    add_url: 'xuanchuan/insert',
+                    edit_url: 'xuanchuan/update',
+                    del_url: 'xuanchuan/delete',
+                    multi_url: 'xuanchuan/multi',
+                    dragsort_url: 'xuanchuan/weigh',
                     table: 'user_xuanchuan',
                 }
             });
diff --git a/plugin/admin/public/libs/fast.js b/plugin/admin/public/libs/fast.js
index 0183385..28a3dd7 100644
--- a/plugin/admin/public/libs/fast.js
+++ b/plugin/admin/public/libs/fast.js
@@ -106,15 +106,20 @@ define(['jquery', 'bootstrap', 'layer','lightyear'], function ($, undefined, Lay
                         Fast.events.onAjaxError(ret, error);
                     }
                 }, options);
+                options.url = Fast.api.fixurl(options.url);
                 return $.ajax(options);
             },
             //修复URL
             fixurl: function (url) {
-                if (url.substr(0, 1) !== "/") {
-                    var r = new RegExp('^(?:[a-z]+:)?//', 'i');
-                    if (!r.test(url)) {
-                        url = Config.moduleurl + "/" + url;
-                    }
+                if (url.substr(0, 1) == "/") {
+                return url;
+                }
+                if (url.substr(0, 4) == "http") {
+                    return url;
+                }
+                var r = new RegExp('^(?:[a-z]+:)?//', 'i');
+                if (!r.test(url)) {
+                    url = Config.moduleurl + "/" + url;
                 }
                 return url;
             },
@@ -148,12 +153,16 @@ define(['jquery', 'bootstrap', 'layer','lightyear'], function ($, undefined, Lay
             },
             //打开一个弹出窗口
             open: function (url, title, options) {
+                if(options && options.area && (typeof options.area == 'string' && options.area.indexOf(','))){
+                    options.area = options.area.split(',');
+                }
                 title = options && options.title ? options.title : (title ? title : "");
                 url = Fast.api.fixurl(url);
                 url = url + (url.indexOf("?") > -1 ? "&" : "?") + "dialog=1";
                 //var area = Fast.config.openArea != undefined ? Fast.config.openArea : [$(window).width() > 800 ? '800px' : '95%', $(window).height() > 600 ? '600px' : '95%'];
                 
-                var area = Fast.config.openArea != undefined ? Fast.config.openArea : ['95%', '90%'];
+                var area = Fast.config.openArea != undefined ? Fast.config.openArea : (options.area || ['95%', '90%']);
+                //console.log(options,area)
                 options = $.extend({
                     type: 2,
                     title: title,
@@ -332,7 +341,7 @@ define(['jquery', 'bootstrap', 'layer','lightyear'], function ($, undefined, Lay
             return self == parent;
         },
         isMainIframe:function(){
-            return parent.location.pathname.toLocaleLowerCase() == '/app/admin/index/index';
+            return parent.location.pathname.toLocaleLowerCase() == Config.admin_path+'/index/index';
         },
         isPopIframe:function(){
             if(Fast.isTopWindow()){
diff --git a/plugin/admin/public/libs/iconselect.js b/plugin/admin/public/libs/iconselect.js
new file mode 100644
index 0000000..3795e34
--- /dev/null
+++ b/plugin/admin/public/libs/iconselect.js
@@ -0,0 +1,7537 @@
+define(['jquery', 'bootstrap', 'layer','template'], function ($, undefined, Layer,Template) {
+    var IconSelector = {
+        iconlist : [
+            "abacus",
+            "abjad-arabic",
+            "abjad-hebrew",
+            "abugida-devanagari",
+            "abugida-thai",
+            "access-point",
+            "access-point-check",
+            "access-point-minus",
+            "access-point-network",
+            "access-point-network-off",
+            "access-point-off",
+            "access-point-plus",
+            "access-point-remove",
+            "account",
+            "account-alert",
+            "account-alert-outline",
+            "account-arrow-down",
+            "account-arrow-down-outline",
+            "account-arrow-left",
+            "account-arrow-left-outline",
+            "account-arrow-right",
+            "account-arrow-right-outline",
+            "account-arrow-up",
+            "account-arrow-up-outline",
+            "account-badge",
+            "account-badge-outline",
+            "account-box",
+            "account-box-edit-outline",
+            "account-box-minus-outline",
+            "account-box-multiple",
+            "account-box-multiple-outline",
+            "account-box-outline",
+            "account-box-plus-outline",
+            "account-cancel",
+            "account-cancel-outline",
+            "account-card",
+            "account-card-outline",
+            "account-cash",
+            "account-cash-outline",
+            "account-check",
+            "account-check-outline",
+            "account-child",
+            "account-child-circle",
+            "account-child-outline",
+            "account-circle",
+            "account-circle-outline",
+            "account-clock",
+            "account-clock-outline",
+            "account-cog",
+            "account-cog-outline",
+            "account-convert",
+            "account-convert-outline",
+            "account-cowboy-hat",
+            "account-cowboy-hat-outline",
+            "account-credit-card",
+            "account-credit-card-outline",
+            "account-details",
+            "account-details-outline",
+            "account-edit",
+            "account-edit-outline",
+            "account-eye",
+            "account-eye-outline",
+            "account-file",
+            "account-file-outline",
+            "account-file-text",
+            "account-file-text-outline",
+            "account-filter",
+            "account-filter-outline",
+            "account-group",
+            "account-group-outline",
+            "account-hard-hat",
+            "account-hard-hat-outline",
+            "account-heart",
+            "account-heart-outline",
+            "account-injury",
+            "account-injury-outline",
+            "account-key",
+            "account-key-outline",
+            "account-lock",
+            "account-lock-open",
+            "account-lock-open-outline",
+            "account-lock-outline",
+            "account-minus",
+            "account-minus-outline",
+            "account-multiple",
+            "account-multiple-check",
+            "account-multiple-check-outline",
+            "account-multiple-minus",
+            "account-multiple-minus-outline",
+            "account-multiple-outline",
+            "account-multiple-plus",
+            "account-multiple-plus-outline",
+            "account-multiple-remove",
+            "account-multiple-remove-outline",
+            "account-music",
+            "account-music-outline",
+            "account-network",
+            "account-network-off",
+            "account-network-off-outline",
+            "account-network-outline",
+            "account-off",
+            "account-off-outline",
+            "account-outline",
+            "account-plus",
+            "account-plus-outline",
+            "account-question",
+            "account-question-outline",
+            "account-reactivate",
+            "account-reactivate-outline",
+            "account-remove",
+            "account-remove-outline",
+            "account-school",
+            "account-school-outline",
+            "account-search",
+            "account-search-outline",
+            "account-settings",
+            "account-settings-outline",
+            "account-star",
+            "account-star-outline",
+            "account-supervisor",
+            "account-supervisor-circle",
+            "account-supervisor-circle-outline",
+            "account-supervisor-outline",
+            "account-switch",
+            "account-switch-outline",
+            "account-sync",
+            "account-sync-outline",
+            "account-tag",
+            "account-tag-outline",
+            "account-tie",
+            "account-tie-hat",
+            "account-tie-hat-outline",
+            "account-tie-outline",
+            "account-tie-voice",
+            "account-tie-voice-off",
+            "account-tie-voice-off-outline",
+            "account-tie-voice-outline",
+            "account-tie-woman",
+            "account-voice",
+            "account-voice-off",
+            "account-wrench",
+            "account-wrench-outline",
+            "adjust",
+            "advertisements",
+            "advertisements-off",
+            "air-conditioner",
+            "air-filter",
+            "air-horn",
+            "air-humidifier",
+            "air-humidifier-off",
+            "air-purifier",
+            "air-purifier-off",
+            "airbag",
+            "airballoon",
+            "airballoon-outline",
+            "airplane",
+            "airplane-alert",
+            "airplane-check",
+            "airplane-clock",
+            "airplane-cog",
+            "airplane-edit",
+            "airplane-landing",
+            "airplane-marker",
+            "airplane-minus",
+            "airplane-off",
+            "airplane-plus",
+            "airplane-remove",
+            "airplane-search",
+            "airplane-settings",
+            "airplane-takeoff",
+            "airport",
+            "alarm",
+            "alarm-bell",
+            "alarm-check",
+            "alarm-light",
+            "alarm-light-off",
+            "alarm-light-off-outline",
+            "alarm-light-outline",
+            "alarm-multiple",
+            "alarm-note",
+            "alarm-note-off",
+            "alarm-off",
+            "alarm-panel",
+            "alarm-panel-outline",
+            "alarm-plus",
+            "alarm-snooze",
+            "album",
+            "alert",
+            "alert-box",
+            "alert-box-outline",
+            "alert-circle",
+            "alert-circle-check",
+            "alert-circle-check-outline",
+            "alert-circle-outline",
+            "alert-decagram",
+            "alert-decagram-outline",
+            "alert-minus",
+            "alert-minus-outline",
+            "alert-octagon",
+            "alert-octagon-outline",
+            "alert-octagram",
+            "alert-octagram-outline",
+            "alert-outline",
+            "alert-plus",
+            "alert-plus-outline",
+            "alert-remove",
+            "alert-remove-outline",
+            "alert-rhombus",
+            "alert-rhombus-outline",
+            "alien",
+            "alien-outline",
+            "align-horizontal-center",
+            "align-horizontal-distribute",
+            "align-horizontal-left",
+            "align-horizontal-right",
+            "align-vertical-bottom",
+            "align-vertical-center",
+            "align-vertical-distribute",
+            "align-vertical-top",
+            "all-inclusive",
+            "all-inclusive-box",
+            "all-inclusive-box-outline",
+            "allergy",
+            "alpha",
+            "alpha-a",
+            "alpha-a-box",
+            "alpha-a-box-outline",
+            "alpha-a-circle",
+            "alpha-a-circle-outline",
+            "alpha-b",
+            "alpha-b-box",
+            "alpha-b-box-outline",
+            "alpha-b-circle",
+            "alpha-b-circle-outline",
+            "alpha-c",
+            "alpha-c-box",
+            "alpha-c-box-outline",
+            "alpha-c-circle",
+            "alpha-c-circle-outline",
+            "alpha-d",
+            "alpha-d-box",
+            "alpha-d-box-outline",
+            "alpha-d-circle",
+            "alpha-d-circle-outline",
+            "alpha-e",
+            "alpha-e-box",
+            "alpha-e-box-outline",
+            "alpha-e-circle",
+            "alpha-e-circle-outline",
+            "alpha-f",
+            "alpha-f-box",
+            "alpha-f-box-outline",
+            "alpha-f-circle",
+            "alpha-f-circle-outline",
+            "alpha-g",
+            "alpha-g-box",
+            "alpha-g-box-outline",
+            "alpha-g-circle",
+            "alpha-g-circle-outline",
+            "alpha-h",
+            "alpha-h-box",
+            "alpha-h-box-outline",
+            "alpha-h-circle",
+            "alpha-h-circle-outline",
+            "alpha-i",
+            "alpha-i-box",
+            "alpha-i-box-outline",
+            "alpha-i-circle",
+            "alpha-i-circle-outline",
+            "alpha-j",
+            "alpha-j-box",
+            "alpha-j-box-outline",
+            "alpha-j-circle",
+            "alpha-j-circle-outline",
+            "alpha-k",
+            "alpha-k-box",
+            "alpha-k-box-outline",
+            "alpha-k-circle",
+            "alpha-k-circle-outline",
+            "alpha-l",
+            "alpha-l-box",
+            "alpha-l-box-outline",
+            "alpha-l-circle",
+            "alpha-l-circle-outline",
+            "alpha-m",
+            "alpha-m-box",
+            "alpha-m-box-outline",
+            "alpha-m-circle",
+            "alpha-m-circle-outline",
+            "alpha-n",
+            "alpha-n-box",
+            "alpha-n-box-outline",
+            "alpha-n-circle",
+            "alpha-n-circle-outline",
+            "alpha-o",
+            "alpha-o-box",
+            "alpha-o-box-outline",
+            "alpha-o-circle",
+            "alpha-o-circle-outline",
+            "alpha-p",
+            "alpha-p-box",
+            "alpha-p-box-outline",
+            "alpha-p-circle",
+            "alpha-p-circle-outline",
+            "alpha-q",
+            "alpha-q-box",
+            "alpha-q-box-outline",
+            "alpha-q-circle",
+            "alpha-q-circle-outline",
+            "alpha-r",
+            "alpha-r-box",
+            "alpha-r-box-outline",
+            "alpha-r-circle",
+            "alpha-r-circle-outline",
+            "alpha-s",
+            "alpha-s-box",
+            "alpha-s-box-outline",
+            "alpha-s-circle",
+            "alpha-s-circle-outline",
+            "alpha-t",
+            "alpha-t-box",
+            "alpha-t-box-outline",
+            "alpha-t-circle",
+            "alpha-t-circle-outline",
+            "alpha-u",
+            "alpha-u-box",
+            "alpha-u-box-outline",
+            "alpha-u-circle",
+            "alpha-u-circle-outline",
+            "alpha-v",
+            "alpha-v-box",
+            "alpha-v-box-outline",
+            "alpha-v-circle",
+            "alpha-v-circle-outline",
+            "alpha-w",
+            "alpha-w-box",
+            "alpha-w-box-outline",
+            "alpha-w-circle",
+            "alpha-w-circle-outline",
+            "alpha-x",
+            "alpha-x-box",
+            "alpha-x-box-outline",
+            "alpha-x-circle",
+            "alpha-x-circle-outline",
+            "alpha-y",
+            "alpha-y-box",
+            "alpha-y-box-outline",
+            "alpha-y-circle",
+            "alpha-y-circle-outline",
+            "alpha-z",
+            "alpha-z-box",
+            "alpha-z-box-outline",
+            "alpha-z-circle",
+            "alpha-z-circle-outline",
+            "alphabet-aurebesh",
+            "alphabet-cyrillic",
+            "alphabet-greek",
+            "alphabet-latin",
+            "alphabet-piqad",
+            "alphabet-tengwar",
+            "alphabetical",
+            "alphabetical-off",
+            "alphabetical-variant",
+            "alphabetical-variant-off",
+            "altimeter",
+            "ambulance",
+            "ammunition",
+            "ampersand",
+            "amplifier",
+            "amplifier-off",
+            "anchor",
+            "android",
+            "android-studio",
+            "angle-acute",
+            "angle-obtuse",
+            "angle-right",
+            "angular",
+            "angularjs",
+            "animation",
+            "animation-outline",
+            "animation-play",
+            "animation-play-outline",
+            "ansible",
+            "antenna",
+            "anvil",
+            "apache-kafka",
+            "api",
+            "api-off",
+            "apple",
+            "apple-finder",
+            "apple-icloud",
+            "apple-ios",
+            "apple-keyboard-caps",
+            "apple-keyboard-command",
+            "apple-keyboard-control",
+            "apple-keyboard-option",
+            "apple-keyboard-shift",
+            "apple-safari",
+            "application",
+            "application-array",
+            "application-array-outline",
+            "application-braces",
+            "application-braces-outline",
+            "application-brackets",
+            "application-brackets-outline",
+            "application-cog",
+            "application-cog-outline",
+            "application-edit",
+            "application-edit-outline",
+            "application-export",
+            "application-import",
+            "application-outline",
+            "application-parentheses",
+            "application-parentheses-outline",
+            "application-settings",
+            "application-settings-outline",
+            "application-variable",
+            "application-variable-outline",
+            "approximately-equal",
+            "approximately-equal-box",
+            "apps",
+            "apps-box",
+            "arch",
+            "archive",
+            "archive-alert",
+            "archive-alert-outline",
+            "archive-arrow-down",
+            "archive-arrow-down-outline",
+            "archive-arrow-up",
+            "archive-arrow-up-outline",
+            "archive-cancel",
+            "archive-cancel-outline",
+            "archive-check",
+            "archive-check-outline",
+            "archive-clock",
+            "archive-clock-outline",
+            "archive-cog",
+            "archive-cog-outline",
+            "archive-edit",
+            "archive-edit-outline",
+            "archive-eye",
+            "archive-eye-outline",
+            "archive-lock",
+            "archive-lock-open",
+            "archive-lock-open-outline",
+            "archive-lock-outline",
+            "archive-marker",
+            "archive-marker-outline",
+            "archive-minus",
+            "archive-minus-outline",
+            "archive-music",
+            "archive-music-outline",
+            "archive-off",
+            "archive-off-outline",
+            "archive-outline",
+            "archive-plus",
+            "archive-plus-outline",
+            "archive-refresh",
+            "archive-refresh-outline",
+            "archive-remove",
+            "archive-remove-outline",
+            "archive-search",
+            "archive-search-outline",
+            "archive-settings",
+            "archive-settings-outline",
+            "archive-star",
+            "archive-star-outline",
+            "archive-sync",
+            "archive-sync-outline",
+            "arm-flex",
+            "arm-flex-outline",
+            "arrange-bring-forward",
+            "arrange-bring-to-front",
+            "arrange-send-backward",
+            "arrange-send-to-back",
+            "arrow-all",
+            "arrow-bottom-left",
+            "arrow-bottom-left-bold-box",
+            "arrow-bottom-left-bold-box-outline",
+            "arrow-bottom-left-bold-outline",
+            "arrow-bottom-left-thick",
+            "arrow-bottom-left-thin",
+            "arrow-bottom-left-thin-circle-outline",
+            "arrow-bottom-right",
+            "arrow-bottom-right-bold-box",
+            "arrow-bottom-right-bold-box-outline",
+            "arrow-bottom-right-bold-outline",
+            "arrow-bottom-right-thick",
+            "arrow-bottom-right-thin",
+            "arrow-bottom-right-thin-circle-outline",
+            "arrow-collapse",
+            "arrow-collapse-all",
+            "arrow-collapse-down",
+            "arrow-collapse-horizontal",
+            "arrow-collapse-left",
+            "arrow-collapse-right",
+            "arrow-collapse-up",
+            "arrow-collapse-vertical",
+            "arrow-decision",
+            "arrow-decision-auto",
+            "arrow-decision-auto-outline",
+            "arrow-decision-outline",
+            "arrow-down",
+            "arrow-down-bold",
+            "arrow-down-bold-box",
+            "arrow-down-bold-box-outline",
+            "arrow-down-bold-circle",
+            "arrow-down-bold-circle-outline",
+            "arrow-down-bold-hexagon-outline",
+            "arrow-down-bold-outline",
+            "arrow-down-box",
+            "arrow-down-circle",
+            "arrow-down-circle-outline",
+            "arrow-down-drop-circle",
+            "arrow-down-drop-circle-outline",
+            "arrow-down-left",
+            "arrow-down-left-bold",
+            "arrow-down-right",
+            "arrow-down-right-bold",
+            "arrow-down-thick",
+            "arrow-down-thin",
+            "arrow-down-thin-circle-outline",
+            "arrow-expand",
+            "arrow-expand-all",
+            "arrow-expand-down",
+            "arrow-expand-horizontal",
+            "arrow-expand-left",
+            "arrow-expand-right",
+            "arrow-expand-up",
+            "arrow-expand-vertical",
+            "arrow-horizontal-lock",
+            "arrow-left",
+            "arrow-left-bold",
+            "arrow-left-bold-box",
+            "arrow-left-bold-box-outline",
+            "arrow-left-bold-circle",
+            "arrow-left-bold-circle-outline",
+            "arrow-left-bold-hexagon-outline",
+            "arrow-left-bold-outline",
+            "arrow-left-bottom",
+            "arrow-left-bottom-bold",
+            "arrow-left-box",
+            "arrow-left-circle",
+            "arrow-left-circle-outline",
+            "arrow-left-drop-circle",
+            "arrow-left-drop-circle-outline",
+            "arrow-left-right",
+            "arrow-left-right-bold",
+            "arrow-left-right-bold-outline",
+            "arrow-left-thick",
+            "arrow-left-thin",
+            "arrow-left-thin-circle-outline",
+            "arrow-left-top",
+            "arrow-left-top-bold",
+            "arrow-oscillating",
+            "arrow-oscillating-off",
+            "arrow-projectile",
+            "arrow-projectile-multiple",
+            "arrow-right",
+            "arrow-right-bold",
+            "arrow-right-bold-box",
+            "arrow-right-bold-box-outline",
+            "arrow-right-bold-circle",
+            "arrow-right-bold-circle-outline",
+            "arrow-right-bold-hexagon-outline",
+            "arrow-right-bold-outline",
+            "arrow-right-bottom",
+            "arrow-right-bottom-bold",
+            "arrow-right-box",
+            "arrow-right-circle",
+            "arrow-right-circle-outline",
+            "arrow-right-drop-circle",
+            "arrow-right-drop-circle-outline",
+            "arrow-right-thick",
+            "arrow-right-thin",
+            "arrow-right-thin-circle-outline",
+            "arrow-right-top",
+            "arrow-right-top-bold",
+            "arrow-split-horizontal",
+            "arrow-split-vertical",
+            "arrow-top-left",
+            "arrow-top-left-bold-box",
+            "arrow-top-left-bold-box-outline",
+            "arrow-top-left-bold-outline",
+            "arrow-top-left-bottom-right",
+            "arrow-top-left-bottom-right-bold",
+            "arrow-top-left-thick",
+            "arrow-top-left-thin",
+            "arrow-top-left-thin-circle-outline",
+            "arrow-top-right",
+            "arrow-top-right-bold-box",
+            "arrow-top-right-bold-box-outline",
+            "arrow-top-right-bold-outline",
+            "arrow-top-right-bottom-left",
+            "arrow-top-right-bottom-left-bold",
+            "arrow-top-right-thick",
+            "arrow-top-right-thin",
+            "arrow-top-right-thin-circle-outline",
+            "arrow-u-down-left",
+            "arrow-u-down-left-bold",
+            "arrow-u-down-right",
+            "arrow-u-down-right-bold",
+            "arrow-u-left-bottom",
+            "arrow-u-left-bottom-bold",
+            "arrow-u-left-top",
+            "arrow-u-left-top-bold",
+            "arrow-u-right-bottom",
+            "arrow-u-right-bottom-bold",
+            "arrow-u-right-top",
+            "arrow-u-right-top-bold",
+            "arrow-u-up-left",
+            "arrow-u-up-left-bold",
+            "arrow-u-up-right",
+            "arrow-u-up-right-bold",
+            "arrow-up",
+            "arrow-up-bold",
+            "arrow-up-bold-box",
+            "arrow-up-bold-box-outline",
+            "arrow-up-bold-circle",
+            "arrow-up-bold-circle-outline",
+            "arrow-up-bold-hexagon-outline",
+            "arrow-up-bold-outline",
+            "arrow-up-box",
+            "arrow-up-circle",
+            "arrow-up-circle-outline",
+            "arrow-up-down",
+            "arrow-up-down-bold",
+            "arrow-up-down-bold-outline",
+            "arrow-up-drop-circle",
+            "arrow-up-drop-circle-outline",
+            "arrow-up-left",
+            "arrow-up-left-bold",
+            "arrow-up-right",
+            "arrow-up-right-bold",
+            "arrow-up-thick",
+            "arrow-up-thin",
+            "arrow-up-thin-circle-outline",
+            "arrow-vertical-lock",
+            "artboard",
+            "artstation",
+            "aspect-ratio",
+            "assistant",
+            "asterisk",
+            "asterisk-circle-outline",
+            "at",
+            "atlassian",
+            "atm",
+            "atom",
+            "atom-variant",
+            "attachment",
+            "attachment-check",
+            "attachment-lock",
+            "attachment-minus",
+            "attachment-off",
+            "attachment-plus",
+            "attachment-remove",
+            "atv",
+            "audio-input-rca",
+            "audio-input-stereo-minijack",
+            "audio-input-xlr",
+            "audio-video",
+            "audio-video-off",
+            "augmented-reality",
+            "aurora",
+            "auto-download",
+            "auto-fix",
+            "auto-mode",
+            "auto-upload",
+            "autorenew",
+            "autorenew-off",
+            "av-timer",
+            "awning",
+            "awning-outline",
+            "aws",
+            "axe",
+            "axe-battle",
+            "axis",
+            "axis-arrow",
+            "axis-arrow-info",
+            "axis-arrow-lock",
+            "axis-lock",
+            "axis-x-arrow",
+            "axis-x-arrow-lock",
+            "axis-x-rotate-clockwise",
+            "axis-x-rotate-counterclockwise",
+            "axis-x-y-arrow-lock",
+            "axis-y-arrow",
+            "axis-y-arrow-lock",
+            "axis-y-rotate-clockwise",
+            "axis-y-rotate-counterclockwise",
+            "axis-z-arrow",
+            "axis-z-arrow-lock",
+            "axis-z-rotate-clockwise",
+            "axis-z-rotate-counterclockwise",
+            "babel",
+            "baby",
+            "baby-bottle",
+            "baby-bottle-outline",
+            "baby-buggy",
+            "baby-buggy-off",
+            "baby-carriage",
+            "baby-carriage-off",
+            "baby-face",
+            "baby-face-outline",
+            "backburger",
+            "backspace",
+            "backspace-outline",
+            "backspace-reverse",
+            "backspace-reverse-outline",
+            "backup-restore",
+            "bacteria",
+            "bacteria-outline",
+            "badge-account",
+            "badge-account-alert",
+            "badge-account-alert-outline",
+            "badge-account-horizontal",
+            "badge-account-horizontal-outline",
+            "badge-account-outline",
+            "badminton",
+            "bag-carry-on",
+            "bag-carry-on-check",
+            "bag-carry-on-off",
+            "bag-checked",
+            "bag-personal",
+            "bag-personal-off",
+            "bag-personal-off-outline",
+            "bag-personal-outline",
+            "bag-personal-plus",
+            "bag-personal-plus-outline",
+            "bag-personal-tag",
+            "bag-personal-tag-outline",
+            "bag-suitcase",
+            "bag-suitcase-off",
+            "bag-suitcase-off-outline",
+            "bag-suitcase-outline",
+            "baguette",
+            "balcony",
+            "balloon",
+            "ballot",
+            "ballot-outline",
+            "ballot-recount",
+            "ballot-recount-outline",
+            "bandage",
+            "bank",
+            "bank-check",
+            "bank-circle",
+            "bank-circle-outline",
+            "bank-minus",
+            "bank-off",
+            "bank-off-outline",
+            "bank-outline",
+            "bank-plus",
+            "bank-remove",
+            "bank-transfer",
+            "bank-transfer-in",
+            "bank-transfer-out",
+            "barcode",
+            "barcode-off",
+            "barcode-scan",
+            "barley",
+            "barley-off",
+            "barn",
+            "barrel",
+            "barrel-outline",
+            "baseball",
+            "baseball-bat",
+            "baseball-diamond",
+            "baseball-diamond-outline",
+            "baseball-outline",
+            "bash",
+            "basket",
+            "basket-check",
+            "basket-check-outline",
+            "basket-fill",
+            "basket-minus",
+            "basket-minus-outline",
+            "basket-off",
+            "basket-off-outline",
+            "basket-outline",
+            "basket-plus",
+            "basket-plus-outline",
+            "basket-remove",
+            "basket-remove-outline",
+            "basket-unfill",
+            "basketball",
+            "basketball-hoop",
+            "basketball-hoop-outline",
+            "bat",
+            "bathtub",
+            "bathtub-outline",
+            "battery",
+            "battery-10",
+            "battery-10-bluetooth",
+            "battery-20",
+            "battery-20-bluetooth",
+            "battery-30",
+            "battery-30-bluetooth",
+            "battery-40",
+            "battery-40-bluetooth",
+            "battery-50",
+            "battery-50-bluetooth",
+            "battery-60",
+            "battery-60-bluetooth",
+            "battery-70",
+            "battery-70-bluetooth",
+            "battery-80",
+            "battery-80-bluetooth",
+            "battery-90",
+            "battery-90-bluetooth",
+            "battery-alert",
+            "battery-alert-bluetooth",
+            "battery-alert-variant",
+            "battery-alert-variant-outline",
+            "battery-arrow-down",
+            "battery-arrow-down-outline",
+            "battery-arrow-up",
+            "battery-arrow-up-outline",
+            "battery-bluetooth",
+            "battery-bluetooth-variant",
+            "battery-charging",
+            "battery-charging-10",
+            "battery-charging-100",
+            "battery-charging-20",
+            "battery-charging-30",
+            "battery-charging-40",
+            "battery-charging-50",
+            "battery-charging-60",
+            "battery-charging-70",
+            "battery-charging-80",
+            "battery-charging-90",
+            "battery-charging-high",
+            "battery-charging-low",
+            "battery-charging-medium",
+            "battery-charging-outline",
+            "battery-charging-wireless",
+            "battery-charging-wireless-10",
+            "battery-charging-wireless-20",
+            "battery-charging-wireless-30",
+            "battery-charging-wireless-40",
+            "battery-charging-wireless-50",
+            "battery-charging-wireless-60",
+            "battery-charging-wireless-70",
+            "battery-charging-wireless-80",
+            "battery-charging-wireless-90",
+            "battery-charging-wireless-alert",
+            "battery-charging-wireless-outline",
+            "battery-check",
+            "battery-check-outline",
+            "battery-clock",
+            "battery-clock-outline",
+            "battery-heart",
+            "battery-heart-outline",
+            "battery-heart-variant",
+            "battery-high",
+            "battery-lock",
+            "battery-lock-open",
+            "battery-low",
+            "battery-medium",
+            "battery-minus",
+            "battery-minus-outline",
+            "battery-minus-variant",
+            "battery-negative",
+            "battery-off",
+            "battery-off-outline",
+            "battery-outline",
+            "battery-plus",
+            "battery-plus-outline",
+            "battery-plus-variant",
+            "battery-positive",
+            "battery-remove",
+            "battery-remove-outline",
+            "battery-sync",
+            "battery-sync-outline",
+            "battery-unknown",
+            "battery-unknown-bluetooth",
+            "beach",
+            "beaker",
+            "beaker-alert",
+            "beaker-alert-outline",
+            "beaker-check",
+            "beaker-check-outline",
+            "beaker-minus",
+            "beaker-minus-outline",
+            "beaker-outline",
+            "beaker-plus",
+            "beaker-plus-outline",
+            "beaker-question",
+            "beaker-question-outline",
+            "beaker-remove",
+            "beaker-remove-outline",
+            "bed",
+            "bed-clock",
+            "bed-double",
+            "bed-double-outline",
+            "bed-empty",
+            "bed-king",
+            "bed-king-outline",
+            "bed-outline",
+            "bed-queen",
+            "bed-queen-outline",
+            "bed-single",
+            "bed-single-outline",
+            "bee",
+            "bee-flower",
+            "beehive-off-outline",
+            "beehive-outline",
+            "beekeeper",
+            "beer",
+            "beer-outline",
+            "bell",
+            "bell-alert",
+            "bell-alert-outline",
+            "bell-badge",
+            "bell-badge-outline",
+            "bell-cancel",
+            "bell-cancel-outline",
+            "bell-check",
+            "bell-check-outline",
+            "bell-circle",
+            "bell-circle-outline",
+            "bell-cog",
+            "bell-cog-outline",
+            "bell-minus",
+            "bell-minus-outline",
+            "bell-off",
+            "bell-off-outline",
+            "bell-outline",
+            "bell-plus",
+            "bell-plus-outline",
+            "bell-remove",
+            "bell-remove-outline",
+            "bell-ring",
+            "bell-ring-outline",
+            "bell-sleep",
+            "bell-sleep-outline",
+            "bench",
+            "bench-back",
+            "beta",
+            "betamax",
+            "biathlon",
+            "bicycle",
+            "bicycle-basket",
+            "bicycle-cargo",
+            "bicycle-electric",
+            "bicycle-penny-farthing",
+            "bike",
+            "bike-fast",
+            "bike-pedal",
+            "bike-pedal-clipless",
+            "bike-pedal-mountain",
+            "billboard",
+            "billiards",
+            "billiards-rack",
+            "binoculars",
+            "bio",
+            "biohazard",
+            "bird",
+            "bitbucket",
+            "bitcoin",
+            "black-mesa",
+            "blender",
+            "blender-outline",
+            "blender-software",
+            "blinds",
+            "blinds-horizontal",
+            "blinds-horizontal-closed",
+            "blinds-open",
+            "blinds-vertical",
+            "blinds-vertical-closed",
+            "block-helper",
+            "blood-bag",
+            "bluetooth",
+            "bluetooth-audio",
+            "bluetooth-connect",
+            "bluetooth-off",
+            "bluetooth-settings",
+            "bluetooth-transfer",
+            "blur",
+            "blur-linear",
+            "blur-off",
+            "blur-radial",
+            "bolt",
+            "bomb",
+            "bomb-off",
+            "bone",
+            "bone-off",
+            "book",
+            "book-account",
+            "book-account-outline",
+            "book-alert",
+            "book-alert-outline",
+            "book-alphabet",
+            "book-arrow-down",
+            "book-arrow-down-outline",
+            "book-arrow-left",
+            "book-arrow-left-outline",
+            "book-arrow-right",
+            "book-arrow-right-outline",
+            "book-arrow-up",
+            "book-arrow-up-outline",
+            "book-cancel",
+            "book-cancel-outline",
+            "book-check",
+            "book-check-outline",
+            "book-clock",
+            "book-clock-outline",
+            "book-cog",
+            "book-cog-outline",
+            "book-cross",
+            "book-edit",
+            "book-edit-outline",
+            "book-education",
+            "book-education-outline",
+            "book-heart",
+            "book-heart-outline",
+            "book-information-variant",
+            "book-lock",
+            "book-lock-open",
+            "book-lock-open-outline",
+            "book-lock-outline",
+            "book-marker",
+            "book-marker-outline",
+            "book-minus",
+            "book-minus-multiple",
+            "book-minus-multiple-outline",
+            "book-minus-outline",
+            "book-multiple",
+            "book-multiple-outline",
+            "book-music",
+            "book-music-outline",
+            "book-off",
+            "book-off-outline",
+            "book-open",
+            "book-open-blank-variant",
+            "book-open-blank-variant-outline",
+            "book-open-outline",
+            "book-open-page-variant",
+            "book-open-page-variant-outline",
+            "book-open-variant",
+            "book-open-variant-outline",
+            "book-outline",
+            "book-play",
+            "book-play-outline",
+            "book-plus",
+            "book-plus-multiple",
+            "book-plus-multiple-outline",
+            "book-plus-outline",
+            "book-refresh",
+            "book-refresh-outline",
+            "book-remove",
+            "book-remove-multiple",
+            "book-remove-multiple-outline",
+            "book-remove-outline",
+            "book-search",
+            "book-search-outline",
+            "book-settings",
+            "book-settings-outline",
+            "book-sync",
+            "book-sync-outline",
+            "book-variant",
+            "bookmark",
+            "bookmark-box",
+            "bookmark-box-multiple",
+            "bookmark-box-multiple-outline",
+            "bookmark-box-outline",
+            "bookmark-check",
+            "bookmark-check-outline",
+            "bookmark-minus",
+            "bookmark-minus-outline",
+            "bookmark-multiple",
+            "bookmark-multiple-outline",
+            "bookmark-music",
+            "bookmark-music-outline",
+            "bookmark-off",
+            "bookmark-off-outline",
+            "bookmark-outline",
+            "bookmark-plus",
+            "bookmark-plus-outline",
+            "bookmark-remove",
+            "bookmark-remove-outline",
+            "bookshelf",
+            "boom-gate",
+            "boom-gate-alert",
+            "boom-gate-alert-outline",
+            "boom-gate-arrow-down",
+            "boom-gate-arrow-down-outline",
+            "boom-gate-arrow-up",
+            "boom-gate-arrow-up-outline",
+            "boom-gate-outline",
+            "boom-gate-up",
+            "boom-gate-up-outline",
+            "boombox",
+            "boomerang",
+            "bootstrap",
+            "border-all",
+            "border-all-variant",
+            "border-bottom",
+            "border-bottom-variant",
+            "border-color",
+            "border-horizontal",
+            "border-inside",
+            "border-left",
+            "border-left-variant",
+            "border-none",
+            "border-none-variant",
+            "border-outside",
+            "border-radius",
+            "border-right",
+            "border-right-variant",
+            "border-style",
+            "border-top",
+            "border-top-variant",
+            "border-vertical",
+            "bottle-soda",
+            "bottle-soda-classic",
+            "bottle-soda-classic-outline",
+            "bottle-soda-outline",
+            "bottle-tonic",
+            "bottle-tonic-outline",
+            "bottle-tonic-plus",
+            "bottle-tonic-plus-outline",
+            "bottle-tonic-skull",
+            "bottle-tonic-skull-outline",
+            "bottle-wine",
+            "bottle-wine-outline",
+            "bow-arrow",
+            "bow-tie",
+            "bowl",
+            "bowl-mix",
+            "bowl-mix-outline",
+            "bowl-outline",
+            "bowling",
+            "box",
+            "box-cutter",
+            "box-cutter-off",
+            "box-shadow",
+            "boxing-glove",
+            "braille",
+            "brain",
+            "bread-slice",
+            "bread-slice-outline",
+            "bridge",
+            "briefcase",
+            "briefcase-account",
+            "briefcase-account-outline",
+            "briefcase-arrow-left-right",
+            "briefcase-arrow-left-right-outline",
+            "briefcase-arrow-up-down",
+            "briefcase-arrow-up-down-outline",
+            "briefcase-check",
+            "briefcase-check-outline",
+            "briefcase-clock",
+            "briefcase-clock-outline",
+            "briefcase-download",
+            "briefcase-download-outline",
+            "briefcase-edit",
+            "briefcase-edit-outline",
+            "briefcase-eye",
+            "briefcase-eye-outline",
+            "briefcase-minus",
+            "briefcase-minus-outline",
+            "briefcase-off",
+            "briefcase-off-outline",
+            "briefcase-outline",
+            "briefcase-plus",
+            "briefcase-plus-outline",
+            "briefcase-remove",
+            "briefcase-remove-outline",
+            "briefcase-search",
+            "briefcase-search-outline",
+            "briefcase-upload",
+            "briefcase-upload-outline",
+            "briefcase-variant",
+            "briefcase-variant-off",
+            "briefcase-variant-off-outline",
+            "briefcase-variant-outline",
+            "brightness-1",
+            "brightness-2",
+            "brightness-3",
+            "brightness-4",
+            "brightness-5",
+            "brightness-6",
+            "brightness-7",
+            "brightness-auto",
+            "brightness-percent",
+            "broadcast",
+            "broadcast-off",
+            "broom",
+            "brush",
+            "brush-off",
+            "brush-outline",
+            "brush-variant",
+            "bucket",
+            "bucket-outline",
+            "buffet",
+            "bug",
+            "bug-check",
+            "bug-check-outline",
+            "bug-outline",
+            "bug-pause",
+            "bug-pause-outline",
+            "bug-play",
+            "bug-play-outline",
+            "bug-stop",
+            "bug-stop-outline",
+            "bugle",
+            "bulkhead-light",
+            "bulldozer",
+            "bullet",
+            "bulletin-board",
+            "bullhorn",
+            "bullhorn-outline",
+            "bullhorn-variant",
+            "bullhorn-variant-outline",
+            "bullseye",
+            "bullseye-arrow",
+            "bulma",
+            "bunk-bed",
+            "bunk-bed-outline",
+            "bus",
+            "bus-alert",
+            "bus-articulated-end",
+            "bus-articulated-front",
+            "bus-clock",
+            "bus-double-decker",
+            "bus-electric",
+            "bus-marker",
+            "bus-multiple",
+            "bus-school",
+            "bus-side",
+            "bus-sign",
+            "bus-stop",
+            "bus-stop-covered",
+            "bus-stop-uncovered",
+            "bus-wrench",
+            "butterfly",
+            "butterfly-outline",
+            "button-cursor",
+            "button-pointer",
+            "cabin-a-frame",
+            "cable-data",
+            "cached",
+            "cactus",
+            "cake",
+            "cake-layered",
+            "cake-variant",
+            "cake-variant-outline",
+            "calculator",
+            "calculator-variant",
+            "calculator-variant-outline",
+            "calendar",
+            "calendar-account",
+            "calendar-account-outline",
+            "calendar-alert",
+            "calendar-alert-outline",
+            "calendar-arrow-left",
+            "calendar-arrow-right",
+            "calendar-badge",
+            "calendar-badge-outline",
+            "calendar-blank",
+            "calendar-blank-multiple",
+            "calendar-blank-outline",
+            "calendar-check",
+            "calendar-check-outline",
+            "calendar-clock",
+            "calendar-clock-outline",
+            "calendar-collapse-horizontal",
+            "calendar-collapse-horizontal-outline",
+            "calendar-cursor",
+            "calendar-cursor-outline",
+            "calendar-edit",
+            "calendar-edit-outline",
+            "calendar-end",
+            "calendar-end-outline",
+            "calendar-expand-horizontal",
+            "calendar-expand-horizontal-outline",
+            "calendar-export",
+            "calendar-export-outline",
+            "calendar-filter",
+            "calendar-filter-outline",
+            "calendar-heart",
+            "calendar-heart-outline",
+            "calendar-import",
+            "calendar-import-outline",
+            "calendar-lock",
+            "calendar-lock-open",
+            "calendar-lock-open-outline",
+            "calendar-lock-outline",
+            "calendar-minus",
+            "calendar-minus-outline",
+            "calendar-month",
+            "calendar-month-outline",
+            "calendar-multiple",
+            "calendar-multiple-check",
+            "calendar-multiselect",
+            "calendar-multiselect-outline",
+            "calendar-outline",
+            "calendar-plus",
+            "calendar-plus-outline",
+            "calendar-question",
+            "calendar-question-outline",
+            "calendar-range",
+            "calendar-range-outline",
+            "calendar-refresh",
+            "calendar-refresh-outline",
+            "calendar-remove",
+            "calendar-remove-outline",
+            "calendar-search",
+            "calendar-search-outline",
+            "calendar-star",
+            "calendar-star-four-points",
+            "calendar-star-outline",
+            "calendar-start",
+            "calendar-start-outline",
+            "calendar-sync",
+            "calendar-sync-outline",
+            "calendar-text",
+            "calendar-text-outline",
+            "calendar-today",
+            "calendar-today-outline",
+            "calendar-week",
+            "calendar-week-begin",
+            "calendar-week-begin-outline",
+            "calendar-week-outline",
+            "calendar-weekend",
+            "calendar-weekend-outline",
+            "call-made",
+            "call-merge",
+            "call-missed",
+            "call-received",
+            "call-split",
+            "camcorder",
+            "camcorder-off",
+            "camera",
+            "camera-account",
+            "camera-burst",
+            "camera-control",
+            "camera-document",
+            "camera-document-off",
+            "camera-enhance",
+            "camera-enhance-outline",
+            "camera-flip",
+            "camera-flip-outline",
+            "camera-front",
+            "camera-front-variant",
+            "camera-gopro",
+            "camera-image",
+            "camera-iris",
+            "camera-lock",
+            "camera-lock-open",
+            "camera-lock-open-outline",
+            "camera-lock-outline",
+            "camera-marker",
+            "camera-marker-outline",
+            "camera-metering-center",
+            "camera-metering-matrix",
+            "camera-metering-partial",
+            "camera-metering-spot",
+            "camera-off",
+            "camera-off-outline",
+            "camera-outline",
+            "camera-party-mode",
+            "camera-plus",
+            "camera-plus-outline",
+            "camera-rear",
+            "camera-rear-variant",
+            "camera-retake",
+            "camera-retake-outline",
+            "camera-switch",
+            "camera-switch-outline",
+            "camera-timer",
+            "camera-wireless",
+            "camera-wireless-outline",
+            "campfire",
+            "cancel",
+            "candelabra",
+            "candelabra-fire",
+            "candle",
+            "candy",
+            "candy-off",
+            "candy-off-outline",
+            "candy-outline",
+            "candycane",
+            "cannabis",
+            "cannabis-off",
+            "caps-lock",
+            "car",
+            "car-2-plus",
+            "car-3-plus",
+            "car-arrow-left",
+            "car-arrow-right",
+            "car-back",
+            "car-battery",
+            "car-brake-abs",
+            "car-brake-alert",
+            "car-brake-fluid-level",
+            "car-brake-hold",
+            "car-brake-low-pressure",
+            "car-brake-parking",
+            "car-brake-retarder",
+            "car-brake-temperature",
+            "car-brake-worn-linings",
+            "car-child-seat",
+            "car-clock",
+            "car-clutch",
+            "car-cog",
+            "car-connected",
+            "car-convertible",
+            "car-coolant-level",
+            "car-cruise-control",
+            "car-defrost-front",
+            "car-defrost-rear",
+            "car-door",
+            "car-door-lock",
+            "car-door-lock-open",
+            "car-electric",
+            "car-electric-outline",
+            "car-emergency",
+            "car-esp",
+            "car-estate",
+            "car-hatchback",
+            "car-info",
+            "car-key",
+            "car-lifted-pickup",
+            "car-light-alert",
+            "car-light-dimmed",
+            "car-light-fog",
+            "car-light-high",
+            "car-limousine",
+            "car-multiple",
+            "car-off",
+            "car-outline",
+            "car-parking-lights",
+            "car-pickup",
+            "car-search",
+            "car-search-outline",
+            "car-seat",
+            "car-seat-cooler",
+            "car-seat-heater",
+            "car-select",
+            "car-settings",
+            "car-shift-pattern",
+            "car-side",
+            "car-speed-limiter",
+            "car-sports",
+            "car-tire-alert",
+            "car-traction-control",
+            "car-turbocharger",
+            "car-wash",
+            "car-windshield",
+            "car-windshield-outline",
+            "car-wireless",
+            "car-wrench",
+            "carabiner",
+            "caravan",
+            "card",
+            "card-account-details",
+            "card-account-details-outline",
+            "card-account-details-star",
+            "card-account-details-star-outline",
+            "card-account-mail",
+            "card-account-mail-outline",
+            "card-account-phone",
+            "card-account-phone-outline",
+            "card-bulleted",
+            "card-bulleted-off",
+            "card-bulleted-off-outline",
+            "card-bulleted-outline",
+            "card-bulleted-settings",
+            "card-bulleted-settings-outline",
+            "card-minus",
+            "card-minus-outline",
+            "card-multiple",
+            "card-multiple-outline",
+            "card-off",
+            "card-off-outline",
+            "card-outline",
+            "card-plus",
+            "card-plus-outline",
+            "card-remove",
+            "card-remove-outline",
+            "card-search",
+            "card-search-outline",
+            "card-text",
+            "card-text-outline",
+            "cards",
+            "cards-club",
+            "cards-club-outline",
+            "cards-diamond",
+            "cards-diamond-outline",
+            "cards-heart",
+            "cards-heart-outline",
+            "cards-outline",
+            "cards-playing",
+            "cards-playing-club",
+            "cards-playing-club-multiple",
+            "cards-playing-club-multiple-outline",
+            "cards-playing-club-outline",
+            "cards-playing-diamond",
+            "cards-playing-diamond-multiple",
+            "cards-playing-diamond-multiple-outline",
+            "cards-playing-diamond-outline",
+            "cards-playing-heart",
+            "cards-playing-heart-multiple",
+            "cards-playing-heart-multiple-outline",
+            "cards-playing-heart-outline",
+            "cards-playing-outline",
+            "cards-playing-spade",
+            "cards-playing-spade-multiple",
+            "cards-playing-spade-multiple-outline",
+            "cards-playing-spade-outline",
+            "cards-spade",
+            "cards-spade-outline",
+            "cards-variant",
+            "carrot",
+            "cart",
+            "cart-arrow-down",
+            "cart-arrow-right",
+            "cart-arrow-up",
+            "cart-check",
+            "cart-heart",
+            "cart-minus",
+            "cart-off",
+            "cart-outline",
+            "cart-percent",
+            "cart-plus",
+            "cart-remove",
+            "cart-variant",
+            "case-sensitive-alt",
+            "cash",
+            "cash-100",
+            "cash-check",
+            "cash-clock",
+            "cash-edit",
+            "cash-fast",
+            "cash-lock",
+            "cash-lock-open",
+            "cash-marker",
+            "cash-minus",
+            "cash-multiple",
+            "cash-off",
+            "cash-plus",
+            "cash-refund",
+            "cash-register",
+            "cash-remove",
+            "cash-sync",
+            "cassette",
+            "cast",
+            "cast-audio",
+            "cast-audio-variant",
+            "cast-connected",
+            "cast-education",
+            "cast-off",
+            "cast-variant",
+            "castle",
+            "cat",
+            "cctv",
+            "cctv-off",
+            "ceiling-fan",
+            "ceiling-fan-light",
+            "ceiling-light",
+            "ceiling-light-multiple",
+            "ceiling-light-multiple-outline",
+            "ceiling-light-outline",
+            "cellphone",
+            "cellphone-arrow-down",
+            "cellphone-arrow-down-variant",
+            "cellphone-basic",
+            "cellphone-charging",
+            "cellphone-check",
+            "cellphone-cog",
+            "cellphone-dock",
+            "cellphone-information",
+            "cellphone-key",
+            "cellphone-link",
+            "cellphone-link-off",
+            "cellphone-lock",
+            "cellphone-marker",
+            "cellphone-message",
+            "cellphone-message-off",
+            "cellphone-nfc",
+            "cellphone-nfc-off",
+            "cellphone-off",
+            "cellphone-play",
+            "cellphone-remove",
+            "cellphone-screenshot",
+            "cellphone-settings",
+            "cellphone-sound",
+            "cellphone-text",
+            "cellphone-wireless",
+            "centos",
+            "certificate",
+            "certificate-outline",
+            "chair-rolling",
+            "chair-school",
+            "chandelier",
+            "charity",
+            "charity-search",
+            "chart-arc",
+            "chart-areaspline",
+            "chart-areaspline-variant",
+            "chart-bar",
+            "chart-bar-stacked",
+            "chart-bell-curve",
+            "chart-bell-curve-cumulative",
+            "chart-box",
+            "chart-box-multiple",
+            "chart-box-multiple-outline",
+            "chart-box-outline",
+            "chart-box-plus-outline",
+            "chart-bubble",
+            "chart-donut",
+            "chart-donut-variant",
+            "chart-gantt",
+            "chart-histogram",
+            "chart-line",
+            "chart-line-stacked",
+            "chart-line-variant",
+            "chart-multiline",
+            "chart-multiple",
+            "chart-pie",
+            "chart-pie-outline",
+            "chart-ppf",
+            "chart-sankey",
+            "chart-sankey-variant",
+            "chart-scatter-plot",
+            "chart-scatter-plot-hexbin",
+            "chart-timeline",
+            "chart-timeline-variant",
+            "chart-timeline-variant-shimmer",
+            "chart-tree",
+            "chart-waterfall",
+            "chat",
+            "chat-alert",
+            "chat-alert-outline",
+            "chat-minus",
+            "chat-minus-outline",
+            "chat-outline",
+            "chat-plus",
+            "chat-plus-outline",
+            "chat-processing",
+            "chat-processing-outline",
+            "chat-question",
+            "chat-question-outline",
+            "chat-remove",
+            "chat-remove-outline",
+            "chat-sleep",
+            "chat-sleep-outline",
+            "check",
+            "check-all",
+            "check-bold",
+            "check-circle",
+            "check-circle-outline",
+            "check-decagram",
+            "check-decagram-outline",
+            "check-network",
+            "check-network-outline",
+            "check-outline",
+            "check-underline",
+            "check-underline-circle",
+            "check-underline-circle-outline",
+            "checkbook",
+            "checkbook-arrow-left",
+            "checkbook-arrow-right",
+            "checkbox-blank",
+            "checkbox-blank-badge",
+            "checkbox-blank-badge-outline",
+            "checkbox-blank-circle",
+            "checkbox-blank-circle-outline",
+            "checkbox-blank-off",
+            "checkbox-blank-off-outline",
+            "checkbox-blank-outline",
+            "checkbox-intermediate",
+            "checkbox-intermediate-variant",
+            "checkbox-marked",
+            "checkbox-marked-circle",
+            "checkbox-marked-circle-auto-outline",
+            "checkbox-marked-circle-minus-outline",
+            "checkbox-marked-circle-outline",
+            "checkbox-marked-circle-plus-outline",
+            "checkbox-marked-outline",
+            "checkbox-multiple-blank",
+            "checkbox-multiple-blank-circle",
+            "checkbox-multiple-blank-circle-outline",
+            "checkbox-multiple-blank-outline",
+            "checkbox-multiple-marked",
+            "checkbox-multiple-marked-circle",
+            "checkbox-multiple-marked-circle-outline",
+            "checkbox-multiple-marked-outline",
+            "checkbox-multiple-outline",
+            "checkbox-outline",
+            "checkerboard",
+            "checkerboard-minus",
+            "checkerboard-plus",
+            "checkerboard-remove",
+            "cheese",
+            "cheese-off",
+            "chef-hat",
+            "chemical-weapon",
+            "chess-bishop",
+            "chess-king",
+            "chess-knight",
+            "chess-pawn",
+            "chess-queen",
+            "chess-rook",
+            "chevron-double-down",
+            "chevron-double-left",
+            "chevron-double-right",
+            "chevron-double-up",
+            "chevron-down",
+            "chevron-down-box",
+            "chevron-down-box-outline",
+            "chevron-down-circle",
+            "chevron-down-circle-outline",
+            "chevron-left",
+            "chevron-left-box",
+            "chevron-left-box-outline",
+            "chevron-left-circle",
+            "chevron-left-circle-outline",
+            "chevron-right",
+            "chevron-right-box",
+            "chevron-right-box-outline",
+            "chevron-right-circle",
+            "chevron-right-circle-outline",
+            "chevron-triple-down",
+            "chevron-triple-left",
+            "chevron-triple-right",
+            "chevron-triple-up",
+            "chevron-up",
+            "chevron-up-box",
+            "chevron-up-box-outline",
+            "chevron-up-circle",
+            "chevron-up-circle-outline",
+            "chili-alert",
+            "chili-alert-outline",
+            "chili-hot",
+            "chili-hot-outline",
+            "chili-medium",
+            "chili-medium-outline",
+            "chili-mild",
+            "chili-mild-outline",
+            "chili-off",
+            "chili-off-outline",
+            "chip",
+            "church",
+            "church-outline",
+            "cigar",
+            "cigar-off",
+            "circle",
+            "circle-box",
+            "circle-box-outline",
+            "circle-double",
+            "circle-edit-outline",
+            "circle-expand",
+            "circle-half",
+            "circle-half-full",
+            "circle-medium",
+            "circle-multiple",
+            "circle-multiple-outline",
+            "circle-off-outline",
+            "circle-opacity",
+            "circle-outline",
+            "circle-slice-1",
+            "circle-slice-2",
+            "circle-slice-3",
+            "circle-slice-4",
+            "circle-slice-5",
+            "circle-slice-6",
+            "circle-slice-7",
+            "circle-slice-8",
+            "circle-small",
+            "circular-saw",
+            "city",
+            "city-switch",
+            "city-variant",
+            "city-variant-outline",
+            "clipboard",
+            "clipboard-account",
+            "clipboard-account-outline",
+            "clipboard-alert",
+            "clipboard-alert-outline",
+            "clipboard-arrow-down",
+            "clipboard-arrow-down-outline",
+            "clipboard-arrow-left",
+            "clipboard-arrow-left-outline",
+            "clipboard-arrow-right",
+            "clipboard-arrow-right-outline",
+            "clipboard-arrow-up",
+            "clipboard-arrow-up-outline",
+            "clipboard-check",
+            "clipboard-check-multiple",
+            "clipboard-check-multiple-outline",
+            "clipboard-check-outline",
+            "clipboard-clock",
+            "clipboard-clock-outline",
+            "clipboard-edit",
+            "clipboard-edit-outline",
+            "clipboard-file",
+            "clipboard-file-outline",
+            "clipboard-flow",
+            "clipboard-flow-outline",
+            "clipboard-list",
+            "clipboard-list-outline",
+            "clipboard-minus",
+            "clipboard-minus-outline",
+            "clipboard-multiple",
+            "clipboard-multiple-outline",
+            "clipboard-off",
+            "clipboard-off-outline",
+            "clipboard-outline",
+            "clipboard-play",
+            "clipboard-play-multiple",
+            "clipboard-play-multiple-outline",
+            "clipboard-play-outline",
+            "clipboard-plus",
+            "clipboard-plus-outline",
+            "clipboard-pulse",
+            "clipboard-pulse-outline",
+            "clipboard-remove",
+            "clipboard-remove-outline",
+            "clipboard-search",
+            "clipboard-search-outline",
+            "clipboard-text",
+            "clipboard-text-clock",
+            "clipboard-text-clock-outline",
+            "clipboard-text-multiple",
+            "clipboard-text-multiple-outline",
+            "clipboard-text-off",
+            "clipboard-text-off-outline",
+            "clipboard-text-outline",
+            "clipboard-text-play",
+            "clipboard-text-play-outline",
+            "clipboard-text-search",
+            "clipboard-text-search-outline",
+            "clippy",
+            "clock",
+            "clock-alert",
+            "clock-alert-outline",
+            "clock-check",
+            "clock-check-outline",
+            "clock-digital",
+            "clock-edit",
+            "clock-edit-outline",
+            "clock-end",
+            "clock-fast",
+            "clock-in",
+            "clock-minus",
+            "clock-minus-outline",
+            "clock-out",
+            "clock-outline",
+            "clock-plus",
+            "clock-plus-outline",
+            "clock-remove",
+            "clock-remove-outline",
+            "clock-star-four-points",
+            "clock-star-four-points-outline",
+            "clock-start",
+            "clock-time-eight",
+            "clock-time-eight-outline",
+            "clock-time-eleven",
+            "clock-time-eleven-outline",
+            "clock-time-five",
+            "clock-time-five-outline",
+            "clock-time-four",
+            "clock-time-four-outline",
+            "clock-time-nine",
+            "clock-time-nine-outline",
+            "clock-time-one",
+            "clock-time-one-outline",
+            "clock-time-seven",
+            "clock-time-seven-outline",
+            "clock-time-six",
+            "clock-time-six-outline",
+            "clock-time-ten",
+            "clock-time-ten-outline",
+            "clock-time-three",
+            "clock-time-three-outline",
+            "clock-time-twelve",
+            "clock-time-twelve-outline",
+            "clock-time-two",
+            "clock-time-two-outline",
+            "close",
+            "close-box",
+            "close-box-multiple",
+            "close-box-multiple-outline",
+            "close-box-outline",
+            "close-circle",
+            "close-circle-multiple",
+            "close-circle-multiple-outline",
+            "close-circle-outline",
+            "close-network",
+            "close-network-outline",
+            "close-octagon",
+            "close-octagon-outline",
+            "close-outline",
+            "close-thick",
+            "closed-caption",
+            "closed-caption-outline",
+            "cloud",
+            "cloud-alert",
+            "cloud-alert-outline",
+            "cloud-arrow-down",
+            "cloud-arrow-down-outline",
+            "cloud-arrow-left",
+            "cloud-arrow-left-outline",
+            "cloud-arrow-right",
+            "cloud-arrow-right-outline",
+            "cloud-arrow-up",
+            "cloud-arrow-up-outline",
+            "cloud-braces",
+            "cloud-cancel",
+            "cloud-cancel-outline",
+            "cloud-check",
+            "cloud-check-outline",
+            "cloud-check-variant",
+            "cloud-check-variant-outline",
+            "cloud-circle",
+            "cloud-circle-outline",
+            "cloud-clock",
+            "cloud-clock-outline",
+            "cloud-cog",
+            "cloud-cog-outline",
+            "cloud-download",
+            "cloud-download-outline",
+            "cloud-key",
+            "cloud-key-outline",
+            "cloud-lock",
+            "cloud-lock-open",
+            "cloud-lock-open-outline",
+            "cloud-lock-outline",
+            "cloud-minus",
+            "cloud-minus-outline",
+            "cloud-off",
+            "cloud-off-outline",
+            "cloud-outline",
+            "cloud-percent",
+            "cloud-percent-outline",
+            "cloud-plus",
+            "cloud-plus-outline",
+            "cloud-print",
+            "cloud-print-outline",
+            "cloud-question",
+            "cloud-question-outline",
+            "cloud-refresh",
+            "cloud-refresh-outline",
+            "cloud-refresh-variant",
+            "cloud-refresh-variant-outline",
+            "cloud-remove",
+            "cloud-remove-outline",
+            "cloud-search",
+            "cloud-search-outline",
+            "cloud-sync",
+            "cloud-sync-outline",
+            "cloud-tags",
+            "cloud-upload",
+            "cloud-upload-outline",
+            "clouds",
+            "clover",
+            "clover-outline",
+            "coach-lamp",
+            "coach-lamp-variant",
+            "coat-rack",
+            "code-array",
+            "code-block-braces",
+            "code-block-brackets",
+            "code-block-parentheses",
+            "code-block-tags",
+            "code-braces",
+            "code-braces-box",
+            "code-brackets",
+            "code-equal",
+            "code-greater-than",
+            "code-greater-than-or-equal",
+            "code-json",
+            "code-less-than",
+            "code-less-than-or-equal",
+            "code-not-equal",
+            "code-not-equal-variant",
+            "code-parentheses",
+            "code-parentheses-box",
+            "code-string",
+            "code-tags",
+            "code-tags-check",
+            "codepen",
+            "coffee",
+            "coffee-maker",
+            "coffee-maker-check",
+            "coffee-maker-check-outline",
+            "coffee-maker-outline",
+            "coffee-off",
+            "coffee-off-outline",
+            "coffee-outline",
+            "coffee-to-go",
+            "coffee-to-go-outline",
+            "coffin",
+            "cog",
+            "cog-box",
+            "cog-clockwise",
+            "cog-counterclockwise",
+            "cog-off",
+            "cog-off-outline",
+            "cog-outline",
+            "cog-pause",
+            "cog-pause-outline",
+            "cog-play",
+            "cog-play-outline",
+            "cog-refresh",
+            "cog-refresh-outline",
+            "cog-stop",
+            "cog-stop-outline",
+            "cog-sync",
+            "cog-sync-outline",
+            "cog-transfer",
+            "cog-transfer-outline",
+            "cogs",
+            "collage",
+            "collapse-all",
+            "collapse-all-outline",
+            "color-helper",
+            "comma",
+            "comma-box",
+            "comma-box-outline",
+            "comma-circle",
+            "comma-circle-outline",
+            "comment",
+            "comment-account",
+            "comment-account-outline",
+            "comment-alert",
+            "comment-alert-outline",
+            "comment-arrow-left",
+            "comment-arrow-left-outline",
+            "comment-arrow-right",
+            "comment-arrow-right-outline",
+            "comment-bookmark",
+            "comment-bookmark-outline",
+            "comment-check",
+            "comment-check-outline",
+            "comment-edit",
+            "comment-edit-outline",
+            "comment-eye",
+            "comment-eye-outline",
+            "comment-flash",
+            "comment-flash-outline",
+            "comment-minus",
+            "comment-minus-outline",
+            "comment-multiple",
+            "comment-multiple-outline",
+            "comment-off",
+            "comment-off-outline",
+            "comment-outline",
+            "comment-plus",
+            "comment-plus-outline",
+            "comment-processing",
+            "comment-processing-outline",
+            "comment-question",
+            "comment-question-outline",
+            "comment-quote",
+            "comment-quote-outline",
+            "comment-remove",
+            "comment-remove-outline",
+            "comment-search",
+            "comment-search-outline",
+            "comment-text",
+            "comment-text-multiple",
+            "comment-text-multiple-outline",
+            "comment-text-outline",
+            "compare",
+            "compare-horizontal",
+            "compare-remove",
+            "compare-vertical",
+            "compass",
+            "compass-off",
+            "compass-off-outline",
+            "compass-outline",
+            "compass-rose",
+            "compost",
+            "cone",
+            "cone-off",
+            "connection",
+            "console",
+            "console-line",
+            "console-network",
+            "console-network-outline",
+            "consolidate",
+            "contactless-payment",
+            "contactless-payment-circle",
+            "contactless-payment-circle-outline",
+            "contacts",
+            "contacts-outline",
+            "contain",
+            "contain-end",
+            "contain-start",
+            "content-copy",
+            "content-cut",
+            "content-duplicate",
+            "content-paste",
+            "content-save",
+            "content-save-alert",
+            "content-save-alert-outline",
+            "content-save-all",
+            "content-save-all-outline",
+            "content-save-check",
+            "content-save-check-outline",
+            "content-save-cog",
+            "content-save-cog-outline",
+            "content-save-edit",
+            "content-save-edit-outline",
+            "content-save-minus",
+            "content-save-minus-outline",
+            "content-save-move",
+            "content-save-move-outline",
+            "content-save-off",
+            "content-save-off-outline",
+            "content-save-outline",
+            "content-save-plus",
+            "content-save-plus-outline",
+            "content-save-settings",
+            "content-save-settings-outline",
+            "contrast",
+            "contrast-box",
+            "contrast-circle",
+            "controller",
+            "controller-classic",
+            "controller-classic-outline",
+            "controller-off",
+            "cookie",
+            "cookie-alert",
+            "cookie-alert-outline",
+            "cookie-check",
+            "cookie-check-outline",
+            "cookie-clock",
+            "cookie-clock-outline",
+            "cookie-cog",
+            "cookie-cog-outline",
+            "cookie-edit",
+            "cookie-edit-outline",
+            "cookie-lock",
+            "cookie-lock-outline",
+            "cookie-minus",
+            "cookie-minus-outline",
+            "cookie-off",
+            "cookie-off-outline",
+            "cookie-outline",
+            "cookie-plus",
+            "cookie-plus-outline",
+            "cookie-refresh",
+            "cookie-refresh-outline",
+            "cookie-remove",
+            "cookie-remove-outline",
+            "cookie-settings",
+            "cookie-settings-outline",
+            "coolant-temperature",
+            "copyleft",
+            "copyright",
+            "cordova",
+            "corn",
+            "corn-off",
+            "cosine-wave",
+            "counter",
+            "countertop",
+            "countertop-outline",
+            "cow",
+            "cow-off",
+            "cpu-32-bit",
+            "cpu-64-bit",
+            "cradle",
+            "cradle-outline",
+            "crane",
+            "creation",
+            "creation-outline",
+            "creative-commons",
+            "credit-card",
+            "credit-card-check",
+            "credit-card-check-outline",
+            "credit-card-chip",
+            "credit-card-chip-outline",
+            "credit-card-clock",
+            "credit-card-clock-outline",
+            "credit-card-edit",
+            "credit-card-edit-outline",
+            "credit-card-fast",
+            "credit-card-fast-outline",
+            "credit-card-lock",
+            "credit-card-lock-outline",
+            "credit-card-marker",
+            "credit-card-marker-outline",
+            "credit-card-minus",
+            "credit-card-minus-outline",
+            "credit-card-multiple",
+            "credit-card-multiple-outline",
+            "credit-card-off",
+            "credit-card-off-outline",
+            "credit-card-outline",
+            "credit-card-plus",
+            "credit-card-plus-outline",
+            "credit-card-refresh",
+            "credit-card-refresh-outline",
+            "credit-card-refund",
+            "credit-card-refund-outline",
+            "credit-card-remove",
+            "credit-card-remove-outline",
+            "credit-card-scan",
+            "credit-card-scan-outline",
+            "credit-card-search",
+            "credit-card-search-outline",
+            "credit-card-settings",
+            "credit-card-settings-outline",
+            "credit-card-sync",
+            "credit-card-sync-outline",
+            "credit-card-wireless",
+            "credit-card-wireless-off",
+            "credit-card-wireless-off-outline",
+            "credit-card-wireless-outline",
+            "cricket",
+            "crop",
+            "crop-free",
+            "crop-landscape",
+            "crop-portrait",
+            "crop-rotate",
+            "crop-square",
+            "cross",
+            "cross-bolnisi",
+            "cross-celtic",
+            "cross-outline",
+            "crosshairs",
+            "crosshairs-gps",
+            "crosshairs-off",
+            "crosshairs-question",
+            "crowd",
+            "crown",
+            "crown-circle",
+            "crown-circle-outline",
+            "crown-outline",
+            "cryengine",
+            "crystal-ball",
+            "cube",
+            "cube-off",
+            "cube-off-outline",
+            "cube-outline",
+            "cube-scan",
+            "cube-send",
+            "cube-unfolded",
+            "cup",
+            "cup-off",
+            "cup-off-outline",
+            "cup-outline",
+            "cup-water",
+            "cupboard",
+            "cupboard-outline",
+            "cupcake",
+            "curling",
+            "currency-bdt",
+            "currency-brl",
+            "currency-btc",
+            "currency-cny",
+            "currency-eth",
+            "currency-eur",
+            "currency-eur-off",
+            "currency-fra",
+            "currency-gbp",
+            "currency-ils",
+            "currency-inr",
+            "currency-jpy",
+            "currency-krw",
+            "currency-kzt",
+            "currency-mnt",
+            "currency-ngn",
+            "currency-php",
+            "currency-rial",
+            "currency-rub",
+            "currency-rupee",
+            "currency-sign",
+            "currency-thb",
+            "currency-try",
+            "currency-twd",
+            "currency-uah",
+            "currency-usd",
+            "currency-usd-off",
+            "current-ac",
+            "current-dc",
+            "cursor-default",
+            "cursor-default-click",
+            "cursor-default-click-outline",
+            "cursor-default-gesture",
+            "cursor-default-gesture-outline",
+            "cursor-default-outline",
+            "cursor-move",
+            "cursor-pointer",
+            "cursor-text",
+            "curtains",
+            "curtains-closed",
+            "cylinder",
+            "cylinder-off",
+            "dance-ballroom",
+            "dance-pole",
+            "data-matrix",
+            "data-matrix-edit",
+            "data-matrix-minus",
+            "data-matrix-plus",
+            "data-matrix-remove",
+            "data-matrix-scan",
+            "database",
+            "database-alert",
+            "database-alert-outline",
+            "database-arrow-down",
+            "database-arrow-down-outline",
+            "database-arrow-left",
+            "database-arrow-left-outline",
+            "database-arrow-right",
+            "database-arrow-right-outline",
+            "database-arrow-up",
+            "database-arrow-up-outline",
+            "database-check",
+            "database-check-outline",
+            "database-clock",
+            "database-clock-outline",
+            "database-cog",
+            "database-cog-outline",
+            "database-edit",
+            "database-edit-outline",
+            "database-export",
+            "database-export-outline",
+            "database-eye",
+            "database-eye-off",
+            "database-eye-off-outline",
+            "database-eye-outline",
+            "database-import",
+            "database-import-outline",
+            "database-lock",
+            "database-lock-outline",
+            "database-marker",
+            "database-marker-outline",
+            "database-minus",
+            "database-minus-outline",
+            "database-off",
+            "database-off-outline",
+            "database-outline",
+            "database-plus",
+            "database-plus-outline",
+            "database-refresh",
+            "database-refresh-outline",
+            "database-remove",
+            "database-remove-outline",
+            "database-search",
+            "database-search-outline",
+            "database-settings",
+            "database-settings-outline",
+            "database-sync",
+            "database-sync-outline",
+            "death-star",
+            "death-star-variant",
+            "deathly-hallows",
+            "debian",
+            "debug-step-into",
+            "debug-step-out",
+            "debug-step-over",
+            "decagram",
+            "decagram-outline",
+            "decimal",
+            "decimal-comma",
+            "decimal-comma-decrease",
+            "decimal-comma-increase",
+            "decimal-decrease",
+            "decimal-increase",
+            "delete",
+            "delete-alert",
+            "delete-alert-outline",
+            "delete-circle",
+            "delete-circle-outline",
+            "delete-clock",
+            "delete-clock-outline",
+            "delete-empty",
+            "delete-empty-outline",
+            "delete-forever",
+            "delete-forever-outline",
+            "delete-off",
+            "delete-off-outline",
+            "delete-outline",
+            "delete-restore",
+            "delete-sweep",
+            "delete-sweep-outline",
+            "delete-variant",
+            "delta",
+            "desk",
+            "desk-lamp",
+            "desk-lamp-off",
+            "desk-lamp-on",
+            "deskphone",
+            "desktop-classic",
+            "desktop-tower",
+            "desktop-tower-monitor",
+            "details",
+            "dev-to",
+            "developer-board",
+            "deviantart",
+            "devices",
+            "dharmachakra",
+            "diabetes",
+            "dialpad",
+            "diameter",
+            "diameter-outline",
+            "diameter-variant",
+            "diamond",
+            "diamond-outline",
+            "diamond-stone",
+            "diaper-outline",
+            "dice-1",
+            "dice-1-outline",
+            "dice-2",
+            "dice-2-outline",
+            "dice-3",
+            "dice-3-outline",
+            "dice-4",
+            "dice-4-outline",
+            "dice-5",
+            "dice-5-outline",
+            "dice-6",
+            "dice-6-outline",
+            "dice-d10",
+            "dice-d10-outline",
+            "dice-d12",
+            "dice-d12-outline",
+            "dice-d20",
+            "dice-d20-outline",
+            "dice-d4",
+            "dice-d4-outline",
+            "dice-d6",
+            "dice-d6-outline",
+            "dice-d8",
+            "dice-d8-outline",
+            "dice-multiple",
+            "dice-multiple-outline",
+            "digital-ocean",
+            "dip-switch",
+            "directions",
+            "directions-fork",
+            "disc",
+            "disc-alert",
+            "disc-player",
+            "dishwasher",
+            "dishwasher-alert",
+            "dishwasher-off",
+            "disqus",
+            "distribute-horizontal-center",
+            "distribute-horizontal-left",
+            "distribute-horizontal-right",
+            "distribute-vertical-bottom",
+            "distribute-vertical-center",
+            "distribute-vertical-top",
+            "diversify",
+            "diving",
+            "diving-flippers",
+            "diving-helmet",
+            "diving-scuba",
+            "diving-scuba-flag",
+            "diving-scuba-mask",
+            "diving-scuba-tank",
+            "diving-scuba-tank-multiple",
+            "diving-snorkel",
+            "division",
+            "division-box",
+            "dlna",
+            "dna",
+            "dns",
+            "dns-outline",
+            "dock-bottom",
+            "dock-left",
+            "dock-right",
+            "dock-top",
+            "dock-window",
+            "docker",
+            "doctor",
+            "dog",
+            "dog-service",
+            "dog-side",
+            "dog-side-off",
+            "dolby",
+            "dolly",
+            "dolphin",
+            "domain",
+            "domain-off",
+            "domain-plus",
+            "domain-remove",
+            "domain-switch",
+            "dome-light",
+            "domino-mask",
+            "donkey",
+            "door",
+            "door-closed",
+            "door-closed-cancel",
+            "door-closed-lock",
+            "door-open",
+            "door-sliding",
+            "door-sliding-lock",
+            "door-sliding-open",
+            "doorbell",
+            "doorbell-video",
+            "dot-net",
+            "dots-circle",
+            "dots-grid",
+            "dots-hexagon",
+            "dots-horizontal",
+            "dots-horizontal-circle",
+            "dots-horizontal-circle-outline",
+            "dots-square",
+            "dots-triangle",
+            "dots-vertical",
+            "dots-vertical-circle",
+            "dots-vertical-circle-outline",
+            "download",
+            "download-box",
+            "download-box-outline",
+            "download-circle",
+            "download-circle-outline",
+            "download-lock",
+            "download-lock-outline",
+            "download-multiple",
+            "download-multiple-outline",
+            "download-network",
+            "download-network-outline",
+            "download-off",
+            "download-off-outline",
+            "download-outline",
+            "drag",
+            "drag-horizontal",
+            "drag-horizontal-variant",
+            "drag-variant",
+            "drag-vertical",
+            "drag-vertical-variant",
+            "drama-masks",
+            "draw",
+            "draw-pen",
+            "drawing",
+            "drawing-box",
+            "dresser",
+            "dresser-outline",
+            "drone",
+            "dropbox",
+            "drupal",
+            "duck",
+            "dumbbell",
+            "dump-truck",
+            "ear-hearing",
+            "ear-hearing-loop",
+            "ear-hearing-off",
+            "earbuds",
+            "earbuds-off",
+            "earbuds-off-outline",
+            "earbuds-outline",
+            "earth",
+            "earth-arrow-down",
+            "earth-arrow-left",
+            "earth-arrow-right",
+            "earth-arrow-up",
+            "earth-box",
+            "earth-box-minus",
+            "earth-box-off",
+            "earth-box-plus",
+            "earth-box-remove",
+            "earth-minus",
+            "earth-off",
+            "earth-plus",
+            "earth-remove",
+            "egg",
+            "egg-easter",
+            "egg-fried",
+            "egg-off",
+            "egg-off-outline",
+            "egg-outline",
+            "eiffel-tower",
+            "eight-track",
+            "eject",
+            "eject-circle",
+            "eject-circle-outline",
+            "eject-outline",
+            "electric-switch",
+            "electric-switch-closed",
+            "electron-framework",
+            "elephant",
+            "elevation-decline",
+            "elevation-rise",
+            "elevator",
+            "elevator-down",
+            "elevator-passenger",
+            "elevator-passenger-off",
+            "elevator-passenger-off-outline",
+            "elevator-passenger-outline",
+            "elevator-up",
+            "ellipse",
+            "ellipse-outline",
+            "email",
+            "email-alert",
+            "email-alert-outline",
+            "email-arrow-left",
+            "email-arrow-left-outline",
+            "email-arrow-right",
+            "email-arrow-right-outline",
+            "email-box",
+            "email-check",
+            "email-check-outline",
+            "email-edit",
+            "email-edit-outline",
+            "email-fast",
+            "email-fast-outline",
+            "email-heart-outline",
+            "email-lock",
+            "email-lock-outline",
+            "email-mark-as-unread",
+            "email-minus",
+            "email-minus-outline",
+            "email-multiple",
+            "email-multiple-outline",
+            "email-newsletter",
+            "email-off",
+            "email-off-outline",
+            "email-open",
+            "email-open-heart-outline",
+            "email-open-multiple",
+            "email-open-multiple-outline",
+            "email-open-outline",
+            "email-outline",
+            "email-plus",
+            "email-plus-outline",
+            "email-remove",
+            "email-remove-outline",
+            "email-seal",
+            "email-seal-outline",
+            "email-search",
+            "email-search-outline",
+            "email-sync",
+            "email-sync-outline",
+            "email-variant",
+            "ember",
+            "emby",
+            "emoticon",
+            "emoticon-angry",
+            "emoticon-angry-outline",
+            "emoticon-confused",
+            "emoticon-confused-outline",
+            "emoticon-cool",
+            "emoticon-cool-outline",
+            "emoticon-cry",
+            "emoticon-cry-outline",
+            "emoticon-dead",
+            "emoticon-dead-outline",
+            "emoticon-devil",
+            "emoticon-devil-outline",
+            "emoticon-excited",
+            "emoticon-excited-outline",
+            "emoticon-frown",
+            "emoticon-frown-outline",
+            "emoticon-happy",
+            "emoticon-happy-outline",
+            "emoticon-kiss",
+            "emoticon-kiss-outline",
+            "emoticon-lol",
+            "emoticon-lol-outline",
+            "emoticon-minus",
+            "emoticon-minus-outline",
+            "emoticon-neutral",
+            "emoticon-neutral-outline",
+            "emoticon-outline",
+            "emoticon-plus",
+            "emoticon-plus-outline",
+            "emoticon-poop",
+            "emoticon-poop-outline",
+            "emoticon-remove",
+            "emoticon-remove-outline",
+            "emoticon-sad",
+            "emoticon-sad-outline",
+            "emoticon-sick",
+            "emoticon-sick-outline",
+            "emoticon-tongue",
+            "emoticon-tongue-outline",
+            "emoticon-wink",
+            "emoticon-wink-outline",
+            "engine",
+            "engine-off",
+            "engine-off-outline",
+            "engine-outline",
+            "epsilon",
+            "equal",
+            "equal-box",
+            "equalizer",
+            "equalizer-outline",
+            "eraser",
+            "eraser-variant",
+            "escalator",
+            "escalator-box",
+            "escalator-down",
+            "escalator-up",
+            "eslint",
+            "et",
+            "ethereum",
+            "ethernet",
+            "ethernet-cable",
+            "ethernet-cable-off",
+            "ethernet-off",
+            "ev-plug-ccs1",
+            "ev-plug-ccs2",
+            "ev-plug-chademo",
+            "ev-plug-tesla",
+            "ev-plug-type1",
+            "ev-plug-type2",
+            "ev-station",
+            "evernote",
+            "excavator",
+            "exclamation",
+            "exclamation-thick",
+            "exit-run",
+            "exit-to-app",
+            "expand-all",
+            "expand-all-outline",
+            "expansion-card",
+            "expansion-card-variant",
+            "exponent",
+            "exponent-box",
+            "export",
+            "export-variant",
+            "eye",
+            "eye-arrow-left",
+            "eye-arrow-left-outline",
+            "eye-arrow-right",
+            "eye-arrow-right-outline",
+            "eye-check",
+            "eye-check-outline",
+            "eye-circle",
+            "eye-circle-outline",
+            "eye-closed",
+            "eye-lock",
+            "eye-lock-open",
+            "eye-lock-open-outline",
+            "eye-lock-outline",
+            "eye-minus",
+            "eye-minus-outline",
+            "eye-off",
+            "eye-off-outline",
+            "eye-outline",
+            "eye-plus",
+            "eye-plus-outline",
+            "eye-refresh",
+            "eye-refresh-outline",
+            "eye-remove",
+            "eye-remove-outline",
+            "eye-settings",
+            "eye-settings-outline",
+            "eyedropper",
+            "eyedropper-minus",
+            "eyedropper-off",
+            "eyedropper-plus",
+            "eyedropper-remove",
+            "eyedropper-variant",
+            "face-agent",
+            "face-man",
+            "face-man-outline",
+            "face-man-profile",
+            "face-man-shimmer",
+            "face-man-shimmer-outline",
+            "face-mask",
+            "face-mask-outline",
+            "face-recognition",
+            "face-woman",
+            "face-woman-outline",
+            "face-woman-profile",
+            "face-woman-shimmer",
+            "face-woman-shimmer-outline",
+            "facebook",
+            "facebook-gaming",
+            "facebook-messenger",
+            "facebook-workplace",
+            "factory",
+            "family-tree",
+            "fan",
+            "fan-alert",
+            "fan-auto",
+            "fan-chevron-down",
+            "fan-chevron-up",
+            "fan-clock",
+            "fan-minus",
+            "fan-off",
+            "fan-plus",
+            "fan-remove",
+            "fan-speed-1",
+            "fan-speed-2",
+            "fan-speed-3",
+            "fast-forward",
+            "fast-forward-10",
+            "fast-forward-15",
+            "fast-forward-30",
+            "fast-forward-45",
+            "fast-forward-5",
+            "fast-forward-60",
+            "fast-forward-outline",
+            "faucet",
+            "faucet-variant",
+            "fax",
+            "feather",
+            "feature-search",
+            "feature-search-outline",
+            "fedora",
+            "fence",
+            "fence-electric",
+            "fencing",
+            "ferris-wheel",
+            "ferry",
+            "file",
+            "file-account",
+            "file-account-outline",
+            "file-alert",
+            "file-alert-outline",
+            "file-arrow-left-right",
+            "file-arrow-left-right-outline",
+            "file-arrow-up-down",
+            "file-arrow-up-down-outline",
+            "file-cabinet",
+            "file-cad",
+            "file-cad-box",
+            "file-cancel",
+            "file-cancel-outline",
+            "file-certificate",
+            "file-certificate-outline",
+            "file-chart",
+            "file-chart-check",
+            "file-chart-check-outline",
+            "file-chart-outline",
+            "file-check",
+            "file-check-outline",
+            "file-clock",
+            "file-clock-outline",
+            "file-cloud",
+            "file-cloud-outline",
+            "file-code",
+            "file-code-outline",
+            "file-cog",
+            "file-cog-outline",
+            "file-compare",
+            "file-delimited",
+            "file-delimited-outline",
+            "file-document",
+            "file-document-alert",
+            "file-document-alert-outline",
+            "file-document-arrow-right",
+            "file-document-arrow-right-outline",
+            "file-document-check",
+            "file-document-check-outline",
+            "file-document-edit",
+            "file-document-edit-outline",
+            "file-document-minus",
+            "file-document-minus-outline",
+            "file-document-multiple",
+            "file-document-multiple-outline",
+            "file-document-outline",
+            "file-document-plus",
+            "file-document-plus-outline",
+            "file-document-refresh",
+            "file-document-refresh-outline",
+            "file-document-remove",
+            "file-document-remove-outline",
+            "file-download",
+            "file-download-outline",
+            "file-edit",
+            "file-edit-outline",
+            "file-excel",
+            "file-excel-box",
+            "file-excel-box-outline",
+            "file-excel-outline",
+            "file-export",
+            "file-export-outline",
+            "file-eye",
+            "file-eye-outline",
+            "file-find",
+            "file-find-outline",
+            "file-gif-box",
+            "file-hidden",
+            "file-image",
+            "file-image-marker",
+            "file-image-marker-outline",
+            "file-image-minus",
+            "file-image-minus-outline",
+            "file-image-outline",
+            "file-image-plus",
+            "file-image-plus-outline",
+            "file-image-remove",
+            "file-image-remove-outline",
+            "file-import",
+            "file-import-outline",
+            "file-jpg-box",
+            "file-key",
+            "file-key-outline",
+            "file-link",
+            "file-link-outline",
+            "file-lock",
+            "file-lock-open",
+            "file-lock-open-outline",
+            "file-lock-outline",
+            "file-marker",
+            "file-marker-outline",
+            "file-minus",
+            "file-minus-outline",
+            "file-move",
+            "file-move-outline",
+            "file-multiple",
+            "file-multiple-outline",
+            "file-music",
+            "file-music-outline",
+            "file-outline",
+            "file-pdf-box",
+            "file-percent",
+            "file-percent-outline",
+            "file-phone",
+            "file-phone-outline",
+            "file-plus",
+            "file-plus-outline",
+            "file-png-box",
+            "file-powerpoint",
+            "file-powerpoint-box",
+            "file-powerpoint-box-outline",
+            "file-powerpoint-outline",
+            "file-presentation-box",
+            "file-question",
+            "file-question-outline",
+            "file-refresh",
+            "file-refresh-outline",
+            "file-remove",
+            "file-remove-outline",
+            "file-replace",
+            "file-replace-outline",
+            "file-restore",
+            "file-restore-outline",
+            "file-rotate-left",
+            "file-rotate-left-outline",
+            "file-rotate-right",
+            "file-rotate-right-outline",
+            "file-search",
+            "file-search-outline",
+            "file-send",
+            "file-send-outline",
+            "file-settings",
+            "file-settings-outline",
+            "file-sign",
+            "file-star",
+            "file-star-four-points",
+            "file-star-four-points-outline",
+            "file-star-outline",
+            "file-swap",
+            "file-swap-outline",
+            "file-sync",
+            "file-sync-outline",
+            "file-table",
+            "file-table-box",
+            "file-table-box-multiple",
+            "file-table-box-multiple-outline",
+            "file-table-box-outline",
+            "file-table-outline",
+            "file-tree",
+            "file-tree-outline",
+            "file-undo",
+            "file-undo-outline",
+            "file-upload",
+            "file-upload-outline",
+            "file-video",
+            "file-video-outline",
+            "file-word",
+            "file-word-box",
+            "file-word-box-outline",
+            "file-word-outline",
+            "file-xml-box",
+            "film",
+            "filmstrip",
+            "filmstrip-box",
+            "filmstrip-box-multiple",
+            "filmstrip-off",
+            "filter",
+            "filter-check",
+            "filter-check-outline",
+            "filter-cog",
+            "filter-cog-outline",
+            "filter-menu",
+            "filter-menu-outline",
+            "filter-minus",
+            "filter-minus-outline",
+            "filter-multiple",
+            "filter-multiple-outline",
+            "filter-off",
+            "filter-off-outline",
+            "filter-outline",
+            "filter-plus",
+            "filter-plus-outline",
+            "filter-remove",
+            "filter-remove-outline",
+            "filter-settings",
+            "filter-settings-outline",
+            "filter-variant",
+            "filter-variant-minus",
+            "filter-variant-plus",
+            "filter-variant-remove",
+            "finance",
+            "find-replace",
+            "fingerprint",
+            "fingerprint-off",
+            "fire",
+            "fire-alert",
+            "fire-circle",
+            "fire-extinguisher",
+            "fire-hydrant",
+            "fire-hydrant-alert",
+            "fire-hydrant-off",
+            "fire-off",
+            "fire-station",
+            "fire-truck",
+            "firebase",
+            "firefox",
+            "fireplace",
+            "fireplace-off",
+            "firewire",
+            "firework",
+            "firework-off",
+            "fish",
+            "fish-off",
+            "fishbowl",
+            "fishbowl-outline",
+            "fit-to-page",
+            "fit-to-page-outline",
+            "fit-to-screen",
+            "fit-to-screen-outline",
+            "flag",
+            "flag-checkered",
+            "flag-minus",
+            "flag-minus-outline",
+            "flag-off",
+            "flag-off-outline",
+            "flag-outline",
+            "flag-plus",
+            "flag-plus-outline",
+            "flag-remove",
+            "flag-remove-outline",
+            "flag-triangle",
+            "flag-variant",
+            "flag-variant-minus",
+            "flag-variant-minus-outline",
+            "flag-variant-off",
+            "flag-variant-off-outline",
+            "flag-variant-outline",
+            "flag-variant-plus",
+            "flag-variant-plus-outline",
+            "flag-variant-remove",
+            "flag-variant-remove-outline",
+            "flare",
+            "flash",
+            "flash-alert",
+            "flash-alert-outline",
+            "flash-auto",
+            "flash-off",
+            "flash-off-outline",
+            "flash-outline",
+            "flash-red-eye",
+            "flash-triangle",
+            "flash-triangle-outline",
+            "flashlight",
+            "flashlight-off",
+            "flask",
+            "flask-empty",
+            "flask-empty-minus",
+            "flask-empty-minus-outline",
+            "flask-empty-off",
+            "flask-empty-off-outline",
+            "flask-empty-outline",
+            "flask-empty-plus",
+            "flask-empty-plus-outline",
+            "flask-empty-remove",
+            "flask-empty-remove-outline",
+            "flask-minus",
+            "flask-minus-outline",
+            "flask-off",
+            "flask-off-outline",
+            "flask-outline",
+            "flask-plus",
+            "flask-plus-outline",
+            "flask-remove",
+            "flask-remove-outline",
+            "flask-round-bottom",
+            "flask-round-bottom-empty",
+            "flask-round-bottom-empty-outline",
+            "flask-round-bottom-outline",
+            "fleur-de-lis",
+            "flip-horizontal",
+            "flip-to-back",
+            "flip-to-front",
+            "flip-vertical",
+            "floor-lamp",
+            "floor-lamp-dual",
+            "floor-lamp-dual-outline",
+            "floor-lamp-outline",
+            "floor-lamp-torchiere",
+            "floor-lamp-torchiere-outline",
+            "floor-lamp-torchiere-variant",
+            "floor-lamp-torchiere-variant-outline",
+            "floor-plan",
+            "floppy",
+            "floppy-variant",
+            "flower",
+            "flower-outline",
+            "flower-pollen",
+            "flower-pollen-outline",
+            "flower-poppy",
+            "flower-tulip",
+            "flower-tulip-outline",
+            "focus-auto",
+            "focus-field",
+            "focus-field-horizontal",
+            "focus-field-vertical",
+            "folder",
+            "folder-account",
+            "folder-account-outline",
+            "folder-alert",
+            "folder-alert-outline",
+            "folder-arrow-down",
+            "folder-arrow-down-outline",
+            "folder-arrow-left",
+            "folder-arrow-left-outline",
+            "folder-arrow-left-right",
+            "folder-arrow-left-right-outline",
+            "folder-arrow-right",
+            "folder-arrow-right-outline",
+            "folder-arrow-up",
+            "folder-arrow-up-down",
+            "folder-arrow-up-down-outline",
+            "folder-arrow-up-outline",
+            "folder-cancel",
+            "folder-cancel-outline",
+            "folder-check",
+            "folder-check-outline",
+            "folder-clock",
+            "folder-clock-outline",
+            "folder-cog",
+            "folder-cog-outline",
+            "folder-download",
+            "folder-download-outline",
+            "folder-edit",
+            "folder-edit-outline",
+            "folder-eye",
+            "folder-eye-outline",
+            "folder-file",
+            "folder-file-outline",
+            "folder-google-drive",
+            "folder-heart",
+            "folder-heart-outline",
+            "folder-hidden",
+            "folder-home",
+            "folder-home-outline",
+            "folder-image",
+            "folder-information",
+            "folder-information-outline",
+            "folder-key",
+            "folder-key-network",
+            "folder-key-network-outline",
+            "folder-key-outline",
+            "folder-lock",
+            "folder-lock-open",
+            "folder-lock-open-outline",
+            "folder-lock-outline",
+            "folder-marker",
+            "folder-marker-outline",
+            "folder-minus",
+            "folder-minus-outline",
+            "folder-move",
+            "folder-move-outline",
+            "folder-multiple",
+            "folder-multiple-image",
+            "folder-multiple-outline",
+            "folder-multiple-plus",
+            "folder-multiple-plus-outline",
+            "folder-music",
+            "folder-music-outline",
+            "folder-network",
+            "folder-network-outline",
+            "folder-off",
+            "folder-off-outline",
+            "folder-open",
+            "folder-open-outline",
+            "folder-outline",
+            "folder-play",
+            "folder-play-outline",
+            "folder-plus",
+            "folder-plus-outline",
+            "folder-pound",
+            "folder-pound-outline",
+            "folder-question",
+            "folder-question-outline",
+            "folder-refresh",
+            "folder-refresh-outline",
+            "folder-remove",
+            "folder-remove-outline",
+            "folder-search",
+            "folder-search-outline",
+            "folder-settings",
+            "folder-settings-outline",
+            "folder-star",
+            "folder-star-multiple",
+            "folder-star-multiple-outline",
+            "folder-star-outline",
+            "folder-swap",
+            "folder-swap-outline",
+            "folder-sync",
+            "folder-sync-outline",
+            "folder-table",
+            "folder-table-outline",
+            "folder-text",
+            "folder-text-outline",
+            "folder-upload",
+            "folder-upload-outline",
+            "folder-wrench",
+            "folder-wrench-outline",
+            "folder-zip",
+            "folder-zip-outline",
+            "font-awesome",
+            "food",
+            "food-apple",
+            "food-apple-outline",
+            "food-croissant",
+            "food-drumstick",
+            "food-drumstick-off",
+            "food-drumstick-off-outline",
+            "food-drumstick-outline",
+            "food-fork-drink",
+            "food-halal",
+            "food-hot-dog",
+            "food-kosher",
+            "food-off",
+            "food-off-outline",
+            "food-outline",
+            "food-steak",
+            "food-steak-off",
+            "food-takeout-box",
+            "food-takeout-box-outline",
+            "food-turkey",
+            "food-variant",
+            "food-variant-off",
+            "foot-print",
+            "football",
+            "football-australian",
+            "football-helmet",
+            "forest",
+            "forest-outline",
+            "forklift",
+            "form-dropdown",
+            "form-select",
+            "form-textarea",
+            "form-textbox",
+            "form-textbox-lock",
+            "form-textbox-password",
+            "format-align-bottom",
+            "format-align-center",
+            "format-align-justify",
+            "format-align-left",
+            "format-align-middle",
+            "format-align-right",
+            "format-align-top",
+            "format-annotation-minus",
+            "format-annotation-plus",
+            "format-bold",
+            "format-clear",
+            "format-color-fill",
+            "format-color-highlight",
+            "format-color-marker-cancel",
+            "format-color-text",
+            "format-columns",
+            "format-float-center",
+            "format-float-left",
+            "format-float-none",
+            "format-float-right",
+            "format-font",
+            "format-font-size-decrease",
+            "format-font-size-increase",
+            "format-header-1",
+            "format-header-2",
+            "format-header-3",
+            "format-header-4",
+            "format-header-5",
+            "format-header-6",
+            "format-header-decrease",
+            "format-header-equal",
+            "format-header-increase",
+            "format-header-pound",
+            "format-horizontal-align-center",
+            "format-horizontal-align-left",
+            "format-horizontal-align-right",
+            "format-indent-decrease",
+            "format-indent-increase",
+            "format-italic",
+            "format-letter-case",
+            "format-letter-case-lower",
+            "format-letter-case-upper",
+            "format-letter-ends-with",
+            "format-letter-matches",
+            "format-letter-spacing",
+            "format-letter-spacing-variant",
+            "format-letter-starts-with",
+            "format-line-height",
+            "format-line-spacing",
+            "format-line-style",
+            "format-line-weight",
+            "format-list-bulleted",
+            "format-list-bulleted-square",
+            "format-list-bulleted-triangle",
+            "format-list-bulleted-type",
+            "format-list-checkbox",
+            "format-list-checks",
+            "format-list-group",
+            "format-list-group-plus",
+            "format-list-numbered",
+            "format-list-numbered-rtl",
+            "format-list-text",
+            "format-overline",
+            "format-page-break",
+            "format-page-split",
+            "format-paint",
+            "format-paragraph",
+            "format-paragraph-spacing",
+            "format-pilcrow",
+            "format-pilcrow-arrow-left",
+            "format-pilcrow-arrow-right",
+            "format-quote-close",
+            "format-quote-close-outline",
+            "format-quote-open",
+            "format-quote-open-outline",
+            "format-rotate-90",
+            "format-section",
+            "format-size",
+            "format-strikethrough",
+            "format-strikethrough-variant",
+            "format-subscript",
+            "format-superscript",
+            "format-text",
+            "format-text-rotation-angle-down",
+            "format-text-rotation-angle-up",
+            "format-text-rotation-down",
+            "format-text-rotation-down-vertical",
+            "format-text-rotation-none",
+            "format-text-rotation-up",
+            "format-text-rotation-vertical",
+            "format-text-variant",
+            "format-text-variant-outline",
+            "format-text-wrapping-clip",
+            "format-text-wrapping-overflow",
+            "format-text-wrapping-wrap",
+            "format-textbox",
+            "format-title",
+            "format-underline",
+            "format-underline-wavy",
+            "format-vertical-align-bottom",
+            "format-vertical-align-center",
+            "format-vertical-align-top",
+            "format-wrap-inline",
+            "format-wrap-square",
+            "format-wrap-tight",
+            "format-wrap-top-bottom",
+            "forum",
+            "forum-minus",
+            "forum-minus-outline",
+            "forum-outline",
+            "forum-plus",
+            "forum-plus-outline",
+            "forum-remove",
+            "forum-remove-outline",
+            "forward",
+            "forwardburger",
+            "fountain",
+            "fountain-pen",
+            "fountain-pen-tip",
+            "fraction-one-half",
+            "freebsd",
+            "french-fries",
+            "frequently-asked-questions",
+            "fridge",
+            "fridge-alert",
+            "fridge-alert-outline",
+            "fridge-bottom",
+            "fridge-industrial",
+            "fridge-industrial-alert",
+            "fridge-industrial-alert-outline",
+            "fridge-industrial-off",
+            "fridge-industrial-off-outline",
+            "fridge-industrial-outline",
+            "fridge-off",
+            "fridge-off-outline",
+            "fridge-outline",
+            "fridge-top",
+            "fridge-variant",
+            "fridge-variant-alert",
+            "fridge-variant-alert-outline",
+            "fridge-variant-off",
+            "fridge-variant-off-outline",
+            "fridge-variant-outline",
+            "fruit-cherries",
+            "fruit-cherries-off",
+            "fruit-citrus",
+            "fruit-citrus-off",
+            "fruit-grapes",
+            "fruit-grapes-outline",
+            "fruit-pear",
+            "fruit-pineapple",
+            "fruit-watermelon",
+            "fuel",
+            "fuel-cell",
+            "fullscreen",
+            "fullscreen-exit",
+            "function",
+            "function-variant",
+            "furigana-horizontal",
+            "furigana-vertical",
+            "fuse",
+            "fuse-alert",
+            "fuse-blade",
+            "fuse-off",
+            "gamepad",
+            "gamepad-circle",
+            "gamepad-circle-down",
+            "gamepad-circle-left",
+            "gamepad-circle-outline",
+            "gamepad-circle-right",
+            "gamepad-circle-up",
+            "gamepad-down",
+            "gamepad-left",
+            "gamepad-outline",
+            "gamepad-right",
+            "gamepad-round",
+            "gamepad-round-down",
+            "gamepad-round-left",
+            "gamepad-round-outline",
+            "gamepad-round-right",
+            "gamepad-round-up",
+            "gamepad-square",
+            "gamepad-square-outline",
+            "gamepad-up",
+            "gamepad-variant",
+            "gamepad-variant-outline",
+            "gamma",
+            "gantry-crane",
+            "garage",
+            "garage-alert",
+            "garage-alert-variant",
+            "garage-lock",
+            "garage-open",
+            "garage-open-variant",
+            "garage-variant",
+            "garage-variant-lock",
+            "gas-burner",
+            "gas-cylinder",
+            "gas-station",
+            "gas-station-in-use",
+            "gas-station-in-use-outline",
+            "gas-station-off",
+            "gas-station-off-outline",
+            "gas-station-outline",
+            "gate",
+            "gate-alert",
+            "gate-and",
+            "gate-arrow-left",
+            "gate-arrow-right",
+            "gate-buffer",
+            "gate-nand",
+            "gate-nor",
+            "gate-not",
+            "gate-open",
+            "gate-or",
+            "gate-xnor",
+            "gate-xor",
+            "gatsby",
+            "gauge",
+            "gauge-empty",
+            "gauge-full",
+            "gauge-low",
+            "gavel",
+            "gender-female",
+            "gender-male",
+            "gender-male-female",
+            "gender-male-female-variant",
+            "gender-non-binary",
+            "gender-transgender",
+            "generator-mobile",
+            "generator-portable",
+            "generator-stationary",
+            "gentoo",
+            "gesture",
+            "gesture-double-tap",
+            "gesture-pinch",
+            "gesture-spread",
+            "gesture-swipe",
+            "gesture-swipe-down",
+            "gesture-swipe-horizontal",
+            "gesture-swipe-left",
+            "gesture-swipe-right",
+            "gesture-swipe-up",
+            "gesture-swipe-vertical",
+            "gesture-tap",
+            "gesture-tap-box",
+            "gesture-tap-button",
+            "gesture-tap-hold",
+            "gesture-two-double-tap",
+            "gesture-two-tap",
+            "ghost",
+            "ghost-off",
+            "ghost-off-outline",
+            "ghost-outline",
+            "gift",
+            "gift-off",
+            "gift-off-outline",
+            "gift-open",
+            "gift-open-outline",
+            "gift-outline",
+            "git",
+            "github",
+            "gitlab",
+            "glass-cocktail",
+            "glass-cocktail-off",
+            "glass-flute",
+            "glass-fragile",
+            "glass-mug",
+            "glass-mug-off",
+            "glass-mug-variant",
+            "glass-mug-variant-off",
+            "glass-pint-outline",
+            "glass-stange",
+            "glass-tulip",
+            "glass-wine",
+            "glasses",
+            "globe-light",
+            "globe-light-outline",
+            "globe-model",
+            "gmail",
+            "gnome",
+            "go-kart",
+            "go-kart-track",
+            "gog",
+            "gold",
+            "golf",
+            "golf-cart",
+            "golf-tee",
+            "gondola",
+            "goodreads",
+            "google",
+            "google-ads",
+            "google-analytics",
+            "google-assistant",
+            "google-cardboard",
+            "google-chrome",
+            "google-circles",
+            "google-circles-communities",
+            "google-circles-extended",
+            "google-circles-group",
+            "google-classroom",
+            "google-cloud",
+            "google-downasaur",
+            "google-drive",
+            "google-earth",
+            "google-fit",
+            "google-glass",
+            "google-hangouts",
+            "google-keep",
+            "google-lens",
+            "google-maps",
+            "google-my-business",
+            "google-nearby",
+            "google-play",
+            "google-plus",
+            "google-podcast",
+            "google-spreadsheet",
+            "google-street-view",
+            "google-translate",
+            "gradient-horizontal",
+            "gradient-vertical",
+            "grain",
+            "graph",
+            "graph-outline",
+            "graphql",
+            "grass",
+            "grave-stone",
+            "grease-pencil",
+            "greater-than",
+            "greater-than-or-equal",
+            "greenhouse",
+            "grid",
+            "grid-large",
+            "grid-off",
+            "grill",
+            "grill-outline",
+            "group",
+            "guitar-acoustic",
+            "guitar-electric",
+            "guitar-pick",
+            "guitar-pick-outline",
+            "guy-fawkes-mask",
+            "gymnastics",
+            "hail",
+            "hair-dryer",
+            "hair-dryer-outline",
+            "halloween",
+            "hamburger",
+            "hamburger-check",
+            "hamburger-minus",
+            "hamburger-off",
+            "hamburger-plus",
+            "hamburger-remove",
+            "hammer",
+            "hammer-screwdriver",
+            "hammer-sickle",
+            "hammer-wrench",
+            "hand-back-left",
+            "hand-back-left-off",
+            "hand-back-left-off-outline",
+            "hand-back-left-outline",
+            "hand-back-right",
+            "hand-back-right-off",
+            "hand-back-right-off-outline",
+            "hand-back-right-outline",
+            "hand-clap",
+            "hand-clap-off",
+            "hand-coin",
+            "hand-coin-outline",
+            "hand-cycle",
+            "hand-extended",
+            "hand-extended-outline",
+            "hand-front-left",
+            "hand-front-left-outline",
+            "hand-front-right",
+            "hand-front-right-outline",
+            "hand-heart",
+            "hand-heart-outline",
+            "hand-okay",
+            "hand-peace",
+            "hand-peace-variant",
+            "hand-pointing-down",
+            "hand-pointing-left",
+            "hand-pointing-right",
+            "hand-pointing-up",
+            "hand-saw",
+            "hand-wash",
+            "hand-wash-outline",
+            "hand-water",
+            "hand-wave",
+            "hand-wave-outline",
+            "handball",
+            "handcuffs",
+            "hands-pray",
+            "handshake",
+            "handshake-outline",
+            "hanger",
+            "hard-hat",
+            "harddisk",
+            "harddisk-plus",
+            "harddisk-remove",
+            "hat-fedora",
+            "hazard-lights",
+            "hdmi-port",
+            "hdr",
+            "hdr-off",
+            "head",
+            "head-alert",
+            "head-alert-outline",
+            "head-check",
+            "head-check-outline",
+            "head-cog",
+            "head-cog-outline",
+            "head-dots-horizontal",
+            "head-dots-horizontal-outline",
+            "head-flash",
+            "head-flash-outline",
+            "head-heart",
+            "head-heart-outline",
+            "head-lightbulb",
+            "head-lightbulb-outline",
+            "head-minus",
+            "head-minus-outline",
+            "head-outline",
+            "head-plus",
+            "head-plus-outline",
+            "head-question",
+            "head-question-outline",
+            "head-remove",
+            "head-remove-outline",
+            "head-snowflake",
+            "head-snowflake-outline",
+            "head-sync",
+            "head-sync-outline",
+            "headphones",
+            "headphones-bluetooth",
+            "headphones-box",
+            "headphones-off",
+            "headphones-settings",
+            "headset",
+            "headset-dock",
+            "headset-off",
+            "heart",
+            "heart-box",
+            "heart-box-outline",
+            "heart-broken",
+            "heart-broken-outline",
+            "heart-circle",
+            "heart-circle-outline",
+            "heart-cog",
+            "heart-cog-outline",
+            "heart-flash",
+            "heart-half",
+            "heart-half-full",
+            "heart-half-outline",
+            "heart-minus",
+            "heart-minus-outline",
+            "heart-multiple",
+            "heart-multiple-outline",
+            "heart-off",
+            "heart-off-outline",
+            "heart-outline",
+            "heart-plus",
+            "heart-plus-outline",
+            "heart-pulse",
+            "heart-remove",
+            "heart-remove-outline",
+            "heart-search",
+            "heart-settings",
+            "heart-settings-outline",
+            "heat-pump",
+            "heat-pump-outline",
+            "heat-wave",
+            "heating-coil",
+            "helicopter",
+            "help",
+            "help-box",
+            "help-box-multiple",
+            "help-box-multiple-outline",
+            "help-box-outline",
+            "help-circle",
+            "help-circle-outline",
+            "help-network",
+            "help-network-outline",
+            "help-rhombus",
+            "help-rhombus-outline",
+            "hexadecimal",
+            "hexagon",
+            "hexagon-multiple",
+            "hexagon-multiple-outline",
+            "hexagon-outline",
+            "hexagon-slice-1",
+            "hexagon-slice-2",
+            "hexagon-slice-3",
+            "hexagon-slice-4",
+            "hexagon-slice-5",
+            "hexagon-slice-6",
+            "hexagram",
+            "hexagram-outline",
+            "high-definition",
+            "high-definition-box",
+            "highway",
+            "hiking",
+            "history",
+            "hockey-puck",
+            "hockey-sticks",
+            "hololens",
+            "home",
+            "home-account",
+            "home-alert",
+            "home-alert-outline",
+            "home-analytics",
+            "home-assistant",
+            "home-automation",
+            "home-battery",
+            "home-battery-outline",
+            "home-circle",
+            "home-circle-outline",
+            "home-city",
+            "home-city-outline",
+            "home-clock",
+            "home-clock-outline",
+            "home-edit",
+            "home-edit-outline",
+            "home-export-outline",
+            "home-flood",
+            "home-floor-0",
+            "home-floor-1",
+            "home-floor-2",
+            "home-floor-3",
+            "home-floor-a",
+            "home-floor-b",
+            "home-floor-g",
+            "home-floor-l",
+            "home-floor-negative-1",
+            "home-group",
+            "home-group-minus",
+            "home-group-plus",
+            "home-group-remove",
+            "home-heart",
+            "home-import-outline",
+            "home-lightbulb",
+            "home-lightbulb-outline",
+            "home-lightning-bolt",
+            "home-lightning-bolt-outline",
+            "home-lock",
+            "home-lock-open",
+            "home-map-marker",
+            "home-minus",
+            "home-minus-outline",
+            "home-modern",
+            "home-off",
+            "home-off-outline",
+            "home-outline",
+            "home-percent",
+            "home-percent-outline",
+            "home-plus",
+            "home-plus-outline",
+            "home-remove",
+            "home-remove-outline",
+            "home-roof",
+            "home-search",
+            "home-search-outline",
+            "home-silo",
+            "home-silo-outline",
+            "home-sound-in",
+            "home-sound-in-outline",
+            "home-sound-out",
+            "home-sound-out-outline",
+            "home-switch",
+            "home-switch-outline",
+            "home-thermometer",
+            "home-thermometer-outline",
+            "home-variant",
+            "home-variant-outline",
+            "hook",
+            "hook-off",
+            "hoop-house",
+            "hops",
+            "horizontal-rotate-clockwise",
+            "horizontal-rotate-counterclockwise",
+            "horse",
+            "horse-human",
+            "horse-variant",
+            "horse-variant-fast",
+            "horseshoe",
+            "hospital",
+            "hospital-box",
+            "hospital-box-outline",
+            "hospital-building",
+            "hospital-marker",
+            "hot-tub",
+            "hours-12",
+            "hours-24",
+            "hub",
+            "hub-outline",
+            "hubspot",
+            "hulu",
+            "human",
+            "human-baby-changing-table",
+            "human-cane",
+            "human-capacity-decrease",
+            "human-capacity-increase",
+            "human-child",
+            "human-dolly",
+            "human-edit",
+            "human-female",
+            "human-female-boy",
+            "human-female-dance",
+            "human-female-female",
+            "human-female-female-child",
+            "human-female-girl",
+            "human-greeting",
+            "human-greeting-proximity",
+            "human-greeting-variant",
+            "human-handsdown",
+            "human-handsup",
+            "human-male",
+            "human-male-board",
+            "human-male-board-poll",
+            "human-male-boy",
+            "human-male-child",
+            "human-male-female",
+            "human-male-female-child",
+            "human-male-girl",
+            "human-male-height",
+            "human-male-height-variant",
+            "human-male-male",
+            "human-male-male-child",
+            "human-non-binary",
+            "human-pregnant",
+            "human-queue",
+            "human-scooter",
+            "human-walker",
+            "human-wheelchair",
+            "human-white-cane",
+            "humble-bundle",
+            "hvac",
+            "hvac-off",
+            "hydraulic-oil-level",
+            "hydraulic-oil-temperature",
+            "hydro-power",
+            "hydrogen-station",
+            "ice-cream",
+            "ice-cream-off",
+            "ice-pop",
+            "id-card",
+            "identifier",
+            "ideogram-cjk",
+            "ideogram-cjk-variant",
+            "image",
+            "image-album",
+            "image-area",
+            "image-area-close",
+            "image-auto-adjust",
+            "image-broken",
+            "image-broken-variant",
+            "image-check",
+            "image-check-outline",
+            "image-edit",
+            "image-edit-outline",
+            "image-filter-black-white",
+            "image-filter-center-focus",
+            "image-filter-center-focus-strong",
+            "image-filter-center-focus-strong-outline",
+            "image-filter-center-focus-weak",
+            "image-filter-drama",
+            "image-filter-drama-outline",
+            "image-filter-frames",
+            "image-filter-hdr",
+            "image-filter-hdr-outline",
+            "image-filter-none",
+            "image-filter-tilt-shift",
+            "image-filter-vintage",
+            "image-frame",
+            "image-lock",
+            "image-lock-outline",
+            "image-marker",
+            "image-marker-outline",
+            "image-minus",
+            "image-minus-outline",
+            "image-move",
+            "image-multiple",
+            "image-multiple-outline",
+            "image-off",
+            "image-off-outline",
+            "image-outline",
+            "image-plus",
+            "image-plus-outline",
+            "image-refresh",
+            "image-refresh-outline",
+            "image-remove",
+            "image-remove-outline",
+            "image-search",
+            "image-search-outline",
+            "image-size-select-actual",
+            "image-size-select-large",
+            "image-size-select-small",
+            "image-sync",
+            "image-sync-outline",
+            "image-text",
+            "import",
+            "inbox",
+            "inbox-arrow-down",
+            "inbox-arrow-down-outline",
+            "inbox-arrow-up",
+            "inbox-arrow-up-outline",
+            "inbox-full",
+            "inbox-full-outline",
+            "inbox-multiple",
+            "inbox-multiple-outline",
+            "inbox-outline",
+            "inbox-remove",
+            "inbox-remove-outline",
+            "incognito",
+            "incognito-circle",
+            "incognito-circle-off",
+            "incognito-off",
+            "induction",
+            "infinity",
+            "information",
+            "information-box",
+            "information-box-outline",
+            "information-off",
+            "information-off-outline",
+            "information-outline",
+            "information-slab-box",
+            "information-slab-box-outline",
+            "information-slab-circle",
+            "information-slab-circle-outline",
+            "information-slab-symbol",
+            "information-symbol",
+            "information-variant",
+            "information-variant-box",
+            "information-variant-box-outline",
+            "information-variant-circle",
+            "information-variant-circle-outline",
+            "instagram",
+            "instrument-triangle",
+            "integrated-circuit-chip",
+            "invert-colors",
+            "invert-colors-off",
+            "invoice",
+            "invoice-arrow-left",
+            "invoice-arrow-left-outline",
+            "invoice-arrow-right",
+            "invoice-arrow-right-outline",
+            "invoice-check",
+            "invoice-check-outline",
+            "invoice-clock",
+            "invoice-clock-outline",
+            "invoice-edit",
+            "invoice-edit-outline",
+            "invoice-export-outline",
+            "invoice-fast",
+            "invoice-fast-outline",
+            "invoice-import",
+            "invoice-import-outline",
+            "invoice-list",
+            "invoice-list-outline",
+            "invoice-minus",
+            "invoice-minus-outline",
+            "invoice-multiple",
+            "invoice-multiple-outline",
+            "invoice-outline",
+            "invoice-plus",
+            "invoice-plus-outline",
+            "invoice-remove",
+            "invoice-remove-outline",
+            "invoice-send",
+            "invoice-send-outline",
+            "invoice-text",
+            "invoice-text-arrow-left",
+            "invoice-text-arrow-left-outline",
+            "invoice-text-arrow-right",
+            "invoice-text-arrow-right-outline",
+            "invoice-text-check",
+            "invoice-text-check-outline",
+            "invoice-text-clock",
+            "invoice-text-clock-outline",
+            "invoice-text-edit",
+            "invoice-text-edit-outline",
+            "invoice-text-fast",
+            "invoice-text-fast-outline",
+            "invoice-text-minus",
+            "invoice-text-minus-outline",
+            "invoice-text-multiple",
+            "invoice-text-multiple-outline",
+            "invoice-text-outline",
+            "invoice-text-plus",
+            "invoice-text-plus-outline",
+            "invoice-text-remove",
+            "invoice-text-remove-outline",
+            "invoice-text-send",
+            "invoice-text-send-outline",
+            "iobroker",
+            "ip",
+            "ip-network",
+            "ip-network-outline",
+            "ip-outline",
+            "ipod",
+            "iron",
+            "iron-board",
+            "iron-outline",
+            "island",
+            "island-variant",
+            "iv-bag",
+            "jabber",
+            "jeepney",
+            "jellyfish",
+            "jellyfish-outline",
+            "jira",
+            "jquery",
+            "jsfiddle",
+            "jump-rope",
+            "kabaddi",
+            "kangaroo",
+            "karate",
+            "kayaking",
+            "keg",
+            "kettle",
+            "kettle-alert",
+            "kettle-alert-outline",
+            "kettle-off",
+            "kettle-off-outline",
+            "kettle-outline",
+            "kettle-pour-over",
+            "kettle-steam",
+            "kettle-steam-outline",
+            "kettlebell",
+            "key",
+            "key-alert",
+            "key-alert-outline",
+            "key-arrow-right",
+            "key-chain",
+            "key-chain-variant",
+            "key-change",
+            "key-link",
+            "key-minus",
+            "key-outline",
+            "key-plus",
+            "key-remove",
+            "key-star",
+            "key-variant",
+            "key-wireless",
+            "keyboard",
+            "keyboard-backspace",
+            "keyboard-caps",
+            "keyboard-close",
+            "keyboard-close-outline",
+            "keyboard-esc",
+            "keyboard-f1",
+            "keyboard-f10",
+            "keyboard-f11",
+            "keyboard-f12",
+            "keyboard-f2",
+            "keyboard-f3",
+            "keyboard-f4",
+            "keyboard-f5",
+            "keyboard-f6",
+            "keyboard-f7",
+            "keyboard-f8",
+            "keyboard-f9",
+            "keyboard-off",
+            "keyboard-off-outline",
+            "keyboard-outline",
+            "keyboard-return",
+            "keyboard-settings",
+            "keyboard-settings-outline",
+            "keyboard-space",
+            "keyboard-tab",
+            "keyboard-tab-reverse",
+            "keyboard-variant",
+            "khanda",
+            "kickstarter",
+            "kite",
+            "kite-outline",
+            "kitesurfing",
+            "klingon",
+            "knife",
+            "knife-military",
+            "knob",
+            "koala",
+            "kodi",
+            "kubernetes",
+            "label",
+            "label-multiple",
+            "label-multiple-outline",
+            "label-off",
+            "label-off-outline",
+            "label-outline",
+            "label-percent",
+            "label-percent-outline",
+            "label-variant",
+            "label-variant-outline",
+            "ladder",
+            "ladybug",
+            "lambda",
+            "lamp",
+            "lamp-outline",
+            "lamps",
+            "lamps-outline",
+            "lan",
+            "lan-check",
+            "lan-connect",
+            "lan-disconnect",
+            "lan-pending",
+            "land-fields",
+            "land-plots",
+            "land-plots-circle",
+            "land-plots-circle-variant",
+            "land-plots-marker",
+            "land-rows-horizontal",
+            "land-rows-vertical",
+            "landslide",
+            "landslide-outline",
+            "language-c",
+            "language-cpp",
+            "language-csharp",
+            "language-css3",
+            "language-fortran",
+            "language-go",
+            "language-haskell",
+            "language-html5",
+            "language-java",
+            "language-javascript",
+            "language-kotlin",
+            "language-lua",
+            "language-markdown",
+            "language-markdown-outline",
+            "language-php",
+            "language-python",
+            "language-r",
+            "language-ruby",
+            "language-ruby-on-rails",
+            "language-rust",
+            "language-swift",
+            "language-typescript",
+            "language-xaml",
+            "laptop",
+            "laptop-account",
+            "laptop-off",
+            "laravel",
+            "laser-pointer",
+            "lasso",
+            "lastpass",
+            "latitude",
+            "launch",
+            "lava-lamp",
+            "layers",
+            "layers-edit",
+            "layers-minus",
+            "layers-off",
+            "layers-off-outline",
+            "layers-outline",
+            "layers-plus",
+            "layers-remove",
+            "layers-search",
+            "layers-search-outline",
+            "layers-triple",
+            "layers-triple-outline",
+            "lead-pencil",
+            "leaf",
+            "leaf-circle",
+            "leaf-circle-outline",
+            "leaf-maple",
+            "leaf-maple-off",
+            "leaf-off",
+            "leak",
+            "leak-off",
+            "lectern",
+            "led-off",
+            "led-on",
+            "led-outline",
+            "led-strip",
+            "led-strip-variant",
+            "led-strip-variant-off",
+            "led-variant-off",
+            "led-variant-on",
+            "led-variant-outline",
+            "leek",
+            "less-than",
+            "less-than-or-equal",
+            "library",
+            "library-outline",
+            "library-shelves",
+            "license",
+            "lifebuoy",
+            "light-flood-down",
+            "light-flood-up",
+            "light-recessed",
+            "light-switch",
+            "light-switch-off",
+            "lightbulb",
+            "lightbulb-alert",
+            "lightbulb-alert-outline",
+            "lightbulb-auto",
+            "lightbulb-auto-outline",
+            "lightbulb-cfl",
+            "lightbulb-cfl-off",
+            "lightbulb-cfl-spiral",
+            "lightbulb-cfl-spiral-off",
+            "lightbulb-fluorescent-tube",
+            "lightbulb-fluorescent-tube-outline",
+            "lightbulb-group",
+            "lightbulb-group-off",
+            "lightbulb-group-off-outline",
+            "lightbulb-group-outline",
+            "lightbulb-multiple",
+            "lightbulb-multiple-off",
+            "lightbulb-multiple-off-outline",
+            "lightbulb-multiple-outline",
+            "lightbulb-night",
+            "lightbulb-night-outline",
+            "lightbulb-off",
+            "lightbulb-off-outline",
+            "lightbulb-on",
+            "lightbulb-on-10",
+            "lightbulb-on-20",
+            "lightbulb-on-30",
+            "lightbulb-on-40",
+            "lightbulb-on-50",
+            "lightbulb-on-60",
+            "lightbulb-on-70",
+            "lightbulb-on-80",
+            "lightbulb-on-90",
+            "lightbulb-on-outline",
+            "lightbulb-outline",
+            "lightbulb-question",
+            "lightbulb-question-outline",
+            "lightbulb-spot",
+            "lightbulb-spot-off",
+            "lightbulb-variant",
+            "lightbulb-variant-outline",
+            "lighthouse",
+            "lighthouse-on",
+            "lightning-bolt",
+            "lightning-bolt-circle",
+            "lightning-bolt-outline",
+            "line-scan",
+            "lingerie",
+            "link",
+            "link-box",
+            "link-box-outline",
+            "link-box-variant",
+            "link-box-variant-outline",
+            "link-circle",
+            "link-circle-outline",
+            "link-edit",
+            "link-lock",
+            "link-off",
+            "link-plus",
+            "link-variant",
+            "link-variant-minus",
+            "link-variant-off",
+            "link-variant-plus",
+            "link-variant-remove",
+            "linkedin",
+            "linux",
+            "linux-mint",
+            "lipstick",
+            "liquid-spot",
+            "liquor",
+            "list-box",
+            "list-box-outline",
+            "list-status",
+            "litecoin",
+            "loading",
+            "location-enter",
+            "location-exit",
+            "lock",
+            "lock-alert",
+            "lock-alert-outline",
+            "lock-check",
+            "lock-check-outline",
+            "lock-clock",
+            "lock-minus",
+            "lock-minus-outline",
+            "lock-off",
+            "lock-off-outline",
+            "lock-open",
+            "lock-open-alert",
+            "lock-open-alert-outline",
+            "lock-open-check",
+            "lock-open-check-outline",
+            "lock-open-minus",
+            "lock-open-minus-outline",
+            "lock-open-outline",
+            "lock-open-plus",
+            "lock-open-plus-outline",
+            "lock-open-remove",
+            "lock-open-remove-outline",
+            "lock-open-variant",
+            "lock-open-variant-outline",
+            "lock-outline",
+            "lock-pattern",
+            "lock-percent",
+            "lock-percent-open",
+            "lock-percent-open-outline",
+            "lock-percent-open-variant",
+            "lock-percent-open-variant-outline",
+            "lock-percent-outline",
+            "lock-plus",
+            "lock-plus-outline",
+            "lock-question",
+            "lock-remove",
+            "lock-remove-outline",
+            "lock-reset",
+            "lock-smart",
+            "locker",
+            "locker-multiple",
+            "login",
+            "login-variant",
+            "logout",
+            "logout-variant",
+            "longitude",
+            "looks",
+            "lotion",
+            "lotion-outline",
+            "lotion-plus",
+            "lotion-plus-outline",
+            "loupe",
+            "lumx",
+            "lungs",
+            "mace",
+            "magazine-pistol",
+            "magazine-rifle",
+            "magic-staff",
+            "magnet",
+            "magnet-on",
+            "magnify",
+            "magnify-close",
+            "magnify-expand",
+            "magnify-minus",
+            "magnify-minus-cursor",
+            "magnify-minus-outline",
+            "magnify-plus",
+            "magnify-plus-cursor",
+            "magnify-plus-outline",
+            "magnify-remove-cursor",
+            "magnify-remove-outline",
+            "magnify-scan",
+            "mail",
+            "mailbox",
+            "mailbox-open",
+            "mailbox-open-outline",
+            "mailbox-open-up",
+            "mailbox-open-up-outline",
+            "mailbox-outline",
+            "mailbox-up",
+            "mailbox-up-outline",
+            "manjaro",
+            "map",
+            "map-check",
+            "map-check-outline",
+            "map-clock",
+            "map-clock-outline",
+            "map-legend",
+            "map-marker",
+            "map-marker-account",
+            "map-marker-account-outline",
+            "map-marker-alert",
+            "map-marker-alert-outline",
+            "map-marker-check",
+            "map-marker-check-outline",
+            "map-marker-circle",
+            "map-marker-distance",
+            "map-marker-down",
+            "map-marker-left",
+            "map-marker-left-outline",
+            "map-marker-minus",
+            "map-marker-minus-outline",
+            "map-marker-multiple",
+            "map-marker-multiple-outline",
+            "map-marker-off",
+            "map-marker-off-outline",
+            "map-marker-outline",
+            "map-marker-path",
+            "map-marker-plus",
+            "map-marker-plus-outline",
+            "map-marker-question",
+            "map-marker-question-outline",
+            "map-marker-radius",
+            "map-marker-radius-outline",
+            "map-marker-remove",
+            "map-marker-remove-outline",
+            "map-marker-remove-variant",
+            "map-marker-right",
+            "map-marker-right-outline",
+            "map-marker-star",
+            "map-marker-star-outline",
+            "map-marker-up",
+            "map-minus",
+            "map-outline",
+            "map-plus",
+            "map-search",
+            "map-search-outline",
+            "mapbox",
+            "margin",
+            "marker",
+            "marker-cancel",
+            "marker-check",
+            "mastodon",
+            "material-design",
+            "material-ui",
+            "math-compass",
+            "math-cos",
+            "math-integral",
+            "math-integral-box",
+            "math-log",
+            "math-norm",
+            "math-norm-box",
+            "math-sin",
+            "math-tan",
+            "matrix",
+            "medal",
+            "medal-outline",
+            "medical-bag",
+            "medical-cotton-swab",
+            "medication",
+            "medication-outline",
+            "meditation",
+            "memory",
+            "memory-arrow-down",
+            "menorah",
+            "menorah-fire",
+            "menu",
+            "menu-close",
+            "menu-down",
+            "menu-down-outline",
+            "menu-left",
+            "menu-left-outline",
+            "menu-open",
+            "menu-right",
+            "menu-right-outline",
+            "menu-swap",
+            "menu-swap-outline",
+            "menu-up",
+            "menu-up-outline",
+            "merge",
+            "message",
+            "message-alert",
+            "message-alert-outline",
+            "message-arrow-left",
+            "message-arrow-left-outline",
+            "message-arrow-right",
+            "message-arrow-right-outline",
+            "message-badge",
+            "message-badge-outline",
+            "message-bookmark",
+            "message-bookmark-outline",
+            "message-bulleted",
+            "message-bulleted-off",
+            "message-check",
+            "message-check-outline",
+            "message-cog",
+            "message-cog-outline",
+            "message-draw",
+            "message-fast",
+            "message-fast-outline",
+            "message-flash",
+            "message-flash-outline",
+            "message-image",
+            "message-image-outline",
+            "message-lock",
+            "message-lock-outline",
+            "message-minus",
+            "message-minus-outline",
+            "message-off",
+            "message-off-outline",
+            "message-outline",
+            "message-plus",
+            "message-plus-outline",
+            "message-processing",
+            "message-processing-outline",
+            "message-question",
+            "message-question-outline",
+            "message-reply",
+            "message-reply-outline",
+            "message-reply-text",
+            "message-reply-text-outline",
+            "message-settings",
+            "message-settings-outline",
+            "message-star",
+            "message-star-outline",
+            "message-text",
+            "message-text-clock",
+            "message-text-clock-outline",
+            "message-text-fast",
+            "message-text-fast-outline",
+            "message-text-lock",
+            "message-text-lock-outline",
+            "message-text-outline",
+            "message-video",
+            "meteor",
+            "meter-electric",
+            "meter-electric-outline",
+            "meter-gas",
+            "meter-gas-outline",
+            "metronome",
+            "metronome-tick",
+            "micro-sd",
+            "microphone",
+            "microphone-message",
+            "microphone-message-off",
+            "microphone-minus",
+            "microphone-off",
+            "microphone-outline",
+            "microphone-plus",
+            "microphone-question",
+            "microphone-question-outline",
+            "microphone-settings",
+            "microphone-variant",
+            "microphone-variant-off",
+            "microscope",
+            "microsoft",
+            "microsoft-access",
+            "microsoft-azure",
+            "microsoft-azure-devops",
+            "microsoft-bing",
+            "microsoft-dynamics-365",
+            "microsoft-edge",
+            "microsoft-excel",
+            "microsoft-internet-explorer",
+            "microsoft-office",
+            "microsoft-onedrive",
+            "microsoft-onenote",
+            "microsoft-outlook",
+            "microsoft-powerpoint",
+            "microsoft-sharepoint",
+            "microsoft-teams",
+            "microsoft-visual-studio",
+            "microsoft-visual-studio-code",
+            "microsoft-windows",
+            "microsoft-windows-classic",
+            "microsoft-word",
+            "microsoft-xbox",
+            "microsoft-xbox-controller",
+            "microsoft-xbox-controller-battery-alert",
+            "microsoft-xbox-controller-battery-charging",
+            "microsoft-xbox-controller-battery-empty",
+            "microsoft-xbox-controller-battery-full",
+            "microsoft-xbox-controller-battery-low",
+            "microsoft-xbox-controller-battery-medium",
+            "microsoft-xbox-controller-battery-unknown",
+            "microsoft-xbox-controller-menu",
+            "microsoft-xbox-controller-off",
+            "microsoft-xbox-controller-view",
+            "microwave",
+            "microwave-off",
+            "middleware",
+            "middleware-outline",
+            "midi",
+            "midi-port",
+            "mine",
+            "minecraft",
+            "mini-sd",
+            "minidisc",
+            "minus",
+            "minus-box",
+            "minus-box-multiple",
+            "minus-box-multiple-outline",
+            "minus-box-outline",
+            "minus-circle",
+            "minus-circle-multiple",
+            "minus-circle-multiple-outline",
+            "minus-circle-off",
+            "minus-circle-off-outline",
+            "minus-circle-outline",
+            "minus-network",
+            "minus-network-outline",
+            "minus-thick",
+            "mirror",
+            "mirror-rectangle",
+            "mirror-variant",
+            "mixed-martial-arts",
+            "mixed-reality",
+            "molecule",
+            "molecule-co",
+            "molecule-co2",
+            "monitor",
+            "monitor-account",
+            "monitor-arrow-down",
+            "monitor-arrow-down-variant",
+            "monitor-cellphone",
+            "monitor-cellphone-star",
+            "monitor-dashboard",
+            "monitor-edit",
+            "monitor-eye",
+            "monitor-lock",
+            "monitor-multiple",
+            "monitor-off",
+            "monitor-screenshot",
+            "monitor-share",
+            "monitor-shimmer",
+            "monitor-small",
+            "monitor-speaker",
+            "monitor-speaker-off",
+            "monitor-star",
+            "monitor-vertical",
+            "moon-first-quarter",
+            "moon-full",
+            "moon-last-quarter",
+            "moon-new",
+            "moon-waning-crescent",
+            "moon-waning-gibbous",
+            "moon-waxing-crescent",
+            "moon-waxing-gibbous",
+            "moped",
+            "moped-electric",
+            "moped-electric-outline",
+            "moped-outline",
+            "more",
+            "mortar-pestle",
+            "mortar-pestle-plus",
+            "mosque",
+            "mosque-outline",
+            "mother-heart",
+            "mother-nurse",
+            "motion",
+            "motion-outline",
+            "motion-pause",
+            "motion-pause-outline",
+            "motion-play",
+            "motion-play-outline",
+            "motion-sensor",
+            "motion-sensor-off",
+            "motorbike",
+            "motorbike-electric",
+            "motorbike-off",
+            "mouse",
+            "mouse-bluetooth",
+            "mouse-left-click",
+            "mouse-left-click-outline",
+            "mouse-move-down",
+            "mouse-move-up",
+            "mouse-move-vertical",
+            "mouse-off",
+            "mouse-outline",
+            "mouse-right-click",
+            "mouse-right-click-outline",
+            "mouse-scroll-wheel",
+            "mouse-variant",
+            "mouse-variant-off",
+            "move-resize",
+            "move-resize-variant",
+            "movie",
+            "movie-check",
+            "movie-check-outline",
+            "movie-cog",
+            "movie-cog-outline",
+            "movie-edit",
+            "movie-edit-outline",
+            "movie-filter",
+            "movie-filter-outline",
+            "movie-minus",
+            "movie-minus-outline",
+            "movie-off",
+            "movie-off-outline",
+            "movie-open",
+            "movie-open-check",
+            "movie-open-check-outline",
+            "movie-open-cog",
+            "movie-open-cog-outline",
+            "movie-open-edit",
+            "movie-open-edit-outline",
+            "movie-open-minus",
+            "movie-open-minus-outline",
+            "movie-open-off",
+            "movie-open-off-outline",
+            "movie-open-outline",
+            "movie-open-play",
+            "movie-open-play-outline",
+            "movie-open-plus",
+            "movie-open-plus-outline",
+            "movie-open-remove",
+            "movie-open-remove-outline",
+            "movie-open-settings",
+            "movie-open-settings-outline",
+            "movie-open-star",
+            "movie-open-star-outline",
+            "movie-outline",
+            "movie-play",
+            "movie-play-outline",
+            "movie-plus",
+            "movie-plus-outline",
+            "movie-remove",
+            "movie-remove-outline",
+            "movie-roll",
+            "movie-search",
+            "movie-search-outline",
+            "movie-settings",
+            "movie-settings-outline",
+            "movie-star",
+            "movie-star-outline",
+            "mower",
+            "mower-bag",
+            "mower-bag-on",
+            "mower-on",
+            "muffin",
+            "multicast",
+            "multimedia",
+            "multiplication",
+            "multiplication-box",
+            "mushroom",
+            "mushroom-off",
+            "mushroom-off-outline",
+            "mushroom-outline",
+            "music",
+            "music-accidental-double-flat",
+            "music-accidental-double-sharp",
+            "music-accidental-flat",
+            "music-accidental-natural",
+            "music-accidental-sharp",
+            "music-box",
+            "music-box-multiple",
+            "music-box-multiple-outline",
+            "music-box-outline",
+            "music-circle",
+            "music-circle-outline",
+            "music-clef-alto",
+            "music-clef-bass",
+            "music-clef-treble",
+            "music-note",
+            "music-note-bluetooth",
+            "music-note-bluetooth-off",
+            "music-note-eighth",
+            "music-note-eighth-dotted",
+            "music-note-half",
+            "music-note-half-dotted",
+            "music-note-minus",
+            "music-note-off",
+            "music-note-off-outline",
+            "music-note-outline",
+            "music-note-plus",
+            "music-note-quarter",
+            "music-note-quarter-dotted",
+            "music-note-sixteenth",
+            "music-note-sixteenth-dotted",
+            "music-note-whole",
+            "music-note-whole-dotted",
+            "music-off",
+            "music-rest-eighth",
+            "music-rest-half",
+            "music-rest-quarter",
+            "music-rest-sixteenth",
+            "music-rest-whole",
+            "mustache",
+            "nail",
+            "nas",
+            "nativescript",
+            "nature",
+            "nature-outline",
+            "nature-people",
+            "nature-people-outline",
+            "navigation",
+            "navigation-outline",
+            "navigation-variant",
+            "navigation-variant-outline",
+            "near-me",
+            "necklace",
+            "needle",
+            "needle-off",
+            "netflix",
+            "network",
+            "network-off",
+            "network-off-outline",
+            "network-outline",
+            "network-pos",
+            "network-strength-1",
+            "network-strength-1-alert",
+            "network-strength-2",
+            "network-strength-2-alert",
+            "network-strength-3",
+            "network-strength-3-alert",
+            "network-strength-4",
+            "network-strength-4-alert",
+            "network-strength-4-cog",
+            "network-strength-off",
+            "network-strength-off-outline",
+            "network-strength-outline",
+            "new-box",
+            "newspaper",
+            "newspaper-check",
+            "newspaper-minus",
+            "newspaper-plus",
+            "newspaper-remove",
+            "newspaper-variant",
+            "newspaper-variant-multiple",
+            "newspaper-variant-multiple-outline",
+            "newspaper-variant-outline",
+            "nfc",
+            "nfc-search-variant",
+            "nfc-tap",
+            "nfc-variant",
+            "nfc-variant-off",
+            "ninja",
+            "nintendo-game-boy",
+            "nintendo-switch",
+            "nintendo-wii",
+            "nintendo-wiiu",
+            "nix",
+            "nodejs",
+            "noodles",
+            "not-equal",
+            "not-equal-variant",
+            "note",
+            "note-alert",
+            "note-alert-outline",
+            "note-check",
+            "note-check-outline",
+            "note-edit",
+            "note-edit-outline",
+            "note-minus",
+            "note-minus-outline",
+            "note-multiple",
+            "note-multiple-outline",
+            "note-off",
+            "note-off-outline",
+            "note-outline",
+            "note-plus",
+            "note-plus-outline",
+            "note-remove",
+            "note-remove-outline",
+            "note-search",
+            "note-search-outline",
+            "note-text",
+            "note-text-outline",
+            "notebook",
+            "notebook-check",
+            "notebook-check-outline",
+            "notebook-edit",
+            "notebook-edit-outline",
+            "notebook-heart",
+            "notebook-heart-outline",
+            "notebook-minus",
+            "notebook-minus-outline",
+            "notebook-multiple",
+            "notebook-outline",
+            "notebook-plus",
+            "notebook-plus-outline",
+            "notebook-remove",
+            "notebook-remove-outline",
+            "notification-clear-all",
+            "npm",
+            "nuke",
+            "null",
+            "numeric",
+            "numeric-0",
+            "numeric-0-box",
+            "numeric-0-box-multiple",
+            "numeric-0-box-multiple-outline",
+            "numeric-0-box-outline",
+            "numeric-0-circle",
+            "numeric-0-circle-outline",
+            "numeric-1",
+            "numeric-1-box",
+            "numeric-1-box-multiple",
+            "numeric-1-box-multiple-outline",
+            "numeric-1-box-outline",
+            "numeric-1-circle",
+            "numeric-1-circle-outline",
+            "numeric-10",
+            "numeric-10-box",
+            "numeric-10-box-multiple",
+            "numeric-10-box-multiple-outline",
+            "numeric-10-box-outline",
+            "numeric-10-circle",
+            "numeric-10-circle-outline",
+            "numeric-2",
+            "numeric-2-box",
+            "numeric-2-box-multiple",
+            "numeric-2-box-multiple-outline",
+            "numeric-2-box-outline",
+            "numeric-2-circle",
+            "numeric-2-circle-outline",
+            "numeric-3",
+            "numeric-3-box",
+            "numeric-3-box-multiple",
+            "numeric-3-box-multiple-outline",
+            "numeric-3-box-outline",
+            "numeric-3-circle",
+            "numeric-3-circle-outline",
+            "numeric-4",
+            "numeric-4-box",
+            "numeric-4-box-multiple",
+            "numeric-4-box-multiple-outline",
+            "numeric-4-box-outline",
+            "numeric-4-circle",
+            "numeric-4-circle-outline",
+            "numeric-5",
+            "numeric-5-box",
+            "numeric-5-box-multiple",
+            "numeric-5-box-multiple-outline",
+            "numeric-5-box-outline",
+            "numeric-5-circle",
+            "numeric-5-circle-outline",
+            "numeric-6",
+            "numeric-6-box",
+            "numeric-6-box-multiple",
+            "numeric-6-box-multiple-outline",
+            "numeric-6-box-outline",
+            "numeric-6-circle",
+            "numeric-6-circle-outline",
+            "numeric-7",
+            "numeric-7-box",
+            "numeric-7-box-multiple",
+            "numeric-7-box-multiple-outline",
+            "numeric-7-box-outline",
+            "numeric-7-circle",
+            "numeric-7-circle-outline",
+            "numeric-8",
+            "numeric-8-box",
+            "numeric-8-box-multiple",
+            "numeric-8-box-multiple-outline",
+            "numeric-8-box-outline",
+            "numeric-8-circle",
+            "numeric-8-circle-outline",
+            "numeric-9",
+            "numeric-9-box",
+            "numeric-9-box-multiple",
+            "numeric-9-box-multiple-outline",
+            "numeric-9-box-outline",
+            "numeric-9-circle",
+            "numeric-9-circle-outline",
+            "numeric-9-plus",
+            "numeric-9-plus-box",
+            "numeric-9-plus-box-multiple",
+            "numeric-9-plus-box-multiple-outline",
+            "numeric-9-plus-box-outline",
+            "numeric-9-plus-circle",
+            "numeric-9-plus-circle-outline",
+            "numeric-negative-1",
+            "numeric-off",
+            "numeric-positive-1",
+            "nut",
+            "nutrition",
+            "nuxt",
+            "oar",
+            "ocarina",
+            "oci",
+            "ocr",
+            "octagon",
+            "octagon-outline",
+            "octagram",
+            "octagram-edit",
+            "octagram-edit-outline",
+            "octagram-minus",
+            "octagram-minus-outline",
+            "octagram-outline",
+            "octagram-plus",
+            "octagram-plus-outline",
+            "octahedron",
+            "octahedron-off",
+            "odnoklassniki",
+            "offer",
+            "office-building",
+            "office-building-cog",
+            "office-building-cog-outline",
+            "office-building-marker",
+            "office-building-marker-outline",
+            "office-building-minus",
+            "office-building-minus-outline",
+            "office-building-outline",
+            "office-building-plus",
+            "office-building-plus-outline",
+            "office-building-remove",
+            "office-building-remove-outline",
+            "oil",
+            "oil-lamp",
+            "oil-level",
+            "oil-temperature",
+            "om",
+            "omega",
+            "one-up",
+            "onepassword",
+            "opacity",
+            "open-in-app",
+            "open-in-new",
+            "open-source-initiative",
+            "openid",
+            "opera",
+            "orbit",
+            "orbit-variant",
+            "order-alphabetical-ascending",
+            "order-alphabetical-descending",
+            "order-bool-ascending",
+            "order-bool-ascending-variant",
+            "order-bool-descending",
+            "order-bool-descending-variant",
+            "order-numeric-ascending",
+            "order-numeric-descending",
+            "origin",
+            "ornament",
+            "ornament-variant",
+            "outdoor-lamp",
+            "overscan",
+            "owl",
+            "pac-man",
+            "package",
+            "package-check",
+            "package-down",
+            "package-up",
+            "package-variant",
+            "package-variant-closed",
+            "package-variant-closed-check",
+            "package-variant-closed-minus",
+            "package-variant-closed-plus",
+            "package-variant-closed-remove",
+            "package-variant-minus",
+            "package-variant-plus",
+            "package-variant-remove",
+            "page-first",
+            "page-last",
+            "page-layout-body",
+            "page-layout-footer",
+            "page-layout-header",
+            "page-layout-header-footer",
+            "page-layout-sidebar-left",
+            "page-layout-sidebar-right",
+            "page-next",
+            "page-next-outline",
+            "page-previous",
+            "page-previous-outline",
+            "pail",
+            "pail-minus",
+            "pail-minus-outline",
+            "pail-off",
+            "pail-off-outline",
+            "pail-outline",
+            "pail-plus",
+            "pail-plus-outline",
+            "pail-remove",
+            "pail-remove-outline",
+            "palette",
+            "palette-advanced",
+            "palette-outline",
+            "palette-swatch",
+            "palette-swatch-outline",
+            "palette-swatch-variant",
+            "palm-tree",
+            "pan",
+            "pan-bottom-left",
+            "pan-bottom-right",
+            "pan-down",
+            "pan-horizontal",
+            "pan-left",
+            "pan-right",
+            "pan-top-left",
+            "pan-top-right",
+            "pan-up",
+            "pan-vertical",
+            "panda",
+            "pandora",
+            "panorama",
+            "panorama-fisheye",
+            "panorama-horizontal",
+            "panorama-horizontal-outline",
+            "panorama-outline",
+            "panorama-sphere",
+            "panorama-sphere-outline",
+            "panorama-variant",
+            "panorama-variant-outline",
+            "panorama-vertical",
+            "panorama-vertical-outline",
+            "panorama-wide-angle",
+            "panorama-wide-angle-outline",
+            "paper-cut-vertical",
+            "paper-roll",
+            "paper-roll-outline",
+            "paperclip",
+            "paperclip-check",
+            "paperclip-lock",
+            "paperclip-minus",
+            "paperclip-off",
+            "paperclip-plus",
+            "paperclip-remove",
+            "parachute",
+            "parachute-outline",
+            "paragliding",
+            "parking",
+            "party-popper",
+            "passport",
+            "passport-alert",
+            "passport-biometric",
+            "passport-cancel",
+            "passport-check",
+            "passport-minus",
+            "passport-plus",
+            "passport-remove",
+            "pasta",
+            "patio-heater",
+            "patreon",
+            "pause",
+            "pause-box",
+            "pause-box-outline",
+            "pause-circle",
+            "pause-circle-outline",
+            "pause-octagon",
+            "pause-octagon-outline",
+            "paw",
+            "paw-off",
+            "paw-off-outline",
+            "paw-outline",
+            "peace",
+            "peanut",
+            "peanut-off",
+            "peanut-off-outline",
+            "peanut-outline",
+            "pen",
+            "pen-lock",
+            "pen-minus",
+            "pen-off",
+            "pen-plus",
+            "pen-remove",
+            "pencil",
+            "pencil-box",
+            "pencil-box-multiple",
+            "pencil-box-multiple-outline",
+            "pencil-box-outline",
+            "pencil-circle",
+            "pencil-circle-outline",
+            "pencil-lock",
+            "pencil-lock-outline",
+            "pencil-minus",
+            "pencil-minus-outline",
+            "pencil-off",
+            "pencil-off-outline",
+            "pencil-outline",
+            "pencil-plus",
+            "pencil-plus-outline",
+            "pencil-remove",
+            "pencil-remove-outline",
+            "pencil-ruler",
+            "pencil-ruler-outline",
+            "penguin",
+            "pentagon",
+            "pentagon-outline",
+            "pentagram",
+            "percent",
+            "percent-box",
+            "percent-box-outline",
+            "percent-circle",
+            "percent-circle-outline",
+            "percent-outline",
+            "periodic-table",
+            "perspective-less",
+            "perspective-more",
+            "ph",
+            "phone",
+            "phone-alert",
+            "phone-alert-outline",
+            "phone-bluetooth",
+            "phone-bluetooth-outline",
+            "phone-cancel",
+            "phone-cancel-outline",
+            "phone-check",
+            "phone-check-outline",
+            "phone-classic",
+            "phone-classic-off",
+            "phone-clock",
+            "phone-dial",
+            "phone-dial-outline",
+            "phone-forward",
+            "phone-forward-outline",
+            "phone-hangup",
+            "phone-hangup-outline",
+            "phone-in-talk",
+            "phone-in-talk-outline",
+            "phone-incoming",
+            "phone-incoming-outgoing",
+            "phone-incoming-outgoing-outline",
+            "phone-incoming-outline",
+            "phone-lock",
+            "phone-lock-outline",
+            "phone-log",
+            "phone-log-outline",
+            "phone-message",
+            "phone-message-outline",
+            "phone-minus",
+            "phone-minus-outline",
+            "phone-missed",
+            "phone-missed-outline",
+            "phone-off",
+            "phone-off-outline",
+            "phone-outgoing",
+            "phone-outgoing-outline",
+            "phone-outline",
+            "phone-paused",
+            "phone-paused-outline",
+            "phone-plus",
+            "phone-plus-outline",
+            "phone-refresh",
+            "phone-refresh-outline",
+            "phone-remove",
+            "phone-remove-outline",
+            "phone-return",
+            "phone-return-outline",
+            "phone-ring",
+            "phone-ring-outline",
+            "phone-rotate-landscape",
+            "phone-rotate-portrait",
+            "phone-settings",
+            "phone-settings-outline",
+            "phone-sync",
+            "phone-sync-outline",
+            "phone-voip",
+            "pi",
+            "pi-box",
+            "pi-hole",
+            "piano",
+            "piano-off",
+            "pickaxe",
+            "picture-in-picture-bottom-right",
+            "picture-in-picture-bottom-right-outline",
+            "picture-in-picture-top-right",
+            "picture-in-picture-top-right-outline",
+            "pier",
+            "pier-crane",
+            "pig",
+            "pig-variant",
+            "pig-variant-outline",
+            "piggy-bank",
+            "piggy-bank-outline",
+            "pill",
+            "pill-multiple",
+            "pill-off",
+            "pillar",
+            "pin",
+            "pin-off",
+            "pin-off-outline",
+            "pin-outline",
+            "pine-tree",
+            "pine-tree-box",
+            "pine-tree-fire",
+            "pine-tree-variant",
+            "pine-tree-variant-outline",
+            "pinterest",
+            "pinwheel",
+            "pinwheel-outline",
+            "pipe",
+            "pipe-disconnected",
+            "pipe-leak",
+            "pipe-valve",
+            "pipe-wrench",
+            "pirate",
+            "pistol",
+            "piston",
+            "pitchfork",
+            "pizza",
+            "plane-car",
+            "plane-train",
+            "play",
+            "play-box",
+            "play-box-edit-outline",
+            "play-box-lock",
+            "play-box-lock-open",
+            "play-box-lock-open-outline",
+            "play-box-lock-outline",
+            "play-box-multiple",
+            "play-box-multiple-outline",
+            "play-box-outline",
+            "play-circle",
+            "play-circle-outline",
+            "play-network",
+            "play-network-outline",
+            "play-outline",
+            "play-pause",
+            "play-protected-content",
+            "play-speed",
+            "playlist-check",
+            "playlist-edit",
+            "playlist-minus",
+            "playlist-music",
+            "playlist-music-outline",
+            "playlist-play",
+            "playlist-plus",
+            "playlist-remove",
+            "playlist-star",
+            "plex",
+            "pliers",
+            "plus",
+            "plus-box",
+            "plus-box-multiple",
+            "plus-box-multiple-outline",
+            "plus-box-outline",
+            "plus-circle",
+            "plus-circle-multiple",
+            "plus-circle-multiple-outline",
+            "plus-circle-outline",
+            "plus-lock",
+            "plus-lock-open",
+            "plus-minus",
+            "plus-minus-box",
+            "plus-minus-variant",
+            "plus-network",
+            "plus-network-outline",
+            "plus-outline",
+            "plus-thick",
+            "pocket",
+            "podcast",
+            "podium",
+            "podium-bronze",
+            "podium-gold",
+            "podium-silver",
+            "point-of-sale",
+            "pokeball",
+            "pokemon-go",
+            "poker-chip",
+            "polaroid",
+            "police-badge",
+            "police-badge-outline",
+            "police-station",
+            "poll",
+            "polo",
+            "polymer",
+            "pool",
+            "pool-thermometer",
+            "popcorn",
+            "post",
+            "post-lamp",
+            "post-outline",
+            "postage-stamp",
+            "pot",
+            "pot-mix",
+            "pot-mix-outline",
+            "pot-outline",
+            "pot-steam",
+            "pot-steam-outline",
+            "pound",
+            "pound-box",
+            "pound-box-outline",
+            "power",
+            "power-cycle",
+            "power-off",
+            "power-on",
+            "power-plug",
+            "power-plug-battery",
+            "power-plug-battery-outline",
+            "power-plug-off",
+            "power-plug-off-outline",
+            "power-plug-outline",
+            "power-settings",
+            "power-sleep",
+            "power-socket",
+            "power-socket-au",
+            "power-socket-ch",
+            "power-socket-de",
+            "power-socket-eu",
+            "power-socket-fr",
+            "power-socket-it",
+            "power-socket-jp",
+            "power-socket-uk",
+            "power-socket-us",
+            "power-standby",
+            "powershell",
+            "prescription",
+            "presentation",
+            "presentation-play",
+            "pretzel",
+            "printer",
+            "printer-3d",
+            "printer-3d-nozzle",
+            "printer-3d-nozzle-alert",
+            "printer-3d-nozzle-alert-outline",
+            "printer-3d-nozzle-heat",
+            "printer-3d-nozzle-heat-outline",
+            "printer-3d-nozzle-off",
+            "printer-3d-nozzle-off-outline",
+            "printer-3d-nozzle-outline",
+            "printer-3d-off",
+            "printer-alert",
+            "printer-check",
+            "printer-eye",
+            "printer-off",
+            "printer-off-outline",
+            "printer-outline",
+            "printer-pos",
+            "printer-pos-alert",
+            "printer-pos-alert-outline",
+            "printer-pos-cancel",
+            "printer-pos-cancel-outline",
+            "printer-pos-check",
+            "printer-pos-check-outline",
+            "printer-pos-cog",
+            "printer-pos-cog-outline",
+            "printer-pos-edit",
+            "printer-pos-edit-outline",
+            "printer-pos-minus",
+            "printer-pos-minus-outline",
+            "printer-pos-network",
+            "printer-pos-network-outline",
+            "printer-pos-off",
+            "printer-pos-off-outline",
+            "printer-pos-outline",
+            "printer-pos-pause",
+            "printer-pos-pause-outline",
+            "printer-pos-play",
+            "printer-pos-play-outline",
+            "printer-pos-plus",
+            "printer-pos-plus-outline",
+            "printer-pos-refresh",
+            "printer-pos-refresh-outline",
+            "printer-pos-remove",
+            "printer-pos-remove-outline",
+            "printer-pos-star",
+            "printer-pos-star-outline",
+            "printer-pos-stop",
+            "printer-pos-stop-outline",
+            "printer-pos-sync",
+            "printer-pos-sync-outline",
+            "printer-pos-wrench",
+            "printer-pos-wrench-outline",
+            "printer-search",
+            "printer-settings",
+            "printer-wireless",
+            "priority-high",
+            "priority-low",
+            "professional-hexagon",
+            "progress-alert",
+            "progress-check",
+            "progress-clock",
+            "progress-close",
+            "progress-download",
+            "progress-helper",
+            "progress-pencil",
+            "progress-question",
+            "progress-star",
+            "progress-star-four-points",
+            "progress-tag",
+            "progress-upload",
+            "progress-wrench",
+            "projector",
+            "projector-off",
+            "projector-screen",
+            "projector-screen-off",
+            "projector-screen-off-outline",
+            "projector-screen-outline",
+            "projector-screen-variant",
+            "projector-screen-variant-off",
+            "projector-screen-variant-off-outline",
+            "projector-screen-variant-outline",
+            "propane-tank",
+            "propane-tank-outline",
+            "protocol",
+            "publish",
+            "publish-off",
+            "pulse",
+            "pump",
+            "pump-off",
+            "pumpkin",
+            "purse",
+            "purse-outline",
+            "puzzle",
+            "puzzle-check",
+            "puzzle-check-outline",
+            "puzzle-edit",
+            "puzzle-edit-outline",
+            "puzzle-heart",
+            "puzzle-heart-outline",
+            "puzzle-minus",
+            "puzzle-minus-outline",
+            "puzzle-outline",
+            "puzzle-plus",
+            "puzzle-plus-outline",
+            "puzzle-remove",
+            "puzzle-remove-outline",
+            "puzzle-star",
+            "puzzle-star-outline",
+            "pyramid",
+            "pyramid-off",
+            "qi",
+            "qqchat",
+            "qrcode",
+            "qrcode-edit",
+            "qrcode-minus",
+            "qrcode-plus",
+            "qrcode-remove",
+            "qrcode-scan",
+            "quadcopter",
+            "quality-high",
+            "quality-low",
+            "quality-medium",
+            "queue-first-in-last-out",
+            "quora",
+            "rabbit",
+            "rabbit-variant",
+            "rabbit-variant-outline",
+            "racing-helmet",
+            "racquetball",
+            "radar",
+            "radiator",
+            "radiator-disabled",
+            "radiator-off",
+            "radio",
+            "radio-am",
+            "radio-fm",
+            "radio-handheld",
+            "radio-off",
+            "radio-tower",
+            "radioactive",
+            "radioactive-circle",
+            "radioactive-circle-outline",
+            "radioactive-off",
+            "radiobox-blank",
+            "radiobox-indeterminate-variant",
+            "radiobox-marked",
+            "radiology-box",
+            "radiology-box-outline",
+            "radius",
+            "radius-outline",
+            "railroad-light",
+            "rake",
+            "raspberry-pi",
+            "raw",
+            "raw-off",
+            "ray-end",
+            "ray-end-arrow",
+            "ray-start",
+            "ray-start-arrow",
+            "ray-start-end",
+            "ray-start-vertex-end",
+            "ray-vertex",
+            "razor-double-edge",
+            "razor-single-edge",
+            "react",
+            "read",
+            "receipt",
+            "receipt-clock",
+            "receipt-clock-outline",
+            "receipt-outline",
+            "receipt-send",
+            "receipt-send-outline",
+            "receipt-text",
+            "receipt-text-arrow-left",
+            "receipt-text-arrow-left-outline",
+            "receipt-text-arrow-right",
+            "receipt-text-arrow-right-outline",
+            "receipt-text-check",
+            "receipt-text-check-outline",
+            "receipt-text-clock",
+            "receipt-text-clock-outline",
+            "receipt-text-edit",
+            "receipt-text-edit-outline",
+            "receipt-text-minus",
+            "receipt-text-minus-outline",
+            "receipt-text-outline",
+            "receipt-text-plus",
+            "receipt-text-plus-outline",
+            "receipt-text-remove",
+            "receipt-text-remove-outline",
+            "receipt-text-send",
+            "receipt-text-send-outline",
+            "record",
+            "record-circle",
+            "record-circle-outline",
+            "record-player",
+            "record-rec",
+            "rectangle",
+            "rectangle-outline",
+            "recycle",
+            "recycle-variant",
+            "reddit",
+            "redhat",
+            "redo",
+            "redo-variant",
+            "reflect-horizontal",
+            "reflect-vertical",
+            "refresh",
+            "refresh-auto",
+            "refresh-circle",
+            "regex",
+            "registered-trademark",
+            "reiterate",
+            "relation-many-to-many",
+            "relation-many-to-one",
+            "relation-many-to-one-or-many",
+            "relation-many-to-only-one",
+            "relation-many-to-zero-or-many",
+            "relation-many-to-zero-or-one",
+            "relation-one-or-many-to-many",
+            "relation-one-or-many-to-one",
+            "relation-one-or-many-to-one-or-many",
+            "relation-one-or-many-to-only-one",
+            "relation-one-or-many-to-zero-or-many",
+            "relation-one-or-many-to-zero-or-one",
+            "relation-one-to-many",
+            "relation-one-to-one",
+            "relation-one-to-one-or-many",
+            "relation-one-to-only-one",
+            "relation-one-to-zero-or-many",
+            "relation-one-to-zero-or-one",
+            "relation-only-one-to-many",
+            "relation-only-one-to-one",
+            "relation-only-one-to-one-or-many",
+            "relation-only-one-to-only-one",
+            "relation-only-one-to-zero-or-many",
+            "relation-only-one-to-zero-or-one",
+            "relation-zero-or-many-to-many",
+            "relation-zero-or-many-to-one",
+            "relation-zero-or-many-to-one-or-many",
+            "relation-zero-or-many-to-only-one",
+            "relation-zero-or-many-to-zero-or-many",
+            "relation-zero-or-many-to-zero-or-one",
+            "relation-zero-or-one-to-many",
+            "relation-zero-or-one-to-one",
+            "relation-zero-or-one-to-one-or-many",
+            "relation-zero-or-one-to-only-one",
+            "relation-zero-or-one-to-zero-or-many",
+            "relation-zero-or-one-to-zero-or-one",
+            "relative-scale",
+            "reload",
+            "reload-alert",
+            "reminder",
+            "remote",
+            "remote-desktop",
+            "remote-off",
+            "remote-tv",
+            "remote-tv-off",
+            "rename",
+            "rename-box",
+            "rename-box-outline",
+            "rename-outline",
+            "reorder-horizontal",
+            "reorder-vertical",
+            "repeat",
+            "repeat-off",
+            "repeat-once",
+            "repeat-variant",
+            "replay",
+            "reply",
+            "reply-all",
+            "reply-all-outline",
+            "reply-circle",
+            "reply-outline",
+            "reproduction",
+            "resistor",
+            "resistor-nodes",
+            "resize",
+            "resize-bottom-right",
+            "responsive",
+            "restart",
+            "restart-alert",
+            "restart-off",
+            "restore",
+            "restore-alert",
+            "rewind",
+            "rewind-10",
+            "rewind-15",
+            "rewind-30",
+            "rewind-45",
+            "rewind-5",
+            "rewind-60",
+            "rewind-outline",
+            "rhombus",
+            "rhombus-medium",
+            "rhombus-medium-outline",
+            "rhombus-outline",
+            "rhombus-split",
+            "rhombus-split-outline",
+            "ribbon",
+            "rice",
+            "rickshaw",
+            "rickshaw-electric",
+            "ring",
+            "rivet",
+            "road",
+            "road-variant",
+            "robber",
+            "robot",
+            "robot-angry",
+            "robot-angry-outline",
+            "robot-confused",
+            "robot-confused-outline",
+            "robot-dead",
+            "robot-dead-outline",
+            "robot-excited",
+            "robot-excited-outline",
+            "robot-happy",
+            "robot-happy-outline",
+            "robot-industrial",
+            "robot-industrial-outline",
+            "robot-love",
+            "robot-love-outline",
+            "robot-mower",
+            "robot-mower-outline",
+            "robot-off",
+            "robot-off-outline",
+            "robot-outline",
+            "robot-vacuum",
+            "robot-vacuum-alert",
+            "robot-vacuum-off",
+            "robot-vacuum-variant",
+            "robot-vacuum-variant-alert",
+            "robot-vacuum-variant-off",
+            "rocket",
+            "rocket-launch",
+            "rocket-launch-outline",
+            "rocket-outline",
+            "rodent",
+            "roller-shade",
+            "roller-shade-closed",
+            "roller-skate",
+            "roller-skate-off",
+            "rollerblade",
+            "rollerblade-off",
+            "rollupjs",
+            "rolodex",
+            "rolodex-outline",
+            "roman-numeral-1",
+            "roman-numeral-10",
+            "roman-numeral-2",
+            "roman-numeral-3",
+            "roman-numeral-4",
+            "roman-numeral-5",
+            "roman-numeral-6",
+            "roman-numeral-7",
+            "roman-numeral-8",
+            "roman-numeral-9",
+            "room-service",
+            "room-service-outline",
+            "rotate-360",
+            "rotate-3d",
+            "rotate-3d-variant",
+            "rotate-left",
+            "rotate-left-variant",
+            "rotate-orbit",
+            "rotate-right",
+            "rotate-right-variant",
+            "rounded-corner",
+            "router",
+            "router-network",
+            "router-network-wireless",
+            "router-wireless",
+            "router-wireless-off",
+            "router-wireless-settings",
+            "routes",
+            "routes-clock",
+            "rowing",
+            "rss",
+            "rss-box",
+            "rss-off",
+            "rug",
+            "rugby",
+            "ruler",
+            "ruler-square",
+            "ruler-square-compass",
+            "run",
+            "run-fast",
+            "rv-truck",
+            "sack",
+            "sack-outline",
+            "sack-percent",
+            "safe",
+            "safe-square",
+            "safe-square-outline",
+            "safety-goggles",
+            "sail-boat",
+            "sail-boat-sink",
+            "sale",
+            "sale-outline",
+            "salesforce",
+            "sass",
+            "satellite",
+            "satellite-uplink",
+            "satellite-variant",
+            "sausage",
+            "sausage-off",
+            "saw-blade",
+            "sawtooth-wave",
+            "saxophone",
+            "scale",
+            "scale-balance",
+            "scale-bathroom",
+            "scale-off",
+            "scale-unbalanced",
+            "scan-helper",
+            "scanner",
+            "scanner-off",
+            "scatter-plot",
+            "scatter-plot-outline",
+            "scent",
+            "scent-off",
+            "school",
+            "school-outline",
+            "scissors-cutting",
+            "scooter",
+            "scooter-electric",
+            "scoreboard",
+            "scoreboard-outline",
+            "screen-rotation",
+            "screen-rotation-lock",
+            "screw-flat-top",
+            "screw-lag",
+            "screw-machine-flat-top",
+            "screw-machine-round-top",
+            "screw-round-top",
+            "screwdriver",
+            "script",
+            "script-outline",
+            "script-text",
+            "script-text-key",
+            "script-text-key-outline",
+            "script-text-outline",
+            "script-text-play",
+            "script-text-play-outline",
+            "sd",
+            "seal",
+            "seal-variant",
+            "search-web",
+            "seat",
+            "seat-flat",
+            "seat-flat-angled",
+            "seat-individual-suite",
+            "seat-legroom-extra",
+            "seat-legroom-normal",
+            "seat-legroom-reduced",
+            "seat-outline",
+            "seat-passenger",
+            "seat-recline-extra",
+            "seat-recline-normal",
+            "seatbelt",
+            "security",
+            "security-network",
+            "seed",
+            "seed-off",
+            "seed-off-outline",
+            "seed-outline",
+            "seed-plus",
+            "seed-plus-outline",
+            "seesaw",
+            "segment",
+            "select",
+            "select-all",
+            "select-arrow-down",
+            "select-arrow-up",
+            "select-color",
+            "select-compare",
+            "select-drag",
+            "select-group",
+            "select-inverse",
+            "select-marker",
+            "select-multiple",
+            "select-multiple-marker",
+            "select-off",
+            "select-place",
+            "select-remove",
+            "select-search",
+            "selection",
+            "selection-drag",
+            "selection-ellipse",
+            "selection-ellipse-arrow-inside",
+            "selection-ellipse-remove",
+            "selection-marker",
+            "selection-multiple",
+            "selection-multiple-marker",
+            "selection-off",
+            "selection-remove",
+            "selection-search",
+            "semantic-web",
+            "send",
+            "send-check",
+            "send-check-outline",
+            "send-circle",
+            "send-circle-outline",
+            "send-clock",
+            "send-clock-outline",
+            "send-lock",
+            "send-lock-outline",
+            "send-outline",
+            "send-variant",
+            "send-variant-clock",
+            "send-variant-clock-outline",
+            "send-variant-outline",
+            "serial-port",
+            "server",
+            "server-minus",
+            "server-minus-outline",
+            "server-network",
+            "server-network-off",
+            "server-network-outline",
+            "server-off",
+            "server-outline",
+            "server-plus",
+            "server-plus-outline",
+            "server-remove",
+            "server-security",
+            "set-all",
+            "set-center",
+            "set-center-right",
+            "set-left",
+            "set-left-center",
+            "set-left-right",
+            "set-merge",
+            "set-none",
+            "set-right",
+            "set-split",
+            "set-square",
+            "set-top-box",
+            "settings-helper",
+            "shaker",
+            "shaker-outline",
+            "shape",
+            "shape-circle-plus",
+            "shape-outline",
+            "shape-oval-plus",
+            "shape-plus",
+            "shape-plus-outline",
+            "shape-polygon-plus",
+            "shape-rectangle-plus",
+            "shape-square-plus",
+            "shape-square-rounded-plus",
+            "share",
+            "share-all",
+            "share-all-outline",
+            "share-circle",
+            "share-off",
+            "share-off-outline",
+            "share-outline",
+            "share-variant",
+            "share-variant-outline",
+            "shark",
+            "shark-fin",
+            "shark-fin-outline",
+            "shark-off",
+            "sheep",
+            "shield",
+            "shield-account",
+            "shield-account-outline",
+            "shield-account-variant",
+            "shield-account-variant-outline",
+            "shield-airplane",
+            "shield-airplane-outline",
+            "shield-alert",
+            "shield-alert-outline",
+            "shield-bug",
+            "shield-bug-outline",
+            "shield-car",
+            "shield-check",
+            "shield-check-outline",
+            "shield-cross",
+            "shield-cross-outline",
+            "shield-crown",
+            "shield-crown-outline",
+            "shield-edit",
+            "shield-edit-outline",
+            "shield-half",
+            "shield-half-full",
+            "shield-home",
+            "shield-home-outline",
+            "shield-key",
+            "shield-key-outline",
+            "shield-link-variant",
+            "shield-link-variant-outline",
+            "shield-lock",
+            "shield-lock-open",
+            "shield-lock-open-outline",
+            "shield-lock-outline",
+            "shield-moon",
+            "shield-moon-outline",
+            "shield-off",
+            "shield-off-outline",
+            "shield-outline",
+            "shield-plus",
+            "shield-plus-outline",
+            "shield-refresh",
+            "shield-refresh-outline",
+            "shield-remove",
+            "shield-remove-outline",
+            "shield-search",
+            "shield-star",
+            "shield-star-outline",
+            "shield-sun",
+            "shield-sun-outline",
+            "shield-sword",
+            "shield-sword-outline",
+            "shield-sync",
+            "shield-sync-outline",
+            "shimmer",
+            "ship-wheel",
+            "shipping-pallet",
+            "shoe-ballet",
+            "shoe-cleat",
+            "shoe-formal",
+            "shoe-heel",
+            "shoe-print",
+            "shoe-sneaker",
+            "shopping",
+            "shopping-music",
+            "shopping-outline",
+            "shopping-search",
+            "shopping-search-outline",
+            "shore",
+            "shovel",
+            "shovel-off",
+            "shower",
+            "shower-head",
+            "shredder",
+            "shuffle",
+            "shuffle-disabled",
+            "shuffle-variant",
+            "shuriken",
+            "sickle",
+            "sigma",
+            "sigma-lower",
+            "sign-caution",
+            "sign-direction",
+            "sign-direction-minus",
+            "sign-direction-plus",
+            "sign-direction-remove",
+            "sign-language",
+            "sign-language-outline",
+            "sign-pole",
+            "sign-real-estate",
+            "sign-text",
+            "sign-yield",
+            "signal",
+            "signal-2g",
+            "signal-3g",
+            "signal-4g",
+            "signal-5g",
+            "signal-cellular-1",
+            "signal-cellular-2",
+            "signal-cellular-3",
+            "signal-cellular-outline",
+            "signal-distance-variant",
+            "signal-hspa",
+            "signal-hspa-plus",
+            "signal-off",
+            "signal-variant",
+            "signature",
+            "signature-freehand",
+            "signature-image",
+            "signature-text",
+            "silo",
+            "silo-outline",
+            "silverware",
+            "silverware-clean",
+            "silverware-fork",
+            "silverware-fork-knife",
+            "silverware-spoon",
+            "silverware-variant",
+            "sim",
+            "sim-alert",
+            "sim-alert-outline",
+            "sim-off",
+            "sim-off-outline",
+            "sim-outline",
+            "simple-icons",
+            "sina-weibo",
+            "sine-wave",
+            "sitemap",
+            "sitemap-outline",
+            "size-l",
+            "size-m",
+            "size-s",
+            "size-xl",
+            "size-xs",
+            "size-xxl",
+            "size-xxs",
+            "size-xxxl",
+            "skate",
+            "skate-off",
+            "skateboard",
+            "skateboarding",
+            "skew-less",
+            "skew-more",
+            "ski",
+            "ski-cross-country",
+            "ski-water",
+            "skip-backward",
+            "skip-backward-outline",
+            "skip-forward",
+            "skip-forward-outline",
+            "skip-next",
+            "skip-next-circle",
+            "skip-next-circle-outline",
+            "skip-next-outline",
+            "skip-previous",
+            "skip-previous-circle",
+            "skip-previous-circle-outline",
+            "skip-previous-outline",
+            "skull",
+            "skull-crossbones",
+            "skull-crossbones-outline",
+            "skull-outline",
+            "skull-scan",
+            "skull-scan-outline",
+            "skype",
+            "skype-business",
+            "slack",
+            "slash-forward",
+            "slash-forward-box",
+            "sledding",
+            "sleep",
+            "sleep-off",
+            "slide",
+            "slope-downhill",
+            "slope-uphill",
+            "slot-machine",
+            "slot-machine-outline",
+            "smart-card",
+            "smart-card-off",
+            "smart-card-off-outline",
+            "smart-card-outline",
+            "smart-card-reader",
+            "smart-card-reader-outline",
+            "smog",
+            "smoke",
+            "smoke-detector",
+            "smoke-detector-alert",
+            "smoke-detector-alert-outline",
+            "smoke-detector-off",
+            "smoke-detector-off-outline",
+            "smoke-detector-outline",
+            "smoke-detector-variant",
+            "smoke-detector-variant-alert",
+            "smoke-detector-variant-off",
+            "smoking",
+            "smoking-off",
+            "smoking-pipe",
+            "smoking-pipe-off",
+            "snail",
+            "snake",
+            "snapchat",
+            "snowboard",
+            "snowflake",
+            "snowflake-alert",
+            "snowflake-check",
+            "snowflake-melt",
+            "snowflake-off",
+            "snowflake-thermometer",
+            "snowflake-variant",
+            "snowman",
+            "snowmobile",
+            "snowshoeing",
+            "soccer",
+            "soccer-field",
+            "social-distance-2-meters",
+            "social-distance-6-feet",
+            "sofa",
+            "sofa-outline",
+            "sofa-single",
+            "sofa-single-outline",
+            "solar-panel",
+            "solar-panel-large",
+            "solar-power",
+            "solar-power-variant",
+            "solar-power-variant-outline",
+            "soldering-iron",
+            "solid",
+            "sony-playstation",
+            "sort",
+            "sort-alphabetical-ascending",
+            "sort-alphabetical-ascending-variant",
+            "sort-alphabetical-descending",
+            "sort-alphabetical-descending-variant",
+            "sort-alphabetical-variant",
+            "sort-ascending",
+            "sort-bool-ascending",
+            "sort-bool-ascending-variant",
+            "sort-bool-descending",
+            "sort-bool-descending-variant",
+            "sort-calendar-ascending",
+            "sort-calendar-descending",
+            "sort-clock-ascending",
+            "sort-clock-ascending-outline",
+            "sort-clock-descending",
+            "sort-clock-descending-outline",
+            "sort-descending",
+            "sort-numeric-ascending",
+            "sort-numeric-ascending-variant",
+            "sort-numeric-descending",
+            "sort-numeric-descending-variant",
+            "sort-numeric-variant",
+            "sort-reverse-variant",
+            "sort-variant",
+            "sort-variant-lock",
+            "sort-variant-lock-open",
+            "sort-variant-off",
+            "sort-variant-remove",
+            "soundbar",
+            "soundcloud",
+            "source-branch",
+            "source-branch-check",
+            "source-branch-minus",
+            "source-branch-plus",
+            "source-branch-refresh",
+            "source-branch-remove",
+            "source-branch-sync",
+            "source-commit",
+            "source-commit-end",
+            "source-commit-end-local",
+            "source-commit-local",
+            "source-commit-next-local",
+            "source-commit-start",
+            "source-commit-start-next-local",
+            "source-fork",
+            "source-merge",
+            "source-pull",
+            "source-repository",
+            "source-repository-multiple",
+            "soy-sauce",
+            "soy-sauce-off",
+            "spa",
+            "spa-outline",
+            "space-invaders",
+            "space-station",
+            "spade",
+            "speaker",
+            "speaker-bluetooth",
+            "speaker-message",
+            "speaker-multiple",
+            "speaker-off",
+            "speaker-pause",
+            "speaker-play",
+            "speaker-stop",
+            "speaker-wireless",
+            "spear",
+            "speedometer",
+            "speedometer-medium",
+            "speedometer-slow",
+            "spellcheck",
+            "sphere",
+            "sphere-off",
+            "spider",
+            "spider-outline",
+            "spider-thread",
+            "spider-web",
+            "spirit-level",
+            "spoon-sugar",
+            "spotify",
+            "spotlight",
+            "spotlight-beam",
+            "spray",
+            "spray-bottle",
+            "sprinkler",
+            "sprinkler-fire",
+            "sprinkler-variant",
+            "sprout",
+            "sprout-outline",
+            "square",
+            "square-circle",
+            "square-circle-outline",
+            "square-edit-outline",
+            "square-medium",
+            "square-medium-outline",
+            "square-off",
+            "square-off-outline",
+            "square-opacity",
+            "square-outline",
+            "square-root",
+            "square-root-box",
+            "square-rounded",
+            "square-rounded-badge",
+            "square-rounded-badge-outline",
+            "square-rounded-outline",
+            "square-small",
+            "square-wave",
+            "squeegee",
+            "ssh",
+            "stack-exchange",
+            "stack-overflow",
+            "stackpath",
+            "stadium",
+            "stadium-outline",
+            "stadium-variant",
+            "stairs",
+            "stairs-box",
+            "stairs-down",
+            "stairs-up",
+            "stamper",
+            "standard-definition",
+            "star",
+            "star-box",
+            "star-box-multiple",
+            "star-box-multiple-outline",
+            "star-box-outline",
+            "star-check",
+            "star-check-outline",
+            "star-circle",
+            "star-circle-outline",
+            "star-cog",
+            "star-cog-outline",
+            "star-crescent",
+            "star-david",
+            "star-face",
+            "star-four-points",
+            "star-four-points-box",
+            "star-four-points-box-outline",
+            "star-four-points-circle",
+            "star-four-points-circle-outline",
+            "star-four-points-outline",
+            "star-four-points-small",
+            "star-half",
+            "star-half-full",
+            "star-minus",
+            "star-minus-outline",
+            "star-off",
+            "star-off-outline",
+            "star-outline",
+            "star-plus",
+            "star-plus-outline",
+            "star-remove",
+            "star-remove-outline",
+            "star-settings",
+            "star-settings-outline",
+            "star-shooting",
+            "star-shooting-outline",
+            "star-three-points",
+            "star-three-points-outline",
+            "state-machine",
+            "steam",
+            "steering",
+            "steering-off",
+            "step-backward",
+            "step-backward-2",
+            "step-forward",
+            "step-forward-2",
+            "stethoscope",
+            "sticker",
+            "sticker-alert",
+            "sticker-alert-outline",
+            "sticker-check",
+            "sticker-check-outline",
+            "sticker-circle-outline",
+            "sticker-emoji",
+            "sticker-minus",
+            "sticker-minus-outline",
+            "sticker-outline",
+            "sticker-plus",
+            "sticker-plus-outline",
+            "sticker-remove",
+            "sticker-remove-outline",
+            "sticker-text",
+            "sticker-text-outline",
+            "stocking",
+            "stomach",
+            "stool",
+            "stool-outline",
+            "stop",
+            "stop-circle",
+            "stop-circle-outline",
+            "storage-tank",
+            "storage-tank-outline",
+            "store",
+            "store-24-hour",
+            "store-alert",
+            "store-alert-outline",
+            "store-check",
+            "store-check-outline",
+            "store-clock",
+            "store-clock-outline",
+            "store-cog",
+            "store-cog-outline",
+            "store-edit",
+            "store-edit-outline",
+            "store-marker",
+            "store-marker-outline",
+            "store-minus",
+            "store-minus-outline",
+            "store-off",
+            "store-off-outline",
+            "store-outline",
+            "store-plus",
+            "store-plus-outline",
+            "store-remove",
+            "store-remove-outline",
+            "store-search",
+            "store-search-outline",
+            "store-settings",
+            "store-settings-outline",
+            "storefront",
+            "storefront-check",
+            "storefront-check-outline",
+            "storefront-edit",
+            "storefront-edit-outline",
+            "storefront-minus",
+            "storefront-minus-outline",
+            "storefront-outline",
+            "storefront-plus",
+            "storefront-plus-outline",
+            "storefront-remove",
+            "storefront-remove-outline",
+            "stove",
+            "strategy",
+            "stretch-to-page",
+            "stretch-to-page-outline",
+            "string-lights",
+            "string-lights-off",
+            "subdirectory-arrow-left",
+            "subdirectory-arrow-right",
+            "submarine",
+            "subtitles",
+            "subtitles-outline",
+            "subway",
+            "subway-alert-variant",
+            "subway-variant",
+            "summit",
+            "sun-angle",
+            "sun-angle-outline",
+            "sun-clock",
+            "sun-clock-outline",
+            "sun-compass",
+            "sun-snowflake",
+            "sun-snowflake-variant",
+            "sun-thermometer",
+            "sun-thermometer-outline",
+            "sun-wireless",
+            "sun-wireless-outline",
+            "sunglasses",
+            "surfing",
+            "surround-sound",
+            "surround-sound-2-0",
+            "surround-sound-2-1",
+            "surround-sound-3-1",
+            "surround-sound-5-1",
+            "surround-sound-5-1-2",
+            "surround-sound-7-1",
+            "svg",
+            "swap-horizontal",
+            "swap-horizontal-bold",
+            "swap-horizontal-circle",
+            "swap-horizontal-circle-outline",
+            "swap-horizontal-hidden",
+            "swap-horizontal-variant",
+            "swap-vertical",
+            "swap-vertical-bold",
+            "swap-vertical-circle",
+            "swap-vertical-circle-outline",
+            "swap-vertical-variant",
+            "swim",
+            "switch",
+            "sword",
+            "sword-cross",
+            "syllabary-hangul",
+            "syllabary-hiragana",
+            "syllabary-katakana",
+            "syllabary-katakana-halfwidth",
+            "symbol",
+            "symfony",
+            "synagogue",
+            "synagogue-outline",
+            "sync",
+            "sync-alert",
+            "sync-circle",
+            "sync-off",
+            "tab",
+            "tab-minus",
+            "tab-plus",
+            "tab-remove",
+            "tab-search",
+            "tab-unselected",
+            "table",
+            "table-account",
+            "table-alert",
+            "table-arrow-down",
+            "table-arrow-left",
+            "table-arrow-right",
+            "table-arrow-up",
+            "table-border",
+            "table-cancel",
+            "table-chair",
+            "table-check",
+            "table-clock",
+            "table-cog",
+            "table-column",
+            "table-column-plus-after",
+            "table-column-plus-before",
+            "table-column-remove",
+            "table-column-width",
+            "table-edit",
+            "table-eye",
+            "table-eye-off",
+            "table-filter",
+            "table-furniture",
+            "table-headers-eye",
+            "table-headers-eye-off",
+            "table-heart",
+            "table-key",
+            "table-large",
+            "table-large-plus",
+            "table-large-remove",
+            "table-lock",
+            "table-merge-cells",
+            "table-minus",
+            "table-multiple",
+            "table-network",
+            "table-of-contents",
+            "table-off",
+            "table-picnic",
+            "table-pivot",
+            "table-plus",
+            "table-question",
+            "table-refresh",
+            "table-remove",
+            "table-row",
+            "table-row-height",
+            "table-row-plus-after",
+            "table-row-plus-before",
+            "table-row-remove",
+            "table-search",
+            "table-settings",
+            "table-split-cell",
+            "table-star",
+            "table-sync",
+            "table-tennis",
+            "tablet",
+            "tablet-cellphone",
+            "tablet-dashboard",
+            "taco",
+            "tag",
+            "tag-arrow-down",
+            "tag-arrow-down-outline",
+            "tag-arrow-left",
+            "tag-arrow-left-outline",
+            "tag-arrow-right",
+            "tag-arrow-right-outline",
+            "tag-arrow-up",
+            "tag-arrow-up-outline",
+            "tag-check",
+            "tag-check-outline",
+            "tag-edit",
+            "tag-edit-outline",
+            "tag-faces",
+            "tag-heart",
+            "tag-heart-outline",
+            "tag-hidden",
+            "tag-minus",
+            "tag-minus-outline",
+            "tag-multiple",
+            "tag-multiple-outline",
+            "tag-off",
+            "tag-off-outline",
+            "tag-outline",
+            "tag-plus",
+            "tag-plus-outline",
+            "tag-remove",
+            "tag-remove-outline",
+            "tag-search",
+            "tag-search-outline",
+            "tag-text",
+            "tag-text-outline",
+            "tailwind",
+            "tally-mark-1",
+            "tally-mark-2",
+            "tally-mark-3",
+            "tally-mark-4",
+            "tally-mark-5",
+            "tangram",
+            "tank",
+            "tanker-truck",
+            "tape-drive",
+            "tape-measure",
+            "target",
+            "target-account",
+            "target-variant",
+            "taxi",
+            "tea",
+            "tea-outline",
+            "teamviewer",
+            "teddy-bear",
+            "telescope",
+            "television",
+            "television-ambient-light",
+            "television-box",
+            "television-classic",
+            "television-classic-off",
+            "television-guide",
+            "television-off",
+            "television-pause",
+            "television-play",
+            "television-shimmer",
+            "television-speaker",
+            "television-speaker-off",
+            "television-stop",
+            "temperature-celsius",
+            "temperature-fahrenheit",
+            "temperature-kelvin",
+            "temple-buddhist",
+            "temple-buddhist-outline",
+            "temple-hindu",
+            "temple-hindu-outline",
+            "tennis",
+            "tennis-ball",
+            "tennis-ball-outline",
+            "tent",
+            "terraform",
+            "terrain",
+            "test-tube",
+            "test-tube-empty",
+            "test-tube-off",
+            "text",
+            "text-account",
+            "text-box",
+            "text-box-check",
+            "text-box-check-outline",
+            "text-box-edit",
+            "text-box-edit-outline",
+            "text-box-minus",
+            "text-box-minus-outline",
+            "text-box-multiple",
+            "text-box-multiple-outline",
+            "text-box-outline",
+            "text-box-plus",
+            "text-box-plus-outline",
+            "text-box-remove",
+            "text-box-remove-outline",
+            "text-box-search",
+            "text-box-search-outline",
+            "text-long",
+            "text-recognition",
+            "text-search",
+            "text-search-variant",
+            "text-shadow",
+            "text-short",
+            "texture",
+            "texture-box",
+            "theater",
+            "theme-light-dark",
+            "thermometer",
+            "thermometer-alert",
+            "thermometer-auto",
+            "thermometer-bluetooth",
+            "thermometer-check",
+            "thermometer-chevron-down",
+            "thermometer-chevron-up",
+            "thermometer-high",
+            "thermometer-lines",
+            "thermometer-low",
+            "thermometer-minus",
+            "thermometer-off",
+            "thermometer-plus",
+            "thermometer-probe",
+            "thermometer-probe-off",
+            "thermometer-water",
+            "thermostat",
+            "thermostat-auto",
+            "thermostat-box",
+            "thermostat-box-auto",
+            "thermostat-cog",
+            "thought-bubble",
+            "thought-bubble-outline",
+            "thumb-down",
+            "thumb-down-outline",
+            "thumb-up",
+            "thumb-up-outline",
+            "thumbs-up-down",
+            "thumbs-up-down-outline",
+            "ticket",
+            "ticket-account",
+            "ticket-confirmation",
+            "ticket-confirmation-outline",
+            "ticket-outline",
+            "ticket-percent",
+            "ticket-percent-outline",
+            "tie",
+            "tilde",
+            "tilde-off",
+            "timelapse",
+            "timeline",
+            "timeline-alert",
+            "timeline-alert-outline",
+            "timeline-check",
+            "timeline-check-outline",
+            "timeline-clock",
+            "timeline-clock-outline",
+            "timeline-minus",
+            "timeline-minus-outline",
+            "timeline-outline",
+            "timeline-plus",
+            "timeline-plus-outline",
+            "timeline-question",
+            "timeline-question-outline",
+            "timeline-remove",
+            "timeline-remove-outline",
+            "timeline-text",
+            "timeline-text-outline",
+            "timer",
+            "timer-10",
+            "timer-3",
+            "timer-alert",
+            "timer-alert-outline",
+            "timer-cancel",
+            "timer-cancel-outline",
+            "timer-check",
+            "timer-check-outline",
+            "timer-cog",
+            "timer-cog-outline",
+            "timer-edit",
+            "timer-edit-outline",
+            "timer-lock",
+            "timer-lock-open",
+            "timer-lock-open-outline",
+            "timer-lock-outline",
+            "timer-marker",
+            "timer-marker-outline",
+            "timer-minus",
+            "timer-minus-outline",
+            "timer-music",
+            "timer-music-outline",
+            "timer-off",
+            "timer-off-outline",
+            "timer-outline",
+            "timer-pause",
+            "timer-pause-outline",
+            "timer-play",
+            "timer-play-outline",
+            "timer-plus",
+            "timer-plus-outline",
+            "timer-refresh",
+            "timer-refresh-outline",
+            "timer-remove",
+            "timer-remove-outline",
+            "timer-sand",
+            "timer-sand-complete",
+            "timer-sand-empty",
+            "timer-sand-full",
+            "timer-sand-paused",
+            "timer-settings",
+            "timer-settings-outline",
+            "timer-star",
+            "timer-star-outline",
+            "timer-stop",
+            "timer-stop-outline",
+            "timer-sync",
+            "timer-sync-outline",
+            "timetable",
+            "tire",
+            "toaster",
+            "toaster-off",
+            "toaster-oven",
+            "toggle-switch",
+            "toggle-switch-off",
+            "toggle-switch-off-outline",
+            "toggle-switch-outline",
+            "toggle-switch-variant",
+            "toggle-switch-variant-off",
+            "toilet",
+            "toolbox",
+            "toolbox-outline",
+            "tools",
+            "tooltip",
+            "tooltip-account",
+            "tooltip-cellphone",
+            "tooltip-check",
+            "tooltip-check-outline",
+            "tooltip-edit",
+            "tooltip-edit-outline",
+            "tooltip-image",
+            "tooltip-image-outline",
+            "tooltip-minus",
+            "tooltip-minus-outline",
+            "tooltip-outline",
+            "tooltip-plus",
+            "tooltip-plus-outline",
+            "tooltip-question",
+            "tooltip-question-outline",
+            "tooltip-remove",
+            "tooltip-remove-outline",
+            "tooltip-text",
+            "tooltip-text-outline",
+            "tooth",
+            "tooth-outline",
+            "toothbrush",
+            "toothbrush-electric",
+            "toothbrush-paste",
+            "torch",
+            "tortoise",
+            "toslink",
+            "touch-text-outline",
+            "tournament",
+            "tow-truck",
+            "tower-beach",
+            "tower-fire",
+            "town-hall",
+            "toy-brick",
+            "toy-brick-marker",
+            "toy-brick-marker-outline",
+            "toy-brick-minus",
+            "toy-brick-minus-outline",
+            "toy-brick-outline",
+            "toy-brick-plus",
+            "toy-brick-plus-outline",
+            "toy-brick-remove",
+            "toy-brick-remove-outline",
+            "toy-brick-search",
+            "toy-brick-search-outline",
+            "track-light",
+            "track-light-off",
+            "trackpad",
+            "trackpad-lock",
+            "tractor",
+            "tractor-variant",
+            "trademark",
+            "traffic-cone",
+            "traffic-light",
+            "traffic-light-outline",
+            "train",
+            "train-bus",
+            "train-car",
+            "train-car-autorack",
+            "train-car-box",
+            "train-car-box-full",
+            "train-car-box-open",
+            "train-car-caboose",
+            "train-car-centerbeam",
+            "train-car-centerbeam-full",
+            "train-car-container",
+            "train-car-flatbed",
+            "train-car-flatbed-car",
+            "train-car-flatbed-tank",
+            "train-car-gondola",
+            "train-car-gondola-full",
+            "train-car-hopper",
+            "train-car-hopper-covered",
+            "train-car-hopper-full",
+            "train-car-intermodal",
+            "train-car-passenger",
+            "train-car-passenger-door",
+            "train-car-passenger-door-open",
+            "train-car-passenger-variant",
+            "train-car-tank",
+            "train-variant",
+            "tram",
+            "tram-side",
+            "transcribe",
+            "transcribe-close",
+            "transfer",
+            "transfer-down",
+            "transfer-left",
+            "transfer-right",
+            "transfer-up",
+            "transit-connection",
+            "transit-connection-horizontal",
+            "transit-connection-variant",
+            "transit-detour",
+            "transit-skip",
+            "transit-transfer",
+            "transition",
+            "transition-masked",
+            "translate",
+            "translate-off",
+            "translate-variant",
+            "transmission-tower",
+            "transmission-tower-export",
+            "transmission-tower-import",
+            "transmission-tower-off",
+            "trash-can",
+            "trash-can-outline",
+            "tray",
+            "tray-alert",
+            "tray-arrow-down",
+            "tray-arrow-up",
+            "tray-full",
+            "tray-minus",
+            "tray-plus",
+            "tray-remove",
+            "treasure-chest",
+            "treasure-chest-outline",
+            "tree",
+            "tree-outline",
+            "trello",
+            "trending-down",
+            "trending-neutral",
+            "trending-up",
+            "triangle",
+            "triangle-down",
+            "triangle-down-outline",
+            "triangle-outline",
+            "triangle-small-down",
+            "triangle-small-up",
+            "triangle-wave",
+            "triforce",
+            "trophy",
+            "trophy-award",
+            "trophy-broken",
+            "trophy-outline",
+            "trophy-variant",
+            "trophy-variant-outline",
+            "truck",
+            "truck-alert",
+            "truck-alert-outline",
+            "truck-cargo-container",
+            "truck-check",
+            "truck-check-outline",
+            "truck-delivery",
+            "truck-delivery-outline",
+            "truck-fast",
+            "truck-fast-outline",
+            "truck-flatbed",
+            "truck-minus",
+            "truck-minus-outline",
+            "truck-off-road",
+            "truck-off-road-off",
+            "truck-outline",
+            "truck-plus",
+            "truck-plus-outline",
+            "truck-remove",
+            "truck-remove-outline",
+            "truck-snowflake",
+            "truck-trailer",
+            "trumpet",
+            "tshirt-crew",
+            "tshirt-crew-outline",
+            "tshirt-v",
+            "tshirt-v-outline",
+            "tsunami",
+            "tumble-dryer",
+            "tumble-dryer-alert",
+            "tumble-dryer-off",
+            "tune",
+            "tune-variant",
+            "tune-vertical",
+            "tune-vertical-variant",
+            "tunnel",
+            "tunnel-outline",
+            "turbine",
+            "turkey",
+            "turnstile",
+            "turnstile-outline",
+            "turtle",
+            "twitch",
+            "twitter",
+            "two-factor-authentication",
+            "typewriter",
+            "ubisoft",
+            "ubuntu",
+            "ufo",
+            "ufo-outline",
+            "ultra-high-definition",
+            "umbraco",
+            "umbrella",
+            "umbrella-beach",
+            "umbrella-beach-outline",
+            "umbrella-closed",
+            "umbrella-closed-outline",
+            "umbrella-closed-variant",
+            "umbrella-outline",
+            "underwear-outline",
+            "undo",
+            "undo-variant",
+            "unfold-less-horizontal",
+            "unfold-less-vertical",
+            "unfold-more-horizontal",
+            "unfold-more-vertical",
+            "ungroup",
+            "unicode",
+            "unicorn",
+            "unicorn-variant",
+            "unicycle",
+            "unity",
+            "unreal",
+            "update",
+            "upload",
+            "upload-box",
+            "upload-box-outline",
+            "upload-circle",
+            "upload-circle-outline",
+            "upload-lock",
+            "upload-lock-outline",
+            "upload-multiple",
+            "upload-multiple-outline",
+            "upload-network",
+            "upload-network-outline",
+            "upload-off",
+            "upload-off-outline",
+            "upload-outline",
+            "usb",
+            "usb-c-port",
+            "usb-flash-drive",
+            "usb-flash-drive-outline",
+            "usb-port",
+            "vacuum",
+            "vacuum-outline",
+            "valve",
+            "valve-closed",
+            "valve-open",
+            "van-passenger",
+            "van-utility",
+            "vanish",
+            "vanish-quarter",
+            "vanity-light",
+            "variable",
+            "variable-box",
+            "vector-arrange-above",
+            "vector-arrange-below",
+            "vector-bezier",
+            "vector-circle",
+            "vector-circle-variant",
+            "vector-combine",
+            "vector-curve",
+            "vector-difference",
+            "vector-difference-ab",
+            "vector-difference-ba",
+            "vector-ellipse",
+            "vector-intersection",
+            "vector-line",
+            "vector-link",
+            "vector-point",
+            "vector-point-edit",
+            "vector-point-minus",
+            "vector-point-plus",
+            "vector-point-select",
+            "vector-polygon",
+            "vector-polygon-variant",
+            "vector-polyline",
+            "vector-polyline-edit",
+            "vector-polyline-minus",
+            "vector-polyline-plus",
+            "vector-polyline-remove",
+            "vector-radius",
+            "vector-rectangle",
+            "vector-selection",
+            "vector-square",
+            "vector-square-close",
+            "vector-square-edit",
+            "vector-square-minus",
+            "vector-square-open",
+            "vector-square-plus",
+            "vector-square-remove",
+            "vector-triangle",
+            "vector-union",
+            "vhs",
+            "vibrate",
+            "vibrate-off",
+            "video",
+            "video-2d",
+            "video-3d",
+            "video-3d-off",
+            "video-3d-variant",
+            "video-4k-box",
+            "video-account",
+            "video-box",
+            "video-box-off",
+            "video-check",
+            "video-check-outline",
+            "video-high-definition",
+            "video-image",
+            "video-input-antenna",
+            "video-input-component",
+            "video-input-hdmi",
+            "video-input-scart",
+            "video-input-svideo",
+            "video-marker",
+            "video-marker-outline",
+            "video-minus",
+            "video-minus-outline",
+            "video-off",
+            "video-off-outline",
+            "video-outline",
+            "video-plus",
+            "video-plus-outline",
+            "video-stabilization",
+            "video-standard-definition",
+            "video-switch",
+            "video-switch-outline",
+            "video-vintage",
+            "video-wireless",
+            "video-wireless-outline",
+            "view-agenda",
+            "view-agenda-outline",
+            "view-array",
+            "view-array-outline",
+            "view-carousel",
+            "view-carousel-outline",
+            "view-column",
+            "view-column-outline",
+            "view-comfy",
+            "view-comfy-outline",
+            "view-compact",
+            "view-compact-outline",
+            "view-dashboard",
+            "view-dashboard-edit",
+            "view-dashboard-edit-outline",
+            "view-dashboard-outline",
+            "view-dashboard-variant",
+            "view-dashboard-variant-outline",
+            "view-day",
+            "view-day-outline",
+            "view-gallery",
+            "view-gallery-outline",
+            "view-grid",
+            "view-grid-compact",
+            "view-grid-outline",
+            "view-grid-plus",
+            "view-grid-plus-outline",
+            "view-headline",
+            "view-list",
+            "view-list-outline",
+            "view-module",
+            "view-module-outline",
+            "view-parallel",
+            "view-parallel-outline",
+            "view-quilt",
+            "view-quilt-outline",
+            "view-sequential",
+            "view-sequential-outline",
+            "view-split-horizontal",
+            "view-split-vertical",
+            "view-stream",
+            "view-stream-outline",
+            "view-week",
+            "view-week-outline",
+            "vimeo",
+            "violin",
+            "virtual-reality",
+            "virus",
+            "virus-off",
+            "virus-off-outline",
+            "virus-outline",
+            "vlc",
+            "voicemail",
+            "volcano",
+            "volcano-outline",
+            "volleyball",
+            "volume-equal",
+            "volume-high",
+            "volume-low",
+            "volume-medium",
+            "volume-minus",
+            "volume-mute",
+            "volume-off",
+            "volume-plus",
+            "volume-source",
+            "volume-variant-off",
+            "volume-vibrate",
+            "vote",
+            "vote-outline",
+            "vpn",
+            "vuejs",
+            "vuetify",
+            "walk",
+            "wall",
+            "wall-fire",
+            "wall-sconce",
+            "wall-sconce-flat",
+            "wall-sconce-flat-outline",
+            "wall-sconce-flat-variant",
+            "wall-sconce-flat-variant-outline",
+            "wall-sconce-outline",
+            "wall-sconce-round",
+            "wall-sconce-round-outline",
+            "wall-sconce-round-variant",
+            "wall-sconce-round-variant-outline",
+            "wallet",
+            "wallet-bifold",
+            "wallet-bifold-outline",
+            "wallet-giftcard",
+            "wallet-membership",
+            "wallet-outline",
+            "wallet-plus",
+            "wallet-plus-outline",
+            "wallet-travel",
+            "wallpaper",
+            "wan",
+            "wardrobe",
+            "wardrobe-outline",
+            "warehouse",
+            "washing-machine",
+            "washing-machine-alert",
+            "washing-machine-off",
+            "watch",
+            "watch-export",
+            "watch-export-variant",
+            "watch-import",
+            "watch-import-variant",
+            "watch-variant",
+            "watch-vibrate",
+            "watch-vibrate-off",
+            "water",
+            "water-alert",
+            "water-alert-outline",
+            "water-boiler",
+            "water-boiler-alert",
+            "water-boiler-auto",
+            "water-boiler-off",
+            "water-check",
+            "water-check-outline",
+            "water-circle",
+            "water-minus",
+            "water-minus-outline",
+            "water-off",
+            "water-off-outline",
+            "water-opacity",
+            "water-outline",
+            "water-percent",
+            "water-percent-alert",
+            "water-plus",
+            "water-plus-outline",
+            "water-polo",
+            "water-pump",
+            "water-pump-off",
+            "water-remove",
+            "water-remove-outline",
+            "water-sync",
+            "water-thermometer",
+            "water-thermometer-outline",
+            "water-well",
+            "water-well-outline",
+            "waterfall",
+            "watering-can",
+            "watering-can-outline",
+            "watermark",
+            "wave",
+            "wave-arrow-down",
+            "wave-arrow-up",
+            "wave-undercurrent",
+            "waveform",
+            "waves",
+            "waves-arrow-left",
+            "waves-arrow-right",
+            "waves-arrow-up",
+            "waze",
+            "weather-cloudy",
+            "weather-cloudy-alert",
+            "weather-cloudy-arrow-right",
+            "weather-cloudy-clock",
+            "weather-dust",
+            "weather-fog",
+            "weather-hail",
+            "weather-hazy",
+            "weather-hurricane",
+            "weather-hurricane-outline",
+            "weather-lightning",
+            "weather-lightning-rainy",
+            "weather-moonset",
+            "weather-moonset-down",
+            "weather-moonset-up",
+            "weather-night",
+            "weather-night-partly-cloudy",
+            "weather-partly-cloudy",
+            "weather-partly-lightning",
+            "weather-partly-rainy",
+            "weather-partly-snowy",
+            "weather-partly-snowy-rainy",
+            "weather-pouring",
+            "weather-rainy",
+            "weather-snowy",
+            "weather-snowy-heavy",
+            "weather-snowy-rainy",
+            "weather-sunny",
+            "weather-sunny-alert",
+            "weather-sunny-off",
+            "weather-sunset",
+            "weather-sunset-down",
+            "weather-sunset-up",
+            "weather-tornado",
+            "weather-windy",
+            "weather-windy-variant",
+            "web",
+            "web-box",
+            "web-cancel",
+            "web-check",
+            "web-clock",
+            "web-minus",
+            "web-off",
+            "web-plus",
+            "web-refresh",
+            "web-remove",
+            "web-sync",
+            "webcam",
+            "webcam-off",
+            "webhook",
+            "webpack",
+            "webrtc",
+            "wechat",
+            "weight",
+            "weight-gram",
+            "weight-kilogram",
+            "weight-lifter",
+            "weight-pound",
+            "whatsapp",
+            "wheel-barrow",
+            "wheelchair",
+            "wheelchair-accessibility",
+            "whistle",
+            "whistle-outline",
+            "white-balance-auto",
+            "white-balance-incandescent",
+            "white-balance-iridescent",
+            "white-balance-sunny",
+            "widgets",
+            "widgets-outline",
+            "wifi",
+            "wifi-alert",
+            "wifi-arrow-down",
+            "wifi-arrow-left",
+            "wifi-arrow-left-right",
+            "wifi-arrow-right",
+            "wifi-arrow-up",
+            "wifi-arrow-up-down",
+            "wifi-cancel",
+            "wifi-check",
+            "wifi-cog",
+            "wifi-lock",
+            "wifi-lock-open",
+            "wifi-marker",
+            "wifi-minus",
+            "wifi-off",
+            "wifi-plus",
+            "wifi-refresh",
+            "wifi-remove",
+            "wifi-settings",
+            "wifi-star",
+            "wifi-strength-1",
+            "wifi-strength-1-alert",
+            "wifi-strength-1-lock",
+            "wifi-strength-1-lock-open",
+            "wifi-strength-2",
+            "wifi-strength-2-alert",
+            "wifi-strength-2-lock",
+            "wifi-strength-2-lock-open",
+            "wifi-strength-3",
+            "wifi-strength-3-alert",
+            "wifi-strength-3-lock",
+            "wifi-strength-3-lock-open",
+            "wifi-strength-4",
+            "wifi-strength-4-alert",
+            "wifi-strength-4-lock",
+            "wifi-strength-4-lock-open",
+            "wifi-strength-alert-outline",
+            "wifi-strength-lock-open-outline",
+            "wifi-strength-lock-outline",
+            "wifi-strength-off",
+            "wifi-strength-off-outline",
+            "wifi-strength-outline",
+            "wifi-sync",
+            "wikipedia",
+            "wind-power",
+            "wind-power-outline",
+            "wind-turbine",
+            "wind-turbine-alert",
+            "wind-turbine-check",
+            "window-close",
+            "window-closed",
+            "window-closed-variant",
+            "window-maximize",
+            "window-minimize",
+            "window-open",
+            "window-open-variant",
+            "window-restore",
+            "window-shutter",
+            "window-shutter-alert",
+            "window-shutter-auto",
+            "window-shutter-cog",
+            "window-shutter-open",
+            "window-shutter-settings",
+            "windsock",
+            "wiper",
+            "wiper-wash",
+            "wiper-wash-alert",
+            "wizard-hat",
+            "wordpress",
+            "wrap",
+            "wrap-disabled",
+            "wrench",
+            "wrench-check",
+            "wrench-check-outline",
+            "wrench-clock",
+            "wrench-clock-outline",
+            "wrench-cog",
+            "wrench-cog-outline",
+            "wrench-outline",
+            "xamarin",
+            "xml",
+            "xmpp",
+            "yahoo",
+            "yeast",
+            "yin-yang",
+            "yoga",
+            "youtube",
+            "youtube-gaming",
+            "youtube-studio",
+            "youtube-subscription",
+            "youtube-tv",
+            "yurt",
+            "z-wave",
+            "zend",
+            "zigbee",
+            "zip-box",
+            "zip-box-outline",
+            "zip-disk",
+            "zodiac-aquarius",
+            "zodiac-aries",
+            "zodiac-cancer",
+            "zodiac-capricorn",
+            "zodiac-gemini",
+            "zodiac-leo",
+            "zodiac-libra",
+            "zodiac-pisces",
+            "zodiac-sagittarius",
+            "zodiac-scorpio",
+            "zodiac-taurus",
+            "zodiac-virgo",
+            "blank",
+            "18px.mdi-set,.mdi-18px.mdi",
+            "24px.mdi-set,.mdi-24px.mdi",
+            "36px.mdi-set,.mdi-36px.mdi",
+            "48px.mdi-set,.mdi-48px.mdi",
+            "dark",
+            "dark.mdi-inactive",
+            "light",
+            "light.mdi-inactive",
+            "rotate-45",
+            "rotate-90",
+            "rotate-135",
+            "rotate-180",
+            "rotate-225",
+            "rotate-270",
+            "rotate-315",
+            "flip-h",
+            "flip-v",
+            "spin"
+        ],
+        getIoncs : function(){
+            $.get(Config.admin_path+"/css/materialdesignicons.min.css", function (ret) {
+                window.iconret = ret;
+                // var exp = /\.mdi-(.*):before/ig;
+                // var result;
+                // while ((result = exp.exec(ret)) != null) {
+                //     iconlist.push(result[1]);
+                // }
+                var list = Array.from(iconret.matchAll(/mdi-(.*?):before/g));
+                for (let index = 1; index < list.length; index++) {
+                    //const element = list[index];
+                    iconlist.push(list[index][1]);
+                    
+                }
+            })
+
+
+        },
+        bind:function(ele,input){
+            var _this = this;
+            var render = Template.compile([
+                "<div id=\"chooseicon\">",
+                "        <div>",
+                "            <form onsubmit=\"return false;\">",
+                "                <div class=\"input-group input-groupp-md\">",
+                "                    <div class=\"input-group-addon\">搜索图标<\/div>",
+                "                    <input class=\"js-icon-search form-control\" type=\"text\" placeholder=\"\">",
+                "                <\/div>",
+                "            <\/form>",
+                "        <\/div>",
+                "        <div>",
+                "            <ul class=\"list-inline\">",
+                "                <% for(var i=0; i<iconlist.length; i++){ %>",
+                "                    <li data-font=\"<%=iconlist[i]%>\" data-toggle=\"tooltip\" title=\"<%=iconlist[i]%>\">",
+                "                    <i class=\"mdi mdi-<%=iconlist[i]%>\"><\/i>",
+                "                <\/li>",
+                "                <% } %>",
+                "            <\/ul>",
+                "        <\/div>",
+                "    <\/div>"].join("")
+            );
+            $(input).on('change keyup', function () {
+                $(this).prev().find("i").prop("class", $(this).val());
+            });
+            $(ele).on('click', function (e) {
+                Layer.open({
+                    type: 1,
+                    area: ['99%', '98%'], //宽高
+                    content: render({iconlist: _this.iconlist}),
+                    success:function(l,index){
+                        l.find("#chooseicon ul li").on('click',function () {
+                            $(input).val('mdi mdi-' + $(this).data("font")).trigger("change");
+                            Layer.close(index);
+                        });
+                        l.find("input.js-icon-search").on('keyup', function () {
+                            l.find.show();
+                            if ($(this).val() != '') {
+                                l.find("#chooseicon ul").find("li:not([data-font*='" + $(this).val() + "'])").hide();
+                            }
+                        });
+                    }
+                });
+                return false;
+            });
+        }
+    }
+    return IconSelector;
+});
\ No newline at end of file
diff --git a/plugin/admin/public/libs/layer.old/.bower.json b/plugin/admin/public/libs/layer.old/.bower.json
deleted file mode 100644
index 3710b09..0000000
--- a/plugin/admin/public/libs/layer.old/.bower.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "name": "layer",
-  "main": "src/layer.js",
-  "version": "3.5.3",
-  "homepage": "https://github.com/sentsin/layer",
-  "authors": [
-    "sentsin <xu@sentsin.com>"
-  ],
-  "description": "弹窗组件",
-  "moduleType": [
-    "amd",
-    "globals"
-  ],
-  "keywords": [
-    "layer",
-    "layui",
-    "dialog"
-  ],
-  "license": "MIT",
-  "_release": "3.5.3",
-  "_resolution": {
-    "type": "version",
-    "tag": "v3.5.3",
-    "commit": "7ef901632a7d21f37692ae5d4f9e671c7d57ce47"
-  },
-  "_source": "https://github.com/karsonzhang/fastadmin-layer.git",
-  "_target": "~3.5.1",
-  "_originalSource": "fastadmin-layer"
-}
\ No newline at end of file
diff --git a/plugin/admin/public/libs/layer.old/.gitignore b/plugin/admin/public/libs/layer.old/.gitignore
deleted file mode 100644
index 18924b8..0000000
--- a/plugin/admin/public/libs/layer.old/.gitignore
+++ /dev/null
@@ -1,23 +0,0 @@
-1.8.5/
-*.iml
-.idea/
-.ipr
-.iws
-*~
-~*
-*.diff
-*.patch
-*.bak
-.DS_Store
-Thumbs.db
-.svn/
-*.swp
-.nojekyll
-.project
-.settings/
-node_modules/
-_site/
-.npmignore
-release/
-skin/moon/
-src/skin/moon/
\ No newline at end of file
diff --git a/plugin/admin/public/libs/layer.old/LICENSE b/plugin/admin/public/libs/layer.old/LICENSE
deleted file mode 100644
index be179b1..0000000
--- a/plugin/admin/public/libs/layer.old/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2016 layui
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
diff --git a/plugin/admin/public/libs/layer.old/README.md b/plugin/admin/public/libs/layer.old/README.md
deleted file mode 100644
index 0defd8f..0000000
--- a/plugin/admin/public/libs/layer.old/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-
-## 概要
-layer 是一款历来都备受青睐的 Web 弹出层组件，具备全方位的解决方案，面向的是各个水平段的开发人员，您的页面会轻松地拥有丰富友好的操作体验。在与同类组件的比较中，layer 会更能被开发者所选择。这不仅是凭「脸」取胜，而是它尽可能地在以更少的代码展现更强健的功能，且格外注重性能的提升、易用和实用性，layer 甚至还兼容了包括 IE6 在内的所有主流浏览器。其数量可观的基础属性和方法，使得您可以自定义太多您需要的风格，每一种弹层模式各具特色，广受欢迎。当然，这种「王婆卖瓜」的陈述听起来总是有点难受，因此你需要进一步了解她是否真的如你所愿。
-
-[文档与演示](http://layer.layui.com/) 
-
-## 愿景
-成为网页弹出层的首先交互方案
-
-## 现状
-因着数年的坚持维护，已被运用在不计其数 Web 平台。几乎所处可见，其中还不乏众多知名大型网站。layer 已被国内乃至全世界至少数十万的开发者所使用过。
-
-
-## 相关
-[官网](http://layer.layui.com/)
\ No newline at end of file
diff --git a/plugin/admin/public/libs/layer.old/bower.json b/plugin/admin/public/libs/layer.old/bower.json
deleted file mode 100644
index 864db69..0000000
--- a/plugin/admin/public/libs/layer.old/bower.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "name": "layer",
-  "main": "src/layer.js",
-  "version": "3.5.3",
-  "homepage": "https://github.com/sentsin/layer",
-  "authors": [
-    "sentsin <xu@sentsin.com>"
-  ],
-  "description": "弹窗组件",
-  "moduleType": [
-    "amd",
-    "globals"
-  ],
-  "keywords": [
-    "layer",
-    "layui",
-    "dialog"
-  ],
-  "license": "MIT"
-}
diff --git a/plugin/admin/public/libs/layer.old/dist/layer.js b/plugin/admin/public/libs/layer.old/dist/layer.js
deleted file mode 100644
index 62f9422..0000000
--- a/plugin/admin/public/libs/layer.old/dist/layer.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! layer-v3.5.3 Web 通用弹出层组件 MIT License  http://layer.layui.com/  By 贤心 */
- ;!function(e,t){"use strict";var i,n,a=e.layui&&layui.define,o={getPath:function(){var t=document.currentScript?document.currentScript.src:function(){for(var e,t=document.scripts,i=t.length-1,n=i;n>0;n--)if("interactive"===t[n].readyState){e=t[n].src;break}return e||t[i].src}(),i=e.LAYUI_GLOBAL||{};return i.layer_dir||t.substring(0,t.lastIndexOf("/")+1)}(),config:{},end:{},minIndex:0,minLeft:[],btn:["&#x786E;&#x5B9A;","&#x53D6;&#x6D88;"],type:["dialog","page","iframe","loading","tips"],getStyle:function(t,i){var n=t.currentStyle?t.currentStyle:e.getComputedStyle(t,null);return n[n.getPropertyValue?"getPropertyValue":"getAttribute"](i)},link:function(t,i,n){if(r.path){var a=document.getElementsByTagName("head")[0],s=document.createElement("link");"string"==typeof i&&(n=i);var l=(n||t).replace(/\.|\//g,""),f="layuicss-"+l,c="creating",u=0;s.rel="stylesheet",s.href=r.path+t,s.id=f,document.getElementById(f)||a.appendChild(s),"function"==typeof i&&!function d(t){var n=100,a=document.getElementById(f);return++u>1e4/n?e.console&&console.error(l+".css: Invalid"):void(1989===parseInt(o.getStyle(a,"width"))?(t===c&&a.removeAttribute("lay-status"),a.getAttribute("lay-status")===c?setTimeout(d,n):i()):(a.setAttribute("lay-status",c),setTimeout(function(){d(c)},n)))}()}}},r={v:"3.5.2",ie:function(){var t=navigator.userAgent.toLowerCase();return!!(e.ActiveXObject||"ActiveXObject"in e)&&((t.match(/msie\s(\d+)/)||[])[1]||"11")}(),index:e.layer&&e.layer.v?1e5:0,path:o.getPath,config:function(e,t){return e=e||{},f=r.cache=o.config=i.extend({},o.config,e),r.path=o.config.path||r.path,"string"==typeof e.extend&&(e.extend=[e.extend]),o.config.path&&r.ready(),e.extend?(a?layui.addcss("modules/layer/"+e.extend):o.link("theme/"+e.extend),this):this},ready:function(e){var t="layer",i="",n=(a?"modules/layer/":"theme/")+"default/layer.css?v="+r.v+i;return a?layui.addcss(n,e,t):o.link(n,e,t),this},alert:function(e,t,n){var a="function"==typeof t;return a&&(n=t),r.open(i.extend({content:e,yes:n},a?{}:t))},confirm:function(e,t,n,a){var s="function"==typeof t;return s&&(a=n,n=t),r.open(i.extend({content:e,btn:o.btn,yes:n,btn2:a},s?{}:t))},msg:function(e,n,a){var s="function"==typeof n,f=o.config.skin,c=(f?f+" "+f+"-msg":"")||"layui-layer-msg",u=l.anim.length-1;return s&&(a=n),r.open(i.extend({content:e,time:3e3,shade:!1,skin:c,title:!1,closeBtn:!1,btn:!1,resize:!1,end:a},s&&!o.config.skin?{skin:c+" layui-layer-hui",anim:u}:function(){return n=n||{},n.icon!==-1&&n.icon!==t||(n.skin=c+" "+(n.skin||"layui-layer-hui")),n}()))},load:function(e,t){return r.open(i.extend({type:3,icon:e||0,resize:!1,shade:.01},t))},tips:function(e,t,n){return r.open(i.extend({type:4,content:[e,t],closeBtn:!1,time:3e3,shade:!1,resize:!1,fixed:!1,maxWidth:260},n))}},s=function(e){var t=this,n=function(){t.creat()};t.index=++r.index,t.config=i.extend({},t.config,o.config,e),document.body?n():setTimeout(function(){n()},30)};s.pt=s.prototype;var l=["layui-layer",".layui-layer-title",".layui-layer-main",".layui-layer-dialog","layui-layer-iframe","layui-layer-content","layui-layer-btn","layui-layer-close"];l.anim=["layer-anim-00","layer-anim-01","layer-anim-02","layer-anim-03","layer-anim-04","layer-anim-05","layer-anim-06"],l.SHADE="layui-layer-shade",l.MOVE="layui-layer-move",s.pt.config={type:0,shade:.3,fixed:!0,move:l[1],title:"&#x4FE1;&#x606F;",offset:"auto",area:"auto",closeBtn:1,time:0,zIndex:19891014,maxWidth:360,anim:0,isOutAnim:!0,minStack:!0,focusBtn:0,icon:-1,moveType:1,resize:!0,scrollbar:!0,tips:2},s.pt.vessel=function(e,t){var n=this,a=n.index,r=n.config,s=r.zIndex+a,f="object"==typeof r.title,c=r.maxmin&&(1===r.type||2===r.type),u=r.title?'<div class="layui-layer-title" style="'+(f?r.title[1]:"")+'">'+(f?r.title[0]:r.title)+"</div>":"";return r.zIndex=s,t([r.shade?'<div class="'+l.SHADE+'" id="'+l.SHADE+a+'" times="'+a+'" style="'+("z-index:"+(s-1)+"; ")+'"></div>':"",'<div class="'+l[0]+(" layui-layer-"+o.type[r.type])+(0!=r.type&&2!=r.type||r.shade?"":" layui-layer-border")+" "+(r.skin||"")+'" id="'+l[0]+a+'" type="'+o.type[r.type]+'" times="'+a+'" showtime="'+r.time+'" conType="'+(e?"object":"string")+'" style="z-index: '+s+"; width:"+r.area[0]+";height:"+r.area[1]+";position:"+(r.fixed?"fixed;":"absolute;")+'">'+(e&&2!=r.type?"":u)+'<div id="'+(r.id||"")+'" class="layui-layer-content'+(0==r.type&&r.icon!==-1?" layui-layer-padding":"")+(3==r.type?" layui-layer-loading"+r.icon:"")+'">'+(0==r.type&&r.icon!==-1?'<i class="layui-layer-ico layui-layer-ico'+r.icon+'"></i>':"")+(1==r.type&&e?"":r.content||"")+'</div><span class="layui-layer-setwin">'+function(){var e=c?'<a class="layui-layer-min" href="javascript:;"><cite></cite></a><a class="layui-layer-ico layui-layer-max" href="javascript:;"></a>':"";return r.closeBtn&&(e+='<a class="layui-layer-ico '+l[7]+" "+l[7]+(r.title?r.closeBtn:4==r.type?"1":"2")+'" href="javascript:;"></a>'),e}()+"</span>"+(r.btn?function(){var e="";"string"==typeof r.btn&&(r.btn=[r.btn]);for(var t=0,i=r.btn.length;t<i;t++)e+='<a class="'+l[6]+t+'" href="javascript:">'+r.btn[t]+"</a>";return'<div class="'+l[6]+" layui-layer-btn-"+(r.btnAlign||"")+'">'+e+"</div>"}():"")+(r.resize?'<span class="layui-layer-resize"></span>':"")+"</div>"],u,i('<div class="'+l.MOVE+'" id="'+l.MOVE+'"></div>')),n},s.pt.creat=function(){var e=this,t=e.config,a=e.index,s=t.content,f="object"==typeof s,c=i("body");if(!t.id||!i("#"+t.id)[0]){switch("string"==typeof t.area&&(t.area="auto"===t.area?["",""]:[t.area,""]),t.shift&&(t.anim=t.shift),6==r.ie&&(t.fixed=!1),t.type){case 0:t.btn="btn"in t?t.btn:o.btn[0],r.closeAll("dialog");break;case 2:var s=t.content=f?t.content:[t.content||"","auto"];t.content='<iframe scrolling="'+(t.content[1]||"auto")+'" allowtransparency="true" id="'+l[4]+a+'" name="'+l[4]+a+'" onload="this.className=\'\';" class="layui-layer-load" frameborder="0" src="'+t.content[0]+'"></iframe>';break;case 3:delete t.title,delete t.closeBtn,t.icon===-1&&0===t.icon,r.closeAll("loading");break;case 4:f||(t.content=[t.content,"body"]),t.follow=t.content[1],t.content=t.content[0]+'<i class="layui-layer-TipsG"></i>',delete t.title,t.tips="object"==typeof t.tips?t.tips:[t.tips,!0],t.tipsMore||r.closeAll("tips")}if(e.vessel(f,function(n,r,u){c.append(n[0]),f?function(){2==t.type||4==t.type?function(){i("body").append(n[1])}():function(){s.parents("."+l[0])[0]||(s.data("display",s.css("display")).show().addClass("layui-layer-wrap").wrap(n[1]),i("#"+l[0]+a).find("."+l[5]).before(r))}()}():c.append(n[1]),i("#"+l.MOVE)[0]||c.append(o.moveElem=u),e.layero=i("#"+l[0]+a),e.shadeo=i("#"+l.SHADE+a),t.scrollbar||l.html.css("overflow","hidden").attr("layer-full",a)}).auto(a),e.shadeo.css({"background-color":t.shade[1]||"#000",opacity:t.shade[0]||t.shade}),2==t.type&&6==r.ie&&e.layero.find("iframe").attr("src",s[0]),4==t.type?e.tips():function(){e.offset(),parseInt(o.getStyle(document.getElementById(l.MOVE),"z-index"))||function(){e.layero.css("visibility","hidden"),r.ready(function(){e.offset(),e.layero.css("visibility","visible")})}()}(),t.fixed&&n.on("resize",function(){e.offset(),(/^\d+%$/.test(t.area[0])||/^\d+%$/.test(t.area[1]))&&e.auto(a),4==t.type&&e.tips()}),t.time<=0||setTimeout(function(){r.close(e.index)},t.time),e.move().callback(),l.anim[t.anim]){var u="layer-anim "+l.anim[t.anim];e.layero.addClass(u).one("webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend",function(){i(this).removeClass(u)})}t.isOutAnim&&e.layero.data("isOutAnim",!0)}},s.pt.auto=function(e){var t=this,a=t.config,o=i("#"+l[0]+e);""===a.area[0]&&a.maxWidth>0&&(r.ie&&r.ie<8&&a.btn&&o.width(o.innerWidth()),o.outerWidth()>a.maxWidth&&o.width(a.maxWidth));var s=[o.innerWidth(),o.innerHeight()],f=o.find(l[1]).outerHeight()||0,c=o.find("."+l[6]).outerHeight()||0,u=function(e){e=o.find(e),e.height(s[1]-f-c-2*(0|parseFloat(e.css("padding-top"))))};switch(a.type){case 2:u("iframe");break;default:""===a.area[1]?a.maxHeight>0&&o.outerHeight()>a.maxHeight?(s[1]=a.maxHeight,u("."+l[5])):a.fixed&&s[1]>=n.height()&&(s[1]=n.height(),u("."+l[5])):u("."+l[5])}return t},s.pt.offset=function(){var e=this,t=e.config,i=e.layero,a=[i.outerWidth(),i.outerHeight()],o="object"==typeof t.offset;e.offsetTop=(n.height()-a[1])/2,e.offsetLeft=(n.width()-a[0])/2,o?(e.offsetTop=t.offset[0],e.offsetLeft=t.offset[1]||e.offsetLeft):"auto"!==t.offset&&("t"===t.offset?e.offsetTop=0:"r"===t.offset?e.offsetLeft=n.width()-a[0]:"b"===t.offset?e.offsetTop=n.height()-a[1]:"l"===t.offset?e.offsetLeft=0:"lt"===t.offset?(e.offsetTop=0,e.offsetLeft=0):"lb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=0):"rt"===t.offset?(e.offsetTop=0,e.offsetLeft=n.width()-a[0]):"rb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=n.width()-a[0]):e.offsetTop=t.offset),t.fixed||(e.offsetTop=/%$/.test(e.offsetTop)?n.height()*parseFloat(e.offsetTop)/100:parseFloat(e.offsetTop),e.offsetLeft=/%$/.test(e.offsetLeft)?n.width()*parseFloat(e.offsetLeft)/100:parseFloat(e.offsetLeft),e.offsetTop+=n.scrollTop(),e.offsetLeft+=n.scrollLeft()),i.attr("minLeft")&&(e.offsetTop=n.height()-(i.find(l[1]).outerHeight()||0),e.offsetLeft=i.css("left")),i.css({top:e.offsetTop,left:e.offsetLeft})},s.pt.tips=function(){var e=this,t=e.config,a=e.layero,o=[a.outerWidth(),a.outerHeight()],r=i(t.follow);r[0]||(r=i("body"));var s={width:r.outerWidth(),height:r.outerHeight(),top:r.offset().top,left:r.offset().left},f=a.find(".layui-layer-TipsG"),c=t.tips[0];t.tips[1]||f.remove(),s.autoLeft=function(){s.left+o[0]-n.width()>0?(s.tipLeft=s.left+s.width-o[0],f.css({right:12,left:"auto"})):s.tipLeft=s.left},s.where=[function(){s.autoLeft(),s.tipTop=s.top-o[1]-10,f.removeClass("layui-layer-TipsB").addClass("layui-layer-TipsT").css("border-right-color",t.tips[1])},function(){s.tipLeft=s.left+s.width+10,s.tipTop=s.top,f.removeClass("layui-layer-TipsL").addClass("layui-layer-TipsR").css("border-bottom-color",t.tips[1])},function(){s.autoLeft(),s.tipTop=s.top+s.height+10,f.removeClass("layui-layer-TipsT").addClass("layui-layer-TipsB").css("border-right-color",t.tips[1])},function(){s.tipLeft=s.left-o[0]-10,s.tipTop=s.top,f.removeClass("layui-layer-TipsR").addClass("layui-layer-TipsL").css("border-bottom-color",t.tips[1])}],s.where[c-1](),1===c?s.top-(n.scrollTop()+o[1]+16)<0&&s.where[2]():2===c?n.width()-(s.left+s.width+o[0]+16)>0||s.where[3]():3===c?s.top-n.scrollTop()+s.height+o[1]+16-n.height()>0&&s.where[0]():4===c&&o[0]+16-s.left>0&&s.where[1](),a.find("."+l[5]).css({"background-color":t.tips[1],"padding-right":t.closeBtn?"30px":""}),a.css({left:s.tipLeft-(t.fixed?n.scrollLeft():0),top:s.tipTop-(t.fixed?n.scrollTop():0)})},s.pt.move=function(){var e=this,t=e.config,a=i(document),s=e.layero,l=s.find(t.move),f=s.find(".layui-layer-resize"),c={};return t.move&&l.css("cursor","move"),l.on("mousedown",function(e){e.preventDefault(),t.move&&(c.moveStart=!0,c.offset=[e.clientX-parseFloat(s.css("left")),e.clientY-parseFloat(s.css("top"))],o.moveElem.css("cursor","move").show())}),f.on("mousedown",function(e){e.preventDefault(),c.resizeStart=!0,c.offset=[e.clientX,e.clientY],c.area=[s.outerWidth(),s.outerHeight()],o.moveElem.css("cursor","se-resize").show()}),a.on("mousemove",function(i){if(c.moveStart){var a=i.clientX-c.offset[0],o=i.clientY-c.offset[1],l="fixed"===s.css("position");if(i.preventDefault(),c.stX=l?0:n.scrollLeft(),c.stY=l?0:n.scrollTop(),!t.moveOut){var f=n.width()-s.outerWidth()+c.stX,u=n.height()-s.outerHeight()+c.stY;a<c.stX&&(a=c.stX),a>f&&(a=f),o<c.stY&&(o=c.stY),o>u&&(o=u)}s.css({left:a,top:o})}if(t.resize&&c.resizeStart){var a=i.clientX-c.offset[0],o=i.clientY-c.offset[1];i.preventDefault(),r.style(e.index,{width:c.area[0]+a,height:c.area[1]+o}),c.isResize=!0,t.resizing&&t.resizing(s)}}).on("mouseup",function(e){c.moveStart&&(delete c.moveStart,o.moveElem.hide(),t.moveEnd&&t.moveEnd(s)),c.resizeStart&&(delete c.resizeStart,o.moveElem.hide())}),e},s.pt.callback=function(){function e(){var e=a.cancel&&a.cancel(t.index,n);e===!1||r.close(t.index)}var t=this,n=t.layero,a=t.config;if(t.openLayer(),a.success&&(2==a.type?n.find("iframe").on("load",function(){a.success(n,t.index)}):a.success(n,t.index)),6==r.ie&&t.IE6(n),n.find("."+l[6]).children("a").on("click",function(){var e=i(this).index();if(0===e)a.yes?a.yes(t.index,n):a.btn1?a.btn1(t.index,n):r.close(t.index);else{var o=a["btn"+(e+1)]&&a["btn"+(e+1)](t.index,n);o===!1||r.close(t.index)}}),"number"==typeof a.focusBtn){n.find("."+l[6]).children("a").each(function(){var e=i(this),t=i("<button type='button' />").addClass("layui-layer-confirm");e.css("position","relative").attr("tabindex",-1).append(t),t.click(function(){return e.trigger("click"),!1})});var s=n.find("."+l[6]).find("button.layui-layer-confirm").eq(a.focusBtn);s.length>0&&s.focus()}n.find("."+l[7]).on("click",e),a.shadeClose&&t.shadeo.on("click",function(){r.close(t.index)}),n.find(".layui-layer-min").on("click",function(){var e=a.min&&a.min(n,t.index);e===!1||r.min(t.index,a)}),n.find(".layui-layer-max").on("click",function(){i(this).hasClass("layui-layer-maxmin")?(r.restore(t.index),a.restore&&a.restore(n,t.index)):(r.full(t.index,a),setTimeout(function(){a.full&&a.full(n,t.index)},100))}),a.end&&(o.end[t.index]=a.end)},o.reselect=function(){i.each(i("select"),function(e,t){var n=i(this);n.parents("."+l[0])[0]||1==n.attr("layer")&&i("."+l[0]).length<1&&n.removeAttr("layer").show(),n=null})},s.pt.IE6=function(e){i("select").each(function(e,t){var n=i(this);n.parents("."+l[0])[0]||"none"===n.css("display")||n.attr({layer:"1"}).hide(),n=null})},s.pt.openLayer=function(){var e=this;r.zIndex=e.config.zIndex,r.setTop=function(e){var t=function(){r.zIndex++,e.css("z-index",r.zIndex+1)};return r.zIndex=parseInt(e[0].style.zIndex),e.on("mousedown",t),r.zIndex}},o.record=function(e){var t=[e.width(),e.height(),e.position().top,e.position().left+parseFloat(e.css("margin-left"))];e.find(".layui-layer-max").addClass("layui-layer-maxmin"),e.attr({area:t})},o.rescollbar=function(e){l.html.attr("layer-full")==e&&(l.html[0].style.removeProperty?l.html[0].style.removeProperty("overflow"):l.html[0].style.removeAttribute("overflow"),l.html.removeAttr("layer-full"))},e.layer=r,r.getChildFrame=function(e,t){return t=t||i("."+l[4]).attr("times"),i("#"+l[0]+t).find("iframe").contents().find(e)},r.getFrameIndex=function(e){return i("#"+e).parents("."+l[4]).attr("times")},r.iframeAuto=function(e){if(e){var t=r.getChildFrame("html",e).outerHeight(),n=i("#"+l[0]+e),a=n.find(l[1]).outerHeight()||0,o=n.find("."+l[6]).outerHeight()||0;n.css({height:t+a+o}),n.find("iframe").css({height:t})}},r.iframeSrc=function(e,t){i("#"+l[0]+e).find("iframe").attr("src",t)},r.style=function(e,t,n){var a=i("#"+l[0]+e),r=a.find(".layui-layer-content"),s=a.attr("type"),f=a.find(l[1]).outerHeight()||0,c=a.find("."+l[6]).outerHeight()||0;a.attr("minLeft");if(s!==o.type[3]&&s!==o.type[4])if(n||(parseFloat(t.width)<=260&&(t.width=260),parseFloat(t.height)-f-c<=64&&(t.height=64+f+c)),a.css(t),c=a.find("."+l[6]).outerHeight(),s===o.type[2])a.find("iframe").css({height:parseFloat(t.height)-f-c});else{var u="border-box"==r.css("box-sizing");r.css({height:parseFloat(t.height)-f-c-parseFloat(u?0:r.css("padding-top"))-parseFloat(u?0:r.css("padding-bottom"))})}},r.min=function(e,t){t=t||{};var a=i("#"+l[0]+e),s=i("#"+l.SHADE+e),f=a.find(l[1]).outerHeight()||0,c=a.attr("minLeft")||181*o.minIndex+"px",u=a.css("position"),d={width:180,height:f,position:"fixed",overflow:"hidden"};o.record(a),o.minLeft[0]&&(c=o.minLeft[0],o.minLeft.shift()),t.minStack&&(d.left=c,d.top=n.height()-f,a.attr("minLeft")||o.minIndex++,a.attr("minLeft",c)),a.attr("position",u),r.style(e,d,!0),a.find(".layui-layer-min").hide(),"page"===a.attr("type")&&a.find(l[4]).hide(),o.rescollbar(e),s.hide()},r.restore=function(e){var t=i("#"+l[0]+e),n=i("#"+l.SHADE+e),a=t.attr("area").split(",");t.attr("type");r.style(e,{width:parseFloat(a[0]),height:parseFloat(a[1]),top:parseFloat(a[2]),left:parseFloat(a[3]),position:t.attr("position"),overflow:"visible"},!0),t.find(".layui-layer-max").removeClass("layui-layer-maxmin"),t.find(".layui-layer-min").show(),"page"===t.attr("type")&&t.find(l[4]).show(),o.rescollbar(e),n.show()},r.full=function(e){var t,a=i("#"+l[0]+e);o.record(a),l.html.attr("layer-full")||l.html.css("overflow","hidden").attr("layer-full",e),clearTimeout(t),t=setTimeout(function(){var t="fixed"===a.css("position");r.style(e,{top:t?0:n.scrollTop(),left:t?0:n.scrollLeft(),width:n.width(),height:n.height()},!0),a.find(".layui-layer-min").hide()},100)},r.title=function(e,t){var n=i("#"+l[0]+(t||r.index)).find(l[1]);n.html(e)},r.close=function(e,t){var n=i("#"+l[0]+e),a=n.attr("type"),s="layer-anim-close";if(n[0]){var f="layui-layer-wrap",c=function(){if(a===o.type[1]&&"object"===n.attr("conType")){n.children(":not(."+l[5]+")").remove();for(var r=n.find("."+f),s=0;s<2;s++)r.unwrap();r.css("display",r.data("display")).removeClass(f)}else{if(a===o.type[2])try{var c=i("#"+l[4]+e)[0];c.contentWindow.document.write(""),c.contentWindow.close(),n.find("."+l[5])[0].removeChild(c)}catch(u){}n[0].innerHTML="",n.remove()}"function"==typeof o.end[e]&&o.end[e](),delete o.end[e],"function"==typeof t&&t()};n.data("isOutAnim")&&n.addClass("layer-anim "+s),i("#layui-layer-moves, #"+l.SHADE+e).remove(),6==r.ie&&o.reselect(),o.rescollbar(e),n.attr("minLeft")&&(o.minIndex--,o.minLeft.push(n.attr("minLeft"))),r.ie&&r.ie<10||!n.data("isOutAnim")?c():setTimeout(function(){c()},200)}},r.closeAll=function(e,t){"function"==typeof e&&(t=e,e=null);var n=i("."+l[0]);i.each(n,function(a){var o=i(this),s=e?o.attr("type")===e:1;s&&r.close(o.attr("times"),a===n.length-1?t:null),s=null}),0===n.length&&"function"==typeof t&&t()};var f=r.cache||{},c=function(e){return f.skin?" "+f.skin+" "+f.skin+"-"+e:""};r.prompt=function(e,t){var a="";if(e=e||{},"function"==typeof e&&(t=e),e.area){var o=e.area;a='style="width: '+o[0]+"; height: "+o[1]+';"',delete e.area}var s,l=2==e.formType?'<textarea class="layui-layer-input"'+a+"></textarea>":function(){return'<input type="'+(1==e.formType?"password":"text")+'" class="layui-layer-input">'}(),f=e.success;return delete e.success,r.open(i.extend({type:1,btn:["&#x786E;&#x5B9A;","&#x53D6;&#x6D88;"],content:l,skin:"layui-layer-prompt"+c("prompt"),maxWidth:n.width(),success:function(t){s=t.find(".layui-layer-input"),s.val(e.value||"").focus(),"function"==typeof f&&f(t)},resize:!1,yes:function(i){var n=s.val();""===n?s.focus():n.length>(e.maxlength||500)?r.tips("&#x6700;&#x591A;&#x8F93;&#x5165;"+(e.maxlength||500)+"&#x4E2A;&#x5B57;&#x6570;",s,{tips:1}):t&&t(n,i,s)}},e))},r.tab=function(e){e=e||{};var t=e.tab||{},n="layui-this",a=e.success;return delete e.success,r.open(i.extend({type:1,skin:"layui-layer-tab"+c("tab"),resize:!1,title:function(){var e=t.length,i=1,a="";if(e>0)for(a='<span class="'+n+'">'+t[0].title+"</span>";i<e;i++)a+="<span>"+t[i].title+"</span>";return a}(),content:'<ul class="layui-layer-tabmain">'+function(){var e=t.length,i=1,a="";if(e>0)for(a='<li class="layui-layer-tabli '+n+'">'+(t[0].content||"no content")+"</li>";i<e;i++)a+='<li class="layui-layer-tabli">'+(t[i].content||"no  content")+"</li>";return a}()+"</ul>",success:function(t){var o=t.find(".layui-layer-title").children(),r=t.find(".layui-layer-tabmain").children();o.on("mousedown",function(t){t.stopPropagation?t.stopPropagation():t.cancelBubble=!0;var a=i(this),o=a.index();a.addClass(n).siblings().removeClass(n),r.eq(o).show().siblings().hide(),"function"==typeof e.change&&e.change(o)}),"function"==typeof a&&a(t)}},e))},r.photos=function(t,n,a){function o(e,t,i){var n=new Image;return n.src=e,n.complete?t(n):(n.onload=function(){n.onload=null,t(n)},void(n.onerror=function(e){n.onerror=null,i(e)}))}var s={};if(t=t||{},t.photos){t.zoom="undefined"==typeof t.zoom||!!t.zoom;var l=!("string"==typeof t.photos||t.photos instanceof i),f=l?t.photos:{},u=f.data||[],d=f.start||0;s.imgIndex=(0|d)+1,t.img=t.img||"img";var y=t.success;if(delete t.success,l){if(0===u.length)return r.msg("&#x6CA1;&#x6709;&#x56FE;&#x7247;")}else{var p=i(t.photos),h=function(){u=[],p.find(t.img).each(function(e){var t=i(this);t.attr("layer-index",e),u.push({alt:t.attr("alt"),pid:t.attr("layer-pid"),src:t.attr("layer-src")||t.attr("src"),thumb:t.attr("src")})})};if(h(),0===u.length)return;if(n||p.on("click",t.img,function(){h();var e=i(this),n=e.attr("layer-index");r.photos(i.extend(t,{photos:{start:n,data:u,tab:t.tab},full:t.full}),!0)}),!n)return}s.imgprev=function(e){s.imgIndex--,s.imgIndex<1&&(s.imgIndex=u.length),s.tabimg(e)},s.imgnext=function(e,t){s.imgIndex++,s.imgIndex>u.length&&(s.imgIndex=1,t)||s.tabimg(e)},s.keyup=function(e){if(!s.end){var t=e.keyCode;e.preventDefault(),37===t?s.imgprev(!0):39===t?s.imgnext(!0):27===t&&r.close(s.index)}},s.tabimg=function(e){if(!(u.length<=1))return f.start=s.imgIndex-1,r.close(s.index),r.photos(t,!0,e)},s.event=function(){s.bigimg.find(".layui-layer-imgprev").on("click",function(e){e.preventDefault(),s.imgprev(!0)}),s.bigimg.find(".layui-layer-imgnext").on("click",function(e){e.preventDefault(),s.imgnext(!0)}),i(document).on("keyup",s.keyup),t.zoom&&s.bigimg.on("wheel mousewheel",i(">img",s.bigimg),function(e){var t=i(this).offset(),n=e.originalEvent.wheelDelta>0,a=n?"+=":"-=",o=24,r=Math.floor(o/2);return!(!n&&(i(this).width()<50||i(this).height()<50))&&(i(this).width(a+o).height(a+o).offset({left:n?t.left-r:t.left+r,top:n?t.top-r:t.top+r}),!1)})},s.loadi=r.load(1,{shade:!("shade"in t)&&.9,scrollbar:!1}),o(u[d].src,function(n){r.close(s.loadi),a&&(t.anim=-1),s.index=r.open(i.extend({type:1,id:"layui-layer-photos",area:function(){var a=[n.width,n.height],o=[i(e).width()-100,i(e).height()-100];if(!t.full&&(a[0]>o[0]||a[1]>o[1])){var r=[a[0]/o[0],a[1]/o[1]];r[0]>r[1]?(a[0]=a[0]/r[0],a[1]=a[1]/r[0]):r[0]<r[1]&&(a[0]=a[0]/r[1],a[1]=a[1]/r[1])}return[a[0]+"px",a[1]+"px"]}(),title:!1,shade:.9,shadeClose:!0,closeBtn:!1,move:".layui-layer-phimg img",moveType:1,scrollbar:!1,moveOut:!0,anim:5,isOutAnim:!1,skin:"layui-layer-photos"+c("photos"),content:'<div class="layui-layer-phimg"><img src="'+u[d].src+'" alt="'+(u[d].alt||"")+'" layer-pid="'+u[d].pid+'">'+function(){return u.length>1?'<div class="layui-layer-imgsee"><span class="layui-layer-imguide"><a href="javascript:;" class="layui-layer-iconext layui-layer-imgprev"></a><a href="javascript:;" class="layui-layer-iconext layui-layer-imgnext"></a></span><div class="layui-layer-imgbar" style="display:'+(a?"block":"")+'"><span class="layui-layer-imgtit"><a href="javascript:;">'+(u[d].alt||"")+"</a><em>"+s.imgIndex+" / "+u.length+"</em></span></div></div>":""}()+"</div>",success:function(e,i){s.bigimg=e.find(".layui-layer-phimg"),s.imgsee=e.find(".layui-layer-imgbar"),s.event(e),t.tab&&t.tab(u[d],e),"function"==typeof y&&y(e)},end:function(){s.end=!0,i(document).off("keyup",s.keyup)}},t))},function(){r.close(s.loadi),r.msg("&#x5F53;&#x524D;&#x56FE;&#x7247;&#x5730;&#x5740;&#x5F02;&#x5E38;<br>&#x662F;&#x5426;&#x7EE7;&#x7EED;&#x67E5;&#x770B;&#x4E0B;&#x4E00;&#x5F20;&#xFF1F;",{time:3e4,btn:["&#x4E0B;&#x4E00;&#x5F20;","&#x4E0D;&#x770B;&#x4E86;"],yes:function(){u.length>1&&s.imgnext(!0,!0)}})})}},o.run=function(t){i=t,n=i(e),l.html=i("html"),r.open=function(e){var t=new s(e);return t.index}},e.layui&&layui.define?(r.ready(),layui.define("jquery",function(t){r.path=layui.cache.dir,o.run(layui.$),e.layer=r,t("layer",r)})):"function"==typeof define&&define.amd?define(["jquery"],function(){return o.run(e.jQuery),r}):function(){r.ready(),o.run(e.jQuery)}()}(window);
\ No newline at end of file
diff --git a/plugin/admin/public/libs/layer.old/dist/mobile/layer.js b/plugin/admin/public/libs/layer.old/dist/mobile/layer.js
deleted file mode 100644
index 60b6e0f..0000000
--- a/plugin/admin/public/libs/layer.old/dist/mobile/layer.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! layer mobile-v2.0.0 Web 通用弹出层组件 MIT License  http://layer.layui.com/mobile  By 贤心 */
- ;!function(e){"use strict";var t=document,n="querySelectorAll",i="getElementsByClassName",a=function(e){return t[n](e)},s={type:0,shade:!0,shadeClose:!0,fixed:!0,anim:"scale"},l={extend:function(e){var t=JSON.parse(JSON.stringify(s));for(var n in e)t[n]=e[n];return t},timer:{},end:{}};l.touch=function(e,t){e.addEventListener("click",function(e){t.call(this,e)},!1)};var r=0,o=["layui-m-layer"],c=function(e){var t=this;t.config=l.extend(e),t.view()};c.prototype.view=function(){var e=this,n=e.config,s=t.createElement("div");e.id=s.id=o[0]+r,s.setAttribute("class",o[0]+" "+o[0]+(n.type||0)),s.setAttribute("index",r);var l=function(){var e="object"==typeof n.title;return n.title?'<h3 style="'+(e?n.title[1]:"")+'">'+(e?n.title[0]:n.title)+"</h3>":""}(),c=function(){"string"==typeof n.btn&&(n.btn=[n.btn]);var e,t=(n.btn||[]).length;return 0!==t&&n.btn?(e='<span yes type="1">'+n.btn[0]+"</span>",2===t&&(e='<span no type="0">'+n.btn[1]+"</span>"+e),'<div class="layui-m-layerbtn">'+e+"</div>"):""}();if(n.fixed||(n.top=n.hasOwnProperty("top")?n.top:100,n.style=n.style||"",n.style+=" top:"+(t.body.scrollTop+n.top)+"px"),2===n.type&&(n.content='<i></i><i class="layui-m-layerload"></i><i></i><p>'+(n.content||"")+"</p>"),n.skin&&(n.anim="up"),"msg"===n.skin&&(n.shade=!1),s.innerHTML=(n.shade?"<div "+("string"==typeof n.shade?'style="'+n.shade+'"':"")+' class="layui-m-layershade"></div>':"")+'<div class="layui-m-layermain" '+(n.fixed?"":'style="position:static;"')+'><div class="layui-m-layersection"><div class="layui-m-layerchild '+(n.skin?"layui-m-layer-"+n.skin+" ":"")+(n.className?n.className:"")+" "+(n.anim?"layui-m-anim-"+n.anim:"")+'" '+(n.style?'style="'+n.style+'"':"")+">"+l+'<div class="layui-m-layercont">'+n.content+"</div>"+c+"</div></div></div>",!n.type||2===n.type){var d=t[i](o[0]+n.type),y=d.length;y>=1&&layer.close(d[0].getAttribute("index"))}document.body.appendChild(s);var u=e.elem=a("#"+e.id)[0];n.success&&n.success(u),e.index=r++,e.action(n,u)},c.prototype.action=function(e,t){var n=this;e.time&&(l.timer[n.index]=setTimeout(function(){layer.close(n.index)},1e3*e.time));var a=function(){var t=this.getAttribute("type");0==t?(e.no&&e.no(),layer.close(n.index)):e.yes?e.yes(n.index):layer.close(n.index)};if(e.btn)for(var s=t[i]("layui-m-layerbtn")[0].children,r=s.length,o=0;o<r;o++)l.touch(s[o],a);if(e.shade&&e.shadeClose){var c=t[i]("layui-m-layershade")[0];l.touch(c,function(){layer.close(n.index,e.end)})}e.end&&(l.end[n.index]=e.end)},e.layer={v:"2.0",index:r,open:function(e){var t=new c(e||{});return t.index},close:function(e){var n=a("#"+o[0]+e)[0];n&&(n.innerHTML="",t.body.removeChild(n),clearTimeout(l.timer[e]),delete l.timer[e],"function"==typeof l.end[e]&&l.end[e](),delete l.end[e])},closeAll:function(){for(var e=t[i](o[0]),n=0,a=e.length;n<a;n++)layer.close(0|e[0].getAttribute("index"))}},"function"==typeof define?define(function(){return layer}):function(){var e=document.scripts,n=e[e.length-1],i=n.src,a=i.substring(0,i.lastIndexOf("/")+1);n.getAttribute("merge")||document.head.appendChild(function(){var e=t.createElement("link");return e.href=a+"need/layer.css?2.0",e.type="text/css",e.rel="styleSheet",e.id="layermcss",e}())}()}(window);
\ No newline at end of file
diff --git a/plugin/admin/public/libs/layer.old/dist/mobile/need/layer.css b/plugin/admin/public/libs/layer.old/dist/mobile/need/layer.css
deleted file mode 100644
index 93731b9..0000000
--- a/plugin/admin/public/libs/layer.old/dist/mobile/need/layer.css
+++ /dev/null
@@ -1 +0,0 @@
-.layui-m-layer{position:relative;z-index:19891014}.layui-m-layer *{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.layui-m-layermain,.layui-m-layershade{position:fixed;left:0;top:0;width:100%;height:100%}.layui-m-layershade{background-color:rgba(0,0,0,.7);pointer-events:auto}.layui-m-layermain{display:table;font-family:Helvetica,arial,sans-serif;pointer-events:none}.layui-m-layermain .layui-m-layersection{display:table-cell;vertical-align:middle;text-align:center}.layui-m-layerchild{position:relative;display:inline-block;text-align:left;background-color:#fff;font-size:14px;border-radius:5px;box-shadow:0 0 8px rgba(0,0,0,.1);pointer-events:auto;-webkit-overflow-scrolling:touch}.layui-m-layerchild{-webkit-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-duration:.2s;animation-duration:.2s}@-webkit-keyframes layui-m-anim-scale{0%{opacity:0;-webkit-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);transform:scale(1)}}@keyframes layui-m-anim-scale{0%{opacity:0;-webkit-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);transform:scale(1)}}.layui-m-anim-scale{animation-name:layui-m-anim-scale;-webkit-animation-name:layui-m-anim-scale}@-webkit-keyframes layui-m-anim-up{0%{opacity:0;-webkit-transform:translateY(800px);transform:translateY(800px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}@keyframes layui-m-anim-up{0%{opacity:0;-webkit-transform:translateY(800px);transform:translateY(800px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}.layui-m-anim-up{-webkit-animation-name:layui-m-anim-up;animation-name:layui-m-anim-up}.layui-m-layer0 .layui-m-layerchild{width:90%;max-width:640px}.layui-m-layer1 .layui-m-layerchild{border:none;border-radius:0}.layui-m-layer2 .layui-m-layerchild{width:auto;max-width:260px;min-width:40px;border:none;background:0 0;box-shadow:none;color:#fff}.layui-m-layerchild h3{padding:0 10px;height:60px;line-height:60px;font-size:16px;font-weight:400;border-radius:5px 5px 0 0;text-align:center}.layui-m-layerbtn span,.layui-m-layerchild h3{text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.layui-m-layercont{padding:50px 30px;line-height:22px;text-align:center}.layui-m-layer1 .layui-m-layercont{padding:0;text-align:left}.layui-m-layer2 .layui-m-layercont{text-align:center;padding:0;line-height:0}.layui-m-layer2 .layui-m-layercont i{width:25px;height:25px;margin-left:8px;display:inline-block;background-color:#fff;border-radius:100%}.layui-m-layer2 .layui-m-layercont p{margin-top:20px}@-webkit-keyframes layui-m-anim-loading{0%,100%,80%{transform:scale(0);-webkit-transform:scale(0)}40%{transform:scale(1);-webkit-transform:scale(1)}}@keyframes layui-m-anim-loading{0%,100%,80%{transform:scale(0);-webkit-transform:scale(0)}40%{transform:scale(1);-webkit-transform:scale(1)}}.layui-m-layer2 .layui-m-layercont i{-webkit-animation:layui-m-anim-loading 1.4s infinite ease-in-out;animation:layui-m-anim-loading 1.4s infinite ease-in-out;-webkit-animation-fill-mode:both;animation-fill-mode:both}.layui-m-layer2 .layui-m-layercont i:first-child{margin-left:0;-webkit-animation-delay:-.32s;animation-delay:-.32s}.layui-m-layer2 .layui-m-layercont i.layui-m-layerload{-webkit-animation-delay:-.16s;animation-delay:-.16s}.layui-m-layer2 .layui-m-layercont>div{line-height:22px;padding-top:7px;margin-bottom:20px;font-size:14px}.layui-m-layerbtn{display:box;display:-moz-box;display:-webkit-box;width:100%;position:relative;height:50px;line-height:50px;font-size:0;text-align:center;border-top:1px solid #d0d0d0;background-color:#f2f2f2;border-radius:0 0 5px 5px}.layui-m-layerbtn span{position:relative;display:block;-moz-box-flex:1;box-flex:1;-webkit-box-flex:1;text-align:center;font-size:14px;border-radius:0 0 5px 5px;cursor:pointer}.layui-m-layerbtn span[yes]{color:#40affe}.layui-m-layerbtn span[no]{border-right:1px solid #d0d0d0;border-radius:0 0 0 5px}.layui-m-layerbtn span:active{background-color:#f6f6f6}.layui-m-layerend{position:absolute;right:7px;top:10px;width:30px;height:30px;border:0;font-weight:400;background:0 0;cursor:pointer;-webkit-appearance:none;font-size:30px}.layui-m-layerend::after,.layui-m-layerend::before{position:absolute;left:5px;top:15px;content:'';width:18px;height:1px;background-color:#999;transform:rotate(45deg);-webkit-transform:rotate(45deg);border-radius:3px}.layui-m-layerend::after{transform:rotate(-45deg);-webkit-transform:rotate(-45deg)}body .layui-m-layer .layui-m-layer-footer{position:fixed;width:95%;max-width:100%;margin:0 auto;left:0;right:0;bottom:10px;background:0 0}.layui-m-layer-footer .layui-m-layercont{padding:20px;border-radius:5px 5px 0 0;background-color:rgba(255,255,255,.8)}.layui-m-layer-footer .layui-m-layerbtn{display:block;height:auto;background:0 0;border-top:none}.layui-m-layer-footer .layui-m-layerbtn span{background-color:rgba(255,255,255,.8)}.layui-m-layer-footer .layui-m-layerbtn span[no]{color:#fd482c;border-top:1px solid #c2c2c2;border-radius:0 0 5px 5px}.layui-m-layer-footer .layui-m-layerbtn span[yes]{margin-top:10px;border-radius:5px}body .layui-m-layer .layui-m-layer-msg{width:auto;max-width:90%;margin:0 auto;bottom:-150px;background-color:rgba(0,0,0,.7);color:#fff}.layui-m-layer-msg .layui-m-layercont{padding:10px 20px}
\ No newline at end of file
diff --git a/plugin/admin/public/libs/layer.old/dist/theme/default/icon-ext.png b/plugin/admin/public/libs/layer.old/dist/theme/default/icon-ext.png
deleted file mode 100644
index bbbb669..0000000
Binary files a/plugin/admin/public/libs/layer.old/dist/theme/default/icon-ext.png and /dev/null differ
diff --git a/plugin/admin/public/libs/layer.old/dist/theme/default/icon.png b/plugin/admin/public/libs/layer.old/dist/theme/default/icon.png
deleted file mode 100644
index 3e17da8..0000000
Binary files a/plugin/admin/public/libs/layer.old/dist/theme/default/icon.png and /dev/null differ
diff --git a/plugin/admin/public/libs/layer.old/dist/theme/default/layer.css b/plugin/admin/public/libs/layer.old/dist/theme/default/layer.css
deleted file mode 100644
index 1eaf51e..0000000
--- a/plugin/admin/public/libs/layer.old/dist/theme/default/layer.css
+++ /dev/null
@@ -1,34 +0,0 @@
-html #layuicss-layer{display:none;position:absolute;width:1989px}html[layer-full]{height:inherit}.layui-layer,.layui-layer-shade{position:fixed;_position:absolute;pointer-events:auto}.layui-layer-shade{top:0;left:0;width:100%;height:100%;_height:expression(document.body.offsetHeight+"px")}.layui-layer{-webkit-overflow-scrolling:touch}.layui-layer{top:150px;left:0;margin:0;padding:0;background-color:#fff;-webkit-background-clip:content;border-radius:2px;box-shadow:1px 1px 50px rgba(0,0,0,.3)}.layui-layer-close{position:absolute}.layui-layer-content{position:relative}.layui-layer-border{border:1px solid #b2b2b2;border:1px solid rgba(0,0,0,.1);box-shadow:1px 1px 5px rgba(0,0,0,.2)}.layui-layer-load{background:url(loading-1.gif) #eee center center no-repeat}.layui-layer-ico{background:url(icon.png) no-repeat}.layui-layer-btn a,.layui-layer-dialog .layui-layer-ico,.layui-layer-setwin a{display:inline-block;*display:inline;*zoom:1;vertical-align:top}.layui-layer-move{display:none;position:fixed;*position:absolute;left:0;top:0;width:100%;height:100%;cursor:move;opacity:0;filter:alpha(opacity=0);background-color:#fff;z-index:2147483647}.layui-layer-resize{position:absolute;width:15px;height:15px;right:0;bottom:0;cursor:se-resize}.layui-layer-confirm{position:absolute;width:1px;height:1px;left:0;bottom:0;border:none;background:0 0}.layer-anim{-webkit-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-duration:.3s;animation-duration:.3s}@-webkit-keyframes layer-bounceIn{0%{opacity:0;-webkit-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);transform:scale(1)}}@keyframes layer-bounceIn{0%{opacity:0;-webkit-transform:scale(.5);-ms-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}}.layer-anim-00{-webkit-animation-name:layer-bounceIn;animation-name:layer-bounceIn}@-webkit-keyframes layer-zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes layer-zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);-ms-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);-ms-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layer-anim-01{-webkit-animation-name:layer-zoomInDown;animation-name:layer-zoomInDown}@-webkit-keyframes layer-fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}@keyframes layer-fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);-ms-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);-ms-transform:translateY(0);transform:translateY(0)}}.layer-anim-02{-webkit-animation-name:layer-fadeInUpBig;animation-name:layer-fadeInUpBig}@-webkit-keyframes layer-zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes layer-zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);-ms-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);-ms-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layer-anim-03{-webkit-animation-name:layer-zoomInLeft;animation-name:layer-zoomInLeft}@-webkit-keyframes layer-rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0) rotate(0);transform:translateX(0) rotate(0)}}@keyframes layer-rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);-ms-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0) rotate(0);-ms-transform:translateX(0) rotate(0);transform:translateX(0) rotate(0)}}.layer-anim-04{-webkit-animation-name:layer-rollIn;animation-name:layer-rollIn}@keyframes layer-fadeIn{0%{opacity:0}100%{opacity:1}}.layer-anim-05{-webkit-animation-name:layer-fadeIn;animation-name:layer-fadeIn}@-webkit-keyframes layer-shake{0%,100%{-webkit-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);transform:translateX(10px)}}@keyframes layer-shake{0%,100%{-webkit-transform:translateX(0);-ms-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);-ms-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);-ms-transform:translateX(10px);transform:translateX(10px)}}.layer-anim-06{-webkit-animation-name:layer-shake;animation-name:layer-shake}@-webkit-keyframes fadeIn{0%{opacity:0}100%{opacity:1}}.layui-layer-title{padding:0 80px 0 20px;height:50px;line-height:50px;border-bottom:1px solid #f0f0f0;font-size:14px;color:#333;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;border-radius:2px 2px 0 0}.layui-layer-setwin{position:absolute;right:15px;*right:0;top:17px;font-size:0;line-height:initial}.layui-layer-setwin a{position:relative;width:16px;height:16px;margin-left:10px;font-size:12px;_overflow:hidden}.layui-layer-setwin .layui-layer-min cite{position:absolute;width:14px;height:2px;left:0;top:50%;margin-top:-1px;background-color:#2e2d3c;cursor:pointer;_overflow:hidden}.layui-layer-setwin .layui-layer-min:hover cite{background-color:#2d93ca}.layui-layer-setwin .layui-layer-max{background-position:-32px -40px}.layui-layer-setwin .layui-layer-max:hover{background-position:-16px -40px}.layui-layer-setwin .layui-layer-maxmin{background-position:-65px -40px}.layui-layer-setwin .layui-layer-maxmin:hover{background-position:-49px -40px}.layui-layer-setwin .layui-layer-close1{background-position:1px -40px;cursor:pointer}.layui-layer-setwin .layui-layer-close1:hover{opacity:.7}.layui-layer-setwin .layui-layer-close2{position:absolute;right:-28px;top:-28px;width:30px;height:30px;margin-left:0;background-position:-149px -31px;*right:-18px;_display:none}.layui-layer-setwin .layui-layer-close2:hover{background-position:-180px -31px}.layui-layer-btn{text-align:right;padding:0 15px 12px;pointer-events:auto;user-select:none;-webkit-user-select:none}.layui-layer-btn a{height:28px;line-height:28px;margin:5px 5px 0;padding:0 15px;border:1px solid #dedede;background-color:#fff;color:#333;border-radius:2px;font-weight:400;cursor:pointer;text-decoration:none}.layui-layer-btn a:hover{opacity:.9;text-decoration:none}.layui-layer-btn a:active{opacity:.8}.layui-layer-btn .layui-layer-btn0{border-color:#1e9fff;background-color:#1e9fff;color:#fff}.layui-layer-btn-l{text-align:left}.layui-layer-btn-c{text-align:center}.layui-layer-dialog{min-width:300px}.layui-layer-dialog .layui-layer-content{position:relative;padding:20px;line-height:24px;word-break:break-all;overflow:hidden;font-size:14px;overflow-x:hidden;overflow-y:auto}.layui-layer-dialog .layui-layer-content .layui-layer-ico{position:absolute;top:16px;left:15px;_left:-40px;width:30px;height:30px}.layui-layer-ico1{background-position:-30px 0}.layui-layer-ico2{background-position:-60px 0}.layui-layer-ico3{background-position:-90px 0}.layui-layer-ico4{background-position:-120px 0}.layui-layer-ico5{background-position:-150px 0}.layui-layer-ico6{background-position:-180px 0}.layui-layer-rim{border:6px solid #8d8d8d;border:6px solid rgba(0,0,0,.3);border-radius:5px;box-shadow:none}.layui-layer-msg{min-width:180px;border:1px solid #d3d4d3;box-shadow:none}.layui-layer-hui{min-width:100px;background-color:#000;filter:alpha(opacity=60);background-color:rgba(0,0,0,.6);color:#fff;border:none}.layui-layer-hui .layui-layer-content{padding:12px 25px;text-align:center}.layui-layer-dialog .layui-layer-padding{padding:20px 20px 20px 55px;text-align:left}.layui-layer-page .layui-layer-content{position:relative;overflow:auto}.layui-layer-iframe .layui-layer-btn,.layui-layer-page .layui-layer-btn{padding-top:10px}.layui-layer-nobg{background:0 0}.layui-layer-iframe iframe{display:block;width:100%}.layui-layer-loading{border-radius:100%;background:0 0;box-shadow:none;border:none}.layui-layer-loading .layui-layer-content{width:60px;height:24px;background:url(loading-0.gif) no-repeat}.layui-layer-loading .layui-layer-loading1{width:37px;height:37px;background:url(loading-1.gif) no-repeat}.layui-layer-ico16,.layui-layer-loading .layui-layer-loading2{width:32px;height:32px;background:url(loading-2.gif) no-repeat}.layui-layer-tips{background:0 0;box-shadow:none;border:none}.layui-layer-tips .layui-layer-content{position:relative;line-height:22px;min-width:12px;padding:8px 15px;font-size:12px;_float:left;border-radius:2px;box-shadow:1px 1px 3px rgba(0,0,0,.2);background-color:#000;color:#fff}.layui-layer-tips .layui-layer-close{right:-2px;top:-1px}.layui-layer-tips i.layui-layer-TipsG{position:absolute;width:0;height:0;border-width:8px;border-color:transparent;border-style:dashed;*overflow:hidden}.layui-layer-tips i.layui-layer-TipsB,.layui-layer-tips i.layui-layer-TipsT{left:5px;border-right-style:solid;border-right-color:#000}.layui-layer-tips i.layui-layer-TipsT{bottom:-8px}.layui-layer-tips i.layui-layer-TipsB{top:-8px}.layui-layer-tips i.layui-layer-TipsL,.layui-layer-tips i.layui-layer-TipsR{top:5px;border-bottom-style:solid;border-bottom-color:#000}.layui-layer-tips i.layui-layer-TipsR{left:-8px}.layui-layer-tips i.layui-layer-TipsL{right:-8px}.layui-layer-lan[type=dialog]{min-width:280px}.layui-layer-lan .layui-layer-title{background:#4476a7;color:#fff;border:none}.layui-layer-lan .layui-layer-btn{padding:5px 10px 10px;text-align:right;border-top:1px solid #e9e7e7}.layui-layer-lan .layui-layer-btn a{background:#fff;border-color:#e9e7e7;color:#333}.layui-layer-lan .layui-layer-btn .layui-layer-btn1{background:#c9c5c5}.layui-layer-molv .layui-layer-title{background:#009f95;color:#fff;border:none}.layui-layer-molv .layui-layer-btn a{background:#009f95;border-color:#009f95}.layui-layer-molv .layui-layer-btn .layui-layer-btn1{background:#92b8b1}.layui-layer-iconext{background:url(icon-ext.png) no-repeat}.layui-layer-prompt .layui-layer-input{display:block;width:260px;height:36px;margin:0 auto;line-height:30px;padding-left:10px;border:1px solid #e6e6e6;color:#333}.layui-layer-prompt textarea.layui-layer-input{width:300px;height:100px;line-height:20px;padding:6px 10px}.layui-layer-prompt .layui-layer-content{padding:20px}.layui-layer-prompt .layui-layer-btn{padding-top:0}.layui-layer-tab{box-shadow:1px 1px 50px rgba(0,0,0,.4)}.layui-layer-tab .layui-layer-title{padding-left:0;overflow:visible}.layui-layer-tab .layui-layer-title span{position:relative;float:left;min-width:80px;max-width:300px;padding:0 20px;text-align:center;cursor:default;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;cursor:pointer}.layui-layer-tab .layui-layer-title span.layui-this{height:51px;border-left:1px solid #eee;border-right:1px solid #eee;background-color:#fff;z-index:10}.layui-layer-tab .layui-layer-title span:first-child{border-left:none}.layui-layer-tabmain{line-height:24px;clear:both}.layui-layer-tabmain .layui-layer-tabli{display:none}.layui-layer-tabmain .layui-layer-tabli.layui-this{display:block}.layui-layer-photos{background:0 0;box-shadow:none}.layui-layer-photos .layui-layer-content{overflow:visible;text-align:center}.layui-layer-photos .layui-layer-phimg img{position:relative;width:100%;display:inline-block;*display:inline;*zoom:1;vertical-align:top}.layui-layer-imgnext,.layui-layer-imgprev{position:fixed;top:50%;width:27px;_width:44px;height:44px;margin-top:-22px;outline:0;blr:expression(this.onFocus=this.blur())}.layui-layer-imgprev{left:30px;background-position:-5px -5px;_background-position:-70px -5px}.layui-layer-imgprev:hover{background-position:-33px -5px;_background-position:-120px -5px}.layui-layer-imgnext{right:30px;_right:8px;background-position:-5px -50px;_background-position:-70px -50px}.layui-layer-imgnext:hover{background-position:-33px -50px;_background-position:-120px -50px}.layui-layer-imgbar{position:fixed;left:0;right:0;bottom:0;width:100%;height:40px;line-height:40px;background-color:#000\9;filter:Alpha(opacity=60);background-color:rgba(2,0,0,.35);color:#fff;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;font-size:0}.layui-layer-imgtit *{display:inline-block;*display:inline;*zoom:1;vertical-align:top;font-size:12px}.layui-layer-imgtit a{max-width:65%;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;color:#fff}.layui-layer-imgtit a:hover{color:#fff;text-decoration:underline}.layui-layer-imgtit em{padding-left:10px;font-style:normal}@-webkit-keyframes layer-bounceOut{100%{opacity:0;-webkit-transform:scale(.7);transform:scale(.7)}30%{-webkit-transform:scale(1.05);transform:scale(1.05)}0%{-webkit-transform:scale(1);transform:scale(1)}}@keyframes layer-bounceOut{100%{opacity:0;-webkit-transform:scale(.7);-ms-transform:scale(.7);transform:scale(.7)}30%{-webkit-transform:scale(1.05);-ms-transform:scale(1.05);transform:scale(1.05)}0%{-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}}.layer-anim-close{-webkit-animation-name:layer-bounceOut;animation-name:layer-bounceOut;-webkit-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-duration:.2s;animation-duration:.2s}@media screen and (max-width:1100px){.layui-layer-iframe{overflow-y:auto;-webkit-overflow-scrolling:touch}}
-
-.layui-layer-setwin .layui-layer-close1,
-.layui-layer-setwin .layui-layer-max,
-.layui-layer-setwin .layui-layer-min
-{
-    display: inline-block;
-    width: 20px;
-    height: 20px;
-    color: #000;
-    background-position: center;
-    background-size: contain;
-}
-
-.layui-layer-setwin .layui-layer-close1:hover,
-.layui-layer-setwin .layui-layer-max:hover,
-.layui-layer-setwin .layui-layer-min:hover{
-    color: #2d93ca;
-}
-.layui-layer-setwin .layui-layer-max{
-    background-image: url(data:image/svg+xml;base64,PHN2ZyB0PSIxNzMwNTc5NDI4NTI0IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjY1NjUiIHdpZHRoPSIyMDAiIGhlaWdodD0iMjAwIj48cGF0aCBkPSJNODE3LjIyNTE0MyAyMDQuNDM0Mjg2djYxMy4wODM0MjhIMjAzLjcwMjg1N1YyMDQuNDM0Mjg2aDYxMy41MjIyODZtMy42NTcxNDMtNTcuNDkwMjg2SDIwMC4wNDU3MTRhNTMuMzk0Mjg2IDUzLjM5NDI4NiAwIDAgMC01My4zMjExNDMgNTMuMzk0Mjg2djYyMS4zNDg1NzFjMCAyOS40MDM0MjkgMjMuOTE3NzE0IDUzLjM5NDI4NiA1My4zOTQyODYgNTMuMzk0Mjg2aDYyMS4zNDg1NzJhNTMuMzk0Mjg2IDUzLjM5NDI4NiAwIDAgMCA1My4zOTQyODUtNTMuMzk0Mjg2di02MjAuOTgyODU3YTUzLjYxMzcxNCA1My42MTM3MTQgMCAwIDAtNTMuODMzMTQzLTUzLjc2YzAuNDM4ODU3IDAgMCAwIDAgMHoiIGZpbGw9IiM2MjZENzgiIHAtaWQ9IjY1NjYiPjwvcGF0aD48L3N2Zz4=);
-}
-.layui-layer-setwin .layui-layer-maxmin{
-    background-image: url(data:image/svg+xml;base64,PHN2ZyB0PSIxNzMwNTgwMDU5MDA3IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjE4MzU0IiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCI+PHBhdGggZD0iTTcwNCAzMjB2NTU0LjQ5NkgxNDkuNTA0VjMyMGg1NTQuNDk2bTAuNTEyLTY0SDE0OC40OGMtMzQuODE2IDAtNjMuNDg4IDI4LjE2LTYzLjQ4OCA2My40ODhWODc1LjUyYzAgMzQuODE2IDI4LjE2IDYzLjQ4OCA2My40ODggNjMuNDg4aDU1Ni4wMzJjMzQuODE2IDAgNjMuNDg4LTI4LjE2IDYzLjQ4OC02My40ODhWMzE5LjQ4OGMwLTM1LjMyOC0yOC4xNi02My40ODgtNjMuNDg4LTYzLjQ4OHogbTE3MS41Mi0xNzAuNDk2SDMxOC45NzZjLTM0LjgxNiAwLTYyLjQ2NCAyOC4xNi02Mi45NzYgNjIuNDY0djY1LjAyNGg2NFYxNDkuNTA0aDU1NC40OTZ2NTU0LjQ5NmgtNjRWNzY4SDg3NS41MmMzNC44MTYgMCA2Mi40NjQtMjguMTYgNjIuOTc2LTYyLjk3NlYxNDcuOTY4YzAtMzQuMzA0LTI4LjE2LTYyLjQ2NC02Mi40NjQtNjIuNDY0eiIgcC1pZD0iMTgzNTUiPjwvcGF0aD48L3N2Zz4=);
-}
-.layui-layer-setwin .layui-layer-min{
-    background-image: url(data:image/svg+xml;base64,PHN2ZyB0PSIxNzMwNTc5OTg2NTI1IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjEzMDUwIiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCI+PHBhdGggZD0iTTIzOC45MzMzMzMgNDc3Ljg2NjY2N2g1NDYuMTMzMzM0djY4LjI2NjY2NkgyMzguOTMzMzMzeiIgcC1pZD0iMTMwNTEiPjwvcGF0aD48L3N2Zz4=);
-}
-.layui-layer-setwin .layui-layer-close1{
-    background-image: url(data:image/svg+xml;base64,PHN2ZyB0PSIxNzMwNTc5ODkxNDcwIiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjExMTE2IiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCI+PHBhdGggZD0iTTU1Ny43NSA1MTAuNWwyOTcuMzgtMjk3LjM3YTMyIDMyIDAgMCAwLTQ1LjI2LTQ1LjI2TDUxMi41IDQ2NS4yNSAyMTUuMTMgMTY3Ljg3YTMyIDMyIDAgMCAwLTQ1LjI2IDQ1LjI2TDQ2Ny4yNSA1MTAuNSAxNjkuODcgODA3Ljg3YTMyIDMyIDAgMCAwIDQ1LjI2IDQ1LjI2TDUxMi41IDU1NS43NWwyOTcuMzcgMjk3LjM4YTMyIDMyIDAgMCAwIDQ1LjI2LTQ1LjI2eiIgcC1pZD0iMTExMTciPjwvcGF0aD48L3N2Zz4=);
-}
-.layui-layer-setwin .layui-layer-max:hover{
-    background-position: center;
-}
\ No newline at end of file
diff --git a/plugin/admin/public/libs/layer.old/dist/theme/default/loading-0.gif b/plugin/admin/public/libs/layer.old/dist/theme/default/loading-0.gif
deleted file mode 100644
index 6f3c953..0000000
Binary files a/plugin/admin/public/libs/layer.old/dist/theme/default/loading-0.gif and /dev/null differ
diff --git a/plugin/admin/public/libs/layer.old/dist/theme/default/loading-1.gif b/plugin/admin/public/libs/layer.old/dist/theme/default/loading-1.gif
deleted file mode 100644
index db3a483..0000000
Binary files a/plugin/admin/public/libs/layer.old/dist/theme/default/loading-1.gif and /dev/null differ
diff --git a/plugin/admin/public/libs/layer.old/dist/theme/default/loading-2.gif b/plugin/admin/public/libs/layer.old/dist/theme/default/loading-2.gif
deleted file mode 100644
index 5bb90fd..0000000
Binary files a/plugin/admin/public/libs/layer.old/dist/theme/default/loading-2.gif and /dev/null differ
diff --git a/plugin/admin/public/libs/layer.old/dist/theme/moon/default.png b/plugin/admin/public/libs/layer.old/dist/theme/moon/default.png
deleted file mode 100644
index 77dfaf3..0000000
Binary files a/plugin/admin/public/libs/layer.old/dist/theme/moon/default.png and /dev/null differ
diff --git a/plugin/admin/public/libs/layer.old/dist/theme/moon/style.css b/plugin/admin/public/libs/layer.old/dist/theme/moon/style.css
deleted file mode 100644
index d66e579..0000000
--- a/plugin/admin/public/libs/layer.old/dist/theme/moon/style.css
+++ /dev/null
@@ -1 +0,0 @@
-html #layui_layer_skinmoonstylecss{display:none;position:absolute;width:1989px}body .layer-ext-moon[type=dialog]{min-width:320px}body .layer-ext-moon-msg[type=dialog]{min-width:200px}body .layer-ext-moon .layui-layer-title{background:#f6f6f6;color:#212a31;font-size:16px;font-weight:700;height:46px;line-height:46px;border-bottom:1px solid #d5d5d5}body .layer-ext-moon .layui-layer-content .layui-layer-ico{height:32px;width:32px;top:18.5px}body .layer-ext-moon .layui-layer-ico0{background:url(default.png) no-repeat -96px 0}body .layer-ext-moon .layui-layer-ico1{background:url(default.png) no-repeat -224px 0}body .layer-ext-moon .layui-layer-ico2{background:url(default.png) no-repeat -192px 0}body .layer-ext-moon .layui-layer-ico3{background:url(default.png) no-repeat -160px 0}body .layer-ext-moon .layui-layer-ico4{background:url(default.png) no-repeat -320px 0}body .layer-ext-moon .layui-layer-ico5{background:url(default.png) no-repeat -288px 0}body .layer-ext-moon .layui-layer-ico6{background:url(default.png) -256px 0}body .layer-ext-moon .layui-layer-ico7{background:url(default.png) no-repeat -128px 0}body .layer-ext-moon .layui-layer-setwin{top:15px;right:15px}body .layer-ext-moon .layui-layer-setwin a{width:16px;height:16px}body .layer-ext-moon .layui-layer-setwin .layui-layer-min cite:hover{background-color:#56abe4}body .layer-ext-moon .layui-layer-setwin .layui-layer-max{background:url(default.png) no-repeat -80px 0}body .layer-ext-moon .layui-layer-setwin .layui-layer-max:hover{background:url(default.png) no-repeat -64px 0}body .layer-ext-moon .layui-layer-setwin .layui-layer-maxmin{background:url(default.png) no-repeat -32px 0}body .layer-ext-moon .layui-layer-setwin .layui-layer-maxmin:hover{background:url(default.png) no-repeat -16px 0}body .layer-ext-moon .layui-layer-setwin .layui-layer-close1,body .layer-ext-moon .layui-layer-setwin .layui-layer-close2{background:url(default.png) 0 0}body .layer-ext-moon .layui-layer-setwin .layui-layer-close1:hover,body .layer-ext-moon .layui-layer-setwin .layui-layer-close2:hover{background:url(default.png) -48px 0}body .layer-ext-moon .layui-layer-padding{padding-top:24px}body .layer-ext-moon .layui-layer-btn{text-align:center;padding-top:15px;padding-bottom:15px;background:#f0f4f7;border-top:1px #c7c7c7 solid}body .layer-ext-moon .layui-layer-btn a{font-size:12px;font-weight:400;margin:0 3px;margin-right:7px;margin-left:7px;padding:6px 20px;color:#fff;border:1px solid #0064b6;background:#0071ce;border-radius:3px;display:inline-block;height:20px;line-height:20px;text-align:center;vertical-align:middle;background-repeat:no-repeat;text-decoration:none;outline:0}body .layer-ext-moon .layui-layer-btn .layui-layer-btn0{background:#0071ce}body .layer-ext-moon .layui-layer-btn .layui-layer-btn1{background:#fff;color:#404a58;border:1px solid #c0c4cd;border-radius:3px}body .layer-ext-moon .layui-layer-btn .layui-layer-btn2{background:#f60;color:#fff;border:1px solid #f60;border-radius:3px}body .layer-ext-moon .layui-layer-btn .layui-layer-btn3{background:red;color:#fff;border:1px solid red;border-radius:3px}body .layer-ext-moon .layui-layer-title span.layui-layer-tabnow{height:47px}
\ No newline at end of file
diff --git a/plugin/admin/public/libs/layer.old/gulpfile.js b/plugin/admin/public/libs/layer.old/gulpfile.js
deleted file mode 100644
index 99443cf..0000000
--- a/plugin/admin/public/libs/layer.old/gulpfile.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- layer构建
- */
-
-const {src, dest, series} = require('gulp');
-var pkg = require('./package.json');
-var uglify = require('gulp-uglify');
-var minify = require('gulp-clean-css');
-var rename = require('gulp-rename');
-var header = require('gulp-header');
-var del = require('del');
-
-var task = {
-    layer: function () {
-        src('./src/**/*.css')
-            .pipe(minify({
-                compatibility: 'ie7'
-            }))
-            .pipe(dest('./dist'));
-
-        return src('./src/layer.js').pipe(uglify())
-            .pipe(header('/*! <%= pkg.realname %>-v<%= pkg.version %> <%= pkg.description %> <%= pkg.license %> License  <%= pkg.homepage %>  By <%= pkg.author %> */\n ;', {pkg: pkg}))
-            .pipe(dest('./dist'));
-
-    }
-    , mobile: function () {
-        return src('./src/mobile/layer.js').pipe(uglify())
-            .pipe(header('/*! <%= pkg.realname %> mobile-v<%= pkg.mobile %> <%= pkg.description %> <%= pkg.license %> License  <%= pkg.homepage %>mobile  By <%= pkg.author %> */\n ;', {pkg: pkg}))
-            .pipe(dest('./dist/mobile'));
-    }
-};
-
-exports.layer = task.layer;
-exports.mobile = task.mobile;
-exports.default = series(task.layer, task.mobile);
diff --git a/plugin/admin/public/libs/layer.old/package.json b/plugin/admin/public/libs/layer.old/package.json
deleted file mode 100644
index 01a3276..0000000
--- a/plugin/admin/public/libs/layer.old/package.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "name": "layer-src",
-  "realname": "layer",
-  "version": "3.5.3",
-  "mobile": "2.0.0",
-  "description": "Web 通用弹出层组件",
-  "main": "src/layer.js",
-  "license": "MIT",
-  "scripts": {
-    "run": "gulp"
-  },
-  "repository": {
-    "type": "https",
-    "url": "git+https://github.com/sentsin/layer.git"
-  },
-  "author": "贤心",
-  "homepage": "http://layer.layui.com/",
-  "devDependencies": {
-    "del": "~2.2.2",
-    "gulp": "^4.0.2",
-    "gulp-header": "~1.8.8",
-    "gulp-clean-css": "~4.2.0",
-    "gulp-rename": "~1.2.2",
-    "gulp-uglify": "~1.5.4"
-  },
-  "bugs": {
-    "url": "https://github.com/sentsin/layer/issues"
-  },
-  "directories": {
-    "test": "test"
-  },
-  "dependencies": {},
-  "keywords": [
-    "layer",
-    "dialog",
-    "tips",
-    "alert",
-    "confirm",
-    "window"
-  ]
-}
diff --git a/plugin/admin/public/libs/layer.old/src/README.md b/plugin/admin/public/libs/layer.old/src/README.md
deleted file mode 100644
index f9a84aa..0000000
--- a/plugin/admin/public/libs/layer.old/src/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-
-## 注意
-开发版源码随时可能会提交，因此生产环境更建议 dist 目录中压缩后的 layer.js。
\ No newline at end of file
diff --git a/plugin/admin/public/libs/layer.old/src/layer.js b/plugin/admin/public/libs/layer.old/src/layer.js
deleted file mode 100644
index a11c627..0000000
--- a/plugin/admin/public/libs/layer.old/src/layer.js
+++ /dev/null
@@ -1,1429 +0,0 @@
-
-/*!
- * layer - 通用 Web 弹出层组件
- * MIT Licensed
- */
-
-;!function(window, undefined){
-"use strict";
-
-var isLayui = window.layui && layui.define, $, win, ready = {
-  getPath: function(){
-    var jsPath = document.currentScript ? document.currentScript.src : function(){
-      var js = document.scripts
-      ,last = js.length - 1
-      ,src;
-      for(var i = last; i > 0; i--){
-        if(js[i].readyState === 'interactive'){
-          src = js[i].src;
-          break;
-        }
-      }
-      return src || js[last].src;
-    }()
-    ,GLOBAL = window.LAYUI_GLOBAL || {};
-    return GLOBAL.layer_dir || jsPath.substring(0, jsPath.lastIndexOf('/') + 1);
-  }(),
-
-  config: {}, end: {}, minIndex: 0, minLeft: [],
-  btn: ['&#x786E;&#x5B9A;', '&#x53D6;&#x6D88;'],
-
-  //五种原始层模式
-  type: ['dialog', 'page', 'iframe', 'loading', 'tips'],
-
-  //获取节点的style属性值
-  getStyle: function(node, name){
-    var style = node.currentStyle ? node.currentStyle : window.getComputedStyle(node, null);
-    return style[style.getPropertyValue ? 'getPropertyValue' : 'getAttribute'](name);
-  },
-
-  //载入 CSS 依赖
-  link: function(href, fn, cssname){
-    //未设置路径，则不主动加载css
-    if(!layer.path) return;
-
-    var head = document.getElementsByTagName("head")[0]
-    ,link = document.createElement('link');
-
-    if(typeof fn === 'string') cssname = fn;
-
-    var app = (cssname || href).replace(/\.|\//g, '');
-    var id = 'layuicss-'+ app
-    ,STAUTS_NAME = 'creating'
-    ,timeout = 0;
-
-    link.rel = 'stylesheet';
-    link.href = layer.path + href;
-    link.id = id;
-
-    if(!document.getElementById(id)){
-      head.appendChild(link);
-    }
-
-    if(typeof fn !== 'function') return;
-
-    //轮询 css 是否加载完毕
-    (function poll(status) {
-      var delay = 100
-      ,getLinkElem = document.getElementById(id); //获取动态插入的 link 元素
-
-      //如果轮询超过指定秒数，则视为请求文件失败或 css 文件不符合规范
-      if(++timeout > 10 * 1000 / delay){
-        return window.console && console.error(app +'.css: Invalid');
-      };
-
-      //css 加载就绪
-      if(parseInt(ready.getStyle(getLinkElem, 'width')) === 1989){
-        //如果参数来自于初始轮询（即未加载就绪时的），则移除 link 标签状态
-        if(status === STAUTS_NAME) getLinkElem.removeAttribute('lay-status');
-        //如果 link 标签的状态仍为「创建中」，则继续进入轮询，直到状态改变，则执行回调
-        getLinkElem.getAttribute('lay-status') === STAUTS_NAME ? setTimeout(poll, delay) : fn();
-      } else {
-        getLinkElem.setAttribute('lay-status', STAUTS_NAME);
-        setTimeout(function(){
-          poll(STAUTS_NAME);
-        }, delay);
-      }
-
-      //parseInt(ready.getStyle(document.getElementById(id), 'width')) === 1989 ? fn() : setTimeout(poll, 1000);
-    }());
-
-  }
-};
-
-//默认内置方法。
-var layer = {
-  v: '3.5.2',
-  ie: function(){ //ie版本
-    var agent = navigator.userAgent.toLowerCase();
-    return (!!window.ActiveXObject || "ActiveXObject" in window) ? (
-      (agent.match(/msie\s(\d+)/) || [])[1] || '11' //由于ie11并没有msie的标识
-    ) : false;
-  }(),
-  index: (window.layer && window.layer.v) ? 100000 : 0,
-  path: ready.getPath,
-  config: function(options, fn){
-    options = options || {};
-    cache = layer.cache = ready.config = $.extend({}, ready.config, options);
-    layer.path = ready.config.path || layer.path;
-    typeof options.extend === 'string' && (options.extend = [options.extend]);
-
-    //如果设置了路径，则加载样式
-    if(ready.config.path) layer.ready();
-
-    if(!options.extend) return this;
-
-    isLayui
-      ? layui.addcss('modules/layer/' + options.extend)
-    : ready.link('theme/' + options.extend);
-
-    return this;
-  },
-
-  //主体CSS等待事件
-  ready: function(callback){
-    var cssname = 'layer', ver = ''
-    ,path = (isLayui ? 'modules/layer/' : 'theme/') + 'default/layer.css?v='+ layer.v + ver;
-    isLayui ? layui.addcss(path, callback, cssname) : ready.link(path, callback, cssname);
-    return this;
-  },
-
-  //各种快捷引用
-  alert: function(content, options, yes){
-    var type = typeof options === 'function';
-    if(type) yes = options;
-    return layer.open($.extend({
-      content: content,
-      yes: yes
-    }, type ? {} : options));
-  },
-
-  confirm: function(content, options, yes, cancel){
-    var type = typeof options === 'function';
-    if(type){
-      cancel = yes;
-      yes = options;
-    }
-    return layer.open($.extend({
-      content: content,
-      btn: ready.btn,
-      yes: yes,
-      btn2: cancel
-    }, type ? {} : options));
-  },
-
-  msg: function(content, options, end){ //最常用提示层
-    var type = typeof options === 'function', rskin = ready.config.skin;
-    var skin = (rskin ? rskin + ' ' + rskin + '-msg' : '')||'layui-layer-msg';
-    var anim = doms.anim.length - 1;
-    if(type) end = options;
-    return layer.open($.extend({
-      content: content,
-      time: 3000,
-      shade: false,
-      skin: skin,
-      title: false,
-      closeBtn: false,
-      btn: false,
-      resize: false,
-      end: end
-    }, (type && !ready.config.skin) ? {
-      skin: skin + ' layui-layer-hui',
-      anim: anim
-    } : function(){
-       options = options || {};
-       if(options.icon === -1 || options.icon === undefined){
-         options.skin = skin + ' ' + (options.skin||'layui-layer-hui');
-       }
-       return options;
-    }()));
-  },
-
-  load: function(icon, options){
-    return layer.open($.extend({
-      type: 3,
-      icon: icon || 0,
-      resize: false,
-      shade: 0.01
-    }, options));
-  },
-
-  tips: function(content, follow, options){
-    return layer.open($.extend({
-      type: 4,
-      content: [content, follow],
-      closeBtn: false,
-      time: 3000,
-      shade: false,
-      resize: false,
-      fixed: false,
-      maxWidth: 260
-    }, options));
-  }
-};
-
-var Class = function(setings){
-  var that = this, creat = function(){
-    that.creat();
-  };
-  that.index = ++layer.index;
-  // that.config.maxWidth = $(win).width() - 15*2; //初始最大宽度：当前屏幕宽，左右留 15px 边距
-  that.config = $.extend({}, that.config, ready.config, setings);
-  document.body ? creat() : setTimeout(function(){
-    creat();
-  }, 30);
-};
-
-Class.pt = Class.prototype;
-
-//缓存常用字符
-var doms = ['layui-layer', '.layui-layer-title', '.layui-layer-main', '.layui-layer-dialog', 'layui-layer-iframe', 'layui-layer-content', 'layui-layer-btn', 'layui-layer-close'];
-doms.anim = ['layer-anim-00', 'layer-anim-01', 'layer-anim-02', 'layer-anim-03', 'layer-anim-04', 'layer-anim-05', 'layer-anim-06'];
-
-doms.SHADE = 'layui-layer-shade';
-doms.MOVE = 'layui-layer-move';
-
-//默认配置
-Class.pt.config = {
-  type: 0,
-  shade: 0.3,
-  fixed: true,
-  move: doms[1],
-  title: '&#x4FE1;&#x606F;',
-  offset: 'auto',
-  area: 'auto',
-  closeBtn: 1,
-  time: 0, //0表示不自动关闭
-  zIndex: 19891014,
-  maxWidth: 360,
-  anim: 0,
-  isOutAnim: true, //退出动画
-  minStack: true, //最小化堆叠
-  focusBtn: 0,
-  icon: -1,
-  moveType: 1,
-  resize: true,
-  scrollbar: true, //是否允许浏览器滚动条
-  tips: 2
-};
-
-//容器
-Class.pt.vessel = function(conType, callback){
-  var that = this, times = that.index, config = that.config;
-  var zIndex = config.zIndex + times, titype = typeof config.title === 'object';
-  var ismax = config.maxmin && (config.type === 1 || config.type === 2);
-  var titleHTML = (config.title ? '<div class="layui-layer-title" style="'+ (titype ? config.title[1] : '') +'">'
-    + (titype ? config.title[0] : config.title)
-  + '</div>' : '');
-
-  config.zIndex = zIndex;
-  callback([
-    //遮罩
-    config.shade ? ('<div class="'+ doms.SHADE +'" id="'+ doms.SHADE + times +'" times="'+ times +'" style="'+ ('z-index:'+ (zIndex-1) +'; ') +'"></div>') : '',
-
-    //主体
-    '<div class="'+ doms[0] + (' layui-layer-'+ready.type[config.type]) + (((config.type == 0 || config.type == 2) && !config.shade) ? ' layui-layer-border' : '') + ' ' + (config.skin||'') +'" id="'+ doms[0] + times +'" type="'+ ready.type[config.type] +'" times="'+ times +'" showtime="'+ config.time +'" conType="'+ (conType ? 'object' : 'string') +'" style="z-index: '+ zIndex +'; width:'+ config.area[0] + ';height:' + config.area[1] + ';position:'+ (config.fixed ? 'fixed;' : 'absolute;') +'">'
-      + (conType && config.type != 2 ? '' : titleHTML)
-      + '<div id="'+ (config.id||'') +'" class="layui-layer-content'+ ((config.type == 0 && config.icon !== -1) ? ' layui-layer-padding' :'') + (config.type == 3 ? ' layui-layer-loading'+config.icon : '') +'">'
-        + (config.type == 0 && config.icon !== -1 ? '<i class="layui-layer-ico layui-layer-ico'+ config.icon +'"></i>' : '')
-        + (config.type == 1 && conType ? '' : (config.content||''))
-      + '</div>'
-      + '<span class="layui-layer-setwin">'+ function(){
-        var closebtn = ismax ? '<a class="layui-layer-min" href="javascript:;"><cite></cite></a><a class="layui-layer-ico layui-layer-max" href="javascript:;"></a>' : '';
-        config.closeBtn && (closebtn += '<a class="layui-layer-ico '+ doms[7] +' '+ doms[7] + (config.title ? config.closeBtn : (config.type == 4 ? '1' : '2')) +'" href="javascript:;"></a>');
-        return closebtn;
-      }() + '</span>'
-      + (config.btn ? function(){
-        var button = '';
-        typeof config.btn === 'string' && (config.btn = [config.btn]);
-        for(var i = 0, len = config.btn.length; i < len; i++){
-          button += '<a class="'+ doms[6] +''+ i +'" href="javascript:">'+ config.btn[i] +'</a>'
-        }
-        return '<div class="'+ doms[6] +' layui-layer-btn-'+ (config.btnAlign||'') +'">'+ button +'</div>'
-      }() : '')
-      + (config.resize ? '<span class="layui-layer-resize"></span>' : '')
-    + '</div>'
-  ], titleHTML, $('<div class="'+ doms.MOVE +'" id="'+ doms.MOVE +'"></div>'));
-  return that;
-};
-
-//创建骨架
-Class.pt.creat = function(){
-  var that = this
-  ,config = that.config
-  ,times = that.index, nodeIndex
-  ,content = config.content
-  ,conType = typeof content === 'object'
-  ,body = $('body');
-
-  if(config.id && $('#'+config.id)[0])  return;
-
-  if(typeof config.area === 'string'){
-    config.area = config.area === 'auto' ? ['', ''] : [config.area, ''];
-  }
-
-  //anim兼容旧版shift
-  if(config.shift){
-    config.anim = config.shift;
-  }
-
-  if(layer.ie == 6){
-    config.fixed = false;
-  }
-
-  switch(config.type){
-    case 0:
-      config.btn = ('btn' in config) ? config.btn : ready.btn[0];
-      layer.closeAll('dialog');
-    break;
-    case 2:
-      var content = config.content = conType ? config.content : [config.content||'', 'auto'];
-      config.content = '<iframe scrolling="'+ (config.content[1]||'auto') +'" allowtransparency="true" id="'+ doms[4] +''+ times +'" name="'+ doms[4] +''+ times +'" onload="this.className=\'\';" class="layui-layer-load" frameborder="0" src="' + config.content[0] + '"></iframe>';
-    break;
-    case 3:
-      delete config.title;
-      delete config.closeBtn;
-      config.icon === -1 && (config.icon === 0);
-      layer.closeAll('loading');
-    break;
-    case 4:
-      conType || (config.content = [config.content, 'body']);
-      config.follow = config.content[1];
-      config.content = config.content[0] + '<i class="layui-layer-TipsG"></i>';
-      delete config.title;
-      config.tips = typeof config.tips === 'object' ? config.tips : [config.tips, true];
-      config.tipsMore || layer.closeAll('tips');
-    break;
-  }
-
-  //建立容器
-  that.vessel(conType, function(html, titleHTML, moveElem){
-    body.append(html[0]);
-    conType ? function(){
-      (config.type == 2 || config.type == 4) ? function(){
-        $('body').append(html[1]);
-      }() : function(){
-        if(!content.parents('.'+doms[0])[0]){
-          content.data('display', content.css('display')).show().addClass('layui-layer-wrap').wrap(html[1]);
-          $('#'+ doms[0] + times).find('.'+doms[5]).before(titleHTML);
-        }
-      }();
-    }() : body.append(html[1]);
-    $('#'+ doms.MOVE)[0] || body.append(ready.moveElem = moveElem);
-
-    that.layero = $('#'+ doms[0] + times);
-    that.shadeo = $('#'+ doms.SHADE + times);
-
-    config.scrollbar || doms.html.css('overflow', 'hidden').attr('layer-full', times);
-  }).auto(times);
-
-  //遮罩
-  that.shadeo.css({
-    'background-color': config.shade[1] || '#000'
-    ,'opacity': config.shade[0] || config.shade
-  });
-
-  config.type == 2 && layer.ie == 6 && that.layero.find('iframe').attr('src', content[0]);
-
-  //坐标自适应浏览器窗口尺寸
-  config.type == 4 ? that.tips() : function(){
-    that.offset()
-    //首次弹出时，若 css 尚未加载，则等待 css 加载完毕后，重新设定尺寸
-    parseInt(ready.getStyle(document.getElementById(doms.MOVE), 'z-index')) ||  function(){
-      that.layero.css('visibility', 'hidden');
-      layer.ready(function(){
-        that.offset();
-        that.layero.css('visibility', 'visible');
-      });
-    }();
-  }();
-
-  //如果是固定定位
-  if(config.fixed){
-    win.on('resize', function(){
-      that.offset();
-      (/^\d+%$/.test(config.area[0]) || /^\d+%$/.test(config.area[1])) && that.auto(times);
-      config.type == 4 && that.tips();
-    });
-  }
-
-  config.time <= 0 || setTimeout(function(){
-    layer.close(that.index);
-  }, config.time);
-  that.move().callback();
-
-  //为兼容jQuery3.0的css动画影响元素尺寸计算
-  if(doms.anim[config.anim]){
-    var animClass = 'layer-anim '+ doms.anim[config.anim];
-    that.layero.addClass(animClass).one('webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend', function(){
-      $(this).removeClass(animClass);
-    });
-  };
-
-  //记录关闭动画
-  if(config.isOutAnim){
-    that.layero.data('isOutAnim', true);
-  }
-};
-
-//自适应
-Class.pt.auto = function(index){
-  var that = this, config = that.config, layero = $('#'+ doms[0] + index);
-
-  if(config.area[0] === '' && config.maxWidth > 0){
-    //为了修复IE7下一个让人难以理解的bug
-    if(layer.ie && layer.ie < 8 && config.btn){
-      layero.width(layero.innerWidth());
-    }
-    layero.outerWidth() > config.maxWidth && layero.width(config.maxWidth);
-  }
-
-  var area = [layero.innerWidth(), layero.innerHeight()]
-  ,titHeight = layero.find(doms[1]).outerHeight() || 0
-  ,btnHeight = layero.find('.'+doms[6]).outerHeight() || 0
-  ,setHeight = function(elem){
-    elem = layero.find(elem);
-    elem.height(area[1] - titHeight - btnHeight - 2*(parseFloat(elem.css('padding-top'))|0));
-  };
-
-  switch(config.type){
-    case 2:
-      setHeight('iframe');
-    break;
-    default:
-      if(config.area[1] === ''){
-        if(config.maxHeight > 0 && layero.outerHeight() > config.maxHeight){
-          area[1] = config.maxHeight;
-          setHeight('.'+doms[5]);
-        } else if(config.fixed && area[1] >= win.height()){
-          area[1] = win.height();
-          setHeight('.'+doms[5]);
-        }
-      } else {
-        setHeight('.'+doms[5]);
-      }
-    break;
-  };
-
-  return that;
-};
-
-//计算坐标
-Class.pt.offset = function(){
-  var that = this, config = that.config, layero = that.layero;
-  var area = [layero.outerWidth(), layero.outerHeight()];
-  var type = typeof config.offset === 'object';
-  that.offsetTop = (win.height() - area[1])/2;
-  that.offsetLeft = (win.width() - area[0])/2;
-
-  if(type){
-    that.offsetTop = config.offset[0];
-    that.offsetLeft = config.offset[1]||that.offsetLeft;
-  } else if(config.offset !== 'auto'){
-
-    if(config.offset === 't'){ //上
-      that.offsetTop = 0;
-    } else if(config.offset === 'r'){ //右
-      that.offsetLeft = win.width() - area[0];
-    } else if(config.offset === 'b'){ //下
-      that.offsetTop = win.height() - area[1];
-    } else if(config.offset === 'l'){ //左
-      that.offsetLeft = 0;
-    } else if(config.offset === 'lt'){ //左上角
-      that.offsetTop = 0;
-      that.offsetLeft = 0;
-    } else if(config.offset === 'lb'){ //左下角
-      that.offsetTop = win.height() - area[1];
-      that.offsetLeft = 0;
-    } else if(config.offset === 'rt'){ //右上角
-      that.offsetTop = 0;
-      that.offsetLeft = win.width() - area[0];
-    } else if(config.offset === 'rb'){ //右下角
-      that.offsetTop = win.height() - area[1];
-      that.offsetLeft = win.width() - area[0];
-    } else {
-      that.offsetTop = config.offset;
-    }
-
-  }
-
-  if(!config.fixed){
-    that.offsetTop = /%$/.test(that.offsetTop) ?
-      win.height()*parseFloat(that.offsetTop)/100
-    : parseFloat(that.offsetTop);
-    that.offsetLeft = /%$/.test(that.offsetLeft) ?
-      win.width()*parseFloat(that.offsetLeft)/100
-    : parseFloat(that.offsetLeft);
-    that.offsetTop += win.scrollTop();
-    that.offsetLeft += win.scrollLeft();
-  }
-
-  if(layero.attr('minLeft')){
-    that.offsetTop = win.height() - (layero.find(doms[1]).outerHeight() || 0);
-    that.offsetLeft = layero.css('left');
-  }
-
-  layero.css({top: that.offsetTop, left: that.offsetLeft});
-};
-
-//Tips
-Class.pt.tips = function(){
-  var that = this, config = that.config, layero = that.layero;
-  var layArea = [layero.outerWidth(), layero.outerHeight()], follow = $(config.follow);
-  if(!follow[0]) follow = $('body');
-  var goal = {
-    width: follow.outerWidth(),
-    height: follow.outerHeight(),
-    top: follow.offset().top,
-    left: follow.offset().left
-  }, tipsG = layero.find('.layui-layer-TipsG');
-
-  var guide = config.tips[0];
-  config.tips[1] || tipsG.remove();
-
-  goal.autoLeft = function(){
-    if(goal.left + layArea[0] - win.width() > 0){
-      goal.tipLeft = goal.left + goal.width - layArea[0];
-      tipsG.css({right: 12, left: 'auto'});
-    } else {
-      goal.tipLeft = goal.left;
-    };
-  };
-
-  //辨别tips的方位
-  goal.where = [function(){ //上
-    goal.autoLeft();
-    goal.tipTop = goal.top - layArea[1] - 10;
-    tipsG.removeClass('layui-layer-TipsB').addClass('layui-layer-TipsT').css('border-right-color', config.tips[1]);
-  }, function(){ //右
-    goal.tipLeft = goal.left + goal.width + 10;
-    goal.tipTop = goal.top;
-    tipsG.removeClass('layui-layer-TipsL').addClass('layui-layer-TipsR').css('border-bottom-color', config.tips[1]);
-  }, function(){ //下
-    goal.autoLeft();
-    goal.tipTop = goal.top + goal.height + 10;
-    tipsG.removeClass('layui-layer-TipsT').addClass('layui-layer-TipsB').css('border-right-color', config.tips[1]);
-  }, function(){ //左
-    goal.tipLeft = goal.left - layArea[0] - 10;
-    goal.tipTop = goal.top;
-    tipsG.removeClass('layui-layer-TipsR').addClass('layui-layer-TipsL').css('border-bottom-color', config.tips[1]);
-  }];
-  goal.where[guide-1]();
-
-  /* 8*2为小三角形占据的空间 */
-  if(guide === 1){
-    goal.top - (win.scrollTop() + layArea[1] + 8*2) < 0 && goal.where[2]();
-  } else if(guide === 2){
-    win.width() - (goal.left + goal.width + layArea[0] + 8*2) > 0 || goal.where[3]()
-  } else if(guide === 3){
-    (goal.top - win.scrollTop() + goal.height + layArea[1] + 8*2) - win.height() > 0 && goal.where[0]();
-  } else if(guide === 4){
-     layArea[0] + 8*2 - goal.left > 0 && goal.where[1]()
-  }
-
-  layero.find('.'+doms[5]).css({
-    'background-color': config.tips[1],
-    'padding-right': (config.closeBtn ? '30px' : '')
-  });
-  layero.css({
-    left: goal.tipLeft - (config.fixed ? win.scrollLeft() : 0),
-    top: goal.tipTop  - (config.fixed ? win.scrollTop() : 0)
-  });
-}
-
-//拖拽层
-Class.pt.move = function(){
-  var that = this
-  ,config = that.config
-  ,_DOC = $(document)
-  ,layero = that.layero
-  ,moveElem = layero.find(config.move)
-  ,resizeElem = layero.find('.layui-layer-resize')
-  ,dict = {};
-
-  if(config.move){
-    moveElem.css('cursor', 'move');
-  }
-
-  moveElem.on('mousedown', function(e){
-    e.preventDefault();
-    if(config.move){
-      dict.moveStart = true;
-      dict.offset = [
-        e.clientX - parseFloat(layero.css('left'))
-        ,e.clientY - parseFloat(layero.css('top'))
-      ];
-      ready.moveElem.css('cursor', 'move').show();
-    }
-  });
-
-  resizeElem.on('mousedown', function(e){
-    e.preventDefault();
-    dict.resizeStart = true;
-    dict.offset = [e.clientX, e.clientY];
-    dict.area = [
-      layero.outerWidth()
-      ,layero.outerHeight()
-    ];
-    ready.moveElem.css('cursor', 'se-resize').show();
-  });
-
-  _DOC.on('mousemove', function(e){
-
-    //拖拽移动
-    if(dict.moveStart){
-      var X = e.clientX - dict.offset[0]
-      ,Y = e.clientY - dict.offset[1]
-      ,fixed = layero.css('position') === 'fixed';
-
-      e.preventDefault();
-
-      dict.stX = fixed ? 0 : win.scrollLeft();
-      dict.stY = fixed ? 0 : win.scrollTop();
-
-      //控制元素不被拖出窗口外
-      if(!config.moveOut){
-        var setRig = win.width() - layero.outerWidth() + dict.stX
-        ,setBot = win.height() - layero.outerHeight() + dict.stY;
-        X < dict.stX && (X = dict.stX);
-        X > setRig && (X = setRig);
-        Y < dict.stY && (Y = dict.stY);
-        Y > setBot && (Y = setBot);
-      }
-
-      layero.css({
-        left: X
-        ,top: Y
-      });
-    }
-
-    //Resize
-    if(config.resize && dict.resizeStart){
-      var X = e.clientX - dict.offset[0]
-      ,Y = e.clientY - dict.offset[1];
-
-      e.preventDefault();
-
-      layer.style(that.index, {
-        width: dict.area[0] + X
-        ,height: dict.area[1] + Y
-      })
-      dict.isResize = true;
-      config.resizing && config.resizing(layero);
-    }
-  }).on('mouseup', function(e){
-    if(dict.moveStart){
-      delete dict.moveStart;
-      ready.moveElem.hide();
-      config.moveEnd && config.moveEnd(layero);
-    }
-    if(dict.resizeStart){
-      delete dict.resizeStart;
-      ready.moveElem.hide();
-    }
-  });
-
-  return that;
-};
-
-Class.pt.callback = function(){
-  var that = this, layero = that.layero, config = that.config;
-  that.openLayer();
-  if(config.success){
-    if(config.type == 2){
-      layero.find('iframe').on('load', function(){
-        config.success(layero, that.index);
-      });
-    } else {
-      config.success(layero, that.index);
-    }
-  }
-  layer.ie == 6 && that.IE6(layero);
-
-  //按钮
-  layero.find('.'+ doms[6]).children('a').on('click', function(){
-    var index = $(this).index();
-    if(index === 0){
-      if(config.yes){
-        config.yes(that.index, layero)
-      } else if(config['btn1']){
-        config['btn1'](that.index, layero)
-      } else {
-        layer.close(that.index);
-      }
-    } else {
-      var close = config['btn'+(index+1)] && config['btn'+(index+1)](that.index, layero);
-      close === false || layer.close(that.index);
-    }
-  });
-
-  //按钮焦点
-  if (typeof config.focusBtn === 'number') {
-      layero.find('.' + doms[6]).children('a').each(function () {
-          var currentBtn = $(this);
-          var confirmBtn = $("<button type='button' />").addClass("layui-layer-confirm");
-          currentBtn.css("position", "relative").attr("tabindex", -1).append(confirmBtn);
-          confirmBtn.click(function () {
-              currentBtn.trigger("click");
-              return false;
-          })
-      });
-      var focusBtn = layero.find('.' + doms[6]).find('button.layui-layer-confirm').eq(config.focusBtn);
-      if (focusBtn.length > 0) {
-          focusBtn.focus();
-      }
-  }
-
-  //取消
-  function cancel() {
-      var close = config.cancel && config.cancel(that.index, layero);
-      close === false || layer.close(that.index);
-  }
-
-  //右上角关闭回调
-  layero.find('.'+ doms[7]).on('click', cancel);
-
-  //点遮罩关闭
-  if(config.shadeClose){
-    that.shadeo.on('click', function(){
-      layer.close(that.index);
-    });
-  }
-
-  //最小化
-  layero.find('.layui-layer-min').on('click', function(){
-    var min = config.min && config.min(layero, that.index);
-    min === false || layer.min(that.index, config);
-  });
-
-  //全屏/还原
-  layero.find('.layui-layer-max').on('click', function(){
-    if($(this).hasClass('layui-layer-maxmin')){
-      layer.restore(that.index);
-      config.restore && config.restore(layero, that.index);
-    } else {
-      layer.full(that.index, config);
-      setTimeout(function(){
-        config.full && config.full(layero, that.index);
-      }, 100);
-    }
-  });
-
-  config.end && (ready.end[that.index] = config.end);
-};
-
-//for ie6 恢复select
-ready.reselect = function(){
-  $.each($('select'), function(index , value){
-    var sthis = $(this);
-    if(!sthis.parents('.'+doms[0])[0]){
-      (sthis.attr('layer') == 1 && $('.'+doms[0]).length < 1) && sthis.removeAttr('layer').show();
-    }
-    sthis = null;
-  });
-};
-
-Class.pt.IE6 = function(layero){
-  //隐藏select
-  $('select').each(function(index , value){
-    var sthis = $(this);
-    if(!sthis.parents('.'+doms[0])[0]){
-      sthis.css('display') === 'none' || sthis.attr({'layer' : '1'}).hide();
-    }
-    sthis = null;
-  });
-};
-
-//需依赖原型的对外方法
-Class.pt.openLayer = function(){
-  var that = this;
-
-  //置顶当前窗口
-  layer.zIndex = that.config.zIndex;
-  layer.setTop = function(layero){
-    var setZindex = function(){
-      layer.zIndex++;
-      layero.css('z-index', layer.zIndex + 1);
-    };
-    layer.zIndex = parseInt(layero[0].style.zIndex);
-    layero.on('mousedown', setZindex);
-    return layer.zIndex;
-  };
-};
-
-//记录宽高坐标，用于还原
-ready.record = function(layero){
-  var area = [
-    layero.width(),
-    layero.height(),
-    layero.position().top,
-    layero.position().left + parseFloat(layero.css('margin-left'))
-  ];
-  layero.find('.layui-layer-max').addClass('layui-layer-maxmin');
-  layero.attr({area: area});
-};
-
-ready.rescollbar = function(index){
-  if(doms.html.attr('layer-full') == index){
-    if(doms.html[0].style.removeProperty){
-      doms.html[0].style.removeProperty('overflow');
-    } else {
-      doms.html[0].style.removeAttribute('overflow');
-    }
-    doms.html.removeAttr('layer-full');
-  }
-};
-
-/** 内置成员 */
-
-window.layer = layer;
-
-//获取子iframe的DOM
-layer.getChildFrame = function(selector, index){
-  index = index || $('.'+doms[4]).attr('times');
-  return $('#'+ doms[0] + index).find('iframe').contents().find(selector);
-};
-
-//得到当前iframe层的索引，子iframe时使用
-layer.getFrameIndex = function(name){
-  return $('#'+ name).parents('.'+doms[4]).attr('times');
-};
-
-//iframe层自适应宽高
-layer.iframeAuto = function(index){
-  if(!index) return;
-  var heg = layer.getChildFrame('html', index).outerHeight();
-  var layero = $('#'+ doms[0] + index);
-  var titHeight = layero.find(doms[1]).outerHeight() || 0;
-  var btnHeight = layero.find('.'+doms[6]).outerHeight() || 0;
-  layero.css({height: heg + titHeight + btnHeight});
-  layero.find('iframe').css({height: heg});
-};
-
-//重置iframe url
-layer.iframeSrc = function(index, url){
-  $('#'+ doms[0] + index).find('iframe').attr('src', url);
-};
-
-//设定层的样式
-layer.style = function(index, options, limit){
-  var layero = $('#'+ doms[0] + index)
-  ,contElem = layero.find('.layui-layer-content')
-  ,type = layero.attr('type')
-  ,titHeight = layero.find(doms[1]).outerHeight() || 0
-  ,btnHeight = layero.find('.'+doms[6]).outerHeight() || 0
-  ,minLeft = layero.attr('minLeft');
-
-  if(type === ready.type[3] || type === ready.type[4]){
-    return;
-  }
-
-  if(!limit){
-    if(parseFloat(options.width) <= 260){
-      options.width = 260;
-    };
-
-    if(parseFloat(options.height) - titHeight - btnHeight <= 64){
-      options.height = 64 + titHeight + btnHeight;
-    };
-  }
-
-  layero.css(options);
-  btnHeight = layero.find('.'+doms[6]).outerHeight();
-
-  if(type === ready.type[2]){
-    layero.find('iframe').css({
-      height: parseFloat(options.height) - titHeight - btnHeight
-    });
-  } else {
-    var isBorderBox = contElem.css("box-sizing") == 'border-box' ? true : false;
-    contElem.css({
-      height: parseFloat(options.height) - titHeight - btnHeight
-      - parseFloat(isBorderBox ? 0 : contElem.css('padding-top'))
-      - parseFloat(isBorderBox ? 0 : contElem.css('padding-bottom'))
-    })
-  }
-};
-
-//最小化
-layer.min = function(index, options){
-  options = options || {};
-  var layero = $('#'+ doms[0] + index)
-  ,shadeo = $('#'+ doms.SHADE + index)
-  ,titHeight = layero.find(doms[1]).outerHeight() || 0
-  ,left = layero.attr('minLeft') || (181*ready.minIndex)+'px'
-  ,position = layero.css('position')
-  ,settings = {
-    width: 180
-    ,height: titHeight
-    ,position: 'fixed'
-    ,overflow: 'hidden'
-  };
-
-  //记录宽高坐标，用于还原
-  ready.record(layero);
-
-  if(ready.minLeft[0]){
-    left = ready.minLeft[0];
-    ready.minLeft.shift();
-  }
-
-  //是否堆叠在左下角
-  if(options.minStack){
-    settings.left = left;
-    settings.top = win.height() - titHeight;
-    layero.attr('minLeft') || ready.minIndex++; //初次执行，最小化操作索引自增
-    layero.attr('minLeft', left);
-  }
-
-  layero.attr('position', position);
-  layer.style(index, settings, true);
-
-  layero.find('.layui-layer-min').hide();
-  layero.attr('type') === 'page' && layero.find(doms[4]).hide();
-  ready.rescollbar(index);
-
-  //隐藏遮罩
-  shadeo.hide();
-};
-
-//还原
-layer.restore = function(index){
-  var layero = $('#'+ doms[0] + index)
-  ,shadeo = $('#'+ doms.SHADE + index)
-  ,area = layero.attr('area').split(',')
-  ,type = layero.attr('type');
-
-  //恢复原来尺寸
-  layer.style(index, {
-    width: parseFloat(area[0]),
-    height: parseFloat(area[1]),
-    top: parseFloat(area[2]),
-    left: parseFloat(area[3]),
-    position: layero.attr('position'),
-    overflow: 'visible'
-  }, true);
-
-  layero.find('.layui-layer-max').removeClass('layui-layer-maxmin');
-  layero.find('.layui-layer-min').show();
-  layero.attr('type') === 'page' && layero.find(doms[4]).show();
-  ready.rescollbar(index);
-
-  //恢复遮罩
-  shadeo.show();
-};
-
-//全屏
-layer.full = function(index){
-  var layero = $('#'+ doms[0] + index), timer;
-  ready.record(layero);
-  if(!doms.html.attr('layer-full')){
-    doms.html.css('overflow','hidden').attr('layer-full', index);
-  }
-  clearTimeout(timer);
-  timer = setTimeout(function(){
-    var isfix = layero.css('position') === 'fixed';
-    layer.style(index, {
-      top: isfix ? 0 : win.scrollTop(),
-      left: isfix ? 0 : win.scrollLeft(),
-      width: win.width(),
-      height: win.height()
-    }, true);
-    layero.find('.layui-layer-min').hide();
-  }, 100);
-};
-
-//改变title
-layer.title = function(name, index){
-  var title = $('#'+ doms[0] + (index||layer.index)).find(doms[1]);
-  title.html(name);
-};
-
-//关闭layer总方法
-layer.close = function(index, callback){
-  var layero = $('#'+ doms[0] + index), type = layero.attr('type'), closeAnim = 'layer-anim-close';
-  if(!layero[0]) return;
-  var WRAP = 'layui-layer-wrap', remove = function(){
-    if(type === ready.type[1] && layero.attr('conType') === 'object'){
-      layero.children(':not(.'+ doms[5] +')').remove();
-      var wrap = layero.find('.'+WRAP);
-      for(var i = 0; i < 2; i++){
-        wrap.unwrap();
-      }
-      wrap.css('display', wrap.data('display')).removeClass(WRAP);
-    } else {
-      //低版本IE 回收 iframe
-      if(type === ready.type[2]){
-        try {
-          var iframe = $('#'+doms[4]+index)[0];
-          iframe.contentWindow.document.write('');
-          iframe.contentWindow.close();
-          layero.find('.'+doms[5])[0].removeChild(iframe);
-        } catch(e){}
-      }
-      layero[0].innerHTML = '';
-      layero.remove();
-    }
-    typeof ready.end[index] === 'function' && ready.end[index]();
-    delete ready.end[index];
-    typeof callback === 'function' && callback();
-  };
-
-  if(layero.data('isOutAnim')){
-    layero.addClass('layer-anim '+ closeAnim);
-  }
-
-  $('#layui-layer-moves, #'+ doms.SHADE + index).remove();
-  layer.ie == 6 && ready.reselect();
-  ready.rescollbar(index);
-  if(layero.attr('minLeft')){
-    ready.minIndex--;
-    ready.minLeft.push(layero.attr('minLeft'));
-  }
-
-  if((layer.ie && layer.ie < 10) || !layero.data('isOutAnim')){
-    remove()
-  } else {
-    setTimeout(function(){
-      remove();
-    }, 200);
-  }
-};
-
-//关闭所有层
-layer.closeAll = function(type, callback){
-  if(typeof type === 'function'){
-    callback = type;
-    type = null;
-  };
-  var domsElem = $('.'+doms[0]);
-  $.each(domsElem, function(_index){
-    var othis = $(this);
-    var is = type ? (othis.attr('type') === type) : 1;
-    is && layer.close(othis.attr('times'), _index === domsElem.length - 1 ? callback : null);
-    is = null;
-  });
-  if(domsElem.length === 0) typeof callback === 'function' && callback();
-};
-
-/**
-
-  拓展模块，layui 开始合并在一起
-
- */
-
-var cache = layer.cache||{}, skin = function(type){
-  return (cache.skin ? (' ' + cache.skin + ' ' + cache.skin + '-'+type) : '');
-};
-
-//仿系统prompt
-layer.prompt = function(options, yes){
-  var style = '';
-  options = options || {};
-
-  if(typeof options === 'function') yes = options;
-
-  if(options.area){
-    var area = options.area;
-    style = 'style="width: '+ area[0] +'; height: '+ area[1] + ';"';
-    delete options.area;
-  }
-  var prompt, content = options.formType == 2 ? '<textarea class="layui-layer-input"' + style +'></textarea>' : function(){
-    return '<input type="'+ (options.formType == 1 ? 'password' : 'text') +'" class="layui-layer-input">';
-  }();
-
-  var success = options.success;
-  delete options.success;
-
-  return layer.open($.extend({
-    type: 1
-    ,btn: ['&#x786E;&#x5B9A;','&#x53D6;&#x6D88;']
-    ,content: content
-    ,skin: 'layui-layer-prompt' + skin('prompt')
-    ,maxWidth: win.width()
-    ,success: function(layero){
-      prompt = layero.find('.layui-layer-input');
-      prompt.val(options.value || '').focus();
-      typeof success === 'function' && success(layero);
-    }
-    ,resize: false
-    ,yes: function(index){
-      var value = prompt.val();
-      if(value === ''){
-        prompt.focus();
-      } else if(value.length > (options.maxlength||500)) {
-        layer.tips('&#x6700;&#x591A;&#x8F93;&#x5165;'+ (options.maxlength || 500) +'&#x4E2A;&#x5B57;&#x6570;', prompt, {tips: 1});
-      } else {
-        yes && yes(value, index, prompt);
-      }
-    }
-  }, options));
-};
-
-//tab层
-layer.tab = function(options){
-  options = options || {};
-
-  var tab = options.tab || {}
-  ,THIS = 'layui-this'
-  ,success = options.success;
-
-  delete options.success;
-
-  return layer.open($.extend({
-    type: 1,
-    skin: 'layui-layer-tab' + skin('tab'),
-    resize: false,
-    title: function(){
-      var len = tab.length, ii = 1, str = '';
-      if(len > 0){
-        str = '<span class="'+ THIS +'">'+ tab[0].title +'</span>';
-        for(; ii < len; ii++){
-          str += '<span>'+ tab[ii].title +'</span>';
-        }
-      }
-      return str;
-    }(),
-    content: '<ul class="layui-layer-tabmain">'+ function(){
-      var len = tab.length, ii = 1, str = '';
-      if(len > 0){
-        str = '<li class="layui-layer-tabli '+ THIS +'">'+ (tab[0].content || 'no content') +'</li>';
-        for(; ii < len; ii++){
-          str += '<li class="layui-layer-tabli">'+ (tab[ii].content || 'no  content') +'</li>';
-        }
-      }
-      return str;
-    }() +'</ul>',
-    success: function(layero){
-      var btn = layero.find('.layui-layer-title').children();
-      var main = layero.find('.layui-layer-tabmain').children();
-      btn.on('mousedown', function(e){
-        e.stopPropagation ? e.stopPropagation() : e.cancelBubble = true;
-        var othis = $(this), index = othis.index();
-        othis.addClass(THIS).siblings().removeClass(THIS);
-        main.eq(index).show().siblings().hide();
-        typeof options.change === 'function' && options.change(index);
-      });
-      typeof success === 'function' && success(layero);
-    }
-  }, options));
-};
-
-//相册层
-layer.photos = function(options, loop, key){
-  var dict = {};
-  options = options || {};
-  if(!options.photos) return;
-  options.zoom = typeof options.zoom === 'undefined' ? true : !!options.zoom;
-
-  //若 photos 并非选择器或 jQuery 对象，则为普通 object
-  var isObject = !(typeof options.photos === 'string' || options.photos instanceof $)
-  ,photos = isObject ? options.photos : {}
-  ,data = photos.data || []
-  ,start = photos.start || 0;
-
-  dict.imgIndex = (start|0) + 1;
-  options.img = options.img || 'img';
-
-  var success = options.success;
-  delete options.success;
-
-  //如果 options.photos 不是一个对象
-  if(!isObject){ //页面直接获取
-    var parent = $(options.photos), pushData = function(){
-      data = [];
-      parent.find(options.img).each(function(index){
-        var othis = $(this);
-        othis.attr('layer-index', index);
-        data.push({
-          alt: othis.attr('alt'),
-          pid: othis.attr('layer-pid'),
-          src: othis.attr('layer-src') || othis.attr('src'),
-          thumb: othis.attr('src')
-        });
-      });
-    };
-
-    pushData();
-
-    if (data.length === 0) return;
-
-    loop || parent.on('click', options.img, function(){
-      pushData();
-      var othis = $(this), index = othis.attr('layer-index');
-      layer.photos($.extend(options, {
-        photos: {
-          start: index,
-          data: data,
-          tab: options.tab
-        },
-        full: options.full
-      }), true);
-    });
-
-    //不直接弹出
-    if(!loop) return;
-
-  } else if (data.length === 0){
-    return layer.msg('&#x6CA1;&#x6709;&#x56FE;&#x7247;');
-  }
-
-  //上一张
-  dict.imgprev = function(key){
-    dict.imgIndex--;
-    if(dict.imgIndex < 1){
-      dict.imgIndex = data.length;
-    }
-    dict.tabimg(key);
-  };
-
-  //下一张
-  dict.imgnext = function(key,errorMsg){
-    dict.imgIndex++;
-    if(dict.imgIndex > data.length){
-      dict.imgIndex = 1;
-      if (errorMsg) {return};
-    }
-    dict.tabimg(key)
-  };
-
-  //方向键
-  dict.keyup = function(event){
-    if(!dict.end){
-      var code = event.keyCode;
-      event.preventDefault();
-      if(code === 37){
-        dict.imgprev(true);
-      } else if(code === 39) {
-        dict.imgnext(true);
-      } else if(code === 27) {
-        layer.close(dict.index);
-      }
-    }
-  }
-
-  //切换
-  dict.tabimg = function(key){
-    if(data.length <= 1) return;
-    photos.start = dict.imgIndex - 1;
-    layer.close(dict.index);
-    return layer.photos(options, true, key);
-    setTimeout(function(){
-      layer.photos(options, true, key);
-    }, 200);
-  }
-
-  //一些动作
-  dict.event = function(){
-    /*
-    dict.bigimg.hover(function(){
-      dict.imgsee.show();
-    }, function(){
-      dict.imgsee.hide();
-    });
-    */
-
-    dict.bigimg.find('.layui-layer-imgprev').on('click', function(event){
-      event.preventDefault();
-      dict.imgprev(true);
-    });
-
-    dict.bigimg.find('.layui-layer-imgnext').on('click', function(event){
-      event.preventDefault();
-      dict.imgnext(true);
-    });
-
-    $(document).on('keyup', dict.keyup);
-
-    //鼠标滚轮缩放图片
-    if(options.zoom){
-      dict.bigimg.on('wheel mousewheel', $(">img", dict.bigimg), function(event) {
-        var offset = $(this).offset(),
-            zoomIn = event.originalEvent.wheelDelta>0,
-            operator = zoomIn ? '+=' : '-=',
-            distance = 24,
-            value = Math.floor(distance / 2) ;
-        if(!zoomIn && ($(this).width()<50 || $(this).height()<50)){
-          return false;
-        }
-        $(this).width(operator + distance).height(operator + distance).offset({
-          'left':  zoomIn ? offset.left - value : offset.left + value,
-          'top':  zoomIn ? offset.top - value : offset.top + value
-        });
-        return false;
-      });
-    }
-  };
-
-  //图片预加载
-  function loadImage(url, callback, error) {
-    var img = new Image();
-    img.src = url;
-    if(img.complete){
-      return callback(img);
-    }
-    img.onload = function(){
-      img.onload = null;
-      callback(img);
-    };
-    img.onerror = function(e){
-      img.onerror = null;
-      error(e);
-    };
-  };
-
-  dict.loadi = layer.load(1, {
-    shade: 'shade' in options ? false : 0.9,
-    scrollbar: false
-  });
-
-  loadImage(data[start].src, function(img){
-    layer.close(dict.loadi);
-
-    //切换图片时不出现动画
-    if(key) options.anim = -1;
-
-    //弹出图片层
-    dict.index = layer.open($.extend({
-      type: 1,
-      id: 'layui-layer-photos',
-      area: function(){
-        var imgarea = [img.width, img.height];
-        var winarea = [$(window).width() - 100, $(window).height() - 100];
-
-        //如果 实际图片的宽或者高比 屏幕大（那么进行缩放）
-        if(!options.full && (imgarea[0]>winarea[0]||imgarea[1]>winarea[1])){
-          var wh = [imgarea[0]/winarea[0],imgarea[1]/winarea[1]];//取宽度缩放比例、高度缩放比例
-          if(wh[0] > wh[1]){//取缩放比例最大的进行缩放
-            imgarea[0] = imgarea[0]/wh[0];
-            imgarea[1] = imgarea[1]/wh[0];
-          } else if(wh[0] < wh[1]){
-            imgarea[0] = imgarea[0]/wh[1];
-            imgarea[1] = imgarea[1]/wh[1];
-          }
-        }
-
-        return [imgarea[0]+'px', imgarea[1]+'px'];
-      }(),
-      title: false,
-      shade: 0.9,
-      shadeClose: true,
-      closeBtn: false,
-      move: '.layui-layer-phimg img',
-      moveType: 1,
-      scrollbar: false,
-      moveOut: true,
-      anim: 5,
-      isOutAnim: false,
-      skin: 'layui-layer-photos' + skin('photos'),
-      content: '<div class="layui-layer-phimg">'
-        +'<img src="'+ data[start].src +'" alt="'+ (data[start].alt||'') +'" layer-pid="'+ data[start].pid +'">'
-        +function(){
-          if(data.length > 1){
-            return '<div class="layui-layer-imgsee">'
-              +'<span class="layui-layer-imguide"><a href="javascript:;" class="layui-layer-iconext layui-layer-imgprev"></a><a href="javascript:;" class="layui-layer-iconext layui-layer-imgnext"></a></span>'
-              +'<div class="layui-layer-imgbar" style="display:'+ (key ? 'block' : '') +'"><span class="layui-layer-imgtit"><a href="javascript:;">'+ (data[start].alt || '') +'</a><em>'+ dict.imgIndex +' / '+ data.length +'</em></span></div>'
-            +'</div>'
-          }
-          return '';
-        }()
-      +'</div>',
-      success: function(layero, index){
-        dict.bigimg = layero.find('.layui-layer-phimg');
-        dict.imgsee = layero.find('.layui-layer-imgbar');
-        dict.event(layero);
-        options.tab && options.tab(data[start], layero);
-        typeof success === 'function' && success(layero);
-      }, end: function(){
-        dict.end = true;
-        $(document).off('keyup', dict.keyup);
-      }
-    }, options));
-  }, function(){
-    layer.close(dict.loadi);
-    layer.msg('&#x5F53;&#x524D;&#x56FE;&#x7247;&#x5730;&#x5740;&#x5F02;&#x5E38;<br>&#x662F;&#x5426;&#x7EE7;&#x7EED;&#x67E5;&#x770B;&#x4E0B;&#x4E00;&#x5F20;&#xFF1F;', {
-      time: 30000,
-      btn: ['&#x4E0B;&#x4E00;&#x5F20;', '&#x4E0D;&#x770B;&#x4E86;'],
-      yes: function(){
-        data.length > 1 && dict.imgnext(true,true);
-      }
-    });
-  });
-};
-
-//主入口
-ready.run = function(_$){
-  $ = _$;
-  win = $(window);
-  doms.html = $('html');
-  layer.open = function(deliver){
-    var o = new Class(deliver);
-    return o.index;
-  };
-};
-
-//加载方式
-window.layui && layui.define ? (
-  layer.ready()
-  ,layui.define('jquery', function(exports){ //layui 加载
-    layer.path = layui.cache.dir;
-    ready.run(layui.$);
-
-    //暴露模块
-    window.layer = layer;
-    exports('layer', layer);
-  })
-) : (
-  (typeof define === 'function' && define.amd) ? define(['jquery'], function(){ //requirejs 加载
-    ready.run(window.jQuery);
-    return layer;
-  }) : function(){ //普通 script 标签加载
-    layer.ready();
-    ready.run(window.jQuery);
-  }()
-);
-
-}(window);
-
-
-
diff --git a/plugin/admin/public/libs/layer.old/src/mobile/README.md b/plugin/admin/public/libs/layer.old/src/mobile/README.md
deleted file mode 100644
index 1e217a7..0000000
--- a/plugin/admin/public/libs/layer.old/src/mobile/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-
-## layer mobile
-layer mobile是为移动设备（手机、平板等webkit内核浏览器/webview）量身定做的弹层支撑，采用Native JavaScript编写，完全独立于PC版的layer，您需要按照场景选择使用。
-
-[文档与演示](http://sentsin.com/layui/layer/)   
-
-1. 无需依赖任何库，只加载layer.m.js即可
-2. 小巧玲珑，性能卓越、柔情似水…
-3. 具备无以伦比的自适应功能
-4. 灵活的皮肤自定义支撑，充分确保弹层风格多样化
-5. 丰富、科学的接口，让弹弹弹层无所不能
-
-## 备注
-[官网](http://sentsin.com/layui/layer/)、[有问必答](http://say.sentsin.com/home-48.html)
diff --git a/plugin/admin/public/libs/layer.old/src/mobile/layer.js b/plugin/admin/public/libs/layer.old/src/mobile/layer.js
deleted file mode 100644
index 2311617..0000000
--- a/plugin/admin/public/libs/layer.old/src/mobile/layer.js
+++ /dev/null
@@ -1,207 +0,0 @@
-/*!
-
- @Name：layer mobile v2.0 弹层组件移动版
- @Author：贤心
- @License：MIT
-    
- */
-
-;!function(win){
-  
-"use strict";
-
-var doc = document, query = 'querySelectorAll', claname = 'getElementsByClassName', S = function(s){
-  return doc[query](s);
-};
-
-//默认配置
-var config = {
-  type: 0
-  ,shade: true
-  ,shadeClose: true
-  ,fixed: true
-  ,anim: 'scale' //默认动画类型
-};
-
-var ready = {
-  extend: function(obj){
-    var newobj = JSON.parse(JSON.stringify(config));
-    for(var i in obj){
-      newobj[i] = obj[i];
-    }
-    return newobj;
-  }, 
-  timer: {}, end: {}
-};
-
-//点触事件
-ready.touch = function(elem, fn){
-  elem.addEventListener('click', function(e){
-    fn.call(this, e);
-  }, false);
-};
-
-var index = 0, classs = ['layui-m-layer'], Layer = function(options){
-  var that = this;
-  that.config = ready.extend(options);
-  that.view();
-};
-
-Layer.prototype.view = function(){
-  var that = this, config = that.config, layerbox = doc.createElement('div');
-
-  that.id = layerbox.id = classs[0] + index;
-  layerbox.setAttribute('class', classs[0] + ' ' + classs[0]+(config.type || 0));
-  layerbox.setAttribute('index', index);
-  
-  //标题区域
-  var title = (function(){
-    var titype = typeof config.title === 'object';
-    return config.title
-    ? '<h3 style="'+ (titype ? config.title[1] : '') +'">'+ (titype ? config.title[0] : config.title)  +'</h3>'
-    : '';
-  }());
-  
-  //按钮区域
-  var button = (function(){
-    typeof config.btn === 'string' && (config.btn = [config.btn]);
-    var btns = (config.btn || []).length, btndom;
-    if(btns === 0 || !config.btn){
-      return '';
-    }
-    btndom = '<span yes type="1">'+ config.btn[0] +'</span>'
-    if(btns === 2){
-      btndom = '<span no type="0">'+ config.btn[1] +'</span>' + btndom;
-    }
-    return '<div class="layui-m-layerbtn">'+ btndom + '</div>';
-  }());
-  
-  if(!config.fixed){
-    config.top = config.hasOwnProperty('top') ?  config.top : 100;
-    config.style = config.style || '';
-    config.style += ' top:'+ ( doc.body.scrollTop + config.top) + 'px';
-  }
-  
-  if(config.type === 2){
-    config.content = '<i></i><i class="layui-m-layerload"></i><i></i><p>'+ (config.content||'') +'</p>';
-  }
-  
-  if(config.skin) config.anim = 'up';
-  if(config.skin === 'msg') config.shade = false;
-  
-  layerbox.innerHTML = (config.shade ? '<div '+ (typeof config.shade === 'string' ? 'style="'+ config.shade +'"' : '') +' class="layui-m-layershade"></div>' : '')
-  +'<div class="layui-m-layermain" '+ (!config.fixed ? 'style="position:static;"' : '') +'>'
-    +'<div class="layui-m-layersection">'
-      +'<div class="layui-m-layerchild '+ (config.skin ? 'layui-m-layer-' + config.skin + ' ' : '') + (config.className ? config.className : '') + ' ' + (config.anim ? 'layui-m-anim-' + config.anim : '') +'" ' + ( config.style ? 'style="'+config.style+'"' : '' ) +'>'
-        + title
-        +'<div class="layui-m-layercont">'+ config.content +'</div>'
-        + button
-      +'</div>'
-    +'</div>'
-  +'</div>';
-  
-  if(!config.type || config.type === 2){
-    var dialogs = doc[claname](classs[0] + config.type), dialen = dialogs.length;
-    if(dialen >= 1){
-      layer.close(dialogs[0].getAttribute('index'))
-    }
-  }
-  
-  document.body.appendChild(layerbox);
-  var elem = that.elem = S('#'+that.id)[0];
-  config.success && config.success(elem);
-  
-  that.index = index++;
-  that.action(config, elem);
-};
-
-Layer.prototype.action = function(config, elem){
-  var that = this;
-  
-  //自动关闭
-  if(config.time){
-    ready.timer[that.index] = setTimeout(function(){
-      layer.close(that.index);
-    }, config.time*1000);
-  }
-  
-  //确认取消
-  var btn = function(){
-    var type = this.getAttribute('type');
-    if(type == 0){
-      config.no && config.no();
-      layer.close(that.index);
-    } else {
-      config.yes ? config.yes(that.index) : layer.close(that.index);
-    }
-  };
-  if(config.btn){
-    var btns = elem[claname]('layui-m-layerbtn')[0].children, btnlen = btns.length;
-    for(var ii = 0; ii < btnlen; ii++){
-      ready.touch(btns[ii], btn);
-    }
-  }
-  
-  //点遮罩关闭
-  if(config.shade && config.shadeClose){
-    var shade = elem[claname]('layui-m-layershade')[0];
-    ready.touch(shade, function(){
-      layer.close(that.index, config.end);
-    });
-  }
-
-  config.end && (ready.end[that.index] = config.end);
-};
-
-win.layer = {
-  v: '2.0',
-  index: index,
-  
-  //核心方法
-  open: function(options){
-    var o = new Layer(options || {});
-    return o.index;
-  },
-  
-  close: function(index){
-    var ibox = S('#'+classs[0]+index)[0];
-    if(!ibox) return;
-    ibox.innerHTML = '';
-    doc.body.removeChild(ibox);
-    clearTimeout(ready.timer[index]);
-    delete ready.timer[index];
-    typeof ready.end[index] === 'function' && ready.end[index]();
-    delete ready.end[index];
-  },
-  
-  //关闭所有layer层
-  closeAll: function(){
-    var boxs = doc[claname](classs[0]);
-    for(var i = 0, len = boxs.length; i < len; i++){
-      layer.close((boxs[0].getAttribute('index')|0));
-    }
-  }
-};
-
-'function' == typeof define ? define(function() {
-  return layer;
-}) : function(){
-  
-  var js = document.scripts, script = js[js.length - 1], jsPath = script.src;
-  var path = jsPath.substring(0, jsPath.lastIndexOf("/") + 1);
-  
-  //如果合并方式，则需要单独引入layer.css
-  if(script.getAttribute('merge')) return; 
-  
-  document.head.appendChild(function(){
-    var link = doc.createElement('link');
-    link.href = path + 'need/layer.css?2.0';
-    link.type = 'text/css';
-    link.rel = 'styleSheet'
-    link.id = 'layermcss';
-    return link;
-  }());
-  
-}();
-
-}(window);
\ No newline at end of file
diff --git a/plugin/admin/public/libs/layer.old/src/mobile/need/layer.css b/plugin/admin/public/libs/layer.old/src/mobile/need/layer.css
deleted file mode 100644
index c8b32e0..0000000
--- a/plugin/admin/public/libs/layer.old/src/mobile/need/layer.css
+++ /dev/null
@@ -1,87 +0,0 @@
-
-/* 
-  layer mobile
-*/
-
-.layui-m-layer{position:relative; z-index: 19891014;}
-.layui-m-layer *{-webkit-box-sizing: content-box; -moz-box-sizing: content-box; box-sizing: content-box;}
-.layui-m-layershade,
-.layui-m-layermain{position:fixed; left:0; top:0; width:100%; height:100%;}
-.layui-m-layershade{background-color:rgba(0,0,0, .7); pointer-events:auto;}
-.layui-m-layermain{display:table; font-family: Helvetica, arial, sans-serif; pointer-events: none;}
-.layui-m-layermain .layui-m-layersection{display:table-cell; vertical-align:middle; text-align:center;}
-.layui-m-layerchild{position:relative; display:inline-block; text-align:left; background-color:#fff; font-size:14px; border-radius: 5px; box-shadow: 0 0 8px rgba(0, 0, 0, 0.1);  pointer-events:auto;  -webkit-overflow-scrolling: touch;}
-.layui-m-layerchild{-webkit-animation-fill-mode: both; animation-fill-mode: both; -webkit-animation-duration: .2s; animation-duration: .2s;}
-
-
-/* 弹出动画 */
-@-webkit-keyframes layui-m-anim-scale { /* 默认 */
-	0% {opacity: 0; -webkit-transform: scale(.5); transform: scale(.5)}
-	100% {opacity: 1; -webkit-transform: scale(1); transform: scale(1)}
-}
-@keyframes layui-m-anim-scale { /* 默认 */
-	0% {opacity: 0; -webkit-transform: scale(.5); transform: scale(.5)}
-	100% {opacity: 1; -webkit-transform: scale(1); transform: scale(1)}
-}
-.layui-m-anim-scale{animation-name:  layui-m-anim-scale; -webkit-animation-name:  layui-m-anim-scale;}
-
-@-webkit-keyframes layui-m-anim-up{
-  0%{opacity: 0; -webkit-transform: translateY(800px); transform: translateY(800px)}
-  100%{opacity: 1; -webkit-transform: translateY(0); transform: translateY(0)}
-}
-@keyframes layui-m-anim-up{
-  0%{opacity: 0; -webkit-transform: translateY(800px); transform: translateY(800px)}
-  100%{opacity: 1; -webkit-transform: translateY(0); transform: translateY(0)}
-}
-.layui-m-anim-up{-webkit-animation-name: layui-m-anim-up;animation-name: layui-m-anim-up}
-
-
-.layui-m-layer0 .layui-m-layerchild{width: 90%; max-width: 640px;}
-.layui-m-layer1 .layui-m-layerchild{border:none; border-radius:0;}
-.layui-m-layer2 .layui-m-layerchild{width:auto; max-width:260px; min-width:40px; border:none; background: none; box-shadow: none; color:#fff;}
-.layui-m-layerchild h3{padding: 0 10px; height: 60px; line-height: 60px; font-size:16px; font-weight: 400;  border-radius: 5px 5px 0 0; text-align: center;}
-.layui-m-layerchild h3,
-.layui-m-layerbtn span{ text-overflow:ellipsis; overflow:hidden; white-space:nowrap;}
-.layui-m-layercont{padding: 50px 30px; line-height: 22px; text-align:center;}
-.layui-m-layer1 .layui-m-layercont{padding:0; text-align:left;}
-.layui-m-layer2 .layui-m-layercont{text-align:center; padding: 0; line-height: 0;}
-.layui-m-layer2 .layui-m-layercont i{width:25px; height:25px; margin-left:8px; display:inline-block; background-color:#fff; border-radius:100%;}
-.layui-m-layer2 .layui-m-layercont p{margin-top: 20px;}
-
-/* loading */
-@-webkit-keyframes layui-m-anim-loading{
-    0%,80%,100%{transform:scale(0); -webkit-transform:scale(0)}
-    40%{transform:scale(1); -webkit-transform:scale(1)}
-}
-@keyframes layui-m-anim-loading{
-    0%,80%,100%{transform:scale(0); -webkit-transform:scale(0)}
-    40%{transform:scale(1); -webkit-transform:scale(1)}
-}
-.layui-m-layer2 .layui-m-layercont i{-webkit-animation: layui-m-anim-loading 1.4s infinite ease-in-out; animation: layui-m-anim-loading 1.4s infinite ease-in-out; -webkit-animation-fill-mode: both; animation-fill-mode: both;}
-
-.layui-m-layer2 .layui-m-layercont i:first-child{margin-left:0; -webkit-animation-delay: -.32s; animation-delay: -.32s;}
-.layui-m-layer2 .layui-m-layercont i.layui-m-layerload{-webkit-animation-delay: -.16s; animation-delay: -.16s;}
-.layui-m-layer2 .layui-m-layercont>div{line-height:22px; padding-top:7px; margin-bottom:20px; font-size: 14px;}
-.layui-m-layerbtn{display: box; display: -moz-box; display: -webkit-box; width: 100%; position:relative; height: 50px; line-height: 50px; font-size: 0; text-align:center;  border-top:1px solid #D0D0D0; background-color: #F2F2F2; border-radius: 0 0 5px 5px;}
-.layui-m-layerbtn span{position:relative; display: block; -moz-box-flex: 1; box-flex: 1; -webkit-box-flex: 1;  text-align:center; font-size:14px; border-radius: 0 0 5px 5px; cursor:pointer;}
-.layui-m-layerbtn span[yes]{color: #40AFFE;}
-.layui-m-layerbtn span[no]{border-right: 1px solid #D0D0D0; border-radius: 0 0 0 5px;}
-.layui-m-layerbtn span:active{background-color: #F6F6F6;}
-.layui-m-layerend{position:absolute; right:7px; top:10px; width:30px; height:30px; border: 0; font-weight:400; background: transparent; cursor: pointer; -webkit-appearance: none; font-size:30px;}
-.layui-m-layerend::before, .layui-m-layerend::after{position:absolute; left:5px; top:15px; content:''; width:18px; height:1px; background-color:#999; transform:rotate(45deg); -webkit-transform:rotate(45deg); border-radius: 3px;}
-.layui-m-layerend::after{transform:rotate(-45deg);  -webkit-transform:rotate(-45deg);}
-
-/* 底部对话框风格 */
-body .layui-m-layer .layui-m-layer-footer{position: fixed; width: 95%; max-width: 100%; margin: 0 auto; left:0; right: 0; bottom: 10px; background: none;}
-.layui-m-layer-footer .layui-m-layercont{padding: 20px; border-radius: 5px 5px 0 0; background-color: rgba(255,255,255,.8);}
-.layui-m-layer-footer .layui-m-layerbtn{display: block; height: auto; background: none; border-top: none;}
-.layui-m-layer-footer .layui-m-layerbtn span{background-color: rgba(255,255,255,.8);}
-.layui-m-layer-footer .layui-m-layerbtn span[no]{color: #FD482C; border-top: 1px solid #c2c2c2; border-radius: 0 0 5px 5px;}
-.layui-m-layer-footer .layui-m-layerbtn span[yes]{margin-top: 10px; border-radius: 5px;}
-
-/* 通用提示 */
-body .layui-m-layer .layui-m-layer-msg{width: auto; max-width: 90%; margin: 0 auto; bottom: -150px; background-color: rgba(0,0,0,.7); color: #fff;}
-.layui-m-layer-msg .layui-m-layercont{padding: 10px 20px;}
-
-
-
diff --git a/plugin/admin/public/libs/layer.old/src/theme/default/icon-ext.png b/plugin/admin/public/libs/layer.old/src/theme/default/icon-ext.png
deleted file mode 100644
index bbbb669..0000000
Binary files a/plugin/admin/public/libs/layer.old/src/theme/default/icon-ext.png and /dev/null differ
diff --git a/plugin/admin/public/libs/layer.old/src/theme/default/icon.png b/plugin/admin/public/libs/layer.old/src/theme/default/icon.png
deleted file mode 100644
index 3e17da8..0000000
Binary files a/plugin/admin/public/libs/layer.old/src/theme/default/icon.png and /dev/null differ
diff --git a/plugin/admin/public/libs/layer.old/src/theme/default/layer.css b/plugin/admin/public/libs/layer.old/src/theme/default/layer.css
deleted file mode 100644
index 110e9f9..0000000
--- a/plugin/admin/public/libs/layer.old/src/theme/default/layer.css
+++ /dev/null
@@ -1,182 +0,0 @@
-/**
-
- @Name: layer
-
- **/
-
-/* *html{background-image: url(about:blank); background-attachment: fixed;} */
-html #layuicss-layer{display: none; position: absolute; width: 1989px;}
-
-html[layer-full]{height:inherit}
-
-/* common */
-.layui-layer-shade, .layui-layer{position:fixed; _position:absolute; pointer-events: auto;}
-.layui-layer-shade{top:0; left:0; width:100%; height:100%; _height:expression(document.body.offsetHeight+"px");}
-.layui-layer{-webkit-overflow-scrolling: touch;}
-.layui-layer{top:150px; left: 0; margin:0; padding:0; background-color:#fff; -webkit-background-clip: content; border-radius: 2px; box-shadow: 1px 1px 50px rgba(0,0,0,.3);}
-.layui-layer-close{position:absolute;}
-.layui-layer-content{position:relative;}
-.layui-layer-border{border: 1px solid #B2B2B2; border: 1px solid rgba(0,0,0,.1); box-shadow: 1px 1px 5px rgba(0,0,0,.2);}
-.layui-layer-load{background:url(loading-1.gif) #eee center center no-repeat;}
-.layui-layer-ico{ background:url(icon.png) no-repeat;}
-.layui-layer-dialog .layui-layer-ico,
-.layui-layer-setwin a,
-.layui-layer-btn a{display:inline-block; *display:inline; *zoom:1; vertical-align:top;}
-
-.layui-layer-move{display: none; position: fixed; *position: absolute; left: 0px; top: 0px; width: 100%; height: 100%; cursor: move; opacity: 0; filter:alpha(opacity=0); background-color: #fff; z-index: 2147483647;}
-.layui-layer-resize{position: absolute; width: 15px; height: 15px; right: 0; bottom: 0; cursor: se-resize;}
-.layui-layer-confirm{position: absolute; width: 1px; height: 1px; left: 0; bottom: 0; border:none; background:transparent;}
-
-/* 动画 */
-.layer-anim{-webkit-animation-fill-mode: both; animation-fill-mode: both; -webkit-animation-duration:.3s; animation-duration:.3s;}
-
-@-webkit-keyframes layer-bounceIn { /* 默认 */
-	0% {opacity: 0; -webkit-transform: scale(.5); transform: scale(.5)}
-	100% {opacity: 1; -webkit-transform: scale(1); transform: scale(1)}
-}
-@keyframes layer-bounceIn {
-	0% {opacity: 0; -webkit-transform: scale(.5); -ms-transform: scale(.5); transform: scale(.5)}
-	100% {opacity: 1; -webkit-transform: scale(1); -ms-transform: scale(1); transform: scale(1)}
-}
-.layer-anim-00{-webkit-animation-name: layer-bounceIn;animation-name: layer-bounceIn}
-
-@-webkit-keyframes layer-zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes layer-zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);-ms-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);-ms-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layer-anim-01{-webkit-animation-name:layer-zoomInDown;animation-name:layer-zoomInDown}
-
-@-webkit-keyframes layer-fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}@keyframes layer-fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);-ms-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);-ms-transform:translateY(0);transform:translateY(0)}}.layer-anim-02{-webkit-animation-name:layer-fadeInUpBig;animation-name:layer-fadeInUpBig}
-
-@-webkit-keyframes layer-zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes layer-zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);-ms-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);-ms-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layer-anim-03{-webkit-animation-name:layer-zoomInLeft;animation-name:layer-zoomInLeft}
-
-@-webkit-keyframes layer-rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0px) rotate(0deg);transform:translateX(0px) rotate(0deg)}}@keyframes layer-rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);-ms-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0px) rotate(0deg);-ms-transform:translateX(0px) rotate(0deg);transform:translateX(0px) rotate(0deg)}}.layer-anim-04{-webkit-animation-name:layer-rollIn;animation-name:layer-rollIn}
-
-@keyframes layer-fadeIn{0%{opacity:0}100%{opacity:1}}.layer-anim-05{-webkit-animation-name:layer-fadeIn;animation-name:layer-fadeIn}
-
-@-webkit-keyframes layer-shake{0%,100%{-webkit-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);transform:translateX(10px)}}@keyframes layer-shake{0%,100%{-webkit-transform:translateX(0);-ms-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);-ms-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);-ms-transform:translateX(10px);transform:translateX(10px)}}.layer-anim-06{-webkit-animation-name:layer-shake;animation-name:layer-shake}@-webkit-keyframes fadeIn{0%{opacity:0}100%{opacity:1}}
-
-/* 标题栏 */
-.layui-layer-title{padding:0 80px 0 20px; height: 50px; line-height: 50px; border-bottom:1px solid #F0F0F0; font-size: 14px; color:#333; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; border-radius: 2px 2px 0 0;}
-.layui-layer-setwin{position:absolute; right: 15px; *right:0; top: 17px; font-size:0; line-height: initial;}
-.layui-layer-setwin a{position:relative; width: 16px; height:16px; margin-left:10px; font-size:12px; _overflow:hidden;}
-.layui-layer-setwin .layui-layer-min cite{position:absolute; width:14px; height:2px; left:0; top:50%; margin-top:-1px; background-color:#2E2D3C; cursor:pointer; _overflow:hidden;}
-.layui-layer-setwin .layui-layer-min:hover cite{background-color:#2D93CA; }
-.layui-layer-setwin .layui-layer-max{background-position:-32px -40px;}
-.layui-layer-setwin .layui-layer-max:hover{background-position:-16px -40px;}
-.layui-layer-setwin .layui-layer-maxmin{background-position:-65px -40px;}
-.layui-layer-setwin .layui-layer-maxmin:hover{background-position:-49px -40px;}
-.layui-layer-setwin .layui-layer-close1{background-position: 1px -40px; cursor: pointer;}
-.layui-layer-setwin .layui-layer-close1:hover{opacity:0.7;}
-.layui-layer-setwin .layui-layer-close2{position:absolute; right:-28px; top:-28px; width:30px; height:30px;  margin-left:0; background-position:-149px -31px; *right:-18px; _display:none;}
-.layui-layer-setwin .layui-layer-close2:hover{ background-position:-180px -31px;}
-
-/* 按钮栏 */
-.layui-layer-btn{text-align: right; padding: 0 15px 12px; pointer-events: auto; user-select: none; -webkit-user-select: none;}
-.layui-layer-btn a{height: 28px; line-height: 28px; margin: 5px 5px 0; padding: 0 15px; border: 1px solid #dedede; background-color:#fff; color: #333; border-radius: 2px; font-weight:400; cursor:pointer; text-decoration: none;}
-.layui-layer-btn a:hover{opacity: 0.9; text-decoration: none;}
-.layui-layer-btn a:active{opacity: 0.8;}
-.layui-layer-btn .layui-layer-btn0{border-color: #1E9FFF; background-color: #1E9FFF; color:#fff;}
-.layui-layer-btn-l{text-align: left;}
-.layui-layer-btn-c{text-align: center;}
-
-/* 定制化 */
-.layui-layer-dialog{min-width: 300px;}
-.layui-layer-dialog .layui-layer-content{position: relative; padding:20px; line-height:24px; word-break: break-all; overflow:hidden; font-size:14px; overflow-x: hidden; overflow-y:auto;}
-.layui-layer-dialog .layui-layer-content .layui-layer-ico{position:absolute; top:16px; left:15px; _left:-40px; width:30px; height:30px;}
-.layui-layer-ico1{background-position:-30px 0 }
-.layui-layer-ico2{background-position:-60px 0;}
-.layui-layer-ico3{background-position:-90px 0;}
-.layui-layer-ico4{background-position:-120px 0;}
-.layui-layer-ico5{background-position:-150px 0;}
-.layui-layer-ico6{background-position:-180px 0;}
-.layui-layer-rim{border:6px solid #8D8D8D; border:6px solid rgba(0,0,0,.3); border-radius:5px; box-shadow: none;}
-.layui-layer-msg{min-width:180px; border:1px solid #D3D4D3; box-shadow: none;}
-.layui-layer-hui{min-width:100px;  background-color: #000; filter:alpha(opacity=60); background-color: rgba(0,0,0,0.6); color: #fff; border:none;}
-.layui-layer-hui .layui-layer-content{padding:12px 25px; text-align:center;}
-.layui-layer-dialog .layui-layer-padding{padding: 20px 20px 20px 55px; text-align: left;}
-.layui-layer-page .layui-layer-content{position:relative; overflow:auto;}
-.layui-layer-page .layui-layer-btn,.layui-layer-iframe .layui-layer-btn{padding-top:10px;}
-.layui-layer-nobg{background:none;}
-.layui-layer-iframe iframe{display: block; width: 100%;}
-
-.layui-layer-loading{border-radius:100%; background:none;  box-shadow:none;  border:none;}
-.layui-layer-loading .layui-layer-content{width:60px; height:24px; background:url(loading-0.gif) no-repeat;}
-.layui-layer-loading .layui-layer-loading1{width:37px; height:37px; background:url(loading-1.gif) no-repeat;}
-.layui-layer-loading .layui-layer-loading2, .layui-layer-ico16{width:32px; height:32px; background:url(loading-2.gif) no-repeat;}
-.layui-layer-tips{background: none; box-shadow:none; border:none;}
-.layui-layer-tips .layui-layer-content{position: relative; line-height: 22px; min-width: 12px; padding: 8px 15px; font-size: 12px; _float:left; border-radius: 2px; box-shadow: 1px 1px 3px rgba(0,0,0,.2); background-color: #000; color: #fff;}
-.layui-layer-tips .layui-layer-close{right:-2px; top:-1px;}
-.layui-layer-tips i.layui-layer-TipsG{ position:absolute;  width:0; height:0; border-width:8px; border-color:transparent; border-style:dashed; *overflow:hidden;}
-.layui-layer-tips i.layui-layer-TipsT, .layui-layer-tips i.layui-layer-TipsB{left:5px; border-right-style:solid; border-right-color: #000;}
-.layui-layer-tips i.layui-layer-TipsT{bottom:-8px;}
-.layui-layer-tips i.layui-layer-TipsB{top:-8px;}
-.layui-layer-tips i.layui-layer-TipsR, .layui-layer-tips i.layui-layer-TipsL{top: 5px; border-bottom-style:solid; border-bottom-color: #000;}
-.layui-layer-tips i.layui-layer-TipsR{left:-8px;}
-.layui-layer-tips i.layui-layer-TipsL{right:-8px;}
-
-/* skin */
-.layui-layer-lan[type="dialog"]{min-width:280px;}
-.layui-layer-lan .layui-layer-title{background:#4476A7; color:#fff; border: none;}
-.layui-layer-lan .layui-layer-btn{padding: 5px 10px 10px; text-align: right; border-top:1px solid #E9E7E7}
-.layui-layer-lan .layui-layer-btn a{background: #fff; border-color: #E9E7E7; color: #333;}
-.layui-layer-lan .layui-layer-btn .layui-layer-btn1{background:#C9C5C5;}
-.layui-layer-molv .layui-layer-title{background: #009f95; color:#fff; border: none;}
-.layui-layer-molv .layui-layer-btn a{background: #009f95; border-color: #009f95;}
-.layui-layer-molv .layui-layer-btn .layui-layer-btn1{background:#92B8B1;}
-
-
-/**
-
- @Name: layer拓展样式
-
- */
-
-.layui-layer-iconext{background:url(icon-ext.png) no-repeat;}
-
-/* prompt模式 */
-.layui-layer-prompt .layui-layer-input{display: block; width: 260px; height: 36px; margin: 0 auto; line-height: 30px; padding-left: 10px; border: 1px solid #e6e6e6; color: #333;}
-.layui-layer-prompt textarea.layui-layer-input{width: 300px; height: 100px; line-height: 20px; padding: 6px 10px;}
-.layui-layer-prompt .layui-layer-content{padding: 20px;}
-.layui-layer-prompt .layui-layer-btn{padding-top: 0;}
-
-/* tab模式 */
-.layui-layer-tab{box-shadow:1px 1px 50px rgba(0,0,0,.4);}
-.layui-layer-tab .layui-layer-title{padding-left:0; overflow: visible;}
-.layui-layer-tab .layui-layer-title span{position:relative; float:left; min-width:80px; max-width: 300px; padding:0 20px; text-align:center; cursor:default; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; cursor: pointer;}
-.layui-layer-tab .layui-layer-title span.layui-this{height: 51px; border-left: 1px solid #eee; border-right: 1px solid #eee; background-color: #fff; z-index: 10;}
-.layui-layer-tab .layui-layer-title span:first-child{border-left:none;}
-.layui-layer-tabmain{line-height:24px; clear:both;}
-.layui-layer-tabmain .layui-layer-tabli{display:none;}
-.layui-layer-tabmain .layui-layer-tabli.layui-this{display: block;}
-
-/* photo模式 */
-.layui-layer-photos{background: none; box-shadow: none;}
-.layui-layer-photos .layui-layer-content{overflow:visible; text-align: center;}
-.layui-layer-photos .layui-layer-phimg img{position: relative; width:100%; display: inline-block; *display:inline; *zoom:1; vertical-align:top;}
-.layui-layer-imgprev, .layui-layer-imgnext{position: fixed; top: 50%; width: 27px; _width: 44px; height: 44px;  margin-top:-22px; outline:none;blr:expression(this.onFocus=this.blur());}
-.layui-layer-imgprev{left: 30px; background-position:-5px -5px; _background-position:-70px -5px;}
-.layui-layer-imgprev:hover{background-position:-33px -5px; _background-position:-120px -5px;}
-.layui-layer-imgnext{right: 30px; _right:8px; background-position:-5px -50px; _background-position:-70px -50px;}
-.layui-layer-imgnext:hover{background-position: -33px -50px; _background-position: -120px -50px;}
-.layui-layer-imgbar{position: fixed; left:0; right: 0; bottom:0; width:100%; height: 40px; line-height: 40px; background-color:#000\9; filter:Alpha(opacity=60); background-color: rgba(2,0,0,.35); color: #fff; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; font-size:0;}
-.layui-layer-imgtit{/*position:absolute; left:20px;*/}
-.layui-layer-imgtit *{display:inline-block; *display:inline; *zoom:1; vertical-align:top; font-size:12px;}
-.layui-layer-imgtit a{max-width:65%;  text-overflow: ellipsis; overflow: hidden; white-space: nowrap; color:#fff;}
-.layui-layer-imgtit a:hover{color:#fff; text-decoration:underline;}
-.layui-layer-imgtit em{padding-left:10px; font-style: normal;}
-
-/* 关闭动画 */
-@-webkit-keyframes layer-bounceOut {
-  100% {opacity: 0; -webkit-transform: scale(.7); transform: scale(.7)}
-  30% {-webkit-transform: scale(1.05); transform: scale(1.05)}
-  0% {-webkit-transform: scale(1); transform: scale(1);}
-}
-@keyframes layer-bounceOut {
-  100% {opacity: 0; -webkit-transform: scale(.7); -ms-transform: scale(.7); transform: scale(.7);}
-  30% {-webkit-transform: scale(1.05); -ms-transform: scale(1.05); transform: scale(1.05);}
-  0% {-webkit-transform: scale(1); -ms-transform: scale(1);transform: scale(1);}
-}
-.layer-anim-close{-webkit-animation-name: layer-bounceOut; animation-name: layer-bounceOut; -webkit-animation-fill-mode: both; animation-fill-mode: both; -webkit-animation-duration:.2s; animation-duration:.2s;}
-
-@media screen and (max-width: 1100px) {
-  .layui-layer-iframe{overflow-y: auto; -webkit-overflow-scrolling: touch;}
-}
-
-
diff --git a/plugin/admin/public/libs/layer.old/src/theme/default/loading-0.gif b/plugin/admin/public/libs/layer.old/src/theme/default/loading-0.gif
deleted file mode 100644
index 6f3c953..0000000
Binary files a/plugin/admin/public/libs/layer.old/src/theme/default/loading-0.gif and /dev/null differ
diff --git a/plugin/admin/public/libs/layer.old/src/theme/default/loading-1.gif b/plugin/admin/public/libs/layer.old/src/theme/default/loading-1.gif
deleted file mode 100644
index db3a483..0000000
Binary files a/plugin/admin/public/libs/layer.old/src/theme/default/loading-1.gif and /dev/null differ
diff --git a/plugin/admin/public/libs/layer.old/src/theme/default/loading-2.gif b/plugin/admin/public/libs/layer.old/src/theme/default/loading-2.gif
deleted file mode 100644
index 5bb90fd..0000000
Binary files a/plugin/admin/public/libs/layer.old/src/theme/default/loading-2.gif and /dev/null differ
diff --git a/plugin/admin/public/libs/layer.old/src/theme/moon/default.png b/plugin/admin/public/libs/layer.old/src/theme/moon/default.png
deleted file mode 100644
index 77dfaf3..0000000
Binary files a/plugin/admin/public/libs/layer.old/src/theme/moon/default.png and /dev/null differ
diff --git a/plugin/admin/public/libs/layer.old/src/theme/moon/style.css b/plugin/admin/public/libs/layer.old/src/theme/moon/style.css
deleted file mode 100644
index e8264ce..0000000
--- a/plugin/admin/public/libs/layer.old/src/theme/moon/style.css
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * layer皮肤
- *
- */
-
-html #layui_layer_skinmoonstylecss {
-	display: none;
-	position: absolute;
-	width: 1989px;
-}
-
-body .layer-ext-moon[type="dialog"] {
-	min-width: 320px;
-}
-body .layer-ext-moon-msg[type="dialog"]{min-width:200px;}
-body .layer-ext-moon .layui-layer-title {
-	background: #f6f6f6;
-	color: #212a31;
-	font-size: 16px;
-	font-weight: bold;
-	height: 46px;
-	line-height: 46px;
-    border-bottom: 1px solid #D5D5D5;
-}
-
-
-
-body .layer-ext-moon .layui-layer-content .layui-layer-ico {
-	height: 32px;
-	width: 32px;
-	top:18.5px;
-}
-body .layer-ext-moon .layui-layer-ico0 {
-	background: url(default.png) no-repeat -96px 0;
-	;
-}
-body .layer-ext-moon .layui-layer-ico1 {
-	background: url(default.png) no-repeat -224px 0;
-	;
-}
-body .layer-ext-moon .layui-layer-ico2 {
-	background: url(default.png) no-repeat -192px 0;
-}
-body .layer-ext-moon .layui-layer-ico3 {
-	background: url(default.png) no-repeat -160px 0;
-}
-body .layer-ext-moon .layui-layer-ico4 {
-	background: url(default.png) no-repeat -320px 0;
-}
-body .layer-ext-moon .layui-layer-ico5 {
-	background: url(default.png) no-repeat -288px 0;
-}
-body .layer-ext-moon .layui-layer-ico6 {
-	background: url(default.png) -256px 0;
-}
-body .layer-ext-moon .layui-layer-ico7 {
-	background: url(default.png) no-repeat -128px 0;
-}
-body .layer-ext-moon .layui-layer-setwin {
-	top: 15px;
-	right: 15px;
-}
-body .layer-ext-moon .layui-layer-setwin a {
-	width: 16px;
-	height: 16px;
-}
-body .layer-ext-moon .layui-layer-setwin .layui-layer-min cite:hover {
-	background-color: #56abe4;
-}
-body .layer-ext-moon .layui-layer-setwin .layui-layer-max {
-	background: url(default.png) no-repeat -80px 0;
-}
-body .layer-ext-moon .layui-layer-setwin .layui-layer-max:hover {
-	background: url(default.png) no-repeat -64px 0;
-}
-body .layer-ext-moon .layui-layer-setwin .layui-layer-maxmin {
-	background: url(default.png) no-repeat -32px 0;
-}
-body .layer-ext-moon .layui-layer-setwin .layui-layer-maxmin:hover {
-	background: url(default.png) no-repeat -16px 0;
-}
-body .layer-ext-moon .layui-layer-setwin .layui-layer-close1,body .layer-ext-moon .layui-layer-setwin .layui-layer-close2 {
-	background: url(default.png) 0 0;
-}
-body .layer-ext-moon .layui-layer-setwin .layui-layer-close1:hover,body .layer-ext-moon .layui-layer-setwin .layui-layer-close2:hover {
-	background: url(default.png) -48px 0;
-}
-body .layer-ext-moon .layui-layer-padding{padding-top: 24px;}
-body .layer-ext-moon .layui-layer-btn {
-    text-align: center;
-	padding-top: 15px;
-    padding-bottom:15px;
-	background: #f0f4f7;
-	border-top: 1px #c7c7c7 solid;
-}
-body .layer-ext-moon .layui-layer-btn a {
-	font-size: 12px;
-	font-weight: normal;
-	margin: 0 3px;
-	margin-right: 7px;
-	margin-left: 7px;
-	padding: 6px 20px;
-	color: #fff;
-	border: 1px solid #0064b6;
-	background: #0071ce;
-	border-radius: 3px;
-	display: inline-block;
-	height: 20px;
-	line-height: 20px;
-	text-align: center;
-	vertical-align: middle;
-	background-repeat: no-repeat;
-	text-decoration: none;
-	outline: none;
-}
-body .layer-ext-moon .layui-layer-btn .layui-layer-btn0 {
-	background: #0071ce;
-}
-body .layer-ext-moon .layui-layer-btn .layui-layer-btn1 {
-	background: #fff;
-	color: #404a58;
-	border: 1px solid #c0c4cd;
-	border-radius: 3px;
-}
-body .layer-ext-moon .layui-layer-btn .layui-layer-btn2 {
-	background: #f60;
-	color: #fff;
-	border: 1px solid #f60;
-	border-radius: 3px;
-}
-body .layer-ext-moon .layui-layer-btn .layui-layer-btn3 {
-	background: #f00;
-	color: #fff;
-	border: 1px solid #f00;
-	border-radius: 3px;
-}
-
-body .layer-ext-moon .layui-layer-title span.layui-layer-tabnow{
-	height:47px;
-}
diff --git a/plugin/admin/public/libs/layer.old/test/demo.html b/plugin/admin/public/libs/layer.old/test/demo.html
deleted file mode 100644
index d091df1..0000000
--- a/plugin/admin/public/libs/layer.old/test/demo.html
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>layer-更懂你的web弹窗解决方案</title>
-
-  <style>
-  html{background-color:#E3E3E3; font-size:14px; color:#000; font-family:'微软雅黑'}
-  a,a:hover{ text-decoration:none;}
-  pre{font-family:'微软雅黑'}
-  .box{padding:20px; background-color:#fff; margin:50px 100px; border-radius:5px;}
-  .box a{padding-right:15px;}
-  #about_hide{display:none}
-  .layer_text{background-color:#fff; padding:20px;}
-  .layer_text p{margin-bottom: 10px; text-indent: 2em; line-height: 23px;}
-  .button{display:inline-block; *display:inline; *zoom:1; line-height:30px; padding:0 20px; background-color:#56B4DC; color:#fff; font-size:14px; border-radius:3px; cursor:pointer; font-weight:normal;}
-  .photos-demo img{width:200px;}
-  </style>
-  
-  <script src="http://cdn.bootcss.com/jquery/1.12.3/jquery.min.js"></script>
-  <script src="../dist/layer.js"></script>
-</head>
-<body>
-<div class="box">
-<pre>
- @Name：layer
- @Version：v<script>document.write(layer.v)</script>
- @Description：通用 Web 弹层组件
-
-
-<strong>【注意事项】</strong>
-一、使用时，请把文件夹 layer 整个放置在您站点的任何一个目录，只需引入 layer.js 即可，除 jQuery 外，其它文件无需再引入。
-二、如果您的 js 引入是通过合并处理或者您不想采用layer自动获取的绝对路径，您可以通过 layer.config() 来配置（详见官网 API 页）
-三、jQuery 需 1.8+
-四、更多使用说明与演示，请参见 layer 官网。
-五、使用时请务必保留来源，请勿用于违反我国法律法规的 Web 平台。
-六、layer 是一款无偿的公益性项目，遵循 MIT 开源协议。
-</pre>
-</div>
-
-<div class="box" style="text-align:center">
-  <a href="http://layer.layui.com/" target="_blank">更多示例</a>
-  <a href="http://www.layui.com/doc/modules/layer.html" target="_blank">使用文档</a>
-  <a href="javascript:;" id="about">关于</a>
-</div>
-
-<script>
-;!function(){
-
-
-//页面一打开就执行，放入ready是为了layer所需配件（css、扩展模块）加载完毕
-layer.ready(function(){ 
-  layer.open({
-    type: 2,
-    title: '欢迎页',
-    maxmin: true,
-    area: ['800px', '500px'],
-    content: 'http://layer.layui.com/test/welcome.html',
-    end: function(){
-      layer.tips('Hi', '#about', {tips: 1})
-    }
-  });
-});
-
-//关于
-$('#about').on('click', function(){
-  layer.alert('layui 出品');
-});
-
-}();
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/plugin/admin/public/libs/require-form.js b/plugin/admin/public/libs/require-form.js
index f5f1a7b..821f343 100644
--- a/plugin/admin/public/libs/require-form.js
+++ b/plugin/admin/public/libs/require-form.js
@@ -243,7 +243,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator'], function ($, undefined, U
                         var admin_id = $(this).data("admin-id") ? $(this).data("admin-id") : '';
                         var user_id = $(this).data("user-id") ? $(this).data("user-id") : '';
                         mimetype = mimetype.replace(/\/\*/ig, '/');
-                        var url = $(this).data("url") ? $(this).data("url") : "/app/admin/attachment/list";
+                        var url = $(this).data("url") ? $(this).data("url") : Config.admin_path+"/files/list";
                         parent.Fast.api.open(url + "?element_id=" + $(this).attr("id") + "&multiple=" + multiple + "&mimetype=" + mimetype + "&admin_id=" + admin_id + "&user_id=" + user_id, __('Choose'), {
                             callback: function (data) {
                                 var button = $("#" + $(that).attr("id"));
@@ -607,7 +607,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator'], function ($, undefined, U
             editor:function(form){
                 if ($("[data-role='editor']", form).length > 0) {
                     require(['froala-editor','froala_lang/zh_cn'], function (FroalaEditor) {
-                        var uploadUrl = '/app/admin/attachment/feupload';
+                        var uploadUrl = Config.admin_path+'/files/feupload';
                         new FroalaEditor('[data-role=editor]',{
                             height:500,
                             language: 'zh_cn',
@@ -732,7 +732,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator'], function ($, undefined, U
                             imageManagerScrollOffset: 10,
 
                             // Set the load images request URL.
-                            imageManagerLoadURL: "/app/admin/attachment/list",
+                            imageManagerLoadURL: Config.admin_path+"/files/list",
 
                             // Set the load images request type.
                             imageManagerLoadMethod: "GET",
@@ -741,7 +741,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator'], function ($, undefined, U
                             imageManagerLoadParams: {user_id: 4219762},
 
                             // Set the delete image request URL.
-                            imageManagerDeleteURL: "/app/admin/attachment/delete",
+                            imageManagerDeleteURL: Config.admin_path+"/files/delete",
 
                             // Set the delete image request type.
                             imageManagerDeleteMethod: "DELETE",
diff --git a/plugin/admin/public/libs/require-table.js b/plugin/admin/public/libs/require-table.js
index 2d200bb..37797dc 100644
--- a/plugin/admin/public/libs/require-table.js
+++ b/plugin/admin/public/libs/require-table.js
@@ -123,7 +123,7 @@ define(['jquery', 'bootstrap', 'moment', 'bootstrap-table', 'bootstrap-table-lan
                 name: 'edit',
                 icon: 'mdi mdi-pencil',
                 title: __('编辑'),
-                extend: 'data-toggle="tooltip" data-container="body"',
+                extend: 'data-toggle="tooltip" data-container="body" data-offset="r" data-area="80%,100%" data-anim="5" data-shade="0.3" data-move="false"',
                 classname: 'btn btn-xs btn-success btn-editone'
             },
             del: {
@@ -155,8 +155,18 @@ define(['jquery', 'bootstrap', 'moment', 'bootstrap-table', 'bootstrap-table-lan
                     localStorage.setItem('pagesize', this.options.pageSize);
                     return false;
                 };
+                var _defaults = $.extend(true, $.fn.bootstrapTable.defaults, Table.defaults, defaults);
+                var extend = _defaults.extend;
+                extend.index_url = extend.index_url ? Fast.api.fixurl(extend.index_url) : extend.index_url;
+                extend.add_url = extend.add_url ? Fast.api.fixurl(extend.add_url) : extend.add_url;
+                extend.edit_url = extend.edit_url ? Fast.api.fixurl(extend.edit_url) : extend.edit_url;
+                extend.del_url = extend.del_url ? Fast.api.fixurl(extend.del_url) : extend.del_url;
+                extend.import_url = extend.import_url ? Fast.api.fixurl(extend.import_url) : extend.import_url;
+                extend.multi_url = extend.multi_url ? Fast.api.fixurl(extend.multi_url) : extend.multi_url;
+                extend.dragsort_url = extend.dragsort_url ? Fast.api.fixurl(extend.dragsort_url) : extend.dragsort_url;
+
                 // 写入bootstrap-table默认配置
-                $.extend(true, $.fn.bootstrapTable.defaults, Table.defaults, defaults);
+                $.extend(true, $.fn.bootstrapTable.defaults, extend);
                 // 写入bootstrap-table column配置
                 $.extend($.fn.bootstrapTable.columnDefaults, Table.columnDefaults, columnDefaults);
                 // 写入bootstrap-table locale配置
@@ -646,6 +656,7 @@ define(['jquery', 'bootstrap', 'moment', 'bootstrap-table', 'bootstrap-table-lan
                         var url = options.extend.edit_url;
                         row = $.extend({}, row ? row : {}, {ids: row[options.pk]});
                         url = Table.api.replaceurl(url, row, table);
+                console.log(data)
                         Fast.api.open(url, typeof title === 'function' ? title.call(table, row) : title, data);
                     });
                 });
@@ -911,7 +922,7 @@ define(['jquery', 'bootstrap', 'moment', 'bootstrap-table', 'bootstrap-table-lan
                         var ids = row[options.pk];
                         row = $.extend({}, row ? row : {}, {ids: ids});
                         var url = options.extend.edit_url;
-                        Fast.api.open(Table.api.replaceurl(url, row, table), $(this).data("original-title") || $(this).attr("title") || __('编辑'), $(this).data() || {});
+                        Fast.api.open(Table.api.replaceurl(url, row, table), $(this).data("original-title") || $(this).attr("title") || __('编辑'), $(e.currentTarget).data() || {});
                     },
                     'click .btn-delone': function (e, value, row, index) {
                         e.stopPropagation();
diff --git a/plugin/admin/public/libs/require-upload.js b/plugin/admin/public/libs/require-upload.js
index 6ef86da..a2791b6 100644
--- a/plugin/admin/public/libs/require-upload.js
+++ b/plugin/admin/public/libs/require-upload.js
@@ -140,18 +140,18 @@ define(['jquery', 'bootstrap', 'dropzone', 'template'], function ($, undefined,
                         //预览ID
                         var preview_id = $(that).data("preview-id") ? $(that).data("preview-id") : "";
                         //上传URL
-                        url = url ? url : Config.uploadurl;
+                        url = url ? url : Config.upload_url;
                         url = Fast.api.fixurl(url);
-                        var chunking = false, chunkSize = Config.chunksize || 2097152, timeout = Config.timeout || 600000;
+                        var chunking = false, chunkSize = 2097152, timeout = Config.upload_timeout || 600000;
 
                         //最大可上传文件大小
-                        maxsize = typeof maxsize !== "undefined" ? maxsize : Config.maxsize;
+                        maxsize = typeof maxsize !== "undefined" ? maxsize : Config.upload_maxsize;
                         //文件类型
-                        mimetype = typeof mimetype !== "undefined" ? mimetype : Config.mimetype;
+                        mimetype = typeof mimetype !== "undefined" ? mimetype : Config.upload_mimetype;
                         //请求的表单参数
-                        multipart = typeof multipart !== "undefined" ? multipart : Config.multipart;
+                        multipart = typeof multipart !== "undefined" ? multipart : Config.upload_multipart;
                         //是否支持批量上传
-                        multiple = typeof multiple !== "undefined" ? multiple : Config.multiple;
+                        multiple = typeof multiple !== "undefined" ? multiple : true;
                         //后缀特殊处理
                         mimetype = mimetype.split(",").map(function (k) {
                             return k.indexOf("/") > -1 ? k : (!k || k === "*" || k.charAt(0) === "." ? k : "." + k);
@@ -367,7 +367,7 @@ define(['jquery', 'bootstrap', 'dropzone', 'template'], function ($, undefined,
                                     j = Config.fullmode ? Fast.api.cdnurl(j) : j;
                                     var value = (json && typeof json[i] !== 'undefined' ? json[i] : null);
                                     var data = {url: j, fullurl: Fast.api.cdnurl(j), data: $(that).data(), key: i, index: i, value: value, row: value, suffix: suffix};
-                                    console.log(data,tpl)
+                                    //console.log(data,tpl)
                                     var html = tpl ? Template(tpl, data) : Template.render(Upload.previewtpl, data);
                                     $("#" + preview_id + ' li[nodelete]').before(html);
                                 });
diff --git a/public/.user.ini b/public/.user.ini
new file mode 100644
index 0000000..a89eb12
--- /dev/null
+++ b/public/.user.ini
@@ -0,0 +1 @@
+open_basedir=/www/wwwroot/openim/admin/:/tmp/
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index 1f94d72..77f23c5 100644
--- a/public/index.html
+++ b/public/index.html
@@ -3,12 +3,10 @@
     <head>
         <meta charset="UTF-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <title>问卷帮</title>
-      <script type="module" crossorigin src="http://wjba.oss-accelerate.aliyuncs.com/web/assets/app.js"></script>
-      <link rel="stylesheet" crossorigin href="http://wjba.oss-accelerate.aliyuncs.com/web/assets/style.css">
+        <title>tet</title>
     </head>
     <body>
-        <div id="app"></div>
+        <div id="app">ok</div>
 
     </body>
 </html>
diff --git a/public/static/img/avatar.png b/public/static/img/avatar.png
index 606dccc..2366b70 100644
Binary files a/public/static/img/avatar.png and b/public/static/img/avatar.png differ
diff --git a/public/static/img/group_avatar.png b/public/static/img/group_avatar.png
deleted file mode 100644
index 114c5d6..0000000
Binary files a/public/static/img/group_avatar.png and /dev/null differ
diff --git a/public/static/img/mail_logo.png b/public/static/img/mail_logo.png
deleted file mode 100644
index 6ab2895..0000000
Binary files a/public/static/img/mail_logo.png and /dev/null differ
diff --git a/public/upload/avatar/5f5b51a6bfc15490cb2e608e0e4042b2_68bd94c014c9e.png b/public/upload/avatar/5f5b51a6bfc15490cb2e608e0e4042b2_68bd94c014c9e.png
deleted file mode 100644
index ee425ae..0000000
Binary files a/public/upload/avatar/5f5b51a6bfc15490cb2e608e0e4042b2_68bd94c014c9e.png and /dev/null differ
diff --git a/public/upload/avatar/6e7d9d512239517feaebcfc37d564c2b_68baa98a0306a.png b/public/upload/avatar/6e7d9d512239517feaebcfc37d564c2b_68baa98a0306a.png
deleted file mode 100644
index 52dfbc8..0000000
Binary files a/public/upload/avatar/6e7d9d512239517feaebcfc37d564c2b_68baa98a0306a.png and /dev/null differ
diff --git a/public/upload/avatar/c986c4510af4cf3ac7b0488923939199_68baa89b80f10.png b/public/upload/avatar/c986c4510af4cf3ac7b0488923939199_68baa89b80f10.png
deleted file mode 100644
index 410ae4e..0000000
Binary files a/public/upload/avatar/c986c4510af4cf3ac7b0488923939199_68baa89b80f10.png and /dev/null differ
diff --git a/public/upload/avatar/c986c4510af4cf3ac7b0488923939199_68baa9665a3d3.png b/public/upload/avatar/c986c4510af4cf3ac7b0488923939199_68baa9665a3d3.png
deleted file mode 100644
index 410ae4e..0000000
Binary files a/public/upload/avatar/c986c4510af4cf3ac7b0488923939199_68baa9665a3d3.png and /dev/null differ
diff --git a/public/upload/avatar/ec765bf41d5ed3c0dc19ea4336d55f72_68d636d975c9d.jpg b/public/upload/avatar/ec765bf41d5ed3c0dc19ea4336d55f72_68d636d975c9d.jpg
deleted file mode 100644
index da3714b..0000000
Binary files a/public/upload/avatar/ec765bf41d5ed3c0dc19ea4336d55f72_68d636d975c9d.jpg and /dev/null differ
diff --git a/public/upload/circle/100003/53af7328d06eae59a609fbd6ecfb2d9a.png b/public/upload/circle/100003/53af7328d06eae59a609fbd6ecfb2d9a.png
new file mode 100644
index 0000000..9f22122
Binary files /dev/null and b/public/upload/circle/100003/53af7328d06eae59a609fbd6ecfb2d9a.png differ
diff --git a/public/upload/circle/100003/57acce6337d4368048e0af9143dcfbba.png b/public/upload/circle/100003/57acce6337d4368048e0af9143dcfbba.png
new file mode 100644
index 0000000..b79d1f3
Binary files /dev/null and b/public/upload/circle/100003/57acce6337d4368048e0af9143dcfbba.png differ
diff --git a/public/upload/circle/100003/633343b09bbe97d722f8f12462045e27.png b/public/upload/circle/100003/633343b09bbe97d722f8f12462045e27.png
new file mode 100644
index 0000000..ca5445b
Binary files /dev/null and b/public/upload/circle/100003/633343b09bbe97d722f8f12462045e27.png differ
diff --git a/public/upload/circle/100003/739d09c895e4f5577a6bd0a11bc74a51.png b/public/upload/circle/100003/739d09c895e4f5577a6bd0a11bc74a51.png
new file mode 100644
index 0000000..dbd076a
Binary files /dev/null and b/public/upload/circle/100003/739d09c895e4f5577a6bd0a11bc74a51.png differ
diff --git a/public/upload/circle/100003/88cf6d8522e4c1a712a49dca382d9368.png b/public/upload/circle/100003/88cf6d8522e4c1a712a49dca382d9368.png
new file mode 100644
index 0000000..d1e85d3
Binary files /dev/null and b/public/upload/circle/100003/88cf6d8522e4c1a712a49dca382d9368.png differ
diff --git a/public/upload/circle/100003/892078debd41a72464041541ebd6c431.png b/public/upload/circle/100003/892078debd41a72464041541ebd6c431.png
new file mode 100644
index 0000000..f75198a
Binary files /dev/null and b/public/upload/circle/100003/892078debd41a72464041541ebd6c431.png differ
diff --git a/public/upload/circle/100003/93b2ff9b9763c5ed8d40dafb864dc24f.png b/public/upload/circle/100003/93b2ff9b9763c5ed8d40dafb864dc24f.png
new file mode 100644
index 0000000..8d92a2f
Binary files /dev/null and b/public/upload/circle/100003/93b2ff9b9763c5ed8d40dafb864dc24f.png differ
diff --git a/public/upload/circle/100003/a22fa5961a07551769a56c81f052b4d3.png b/public/upload/circle/100003/a22fa5961a07551769a56c81f052b4d3.png
new file mode 100644
index 0000000..4e9e0b4
Binary files /dev/null and b/public/upload/circle/100003/a22fa5961a07551769a56c81f052b4d3.png differ
diff --git a/public/upload/circle/100003/acdd5fc034d972fd55489dc5d757d6e0.png b/public/upload/circle/100003/acdd5fc034d972fd55489dc5d757d6e0.png
new file mode 100644
index 0000000..4a13fd3
Binary files /dev/null and b/public/upload/circle/100003/acdd5fc034d972fd55489dc5d757d6e0.png differ
diff --git a/public/upload/circle/100003/ca9ac8ce51d5dde189c6937778ddfd78.png b/public/upload/circle/100003/ca9ac8ce51d5dde189c6937778ddfd78.png
new file mode 100644
index 0000000..d85ab01
Binary files /dev/null and b/public/upload/circle/100003/ca9ac8ce51d5dde189c6937778ddfd78.png differ
diff --git a/public/upload/circle/100003/e11f2ddbaf4f3ecaace96f4d7d63fca0.png b/public/upload/circle/100003/e11f2ddbaf4f3ecaace96f4d7d63fca0.png
new file mode 100644
index 0000000..2bf7911
Binary files /dev/null and b/public/upload/circle/100003/e11f2ddbaf4f3ecaace96f4d7d63fca0.png differ
diff --git a/public/upload/circle/100003/f0d740056b7000cc3623e8c295a7f7f2.png b/public/upload/circle/100003/f0d740056b7000cc3623e8c295a7f7f2.png
new file mode 100644
index 0000000..0d98b4f
Binary files /dev/null and b/public/upload/circle/100003/f0d740056b7000cc3623e8c295a7f7f2.png differ
diff --git a/public/upload/files/1/2458f50eb2ba6db38e63fd142183e420.png b/public/upload/files/1/2458f50eb2ba6db38e63fd142183e420.png
new file mode 100644
index 0000000..63da913
Binary files /dev/null and b/public/upload/files/1/2458f50eb2ba6db38e63fd142183e420.png differ
diff --git a/public/upload/files/20250922/911fabdb0719edcbba3f0f7b84f59f85_68d09e2a8447e.png b/public/upload/files/20250922/911fabdb0719edcbba3f0f7b84f59f85_68d09e2a8447e.png
deleted file mode 100644
index 4f70c66..0000000
Binary files a/public/upload/files/20250922/911fabdb0719edcbba3f0f7b84f59f85_68d09e2a8447e.png and /dev/null differ
diff --git a/public/upload/files/20250924/20d55bfe87a8d1517c20979363757470_68d2f0c3b825c.png b/public/upload/files/20250924/20d55bfe87a8d1517c20979363757470_68d2f0c3b825c.png
deleted file mode 100644
index 93ad315..0000000
Binary files a/public/upload/files/20250924/20d55bfe87a8d1517c20979363757470_68d2f0c3b825c.png and /dev/null differ
diff --git a/public/upload/files/20250924/24c39886530b730bf4bbcef3a560ea26_68d2f0eebfb5d.png b/public/upload/files/20250924/24c39886530b730bf4bbcef3a560ea26_68d2f0eebfb5d.png
deleted file mode 100644
index 516c9ab..0000000
Binary files a/public/upload/files/20250924/24c39886530b730bf4bbcef3a560ea26_68d2f0eebfb5d.png and /dev/null differ
diff --git a/public/upload/files/20250924/285f1795989fd46fcc45cdf0337581db_68d2f101ef05b.png b/public/upload/files/20250924/285f1795989fd46fcc45cdf0337581db_68d2f101ef05b.png
deleted file mode 100644
index 4b10a06..0000000
Binary files a/public/upload/files/20250924/285f1795989fd46fcc45cdf0337581db_68d2f101ef05b.png and /dev/null differ
diff --git a/public/upload/files/20250924/668bdbf1abf1f355274e9c08749937b0_68d2f0d8f25f2.png b/public/upload/files/20250924/668bdbf1abf1f355274e9c08749937b0_68d2f0d8f25f2.png
deleted file mode 100644
index cb7aed9..0000000
Binary files a/public/upload/files/20250924/668bdbf1abf1f355274e9c08749937b0_68d2f0d8f25f2.png and /dev/null differ
diff --git a/public/upload/files/20250924/7814932d97bc00b72f764f975f360e8d_68d2f0cf089a7.png b/public/upload/files/20250924/7814932d97bc00b72f764f975f360e8d_68d2f0cf089a7.png
deleted file mode 100644
index 4313d3e..0000000
Binary files a/public/upload/files/20250924/7814932d97bc00b72f764f975f360e8d_68d2f0cf089a7.png and /dev/null differ
diff --git a/public/upload/files/20250924/911fabdb0719edcbba3f0f7b84f59f85_68d2f0f7c167d.png b/public/upload/files/20250924/911fabdb0719edcbba3f0f7b84f59f85_68d2f0f7c167d.png
deleted file mode 100644
index 4f70c66..0000000
Binary files a/public/upload/files/20250924/911fabdb0719edcbba3f0f7b84f59f85_68d2f0f7c167d.png and /dev/null differ
diff --git a/public/upload/files/20250924/e9e33aad5d4a86ef8a8ae1050a6e63a5_68d2f0b96aab8.png b/public/upload/files/20250924/e9e33aad5d4a86ef8a8ae1050a6e63a5_68d2f0b96aab8.png
deleted file mode 100644
index 574e95a..0000000
Binary files a/public/upload/files/20250924/e9e33aad5d4a86ef8a8ae1050a6e63a5_68d2f0b96aab8.png and /dev/null differ
diff --git a/public/upload/files/20250924/fcb1d2b87ff6e543ab3904cf0ba61cbe_68d2f0e56765b.png b/public/upload/files/20250924/fcb1d2b87ff6e543ab3904cf0ba61cbe_68d2f0e56765b.png
deleted file mode 100644
index 1478f15..0000000
Binary files a/public/upload/files/20250924/fcb1d2b87ff6e543ab3904cf0ba61cbe_68d2f0e56765b.png and /dev/null differ
diff --git a/public/upload/files/2458f50eb2ba6db38e63fd142183e420_694b07b86091e.png b/public/upload/files/2458f50eb2ba6db38e63fd142183e420_694b07b86091e.png
new file mode 100644
index 0000000..63da913
Binary files /dev/null and b/public/upload/files/2458f50eb2ba6db38e63fd142183e420_694b07b86091e.png differ
diff --git a/public/upload/files/2458f50eb2ba6db38e63fd142183e420_694b080305196.png b/public/upload/files/2458f50eb2ba6db38e63fd142183e420_694b080305196.png
new file mode 100644
index 0000000..63da913
Binary files /dev/null and b/public/upload/files/2458f50eb2ba6db38e63fd142183e420_694b080305196.png differ
diff --git a/public/upload/files/2458f50eb2ba6db38e63fd142183e420_694b084ca9db5.png b/public/upload/files/2458f50eb2ba6db38e63fd142183e420_694b084ca9db5.png
new file mode 100644
index 0000000..63da913
Binary files /dev/null and b/public/upload/files/2458f50eb2ba6db38e63fd142183e420_694b084ca9db5.png differ
diff --git a/public/upload/files/2458f50eb2ba6db38e63fd142183e420_694b095fef1e7.png b/public/upload/files/2458f50eb2ba6db38e63fd142183e420_694b095fef1e7.png
new file mode 100644
index 0000000..63da913
Binary files /dev/null and b/public/upload/files/2458f50eb2ba6db38e63fd142183e420_694b095fef1e7.png differ
diff --git a/public/upload/files/2458f50eb2ba6db38e63fd142183e420_694b09a345c65.png b/public/upload/files/2458f50eb2ba6db38e63fd142183e420_694b09a345c65.png
new file mode 100644
index 0000000..63da913
Binary files /dev/null and b/public/upload/files/2458f50eb2ba6db38e63fd142183e420_694b09a345c65.png differ
diff --git a/public/upload/files/2458f50eb2ba6db38e63fd142183e420_694b80870ae9f.png b/public/upload/files/2458f50eb2ba6db38e63fd142183e420_694b80870ae9f.png
new file mode 100644
index 0000000..63da913
Binary files /dev/null and b/public/upload/files/2458f50eb2ba6db38e63fd142183e420_694b80870ae9f.png differ
diff --git a/public/upload/files/2458f50eb2ba6db38e63fd142183e420_694b8171d4db0.png b/public/upload/files/2458f50eb2ba6db38e63fd142183e420_694b8171d4db0.png
new file mode 100644
index 0000000..63da913
Binary files /dev/null and b/public/upload/files/2458f50eb2ba6db38e63fd142183e420_694b8171d4db0.png differ
diff --git a/public/upload/files/2948bdecf20939e8c48ee61614bc2483.jpg b/public/upload/files/2948bdecf20939e8c48ee61614bc2483.jpg
deleted file mode 100644
index ac9bd91..0000000
Binary files a/public/upload/files/2948bdecf20939e8c48ee61614bc2483.jpg and /dev/null differ
diff --git a/public/upload/files/37ffbada76100a63c34b4de8286f5839.jpg b/public/upload/files/37ffbada76100a63c34b4de8286f5839.jpg
deleted file mode 100644
index 9fe4a8b..0000000
Binary files a/public/upload/files/37ffbada76100a63c34b4de8286f5839.jpg and /dev/null differ
diff --git a/public/upload/files/6b10d4b8b230d1832f2e659b83882954.jpg b/public/upload/files/6b10d4b8b230d1832f2e659b83882954.jpg
deleted file mode 100644
index a41d9d5..0000000
Binary files a/public/upload/files/6b10d4b8b230d1832f2e659b83882954.jpg and /dev/null differ
diff --git a/public/upload/files/6f7f300953951c5005dc6eb76170a8f0_694b1709d023e.png b/public/upload/files/6f7f300953951c5005dc6eb76170a8f0_694b1709d023e.png
new file mode 100644
index 0000000..ead5987
Binary files /dev/null and b/public/upload/files/6f7f300953951c5005dc6eb76170a8f0_694b1709d023e.png differ
diff --git a/public/upload/files/7021d950a022776afb0177dc9c48f2ef.jpg b/public/upload/files/7021d950a022776afb0177dc9c48f2ef.jpg
deleted file mode 100644
index 48d76c7..0000000
Binary files a/public/upload/files/7021d950a022776afb0177dc9c48f2ef.jpg and /dev/null differ
diff --git a/public/upload/files/72fd6fa9542b7686b04ba0777be5ed84_694b0a2d787f5.png b/public/upload/files/72fd6fa9542b7686b04ba0777be5ed84_694b0a2d787f5.png
new file mode 100644
index 0000000..8bbcef7
Binary files /dev/null and b/public/upload/files/72fd6fa9542b7686b04ba0777be5ed84_694b0a2d787f5.png differ
diff --git a/public/upload/files/75f9724c567fbe4944e25015b3adb147.jpg b/public/upload/files/75f9724c567fbe4944e25015b3adb147.jpg
deleted file mode 100644
index 14a69d9..0000000
Binary files a/public/upload/files/75f9724c567fbe4944e25015b3adb147.jpg and /dev/null differ
diff --git a/public/upload/files/b501eeadf730e13b1bf4b06704a8491e_694b837e1b0f9.png b/public/upload/files/b501eeadf730e13b1bf4b06704a8491e_694b837e1b0f9.png
new file mode 100644
index 0000000..0f717a2
Binary files /dev/null and b/public/upload/files/b501eeadf730e13b1bf4b06704a8491e_694b837e1b0f9.png differ
diff --git a/public/upload/files/e968e7c41bcb48c7524c5229116ba271.jpg b/public/upload/files/e968e7c41bcb48c7524c5229116ba271.jpg
deleted file mode 100644
index ae24a88..0000000
Binary files a/public/upload/files/e968e7c41bcb48c7524c5229116ba271.jpg and /dev/null differ
diff --git a/public/upload/files/ec765bf41d5ed3c0dc19ea4336d55f72.jpg b/public/upload/files/ec765bf41d5ed3c0dc19ea4336d55f72.jpg
deleted file mode 100644
index def5ad9..0000000
Binary files a/public/upload/files/ec765bf41d5ed3c0dc19ea4336d55f72.jpg and /dev/null differ
diff --git a/public/upload/files/fe0f61dba7266c4d7b1f1f79e5d792a7.jpg b/public/upload/files/fe0f61dba7266c4d7b1f1f79e5d792a7.jpg
deleted file mode 100644
index a73fd64..0000000
Binary files a/public/upload/files/fe0f61dba7266c4d7b1f1f79e5d792a7.jpg and /dev/null differ
diff --git a/public/upload/qrcode/1.jpg b/public/upload/qrcode/1.jpg
deleted file mode 100644
index 0c252cd..0000000
Binary files a/public/upload/qrcode/1.jpg and /dev/null differ
diff --git a/support/Jwt.php b/support/Jwt.php
index 124466c..874f2d9 100644
--- a/support/Jwt.php
+++ b/support/Jwt.php
@@ -75,7 +75,8 @@ class Jwt
             'avatar'   => '',
         ];
         $params = array_merge($data, [
-            'nickname'  => preg_match("/^1[3-9]{1}\d{9}$/", $username) ? substr_replace($username, '****', 3, 4) : $username,
+            //'nickname'  => preg_match("/^1[3-9]{1}\d{9}$/", $username) ? substr_replace($username, '****', 3, 4) : $username,
+            'nickname'  => "wx_".Random::alnum(),
             //'salt'      => Random::alnum(),
             'join_time'  => $time,
             'join_ip'    => $ip,
@@ -83,6 +84,10 @@ class Jwt
             'last_ip'   => $ip,
             'status'    => '1'
         ]);
+        $region = Request()->post('region');
+        if($region){
+            $params['region'] = str_replace('+','',$region);
+        }
         $params['password'] = \plugin\admin\app\common\Util::passwordHash($password);
         $params = array_merge($params, $extend); 
 
@@ -102,9 +107,9 @@ class Jwt
             }
             $_token = \support\Jwt\JwtToken::generateToken($user->toArray());
             $user->token = $_token['access_token'];
-            Db::commit();
             //注册成功的事件
             Hook("user.register_successed", $user);
+            Db::commit();
             return self::getUserinfo($user);
         } catch (\Exception $e) {
             Db::rollback();
@@ -130,7 +135,9 @@ class Jwt
          * @var User $user
          * */
         if($field=='mobile'){
-            $user = User::where($field , $account)->where('region',Request()->post('region'))->find();
+            $region = Request()->post('region');
+            $region = str_replace('+','',$region);
+            $user = User::where($field , $account)->where('region',$region)->find();
         }else{
             $user = User::where($field , $account)->find();
         }
diff --git a/support/OpenImSdk/Api/Auth.php b/support/OpenImSdk/Api/Auth.php
index 61a3a8f..a79c5fb 100644
--- a/support/OpenImSdk/Api/Auth.php
+++ b/support/OpenImSdk/Api/Auth.php
@@ -27,30 +27,31 @@ class Auth
      * 获取用户token
      * 直接从服务器获取，不使用缓存
      * @param string $userID 用户ID
-     * @param int $platformID 平台ID，默认为1
+     * @param string $platformID 平台ID，默认为android
      * @return array
      */
-    public function getUserToken(string $userID, int $platformID = 1): array
+    public function getUserToken(string $userID, string $platformID = 'android'): array
     {
         // 获取管理员token
         $adminToken = Utils::getAdminToken();
+        $platformID = Utils::getPlatformId( $platformID );
         return Utils::send(Url::$getUserToken, ['userID' => $userID, 'platformID' => $platformID], '获取用户token错误', $adminToken);
     }
 
     /**
      * 强制登出
      * @param string $userID 要登出的用户ID
-     * @param int $platformID 平台ID，默认为1
+     * @param string $platformID 平台ID，默认为android
      * @return array
      */
-    public function forceLogout(string $userID, int $platformID = 1): array
+    public function forceLogout(string $userID, string $platformID = 'android'): array
     {
         // 获取管理员token
         $adminToken = Utils::getAdminToken();
         
         // 清除本地缓存的用户token
         Utils::clearToken($userID);
-        
+        $platformID = Utils::getPlatformId( $platformID );
         return Utils::send(Url::$forceLogout, ['userID' => $userID, 'platformID' => $platformID], '强制登出错误', $adminToken);
     }
 
diff --git a/support/OpenImSdk/Api/User.php b/support/OpenImSdk/Api/User.php
index 478e46e..46144fb 100644
--- a/support/OpenImSdk/Api/User.php
+++ b/support/OpenImSdk/Api/User.php
@@ -92,11 +92,14 @@ class User
      * @param array $data 用户信息
      * @return array
      */
-    public function updateUserInfo(string $userID, array $data): array
+    public function updateUserInfo(string $userID, array $data): array|bool
     {
         // 获取管理员token
         $adminToken = Utils::getAdminToken();
         $data = array_merge(['userID' => $userID], $data);
+        $data = [
+            'userInfo'  =>  $data
+        ];
         return Utils::send(Url::$updateUserInfo, $data, '修改用户信息错误', $adminToken);
     }
 
@@ -244,7 +247,7 @@ class User
      * @param string $faceURL 头像地址
      * @return array
      */
-    public function userRegister(string $userID, string $nickname = '', string $faceURL = ''): array
+    public function userRegister(string $userID, string $nickname = '', string $faceURL = ''): array|bool
     {
         // 获取管理员token
         $adminToken = Utils::getAdminToken();
diff --git a/support/OpenImSdk/Core/Utils.php b/support/OpenImSdk/Core/Utils.php
index e3c3908..8ddbca0 100644
--- a/support/OpenImSdk/Core/Utils.php
+++ b/support/OpenImSdk/Core/Utils.php
@@ -85,7 +85,10 @@ class Utils
     {       
         $url = Url::buildUrl($path);
         //cp($url);
-        $res = json_decode(self::request($url, $data, $token), true);
+        $res = self::request($url, $data, $token);
+        //cp($data);
+        //cp($res);
+        $res = json_decode($res, true);
         if($res['errCode'] !==0 ){
             throw new \Exception($res['errMsg'],$res['errCode']);
             //throw new \Exception($res['errDlt'],$res['errCode']);
@@ -139,10 +142,10 @@ class Utils
      * 获取用户Token
      * 如果缓存中没有，则自动获取并缓存
      * @param string $userID 用户ID
-     * @param int $platformID 平台ID
+     * @param string $platformID 平台ID
      * @return string|null
      */
-    public static function getUserToken(string $userID, int $platformID = 1): ?string
+    public static function getUserToken(string $userID, string $platformID = 'android'): ?string
     {
         $tokenManager = self::getTokenManager();
         $token = $tokenManager->getUserToken($userID);
@@ -156,7 +159,7 @@ class Utils
             
             $result = self::send(Url::$getUserToken, [
                 'userID' => $userID,
-                'platformID' => $platformID
+                'platformID' => self::getPlatformId($platformID)
             ], '获取用户Token失败', $adminToken);
         
             $token = $result['token'];
@@ -181,4 +184,23 @@ class Utils
     {
         return self::getTokenManager()->clearToken($userID, $isAdmin);
     }
+    public static function getPlatformId($name=''): int{
+        $arr = [
+            'ios'   =>  1,
+            'android'   =>  2,
+            'windows'   =>  3,
+            'macos'   =>  4,
+            'web'   =>  5,
+            'mp-weixin'   =>  6,
+            'linux'   =>  7,
+            'androidpad'   =>  8,
+            'ipad'   =>  9,
+            'admin'   =>  10,
+        ];
+        $name = strtolower($name);
+        if(isset($arr[$name])){
+            return $arr[$name];
+        }
+        return 2;
+    }
 }
diff --git a/support/TagLib/Html.php b/support/TagLib/Html.php
index cc38639..ec6cbb2 100644
--- a/support/TagLib/Html.php
+++ b/support/TagLib/Html.php
@@ -39,7 +39,7 @@ class Html extends \think\template\TagLib{
         $parseStr .= '<ul class="list-inline clearfix lyear-uploads-pic" data-template="preview" id="p-{'.$name.'}">';
         $parseStr .= '    <li nodelete class="col-xs-4 col-sm-3 col-md-2">';
         $parseStr .= '        <a class="pic-add faupload" style="height: auto;border: 0;"';
-        $parseStr .= '            permission="app.admin.upload.avatar" id="add-pic-btn" href="#!" title="点击上传"';
+        $parseStr .= '            permission="app.admin.files.upload" id="add-pic-btn" href="#!" title="点击上传"';
         $parseStr .= '            data-input-id="c-{'.$name.'}"';
         $parseStr .= '            data-mimetype="{'.$mimetype.'}"';
         $parseStr .= '            data-multiple="{'.$multiple.'}" ';
@@ -49,7 +49,7 @@ class Html extends \think\template\TagLib{
         $parseStr .= '            '.$extendData.' ';
         $parseStr .= '            data-preview-id="p-{'.$name.'}"></a>';
         $parseStr .= '        <a class="pic-add fachoose" style="height: auto;border: 0;"';
-        $parseStr .= '            permission="app.admin.upload.attachment" ';
+        $parseStr .= '            permission="app.admin.files.list" ';
         $parseStr .= '            id="choose-pic-btn" href="#!" title="选择文件"';
         $parseStr .= '            data-input-id="c-{'.$name.'}" ';
         $parseStr .= '            data-mimetype="{'.$mimetype.'}" ';