diff --git a/README_EN.md b/README_EN.md old mode 100644 new mode 100755 diff --git a/auto_install.json b/auto_install.json old mode 100644 new mode 100755 diff --git a/class/Api.php b/class/Api.php old mode 100644 new mode 100755 index 6a9e755..08b5a90 --- a/class/Api.php +++ b/class/Api.php @@ -921,42 +921,63 @@ class Api { public function category_list($page,$limit){ $token = @$_POST['token']; $offset = ($page - 1) * $limit; - /** - * name:如果成功登录，则查询所有 - * - */ - //如果使用cookie登录成功，或者token不为空，则使用token进行验证 - if( $this->is_login() || ( !empty($token) && $this->auth($token) ) ){ - $sql = "SELECT *,(SELECT name FROM on_categorys WHERE id = a.fid LIMIT 1) AS fname,(SELECT COUNT(id) FROM on_links WHERE fid = a.id) AS link_num FROM on_categorys as a ORDER BY weight DESC,id DESC LIMIT {$limit} OFFSET {$offset}"; - //统计总数 - $count = $this->db->count('on_categorys','*'); - } - //如果存在token，则验证 - else if( !empty($token) ) { + // 验证登录或 token + if ($this->is_login() || (!empty($token) && $this->auth($token))) { + $sql = "SELECT *,(SELECT name FROM on_categorys WHERE id = a.fid LIMIT 1) AS fname,(SELECT COUNT(id) FROM on_links WHERE fid = a.id) AS link_num FROM on_categorys as a ORDER BY fid ASC, weight DESC, id ASC"; + $count = $this->db->count('on_categorys', '*'); + } elseif (!empty($token)) { $this->auth($token); - //查询所有分类 - $sql = "SELECT *,(SELECT name FROM on_categorys WHERE id = a.fid LIMIT 1) AS fname,(SELECT COUNT(id) FROM on_links WHERE fid = a.id) AS link_num FROM on_categorys as a ORDER BY weight DESC,id DESC LIMIT {$limit} OFFSET {$offset}"; - //统计总数 - $count = $this->db->count('on_categorys','*'); + $sql = "SELECT *,(SELECT name FROM on_categorys WHERE id = a.fid LIMIT 1) AS fname,(SELECT COUNT(id) FROM on_links WHERE fid = a.id) AS link_num FROM on_categorys as a ORDER BY fid ASC, weight DESC, id ASC"; + $count = $this->db->count('on_categorys', '*'); + } else { + $sql = "SELECT *,(SELECT name FROM on_categorys WHERE id = a.fid LIMIT 1) AS fname,(SELECT COUNT(id) FROM on_links WHERE fid = a.id) AS link_num FROM on_categorys as a WHERE property = 0 ORDER BY fid ASC, weight DESC, id ASC"; + $count = $this->db->count('on_categorys', '*', ['property' => 0]); } - else{ - $sql = "SELECT *,(SELECT name FROM on_categorys WHERE id = a.fid LIMIT 1) AS fname,(SELECT COUNT(id) FROM on_links WHERE fid = a.id) AS link_num FROM on_categorys as a WHERE property = 0 ORDER BY weight DESC,id DESC LIMIT {$limit} OFFSET {$offset}"; - //统计总数 - $count = $this->db->count('on_categorys','*',[ - "property" => 0 - ]); + + $all_categories = $this->db->query($sql)->fetchAll(); + + // 构建排序规则 + $sorted_categories = []; + $categories_by_fid = []; + + foreach ($all_categories as $category) { + if ($category['fid'] == 0) { + // 父级分类 + $sorted_categories[] = $category; + } else { + // 子分类，按 fid 分组 + $categories_by_fid[$category['fid']][] = $category; + } } - - //原生查询 - $datas = $this->db->query($sql)->fetchAll(); - $datas = [ - 'code' => 0, - 'msg' => '', - 'count' => $count, - 'data' => $datas + + // 对每个子分类组按 weight 排序 + foreach ($categories_by_fid as &$sub_categories) { + usort($sub_categories, function ($a, $b) { + return $b['weight'] <=> $a['weight']; + }); + } + + // 将子分类插入到对应父级分类后 + $final_sorted_categories = []; + foreach ($sorted_categories as $parent_category) { + $final_sorted_categories[] = $parent_category; + if (isset($categories_by_fid[$parent_category['id']])) { + $final_sorted_categories = array_merge($final_sorted_categories, $categories_by_fid[$parent_category['id']]); + } + } + + // 截取分页数据 + $paged_data = array_slice($final_sorted_categories, $offset, $limit); + + $result = [ + 'code' => 0, + 'msg' => '', + 'count' => $count, + 'data' => $paged_data, ]; - exit(json_encode($datas)); + + exit(json_encode($result)); } /** * 生成 @@ -1469,7 +1490,7 @@ class Api { $this->return_json(-2000,'',"主题名称不合法！"); } //如果是默认主题，则不允许删除 - if( ($name === 'default') || ($name === 'admin') ) { + if( ($name === 'default') || ($name === 'admin') || ($name === 'default2') ) { $this->return_json(-2000,'',"默认主题不允许删除！"); } //查询当前使用中的主题 @@ -1815,6 +1836,7 @@ class Api { $subscribe = unserialize($subscribe); //api请求地址 $api_url = API_URL."/v1/check_subscribe.php?order_id=".$subscribe['order_id']."&email=".$subscribe['email']."&domain=".$domain; + // echo $api_url; try { #GET HTTPS $curl = curl_init($api_url); @@ -2521,6 +2543,70 @@ class Api { exit( json_encode($datas) ); } + + /** + * 批量更新链接排序 + * + */ + public function update_link_order(){ + //验证授权 + $this->auth($token); + // 获取分类ID + $cid = intval($this->getData("category_id")); + // 获取json对象数据 + // 获取前端传递的原始 JSON 数据 + $rawData = file_get_contents('php://input'); + // 将 JSON 数据转换为 PHP 关联数组 + $jsonData = json_decode($rawData, true); + // 检查解析是否成功 + if (json_last_error() !== JSON_ERROR_NONE) { + $this->return_json(-2000,'','JSON解析失败！'); + } + + // 批量更新on_links表的weight字段 + foreach ($jsonData as $key => $value) { + $this->db->update('on_links', [ + 'weight' => $value['weight'] + ], [ + 'fid' => $cid, + 'id' => intval($value['id']) + ]); + } + + // 返回成功 + $this->return_json(200,'','success'); + } + + /** + * name:获取订阅信息 + */ + public function get_subscribe() { + //验证授权 + $this->auth($token); + //获取当前站点信息 + $subscribe = $this->db->get('on_options','value',[ 'key' => "s_subscribe" ]); + $subscribe = unserialize($subscribe); + + $this->return_json(200,$subscribe,'success'); + } + + /** + * 验证订阅是否有效 + */ + public function get_subscribe_status(){ + // var_dump($_SERVER['HTTP_HOST']); + //验证授权 + $this->auth($token); + // 获取订阅结果 + $result = $this->is_subscribe(); + + if( $result === TRUE ) { + $this->return_json(200,'Active','success'); + } + else{ + $this->return_json(-2000,'','failure'); + } + } } diff --git a/controller/api.php b/controller/api.php index 1dbbf18..3d2b7ca 100755 --- a/controller/api.php +++ b/controller/api.php @@ -668,3 +668,21 @@ function upload_backup(){ global $api; $api->general_upload('data/backup/',['db3']); } + +// 批量更新排序 +function update_link_order(){ + global $api; + $api->update_link_order(); +} + +// 获取订阅信息 +function get_subscribe(){ + global $api; + $api->get_subscribe(); +} + +// 获取订阅状态 +function get_subscribe_status(){ + global $api; + $api->get_subscribe_status(); +} \ No newline at end of file diff --git a/controller/bing.php b/controller/bing.php old mode 100644 new mode 100755 diff --git a/controller/ico.php b/controller/ico.php old mode 100644 new mode 100755 diff --git a/controller/init.php b/controller/init.php old mode 100644 new mode 100755 diff --git a/controller/mobile.php b/controller/mobile.php old mode 100644 new mode 100755 diff --git a/controller/universal.php b/controller/universal.php old mode 100644 new mode 100755 diff --git a/data/update.log b/data/update.log index d0e0b15..c4fd989 100755 --- a/data/update.log +++ b/data/update.log @@ -1,3 +1,15 @@ +2024.11.27 +1. 修改默认主题为`default2` +2. 后端禁止删除默认主题：default2 +3. 新增API接口查询订阅是否有效：get_subscribe_status +4. 新增API接口查询订阅订单号：get_subscribe +5. 修改默认数据库中一些失效链接 + +2024.11.25 +1. 分类排序优化，父分类后面紧跟子分类 +2. 新增批量排序接口：update_link_order + +___ 20200409 1. 新增快捷键支持 2. 后台增加自定义js功能 diff --git a/db/index.html b/db/index.html old mode 100644 new mode 100755 diff --git a/db/onenav.simple.db3 b/db/onenav.simple.db3 index 0ae2cbe..9013039 100644 Binary files a/db/onenav.simple.db3 and b/db/onenav.simple.db3 differ diff --git a/db/sql/20220308.sql b/db/sql/20220308.sql old mode 100644 new mode 100755 diff --git a/db/sql/20220311.sql b/db/sql/20220311.sql old mode 100644 new mode 100755 diff --git a/db/sql/20220413.sql b/db/sql/20220413.sql old mode 100644 new mode 100755 diff --git a/db/sql/20220414.sql b/db/sql/20220414.sql old mode 100644 new mode 100755 diff --git a/db/sql/20220419.sql b/db/sql/20220419.sql old mode 100644 new mode 100755 diff --git a/db/sql/20221114.sql b/db/sql/20221114.sql old mode 100644 new mode 100755 diff --git a/db/sql/20221129.sql b/db/sql/20221129.sql old mode 100644 new mode 100755 diff --git a/db/sql/on_db_logs.sql b/db/sql/on_db_logs.sql old mode 100644 new mode 100755 diff --git a/nginx.rewrite b/nginx.rewrite old mode 100644 new mode 100755 diff --git a/static/bootstrap4/css/bootstrap-grid.css b/static/bootstrap4/css/bootstrap-grid.css old mode 100644 new mode 100755 diff --git a/static/bootstrap4/css/bootstrap-grid.css.map b/static/bootstrap4/css/bootstrap-grid.css.map old mode 100644 new mode 100755 diff --git a/static/bootstrap4/css/bootstrap-grid.min.css b/static/bootstrap4/css/bootstrap-grid.min.css old mode 100644 new mode 100755 diff --git a/static/bootstrap4/css/bootstrap-grid.min.css.map b/static/bootstrap4/css/bootstrap-grid.min.css.map old mode 100644 new mode 100755 diff --git a/static/bootstrap4/css/bootstrap-reboot.css b/static/bootstrap4/css/bootstrap-reboot.css old mode 100644 new mode 100755 diff --git a/static/bootstrap4/css/bootstrap-reboot.css.map b/static/bootstrap4/css/bootstrap-reboot.css.map old mode 100644 new mode 100755 diff --git a/static/bootstrap4/css/bootstrap-reboot.min.css b/static/bootstrap4/css/bootstrap-reboot.min.css old mode 100644 new mode 100755 diff --git a/static/bootstrap4/css/bootstrap-reboot.min.css.map b/static/bootstrap4/css/bootstrap-reboot.min.css.map old mode 100644 new mode 100755 diff --git a/static/bootstrap4/css/bootstrap.css b/static/bootstrap4/css/bootstrap.css old mode 100644 new mode 100755 diff --git a/static/bootstrap4/css/bootstrap.css.map b/static/bootstrap4/css/bootstrap.css.map old mode 100644 new mode 100755 diff --git a/static/bootstrap4/css/bootstrap.min.css b/static/bootstrap4/css/bootstrap.min.css old mode 100644 new mode 100755 diff --git a/static/bootstrap4/css/bootstrap.min.css.map b/static/bootstrap4/css/bootstrap.min.css.map old mode 100644 new mode 100755 diff --git a/static/bootstrap4/js/bootstrap.bundle.js b/static/bootstrap4/js/bootstrap.bundle.js old mode 100644 new mode 100755 diff --git a/static/bootstrap4/js/bootstrap.bundle.js.map b/static/bootstrap4/js/bootstrap.bundle.js.map old mode 100644 new mode 100755 diff --git a/static/bootstrap4/js/bootstrap.bundle.min.js b/static/bootstrap4/js/bootstrap.bundle.min.js old mode 100644 new mode 100755 diff --git a/static/bootstrap4/js/bootstrap.bundle.min.js.map b/static/bootstrap4/js/bootstrap.bundle.min.js.map old mode 100644 new mode 100755 diff --git a/static/bootstrap4/js/bootstrap.js b/static/bootstrap4/js/bootstrap.js old mode 100644 new mode 100755 diff --git a/static/bootstrap4/js/bootstrap.js.map b/static/bootstrap4/js/bootstrap.js.map old mode 100644 new mode 100755 diff --git a/static/bootstrap4/js/bootstrap.min.js b/static/bootstrap4/js/bootstrap.min.js old mode 100644 new mode 100755 diff --git a/static/bootstrap4/js/bootstrap.min.js.map b/static/bootstrap4/js/bootstrap.min.js.map old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/HELP-US-OUT.txt b/static/font-awesome/4.7.0/HELP-US-OUT.txt old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/css/font-awesome.css b/static/font-awesome/4.7.0/css/font-awesome.css old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/css/font-awesome.min.css b/static/font-awesome/4.7.0/css/font-awesome.min.css old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/fonts/FontAwesome.otf b/static/font-awesome/4.7.0/fonts/FontAwesome.otf old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/fonts/fontawesome-webfont.eot b/static/font-awesome/4.7.0/fonts/fontawesome-webfont.eot old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/fonts/fontawesome-webfont.svg b/static/font-awesome/4.7.0/fonts/fontawesome-webfont.svg old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/fonts/fontawesome-webfont.ttf b/static/font-awesome/4.7.0/fonts/fontawesome-webfont.ttf old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/fonts/fontawesome-webfont.woff b/static/font-awesome/4.7.0/fonts/fontawesome-webfont.woff old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/fonts/fontawesome-webfont.woff2 b/static/font-awesome/4.7.0/fonts/fontawesome-webfont.woff2 old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/less/animated.less b/static/font-awesome/4.7.0/less/animated.less old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/less/bordered-pulled.less b/static/font-awesome/4.7.0/less/bordered-pulled.less old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/less/core.less b/static/font-awesome/4.7.0/less/core.less old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/less/fixed-width.less b/static/font-awesome/4.7.0/less/fixed-width.less old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/less/font-awesome.less b/static/font-awesome/4.7.0/less/font-awesome.less old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/less/icons.less b/static/font-awesome/4.7.0/less/icons.less old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/less/larger.less b/static/font-awesome/4.7.0/less/larger.less old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/less/list.less b/static/font-awesome/4.7.0/less/list.less old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/less/mixins.less b/static/font-awesome/4.7.0/less/mixins.less old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/less/path.less b/static/font-awesome/4.7.0/less/path.less old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/less/rotated-flipped.less b/static/font-awesome/4.7.0/less/rotated-flipped.less old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/less/screen-reader.less b/static/font-awesome/4.7.0/less/screen-reader.less old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/less/stacked.less b/static/font-awesome/4.7.0/less/stacked.less old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/less/variables.less b/static/font-awesome/4.7.0/less/variables.less old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/scss/_animated.scss b/static/font-awesome/4.7.0/scss/_animated.scss old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/scss/_bordered-pulled.scss b/static/font-awesome/4.7.0/scss/_bordered-pulled.scss old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/scss/_core.scss b/static/font-awesome/4.7.0/scss/_core.scss old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/scss/_fixed-width.scss b/static/font-awesome/4.7.0/scss/_fixed-width.scss old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/scss/_icons.scss b/static/font-awesome/4.7.0/scss/_icons.scss old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/scss/_larger.scss b/static/font-awesome/4.7.0/scss/_larger.scss old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/scss/_list.scss b/static/font-awesome/4.7.0/scss/_list.scss old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/scss/_mixins.scss b/static/font-awesome/4.7.0/scss/_mixins.scss old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/scss/_path.scss b/static/font-awesome/4.7.0/scss/_path.scss old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/scss/_rotated-flipped.scss b/static/font-awesome/4.7.0/scss/_rotated-flipped.scss old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/scss/_screen-reader.scss b/static/font-awesome/4.7.0/scss/_screen-reader.scss old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/scss/_stacked.scss b/static/font-awesome/4.7.0/scss/_stacked.scss old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/scss/_variables.scss b/static/font-awesome/4.7.0/scss/_variables.scss old mode 100644 new mode 100755 diff --git a/static/font-awesome/4.7.0/scss/font-awesome.scss b/static/font-awesome/4.7.0/scss/font-awesome.scss old mode 100644 new mode 100755 diff --git a/static/images/avatar.jpg b/static/images/avatar.jpg old mode 100644 new mode 100755 diff --git a/static/images/default.png b/static/images/default.png old mode 100644 new mode 100755 diff --git a/static/images/error.png b/static/images/error.png old mode 100644 new mode 100755 diff --git a/static/images/share_tit_bg_5855301.png b/static/images/share_tit_bg_5855301.png old mode 100644 new mode 100755 diff --git a/static/images/white64.png b/static/images/white64.png old mode 100644 new mode 100755 diff --git a/static/jQuery-contextMenu/font/context-menu-icons.eot b/static/jQuery-contextMenu/font/context-menu-icons.eot old mode 100644 new mode 100755 diff --git a/static/jQuery-contextMenu/font/context-menu-icons.ttf b/static/jQuery-contextMenu/font/context-menu-icons.ttf old mode 100644 new mode 100755 diff --git a/static/jQuery-contextMenu/font/context-menu-icons.woff b/static/jQuery-contextMenu/font/context-menu-icons.woff old mode 100644 new mode 100755 diff --git a/static/jQuery-contextMenu/font/context-menu-icons.woff2 b/static/jQuery-contextMenu/font/context-menu-icons.woff2 old mode 100644 new mode 100755 diff --git a/static/jQuery-contextMenu/jquery.contextMenu.css b/static/jQuery-contextMenu/jquery.contextMenu.css old mode 100644 new mode 100755 diff --git a/static/jQuery-contextMenu/jquery.contextMenu.js b/static/jQuery-contextMenu/jquery.contextMenu.js old mode 100644 new mode 100755 diff --git a/static/jQuery-contextMenu/jquery.contextMenu.min.css b/static/jQuery-contextMenu/jquery.contextMenu.min.css old mode 100644 new mode 100755 diff --git a/static/jQuery-contextMenu/jquery.contextMenu.min.css.map b/static/jQuery-contextMenu/jquery.contextMenu.min.css.map old mode 100644 new mode 100755 diff --git a/static/jQuery-contextMenu/jquery.contextMenu.min.js b/static/jQuery-contextMenu/jquery.contextMenu.min.js old mode 100644 new mode 100755 diff --git a/static/jQuery-contextMenu/jquery.contextMenu.min.js.map b/static/jQuery-contextMenu/jquery.contextMenu.min.js.map old mode 100644 new mode 100755 diff --git a/static/jQuery-contextMenu/jquery.ui.position.js b/static/jQuery-contextMenu/jquery.ui.position.js old mode 100644 new mode 100755 diff --git a/static/jQuery-contextMenu/jquery.ui.position.min.js b/static/jQuery-contextMenu/jquery.ui.position.min.js old mode 100644 new mode 100755 diff --git a/static/js/clipBoard.min.js b/static/js/clipBoard.min.js old mode 100644 new mode 100755 diff --git a/static/js/holmes.js b/static/js/holmes.js old mode 100644 new mode 100755 diff --git a/static/js/jquery.min.js b/static/js/jquery.min.js old mode 100644 new mode 100755 diff --git a/static/js/md5.min.js b/static/js/md5.min.js old mode 100644 new mode 100755 diff --git a/static/js/qrcode.min.js b/static/js/qrcode.min.js old mode 100644 new mode 100755 diff --git a/static/layui-2.6.8/css/layui.css b/static/layui-2.6.8/css/layui.css old mode 100644 new mode 100755 diff --git a/static/layui-2.6.8/css/modules/code.css b/static/layui-2.6.8/css/modules/code.css old mode 100644 new mode 100755 diff --git a/static/layui-2.6.8/css/modules/laydate/default/laydate.css b/static/layui-2.6.8/css/modules/laydate/default/laydate.css old mode 100644 new mode 100755 diff --git a/static/layui-2.6.8/css/modules/layer/default/icon-ext.png b/static/layui-2.6.8/css/modules/layer/default/icon-ext.png old mode 100644 new mode 100755 diff --git a/static/layui-2.6.8/css/modules/layer/default/icon.png b/static/layui-2.6.8/css/modules/layer/default/icon.png old mode 100644 new mode 100755 diff --git a/static/layui-2.6.8/css/modules/layer/default/layer.css b/static/layui-2.6.8/css/modules/layer/default/layer.css old mode 100644 new mode 100755 diff --git a/static/layui-2.6.8/css/modules/layer/default/loading-0.gif b/static/layui-2.6.8/css/modules/layer/default/loading-0.gif old mode 100644 new mode 100755 diff --git a/static/layui-2.6.8/css/modules/layer/default/loading-1.gif b/static/layui-2.6.8/css/modules/layer/default/loading-1.gif old mode 100644 new mode 100755 diff --git a/static/layui-2.6.8/css/modules/layer/default/loading-2.gif b/static/layui-2.6.8/css/modules/layer/default/loading-2.gif old mode 100644 new mode 100755 diff --git a/static/layui-2.6.8/font/iconfont.eot b/static/layui-2.6.8/font/iconfont.eot old mode 100644 new mode 100755 diff --git a/static/layui-2.6.8/font/iconfont.svg b/static/layui-2.6.8/font/iconfont.svg old mode 100644 new mode 100755 diff --git a/static/layui-2.6.8/font/iconfont.ttf b/static/layui-2.6.8/font/iconfont.ttf old mode 100644 new mode 100755 diff --git a/static/layui-2.6.8/font/iconfont.woff b/static/layui-2.6.8/font/iconfont.woff old mode 100644 new mode 100755 diff --git a/static/layui-2.6.8/font/iconfont.woff2 b/static/layui-2.6.8/font/iconfont.woff2 old mode 100644 new mode 100755 diff --git a/static/layui-2.6.8/layui.js b/static/layui-2.6.8/layui.js old mode 100644 new mode 100755 diff --git a/static/layui/css/layui.css b/static/layui/css/layui.css old mode 100644 new mode 100755 diff --git a/static/layui/font/iconfont.eot b/static/layui/font/iconfont.eot old mode 100644 new mode 100755 diff --git a/static/layui/font/iconfont.svg b/static/layui/font/iconfont.svg old mode 100644 new mode 100755 diff --git a/static/layui/font/iconfont.ttf b/static/layui/font/iconfont.ttf old mode 100644 new mode 100755 diff --git a/static/layui/font/iconfont.woff b/static/layui/font/iconfont.woff old mode 100644 new mode 100755 diff --git a/static/layui/font/iconfont.woff2 b/static/layui/font/iconfont.woff2 old mode 100644 new mode 100755 diff --git a/static/layui/layui.js b/static/layui/layui.js old mode 100644 new mode 100755 diff --git a/static/mdui/css/mdui.css b/static/mdui/css/mdui.css old mode 100644 new mode 100755 diff --git a/static/mdui/css/mdui.css.map b/static/mdui/css/mdui.css.map old mode 100644 new mode 100755 diff --git a/static/mdui/css/mdui.min.css b/static/mdui/css/mdui.min.css old mode 100644 new mode 100755 diff --git a/static/mdui/css/mdui.min.css.map b/static/mdui/css/mdui.min.css.map old mode 100644 new mode 100755 diff --git a/static/mdui/fonts/roboto/LICENSE.txt b/static/mdui/fonts/roboto/LICENSE.txt old mode 100644 new mode 100755 diff --git a/static/mdui/fonts/roboto/Roboto-Black.woff b/static/mdui/fonts/roboto/Roboto-Black.woff old mode 100644 new mode 100755 diff --git a/static/mdui/fonts/roboto/Roboto-Black.woff2 b/static/mdui/fonts/roboto/Roboto-Black.woff2 old mode 100644 new mode 100755 diff --git a/static/mdui/fonts/roboto/Roboto-BlackItalic.woff b/static/mdui/fonts/roboto/Roboto-BlackItalic.woff old mode 100644 new mode 100755 diff --git a/static/mdui/fonts/roboto/Roboto-BlackItalic.woff2 b/static/mdui/fonts/roboto/Roboto-BlackItalic.woff2 old mode 100644 new mode 100755 diff --git a/static/mdui/fonts/roboto/Roboto-Bold.woff b/static/mdui/fonts/roboto/Roboto-Bold.woff old mode 100644 new mode 100755 diff --git a/static/mdui/fonts/roboto/Roboto-Bold.woff2 b/static/mdui/fonts/roboto/Roboto-Bold.woff2 old mode 100644 new mode 100755 diff --git a/static/mdui/fonts/roboto/Roboto-BoldItalic.woff b/static/mdui/fonts/roboto/Roboto-BoldItalic.woff old mode 100644 new mode 100755 diff --git a/static/mdui/fonts/roboto/Roboto-BoldItalic.woff2 b/static/mdui/fonts/roboto/Roboto-BoldItalic.woff2 old mode 100644 new mode 100755 diff --git a/static/mdui/fonts/roboto/Roboto-Light.woff b/static/mdui/fonts/roboto/Roboto-Light.woff old mode 100644 new mode 100755 diff --git a/static/mdui/fonts/roboto/Roboto-Light.woff2 b/static/mdui/fonts/roboto/Roboto-Light.woff2 old mode 100644 new mode 100755 diff --git a/static/mdui/fonts/roboto/Roboto-LightItalic.woff b/static/mdui/fonts/roboto/Roboto-LightItalic.woff old mode 100644 new mode 100755 diff --git a/static/mdui/fonts/roboto/Roboto-LightItalic.woff2 b/static/mdui/fonts/roboto/Roboto-LightItalic.woff2 old mode 100644 new mode 100755 diff --git a/static/mdui/fonts/roboto/Roboto-Medium.woff b/static/mdui/fonts/roboto/Roboto-Medium.woff old mode 100644 new mode 100755 diff --git a/static/mdui/fonts/roboto/Roboto-Medium.woff2 b/static/mdui/fonts/roboto/Roboto-Medium.woff2 old mode 100644 new mode 100755 diff --git a/static/mdui/fonts/roboto/Roboto-MediumItalic.woff b/static/mdui/fonts/roboto/Roboto-MediumItalic.woff old mode 100644 new mode 100755 diff --git a/static/mdui/fonts/roboto/Roboto-MediumItalic.woff2 b/static/mdui/fonts/roboto/Roboto-MediumItalic.woff2 old mode 100644 new mode 100755 diff --git a/static/mdui/fonts/roboto/Roboto-Regular.woff b/static/mdui/fonts/roboto/Roboto-Regular.woff old mode 100644 new mode 100755 diff --git a/static/mdui/fonts/roboto/Roboto-Regular.woff2 b/static/mdui/fonts/roboto/Roboto-Regular.woff2 old mode 100644 new mode 100755 diff --git a/static/mdui/fonts/roboto/Roboto-RegularItalic.woff b/static/mdui/fonts/roboto/Roboto-RegularItalic.woff old mode 100644 new mode 100755 diff --git a/static/mdui/fonts/roboto/Roboto-RegularItalic.woff2 b/static/mdui/fonts/roboto/Roboto-RegularItalic.woff2 old mode 100644 new mode 100755 diff --git a/static/mdui/fonts/roboto/Roboto-Thin.woff b/static/mdui/fonts/roboto/Roboto-Thin.woff old mode 100644 new mode 100755 diff --git a/static/mdui/fonts/roboto/Roboto-Thin.woff2 b/static/mdui/fonts/roboto/Roboto-Thin.woff2 old mode 100644 new mode 100755 diff --git a/static/mdui/fonts/roboto/Roboto-ThinItalic.woff b/static/mdui/fonts/roboto/Roboto-ThinItalic.woff old mode 100644 new mode 100755 diff --git a/static/mdui/fonts/roboto/Roboto-ThinItalic.woff2 b/static/mdui/fonts/roboto/Roboto-ThinItalic.woff2 old mode 100644 new mode 100755 diff --git a/static/mdui/icons/material-icons/LICENSE.txt b/static/mdui/icons/material-icons/LICENSE.txt old mode 100644 new mode 100755 diff --git a/static/mdui/icons/material-icons/MaterialIcons-Regular.ijmap b/static/mdui/icons/material-icons/MaterialIcons-Regular.ijmap old mode 100644 new mode 100755 diff --git a/static/mdui/icons/material-icons/MaterialIcons-Regular.woff b/static/mdui/icons/material-icons/MaterialIcons-Regular.woff old mode 100644 new mode 100755 diff --git a/static/mdui/icons/material-icons/MaterialIcons-Regular.woff2 b/static/mdui/icons/material-icons/MaterialIcons-Regular.woff2 old mode 100644 new mode 100755 diff --git a/static/mdui/js/mdui.esm.js b/static/mdui/js/mdui.esm.js old mode 100644 new mode 100755 diff --git a/static/mdui/js/mdui.esm.js.map b/static/mdui/js/mdui.esm.js.map old mode 100644 new mode 100755 diff --git a/static/mdui/js/mdui.js b/static/mdui/js/mdui.js old mode 100644 new mode 100755 diff --git a/static/mdui/js/mdui.js.map b/static/mdui/js/mdui.js.map old mode 100644 new mode 100755 diff --git a/static/mdui/js/mdui.min.js b/static/mdui/js/mdui.min.js old mode 100644 new mode 100755 diff --git a/static/mdui/js/mdui.min.js.map b/static/mdui/js/mdui.min.js.map old mode 100644 new mode 100755 diff --git a/static/module/iconHhys/iconHhysFa.js b/static/module/iconHhys/iconHhysFa.js old mode 100644 new mode 100755 diff --git a/templates/admin/header.php b/templates/admin/header.php index 444b91c..c849ad7 100755 --- a/templates/admin/header.php +++ b/templates/admin/header.php @@ -33,7 +33,7 @@