同步插件代码

config/app.php

@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------
@@ -31,9 +31,13 @@ return [
     'domain_bind'             => [],
     // 禁止访问（自动多应用模式有效）
     'deny_app_list'           => [],
-    // CORS 自动配置跨域
+    // RBAC 登录地址（填写登录地址）
-    'cors_auto'               => true,
+    'rbac_login'              => '',
-    // CORS 配置跨域域名
+    // RBAC 忽略应用（填写应用名称）
+    'rbac_ignore'             => ['index'],
+    // CORS 启用状态（默认开启跨域）
+    'cors_on'                 => true,
+    // CORS 配置跨域域名（仅需填写域名，留空则自适应域名）
     'cors_host'               => [],
     // CORS 授权请求方法
     'cors_methods'            => 'GET,PUT,POST,PATCH,DELETE',

config/cache.php

@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

config/cookie.php

@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

config/lang.php

@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

config/log.php

@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

config/phinx.php

@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

config/route.php

@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

config/session.php

@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

config/view.php

@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

public/index.php

@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

public/router.php

@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

public/static/admin.js

@@ -1,7 +1,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------
@@ -84,8 +84,7 @@ define('ckeditor', (function (type) {
     return ckeditor;
 });
 
-/*! 注册 ThinkAdmin 组件 */
+$(function () {
-define('ThinkAdmin', function (require) {
 
     window.$body = $('body');
 
@@ -173,7 +172,7 @@ define('ThinkAdmin', function (require) {
         this.close = function (idx) {
             if (idx !== null) return layer.close(idx);
             for (var i in this.idx) $.msg.close(this.idx[i]);
-            this.idx = [];
+            return (this.idx = []) !== false;
         };
         /*! 弹出警告框 */
         this.alert = function (msg, call) {
@@ -258,8 +257,11 @@ define('ThinkAdmin', function (require) {
         };
         /*! 内容区域动态加载后初始化 */
         this.reInit = function ($dom) {
+            $dom = $dom || $(this.selecter);
             layui.form.render(), layui.element.render(), $(window).trigger('scroll');
-            $.vali.listen($dom = $dom || $(this.selecter)), $body.trigger('reInit', $dom);
+            require(['ThinkAdmin'], function () {
+                $.vali.listen($dom) && $body.trigger('reInit', $dom);
+            });
             return $dom.find('[required]').map(function () {
                 this.$parent = $(this).parent();
                 if (this.$parent.is('label')) this.$parent.addClass('label-required-prev'); else this.$parent.prevAll('label.layui-form-label').addClass('label-required-next');
@@ -463,41 +465,6 @@ define('ThinkAdmin', function (require) {
         };
     };
 
-    /*! 表单验证组件 */
-    $.vali = function (form, callable) {
-        return $(form).data('validate') || new (require('validate'))(form, callable, onConfirm);
-    };
-
-    /*! 自动监听表单 */
-    $.vali.listen = function ($dom, $els) {
-        $els = $($dom || $body).find('form[data-auto]');
-        $dom && $($dom).filter('form[data-auto]') && $els.add($dom);
-        $els.size() > 0 && $els.map(function (idx, form) {
-            $(this).vali(function (data) {
-                var dset = form.dataset, type = form.method || 'POST', href = form.action || location.href;
-                var tips = dset.tips || undefined, time = dset.time || undefined, taid = dset.tableId || false;
-                var call = window[dset.callable || '_default_callable'] || (taid ? function (ret) {
-                    if (typeof ret === 'object' && ret.code > 0 && $('#' + taid).size() > 0) {
-                        return $.msg.success(ret.info, 3, function () {
-                            $.msg.closeLastModal();
-                            (typeof ret.data === 'string' && ret.data) ? $.form.goto(ret.data) : $.layTable.reload(taid);
-                        }) && false;
-                    }
-                } : undefined);
-                onConfirm(dset.confirm, function () {
-                    $.form.load(href, data, type, call, true, tips, time);
-                });
-            });
-        });
-    };
-
-    /*! 注册对象到JqFn */
-    $.fn.vali = function (callable) {
-        return this.each(function () {
-            $.vali(this, callable);
-        });
-    };
-
     /*! 表单转JSON */
     $.fn.formToJson = function () {
         var self = this, data = {}, push = {};
@@ -754,13 +721,13 @@ define('ThinkAdmin', function (require) {
         img.style.background = '#FFF', img.referrerPolicy = 'no-referrer';
         img.style.height = 'auto', img.style.width = area || '100%', img.style.display = 'none';
         return document.body.appendChild(img), img.onerror = function () {
-            $.msg.close(loaded), defer.reject();
+            $.msg.close(loaded) && defer.reject();
         }, img.src = src, img.onload = function () {
             layer.open({
                 type: 1, title: false, shadeClose: true, content: $(img), success: function ($elem, idx) {
-                    $.msg.close(loaded), defer.notify($elem, idx);
+                    $.msg.close(loaded) && defer.notify($elem, idx);
                 }, area: area || '480px', skin: 'layui-layer-nobg', closeBtn: 1, end: function () {
-                    document.body.removeChild(img), defer.resolve()
+                    document.body.removeChild(img) && defer.resolve()
                 }
             });
         }, defer.promise();
@@ -772,10 +739,46 @@ define('ThinkAdmin', function (require) {
         layer.style(layer.open({type: true, resize: false, scrollbar: false, area: ['320px', '600px'], title: false, closeBtn: true, shadeClose: false, skin: 'layui-layer-nobg', content: laytpl(template).render({title: title || '公众号', url: href})}), {boxShadow: 'none'});
     };
 
-    /*! 显示任务进度消息 */
+    /*! 注册 ThinkAdmin 组件及标签行为 */
+    define('ThinkAdmin', ['require', 'queue', 'validate'], function (require, Queue, Validate) {
+
+        /*! 显示任务进度 */
         $.loadQueue = function (code, doScript, element) {
-        require(['queue'], function (Queue) {
+            return new Queue(code, doScript, element);
-            new Queue(code, doScript, element);
+        };
+
+        /*! 创建表单验证 */
+        $.vali = function (form, callable) {
+            return $(form).data('validate') || new Validate(form, callable, onConfirm);
+        };
+
+        /*! 自动监听表单 */
+        $.vali.listen = function ($dom) {
+            var $els = $($dom || $body).find('form[data-auto]');
+            $dom && $($dom).filter('form[data-auto]') && $els.add($dom);
+            return $els.map(function (idx, form) {
+                $(this).vali(function (data) {
+                    var dset = form.dataset, type = form.method || 'POST', href = form.action || location.href;
+                    var tips = dset.tips || undefined, time = dset.time || undefined, taid = dset.tableId || false;
+                    var call = window[dset.callable || '_default_callable'] || (taid ? function (ret) {
+                        if (typeof ret === 'object' && ret.code > 0 && $('#' + taid).size() > 0) {
+                            return $.msg.success(ret.info, 3, function () {
+                                $.msg.closeLastModal();
+                                (typeof ret.data === 'string' && ret.data) ? $.form.goto(ret.data) : $.layTable.reload(taid);
+                            }) && false;
+                        }
+                    } : undefined);
+                    onConfirm(dset.confirm, function () {
+                        $.form.load(href, data, type, call, true, tips, time);
+                    });
+                });
+            });
+        };
+
+        /*! 注册对象到JqFn */
+        $.fn.vali = function (callable) {
+            return this.each(function () {
+                $.vali(this, callable);
             });
         };
 
@@ -989,9 +992,10 @@ define('ThinkAdmin', function (require) {
             event.target.src = baseRoot + 'theme/img/404_icon.png';
         }, true);
 
-});
+    });
 
-/*! 系统菜单表单页面初始化 */
+    /*! 系统菜单表单页面初始化 */
-require(['ThinkAdmin'], function () {
+    require(['ThinkAdmin'], function () {
         $.menu.listen() && $.form.reInit($body);
+    });
 });

public/static/login.js

@@ -1,7 +1,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

public/static/plugs/admin/excel.js

@@ -1,7 +1,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

public/static/plugs/admin/queue.js

@@ -1,7 +1,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

public/static/plugs/admin/validate.js

@@ -1,7 +1,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

public/static/theme/css/_config.less

@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

public/static/theme/css/_custom.less

@@ -4,7 +4,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

public/static/theme/css/_display.less

@@ -4,7 +4,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

public/static/theme/css/_layout.less

@@ -4,7 +4,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

public/static/theme/css/_layout_1.less

@@ -4,7 +4,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

public/static/theme/css/_layout_1_black.less

@@ -4,7 +4,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

public/static/theme/css/_layout_1_blue.less

@@ -4,7 +4,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

public/static/theme/css/_layout_1_green.less

@@ -4,7 +4,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

public/static/theme/css/_layout_1_red.less

@@ -4,7 +4,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

public/static/theme/css/_layout_2.less

@@ -4,7 +4,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

public/static/theme/css/_layout_2_black.less

@@ -4,7 +4,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

public/static/theme/css/_layout_2_blue.less

@@ -4,7 +4,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

public/static/theme/css/_layout_2_green.less

@@ -4,7 +4,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

public/static/theme/css/_layout_2_red.less

@@ -4,7 +4,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

public/static/theme/css/_layout_white.less

@@ -4,7 +4,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

public/static/theme/css/console.less

@@ -4,7 +4,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

public/static/theme/css/iconfont.less

@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

public/static/theme/css/login.less

@@ -4,7 +4,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

public/static/theme/css/mobile.less

@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------

think

@@ -4,7 +4,7 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------