diff --git a/.gitignore b/.gitignore index dbbccb5f..f230592c 100755 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ /vendor *.log .env +nginx.rewrite +auto_install.json composer.lock install.lock runtime/cache diff --git a/extend/com/Version.php b/extend/com/Version.php new file mode 100644 index 00000000..1093c036 --- /dev/null +++ b/extend/com/Version.php @@ -0,0 +1,23 @@ + +// +---------------------------------------------------------------------- +namespace com; + +use GuzzleHttp\Client; + +/** + * @title 版本管理 + * @description 版本管理类 + */ +class Version{ + + public static function check(){ + $client = new Client(); + $res = $client->request('POST', 'http://www.tensent.cn/api/version/index'); + } +} \ No newline at end of file diff --git a/public/static/admin/js/main.js b/public/static/admin/js/main.js index d6d228bf..ce0b6282 100644 --- a/public/static/admin/js/main.js +++ b/public/static/admin/js/main.js @@ -26,6 +26,7 @@ require.config({ paths: { 'sent': ['common/js/sent'], 'form': ['common/js/require-form'], + 'xlsx': ['common/js/require-xlsx'], 'upload': 'common/js/require-upload', 'validator': 'common/js/require-validator', 'message': ['plugins/messager/messager'], @@ -69,6 +70,7 @@ require.config({ // nanoscroller 'slimscroll': 'plugins/jquery-slimscroll/jquery.slimscroll', + 'sheetjs': ['plugins/sheetjs/xlsx.full.min'] }, shim: { 'message': {deps: ['jquery', 'css!'+'plugins/messager/css/style.css']}, @@ -106,7 +108,7 @@ require.config({ }, deps: ['json'], // 开启debug模式,不缓存资源 - urlArgs: "ver=" + (new Date()).getTime() + urlArgs: "ver=" + requirejs.s.contexts._.config.config.version }); // 注册jquery到require模块 diff --git a/public/static/common/js/app.js b/public/static/common/js/app.js index 76be1c7a..a1fa9ad9 100644 --- a/public/static/common/js/app.js +++ b/public/static/common/js/app.js @@ -40,7 +40,8 @@ require.config({ 'distpicker': ['plugins/distpicker/distpicker'], // nanoscroller - 'nanoscroller': ['plugins/nanoscroller/jquery.nanoscroller.min'] + 'nanoscroller': ['plugins/nanoscroller/jquery.nanoscroller.min'], + 'sheetjs': ['plugins/sheetjs/xlsx.full.min'] }, shim: { // open-source