From d9d2790b6c0cd632b85d1afd5191f7615cc83e63 Mon Sep 17 00:00:00 2001 From: "wmgang@qq.com" Date: Wed, 23 Nov 2022 11:44:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E6=98=BE=E7=A4=BA=202.=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E5=A2=9E=E5=8A=A0=E9=93=BE=E6=8E=A5=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=203.=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/onenav.simple.db3 | Bin 53248 -> 61440 bytes static/images/default.png | Bin 0 -> 1471 bytes templates/admin/static/embed.js | 13 +++++++++++++ 3 files changed, 13 insertions(+) create mode 100644 static/images/default.png diff --git a/db/onenav.simple.db3 b/db/onenav.simple.db3 index 43851ab8ff6a4e86d5d6a5f8d3de79203400013f..42b41aa36190883bcb0629e7e695cdfbacaf7985 100644 GIT binary patch delta 1783 zcmdT^&rj1(9B;R7?bwgEia3HI9g5i^OvW4w2cs3L62=B|i%haCV=J>#+OZXtn9zwN zcrg)Qyc&av+&nlB-T*KD1zz+b7ZXoj2^W238*U(pQ7^ogZ<>6*-}n9Y^XaFr_(EU& zqJMInUdAvCprBCbP@G!s^tqQYPx6G7Jd0U~O$@xYZd*4Rx=dT9Md~>vkl)E7v1#1a zc8Rvf33c(9gLJgE;!CQMnh<$eN{WIsRj58~{Sl6ha!i!H9ORhsDx7dx8yIF>$RwD- zP?WpMMVOJu;4mABGecaQ35BCfC>9KMGCO6HHFYk(yEd(AZ4^Nf`2-W?#-gs?^L2SG zJ)0LR$sT|2zHEjsr1L^f5oD>Rsxmp1$s`qFy4u{^z4tikp4(GVIeM2DvbU5395u9o zGL2kb&hdF=E&=BaZE6`yi$Z!T!3dJVXZidtGiHFh!p4G8rn}Njk#jjg%Knn8D$%}5 z#5P$_Qc`AOZa<$%SyGZh8d3F@<kLVAFu16y*`WzL-Vxhs&80XrN&+R_f3>lk; z1m=raEX%@HsyUD>%!q=*^Y=7XNrj(AN@yNPdeJ^GN5L)X8~o7VhnuFakT5IILHSD- z>k-_DT)0r~t=6A6I#3R+#i1tB!Ls-xXL-oeGmJq zXz7(`!Rau8U}s>VuL{HU>2)xmN7EVuJ`FTc7?kAzi0cs65ePV)Wo$(X+Q)GX3kNE7 z7%a)d%^DB1a1)K7(2CxI{DWZSd3l1>&Th#o@Z#0=MSJ;D*`)SJgA{on$rW qPV2)alyR;UN1k3Hj#B21!>&h2`>qslVBjX$*dxaeO^!RiSKucYvC<&` delta 938 zcmZXRPfQa*6vk(4ZKq3jmbTDEw7P9 zK_wm(nlTzZ7=*+>i6KJ0c~HD~H}Qf8^-zKr&uBcj-GVW)$z(I%``+(;Gn4zO$<1r# z_L}Yj0BB`xf3^8WxAQJ&?wq4h02s9bz~{6A^H#^<{j?FW6VshrZ7%0GG=*RE zYj|{8*6UfD4bHU7vAB?w#6E!+QJkExtMtZqUe=k?> zP-2#4UnqDc8u4}nqntwx)E(?N-R)N_rCkF}HMnUVd&*8)^fkmvv0Cakc$v>XCprCh z@))h_+?9XJGl)eMR{<(L0J&k1DI9|LSf>--Oct~_4#_R1zR*OOq0WVLtk0%0YxHIV z!Y{VEmY9f^*@V{Rycv>Jx~;@gc`KDL%;FqC)Cypp;(JVtUN$~3?y5LItrSd^k0>^U zDgZp-9kBz1kfm#aJH^XGV{!6MswKUt6Zn$e2w+p^lvg#7XQ@xvtWzX++x3>RbVr!M z>~2MBaZmeHso)$o!aV`4qS-xDZDn-v)$C;P&ZFYe0?B8qNnD(F;2)q0Iujnd9U+6I zxO97C@n+918bGI~tRZqv3bZPR$w12mcZp-Lc*7k-vYgHwce%#L$D1d{M#hrO32E3h zloSMM(j|#WF?PijOY`KAWNTEK6VMs+Y=ux~tlytmf3jGj_%zBii>Hi6#3Xs>9;jT1 zGo&^cNa0J6Wx@dAHNe=I0p=NA!#|nNOe?cmFmdlOS-WVHRr-YC;C(4eSfK@E=p2{saI3 diff --git a/static/images/default.png b/static/images/default.png new file mode 100644 index 0000000000000000000000000000000000000000..e5534a14b22e05f81ec8193cb4efb73b0c127d99 GIT binary patch literal 1471 zcmV;w1wi_VP)Fn(6_V)Jp`1tzz`v3p`|NsBt;o;)q;^X7v=jZ3>=;-R| z>g((4?d|RD?d|aJ@bmNY_4W1g^78fd_4oJp`uh6$`T76<|M~g(|NsC0|NsC0|MvFw z-{0T=|Nr~@`{d;0{r&y;`1tPb?&|95=;-M4^YifV@b&fea_{LD0000abW%=J0PV&1 z`{BBzR7p1+2j}0?%d)JRnTvaCV`ED|H7zMA6cPkjXjS#w000EKNkl(k_%U{192-@gyb(FmXFce%odkcXX#KJNg zZ!yz0w#Zf~ETq-kZcea5`K;_xz?xW^cMF08R2XLK431>A{WtS}cd6izDz%rF;1tE0 zw@Sh>sddMmKAiKP8t?VN!2kK?Sb~N8G3S!Ngv!bNRbZng_PG{dB*t%823FZvw*a$Z zWWWSwG(2Vjc4DZT1N`!Sw<4H$w@uS^UDLi{f~sCP1+<%=*WZ`dr-in(cPjrWF}I!8 zVIYdSr_h$8auot34mv#Sj;~4n|L^EHmIkYd$6XIVMU~Y(7dI_BiQb(qaK799*VH_r zi$JFpD4>g{+I!chb-ztH>GkTnt5+#imIVHZL?^-9Ygg(MI-@JOSTzB&81N-O<3{Lw z8es{trG> z(Lnmgkhp3w9M@VpLuj%$%spC!Jf{+VSQbyYz_MKdE$-R-A5EN8S4Qhn9IH`NcZ$FF zd{-ySqaeE^;)PnntMm1K7Qd*06Ba5hVv)t)kLh;H`CT)jMMIW(||~M9w*>x+C&_szX|BuJ>lA zw3w=uPFS02gsQrvG5Cj%A>rU3ct$6Y_W>G8}*Cp{OfFgn6siC24N8RGt(AZ?EnAWY|KiQ zZn>TkwNErLK>^|JxXm#LHIrj5)MRl5x8fpxr{elM!3Lt1an}Yyw#?+#GVze;($+b) zfFxo_ps{EH%Pp2+JGowC&ed+UXV1d12!MbkIplizi#TS9J20}(2S5NqpSZa+8~{%g zP2q*14+MLM&Wynxgty(<0Y@oXZQTr!F8&zaVnA;ZTvw}@-+*4#a)JRprZDkSGxG?A z2}vhRVa7xJ`WVlAE&0O>tCi z;srM89ZM6~CPHANBt>z@l3UQb!^y}P#qA^<=bhJpTFqXAfY>2%~1i<+K{8w%H^R3E_!E{?$i6d$>Pk&%&A zk&w(v=O`>_=8*&lwG-HB^xMFk2Vr*)Wgo%&ZM(wfpwYRcyiPdX+tKZ4wPP*AX1e@7 ZcmP9LJ!&uVJf;8u002ovPDHLkV1m`>3Y-7{ literal 0 HcmV?d00001 diff --git a/templates/admin/static/embed.js b/templates/admin/static/embed.js index 0cfaaff..48d68c8 100755 --- a/templates/admin/static/embed.js +++ b/templates/admin/static/embed.js @@ -21,6 +21,9 @@ layui.use(['element','table','layer','form','upload','iconHhysFa'], function(){ ,page: true //开启分页 ,cols: [[ //表头 {field: 'id', title: 'ID', width:80, sort: true, fixed: 'left'} + ,{field: 'font_icon', title: '图标', width:60, templet: function(d){ + return ''; + }} ,{field: 'name', title: '分类名称', width:160} ,{field: 'fname', title: '父级分类', width:160} ,{field: 'add_time', title: '添加时间', width:160, sort: true,templet:function(d){ @@ -84,6 +87,16 @@ layui.use(['element','table','layer','form','upload','iconHhysFa'], function(){ ,cols: [[ //表头 {type:'checkbox'} //开启复选框 ,{field: 'id', title: 'ID', width:80, sort: true} + ,{field: 'font_icon', title: '图标', width:60, templet:function(d){ + if(d.font_icon==null) + { + return ''; + } + else + { + return ''; + } + }} // ,{field: 'fid', title: '分类ID',sort:true, width:90} ,{field: 'category_name', title: '所属分类',sort:true,width:120} ,{field: 'url', title: 'URL',width:140,templet:function(d){ From 3df736df371386edccb762f836b8a28d00de5611 Mon Sep 17 00:00:00 2001 From: "wmgang@qq.com" Date: Wed, 23 Nov 2022 15:00:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E4=BD=8D=E7=BD=AE=202.=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E6=97=B6=E5=8F=AF=E4=B8=8A=E4=BC=A0=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E6=88=96=E6=89=8B=E5=B7=A5=E8=BE=93=E5=85=A5=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- class/Api.php | 44 ++++++++++++++++++++++++-- controller/api.php | 13 ++++++-- controller/click.php | 2 +- templates/admin/add_link.php | 14 ++++++++ templates/admin/static/embed.js | 23 +++++++++++++- {static/images => upload}/default.png | Bin 6 files changed, 90 insertions(+), 6 deletions(-) rename {static/images => upload}/default.png (100%) diff --git a/class/Api.php b/class/Api.php index 02dfb4a..833c15d 100755 --- a/class/Api.php +++ b/class/Api.php @@ -204,7 +204,7 @@ class Api { /** * name:添加链接 */ - public function add_link($token,$fid,$title,$url,$description = '',$weight = 0,$property = 0,$url_standby = ''){ + public function add_link($token,$fid,$title,$url,$description = '',$weight = 0,$property = 0,$url_standby = '',$font_icon=''){ $this->auth($token); $fid = intval($fid); //检测链接是否合法 @@ -225,7 +225,8 @@ class Api { 'description' => htmlspecialchars($description,ENT_QUOTES), 'add_time' => time(), 'weight' => $weight, - 'property' => $property + 'property' => $property, + 'font_icon' => $font_icon ]; //插入数据库 $re = $this->db->insert('on_links',$data); @@ -531,6 +532,45 @@ class Api { } } } + + /** + * 图标上传 + * type:上传类型 + */ + public function uploadImages($token,$type){ + $this->auth($token); + if ($_FILES["file"]["error"] > 0) + { + $this->err_msg(-1015,'File upload failed!'); + } + else + { + //根据时间生成文件名 + $filename = $_FILES["file"]["name"]; + //获取文件后缀 + $suffix = explode('.',$filename); + $suffix = strtolower(end($suffix)); + + //临时文件位置 + $temp = $_FILES["file"]["tmp_name"]; + if( $suffix != 'ico' && $suffix != 'jpg' && $suffix != 'png' && $suffix != 'bmp' ) { + //删除临时文件 + unlink($filename); + $this->err_msg(-1014,'Unsupported file suffix name!'); + } + + $newfilename='upload/'.time().'.'.$suffix; + + if( copy($temp,$newfilename) ) { + $data = [ + 'code' => 0, + 'file_name' => $newfilename + ]; + exit(json_encode($data)); + } + } + } + /** * 导出HTML链接进行备份 */ diff --git a/controller/api.php b/controller/api.php index e95020a..d551e3f 100755 --- a/controller/api.php +++ b/controller/api.php @@ -107,8 +107,9 @@ function add_link($api){ $description = empty($_POST['description']) ? '' : $_POST['description']; $weight = empty($_POST['weight']) ? 0 : intval($_POST['weight']); $property = empty($_POST['property']) ? 0 : 1; - - $api->add_link($token,$fid,$title,$url,$description,$weight,$property,$url_standby); + $font_icon = empty($_POST['font_icon']) ? '' : $_POST['font_icon']; + + $api->add_link($token,$fid,$title,$url,$description,$weight,$property,$url_standby,$font_icon); } /** @@ -239,6 +240,14 @@ function upload($api){ $type = $_GET['type']; $api->upload($token,$type); } +// 上传图标 +function uploadImages($api){ + //获取token + $token = empty( $_POST['token'] ) ? $_GET['token'] : $_POST['token']; + //获取上传类型 + $type = $_GET['type']; + $api->uploadImages($token,$type); +} //书签导入 function imp_link($api) { //获取token diff --git a/controller/click.php b/controller/click.php index 523d6f3..687d77e 100755 --- a/controller/click.php +++ b/controller/click.php @@ -13,7 +13,7 @@ if(empty($id)) { } //查询链接信息 -$link = $db->get('on_links',['id','fid','url','url_standby','property','click','title','description'],[ +$link = $db->get('on_links',['id','fid','url','url_standby','property','click','title','description','font_icon'],[ 'id' => $id ]); diff --git a/templates/admin/add_link.php b/templates/admin/add_link.php index e96e4fd..de6288b 100755 --- a/templates/admin/add_link.php +++ b/templates/admin/add_link.php @@ -30,6 +30,20 @@ +
+ +
+ +
+
+ +
+ +
+ +
+
+
diff --git a/templates/admin/static/embed.js b/templates/admin/static/embed.js index 48d68c8..9f5ac90 100755 --- a/templates/admin/static/embed.js +++ b/templates/admin/static/embed.js @@ -90,7 +90,7 @@ layui.use(['element','table','layer','form','upload','iconHhysFa'], function(){ ,{field: 'font_icon', title: '图标', width:60, templet:function(d){ if(d.font_icon==null) { - return ''; + return ''; } else { @@ -733,6 +733,27 @@ layui.use(['element','table','layer','form','upload','iconHhysFa'], function(){ } }); + upload.render({ + elem: '#iconUpload' //绑定元素 + ,url: 'index.php?c=api&method=uploadImages' //上传接口 + ,accept:'file' + ,exts: 'ico|jpg|png|bmp' + ,done: function(res){ + //console.log(res); + //上传完毕回调 + if( res.code == 0 ) { + $("#font_icon").val(res.file_name); + } + else if( res.code < 0) { + layer.msg(res.err_msg, {icon: 5}); + layer.close(); + } + + } + ,error: function(){ + //请求异常回调 + } + }); }); function get_link_info() { diff --git a/static/images/default.png b/upload/default.png similarity index 100% rename from static/images/default.png rename to upload/default.png From 76f9e06f690d4849a5ad794f9a906311f0045645 Mon Sep 17 00:00:00 2001 From: "wmgang@qq.com" Date: Wed, 23 Nov 2022 15:13:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E6=97=B6=E5=8F=AF=E4=BF=AE=E6=94=B9=E5=9B=BE=E6=A0=87=E6=88=96?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=B0=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- class/Api.php | 5 +++-- controller/api.php | 5 +++-- templates/admin/edit_link.php | 14 ++++++++++++++ 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/class/Api.php b/class/Api.php index 833c15d..5182f00 100755 --- a/class/Api.php +++ b/class/Api.php @@ -608,7 +608,7 @@ class Api { /** * name:修改链接 */ - public function edit_link($token,$id,$fid,$title,$url,$description = '',$weight = 0,$property = 0,$url_standby = ''){ + public function edit_link($token,$id,$fid,$title,$url,$description = '',$weight = 0,$property = 0,$url_standby = '',$font_icon = ''){ $this->auth($token); $fid = intval($fid); //检测链接是否合法 @@ -634,7 +634,8 @@ class Api { 'description' => htmlspecialchars($description,ENT_QUOTES), 'up_time' => time(), 'weight' => $weight, - 'property' => $property + 'property' => $property, + 'font_icon' => $font_icon ]; //插入数据库 $re = $this->db->update('on_links',$data,[ 'id' => $id]); diff --git a/controller/api.php b/controller/api.php index d551e3f..dccdd6f 100755 --- a/controller/api.php +++ b/controller/api.php @@ -129,8 +129,9 @@ function edit_link($api){ $description = empty($_POST['description']) ? '' : $_POST['description']; $weight = empty($_POST['weight']) ? 0 : intval($_POST['weight']); $property = empty($_POST['property']) ? 0 : 1; - - $api->edit_link($token,$id,$fid,$title,$url,$description,$weight,$property,$url_standby); + $font_icon = empty($_POST['font_icon']) ? '' : $_POST['font_icon']; + + $api->edit_link($token,$id,$fid,$title,$url,$description,$weight,$property,$url_standby,$font_icon); } diff --git a/templates/admin/edit_link.php b/templates/admin/edit_link.php index 3aa8509..5471eef 100755 --- a/templates/admin/edit_link.php +++ b/templates/admin/edit_link.php @@ -38,6 +38,20 @@
+
+ +
+ +
+
+ +
+ +
+ +
+
+