修复问题

UPDATE.md

@@ -1,17 +1,21 @@
-## PicHome beta3.2 更新说明
+## PicHome beta3.3 更新说明
 
-### 1.修复windows文件上传至linux服务器，由于编码问题导致的库导入没有文件问题
+### 1.billfish数据支持，兼容billfish2.5版本数据导入
 
-### 2.库设置内容更改，当库状态为断开时，可以重新设置库的路径(即目录位置移动之后，库读取不到，可以设置为新目录所在位置)
+### 2.eagle数据支持，兼容新旧版本eagle数据导入
 
-### 3.优化普通目录文件缩略图生成逻辑，以修复瀑布流展示时页面问题(此项对已生成过缩略图的不生效，需重新导入库生成）
+### 3.优化普通目录文件缩略图生成逻辑，优化效率，以及缩略图转换数字显示等问题修复
 
-### 4.优化导入逻辑，当库在导入状态时，将会自动执行导入文件，直至导入完成为止
+### 4.修复普通目录由于文件名长度问题导致的文件缺失和部分服务器中存在因路径分割符不同导致文件导入累加式重复问题
 
-### 5.修复eagle库注释显示html标签问题
+### 5.库设置增加库名称修改选项
 
-### 6.修复billfish库导入链接丢失问题
+### 6.修复页面标签未分类数据显示错误问题，修复单一库时存在的筛选项不能正常显示问题
 
-### 7.优化删除逻辑
+### 7.页面增加按eagle和billfish内目录排序显示支持
 
-### 8.其他已知bug修复
+### 8.优化库删除逻辑，删除时清理库冗余数据
+
+### 9.文件访问地址修改为动态地址，增强文件私密性，为之后版本文件私密保护做准备
+
+### 10.其他已知bug修复

admin/login/login.php

@@ -130,7 +130,7 @@ function html_login_form() {
     $sid = getglobal('sid');
     $avatarstatus=getglobal('avatarstatus','member');
     if(!$uid ){
-        $avastar ='<img src="'.($_G['setting']['sitelogo']?\IO::getFileUri('attach::'.$_G['setting']['sitelogo']):'data/attachment/sitelogo/sitelogo.png').'" />';
+        $avastar ='<img src="data/attachment/sitelogo/sitelogo.png" />';
     }else{
         $avastar = avatar_block($uid);
     }

admin/oaooafiles.md5

@@ -20,6 +20,7 @@ b725e80a7ff1e8a3a434e77ba290a6df *admin/system/dist/css/chunk-74c32c70.4b7d665e.
 2e6b6788446f5529d3deed1697515b3b *admin/system/dist/css/chunk-76f23146.6fc79cd8.css
 c513c1a246b65307640fca09b0034313 *admin/system/dist/css/chunk-77c8d08e.61624e22.css
 d12dc4f1e439eb23e83c18205290cf55 *admin/system/dist/css/chunk-7828662a.c81657ef.css
+053d89992d7adc9fae1b7830d031f2b0 *admin/system/dist/css/chunk-801d4da6.a47ba236.css
 4fc8845677fec5f6ab3e4e56dcf36650 *admin/system/dist/css/chunk-9f9c2568.5356ad7d.css
 84614a4a0974a1157dc75739ce2b8966 *admin/system/dist/css/chunk-af3b1b98.b822363f.css
 f018e18ed2f2fe16f2d76ed02b284545 *admin/system/dist/css/chunk-e730cc06.987283b7.css
@@ -33,7 +34,8 @@ ea41001e9a9735db73fd1c33f753a258 *admin/system/dist/css/chunk-vendors.4d5d56a8.c
 888e61f04316f10bddfff7bee10c6dd0 *admin/system/dist/fonts/remixicon.888e61f0.ttf
 9915fef980fa539085da55b84dfde760 *admin/system/dist/fonts/remixicon.9915fef9.woff2
 95138f36e015ad912c37db92164f5844 *admin/system/dist/img/remixicon.95138f36.svg
-ae1ba44ed8a73c33b0aa0ab4a44cf523 *admin/system/dist/index.html
+911c0d4f607a5e0f1ba2a9eb9280ab66 *admin/system/dist/index.html
+e116b4f06b14ec0f557bbf891fd591af *admin/system/dist/js/chunk-2b4f90f7.8dd0185d.js
 057184d69924bbec3848613e9d484a61 *admin/system/dist/js/chunk-2b4f90f7.ec4ac270.js
 9915050af25ebd2a757ddda815fa2025 *admin/system/dist/js/chunk-2d0a3327.ad2684c9.js
 14d1eb5255f59b744a0e86b76e999f8c *admin/system/dist/js/chunk-2d0bdbc6.4ec7bc5e.js
@@ -54,11 +56,13 @@ f1356ba4b41b1c2d0db9158645cfd968 *admin/system/dist/js/chunk-2d0dd46d.bd431129.j
 240a2f188b2b072ac8200cd0a3cc153a *admin/system/dist/js/chunk-76f23146.0d2957ed.js
 60e968e5f5a74243077cee14c95528ee *admin/system/dist/js/chunk-77c8d08e.3e576953.js
 80880cf301a3788dc9bee90756f7e93d *admin/system/dist/js/chunk-7828662a.e587f025.js
+55515e2cd3f2bb776a090112418eae77 *admin/system/dist/js/chunk-801d4da6.0f74a3ea.js
 55253ec60403c36280aecd7a278c8737 *admin/system/dist/js/chunk-9f9c2568.538835dd.js
 0b209b8b1a24238e609f30444e59741f *admin/system/dist/js/chunk-9f9c2568.877eae72.js
 037a3c1f50e8e47edde48a7ff4d45130 *admin/system/dist/js/chunk-af3b1b98.850ec152.js
 25f102fba0aba57fcad60998d1e1c334 *admin/system/dist/js/chunk-e730cc06.3ce9a994.js
 328be3371bb7c2536befbfddcc64e417 *admin/system/dist/js/chunk-vendors.3b95dfe3.js
+b4c690180b4c0268240bb8544d252b67 *admin/system/dist/js/index.5892fe49.js
 5247e802fd0efbbe8eb80cd9f6a34540 *admin/system/dist/js/index.b5ff203c.js
 e6b823145386281984301ad83fcf96fe *admin/system/dist/js/index.d36cff59.js
 904b573ab459ffaba51c33b5851d0f5d *admin/system/dist/js/index.d77cc092.js
@@ -111,7 +115,7 @@ bcfb2e3e9c3ff2018f356176a1cf43a2 *core/class/class_core.php
 3ce9db683150a76cd033167c7e281391 *core/class/class_Des.php
 212cc7650e4798754337b1fefb291827 *core/class/class_FileDownload.php
 b6b0b9dc4773307d80f9215ed5122361 *core/class/class_GifMerge.php
-4793dcfc740be53d3fc40ba98562558a *core/class/class_image.php
+fda45a96b7be48e159007eb8434a9685 *core/class/class_image.php
 d301e008d382be1af825d77bc993d423 *core/class/class_ImagePalette.php
 1b836428237ca8d2bb58695cbe37df67 *core/class/class_JSSDK.php
 986ad79bf8a9bff90c64c82918c0fa74 *core/class/class_Minifier.php
@@ -218,14 +222,15 @@ b333c9e8748737d29d090f31a502a147 *core/class/table/table_mailcron.php
 7efba4a878332f9739c40a4f63d96f64 *core/class/table/table_organization_job.php
 f9fea2c25dbea100b27386dde7057be4 *core/class/table/table_organization_upjob.php
 7e02ce47e363f56c798a7c261cccc6a4 *core/class/table/table_organization_user.php
+def27091cbc525a4cd45b2955472ce29 *core/class/table/table_pichome_collectlist.php
 37e3c23f4c36ba1167bc433f18e8ce93 *core/class/table/table_pichome_comments.php
 dc169efe36fdf79623277fb5a538c673 *core/class/table/table_pichome_ffmpeg_record.php
-64030519d059cc061b9cc990b2ed9b08 *core/class/table/table_pichome_folder.php
+1cbfd07fc6cc2ec4ce28cae9d5334a95 *core/class/table/table_pichome_folder.php
 15cc26415b076bb08eeed7f76c40c45b *core/class/table/table_pichome_folderresources.php
 fb390b2cfce67236a7263549a430868b *core/class/table/table_pichome_folder_relation.php
 180233f6f8d234986280df5c3821fe24 *core/class/table/table_pichome_imagickrecord.php
 a2a946f8d3a0180db50b1c7435d9516a *core/class/table/table_pichome_palette.php
-ec314812cba390bac62835cce5efdfbf *core/class/table/table_pichome_resources.php
+9070977794d2ca52379721d552c3e1e7 *core/class/table/table_pichome_resources.php
 534452d059df927d062dac5bcd7b0de6 *core/class/table/table_pichome_resourcestag.php
 c08ce988dad5ccead193db0a7f79b4f2 *core/class/table/table_pichome_resources_attr.php
 09db8f5c9d2966f503bee5a4c6d6cc32 *core/class/table/table_pichome_resources_relation.php
@@ -235,7 +240,7 @@ fafb2bf10eed9314bc2bf2d6b32d84b9 *core/class/table/table_pichome_tag.php
 02ef950574c3af62f7b13fd61a61c2ce *core/class/table/table_pichome_taggroup.php
 d36c3e504e4666b6a9301699ebeeeaa5 *core/class/table/table_pichome_taggroup_relation.php
 1969387f935173b42f34c33c426e1fb7 *core/class/table/table_pichome_tagrelation.php
-15537ad5c8fac2620c4199d07038a126 *core/class/table/table_pichome_vapp.php
+c860e27706f0d5d97efceba9a5a1c619 *core/class/table/table_pichome_vapp.php
 eea6b39fd13b5fdf18052c7733adb369 *core/class/table/table_process.php
 ffc8c199da703d941c493fa317785611 *core/class/table/table_session.php
 774bda01812449ffa4819b0be241dc4e *core/class/table/table_setting.php
@@ -254,7 +259,7 @@ d5b0e7dc291a731a5c184d97baecf2df *core/class/table/table_user_profile_setting.ph
 bc2e189cfaacbdb84ddceb3a0abdcf92 *core/class/table/table_user_verify_info.php
 692cda4c6ad17e87e1edefb7251d0116 *core/class/table/table_user_wechat.php
 ca64f852f9c9442d65fa30ed279c6d6c *core/coreBase.php
-25f7c644790916b7121bd38d1301d1ea *core/core_version.php
+32785586bb05fca676beed40893a76ba *core/core_version.php
 d90d23b8deb20cef2c43e66725ec2813 *core/cron/cron_cache_cleanup_week.php
 540843e90244b66d31a1deb8c882d238 *core/cron/cron_cache_pichome_searchhot.php
 09bf107dfc58f0424b0245834d221a42 *core/cron/cron_clean_notification_month.php
@@ -371,10 +376,25 @@ f4741b20d0983035a4db52858a0f6240 *data/cache/tags.php
 47bbeaba8bfa9a1b1d088e2977ddc314 *data/extdata/exts.php
 d41d8cd98f00b204e9800998ecf8427e *data/sendmail.lock
 d41d8cd98f00b204e9800998ecf8427e *data/sendwx.lock
-ac153bd851d728eed4c993b38260f1c8 *dzz/class/class_encode.php
+3adf9db6567079f39787326907e65a81 *dzz/billfish/class/class_billfishexport.php
+043e8771d5984838964069c11815a104 *dzz/billfish/class/table/table_billfish_folderrecord.php
+e8a6a327799675bebb4a6c66aa895f32 *dzz/billfish/class/table/table_billfish_record.php
+946e09642ffe242f3eb7e3876e66127b *dzz/billfish/class/table/table_billfish_taggrouprecord.php
+af76b998930a2ea1b565afe98e83c6e3 *dzz/billfish/class/table/table_billfish_tagrecord.php
+66eb18511cf2fd7817c97629562f45b2 *dzz/billfish/classes/delpichomefolderafter.php
+aebc0d22523952b3a81993ab5d52321d *dzz/billfish/classes/getpichomethumb.php
+930c3c4350639839e724b8de7d16b013 *dzz/billfish/classes/pichomevappdelete.php
+e284fd1a7b8d5d5ce30d04583588c5e1 *dzz/class/class_encode.php
+762fd46dbe12c6fa06ba3df224fe20f8 *dzz/eagle/class/class_eagleexport.php
+e165ceec42c6de2c56b5d4339f4843e1 *dzz/eagle/class/table/table_eagle_folderrecord.php
+2c1f9123c8775cd340416afee533d29a *dzz/eagle/class/table/table_eagle_record.php
+e9a0575b63f2ee8011d81724eb829b30 *dzz/eagle/classes/deleteafter.php
+d2a28bf51a52b9530d54e364e6e5766c *dzz/eagle/classes/delpichomefolderafter.php
+db2a8594d52f5cc6f65f5271849b094f *dzz/eagle/classes/getpichomethumb.php
+0b99362e5be7a741986567d8e9738c69 *dzz/eagle/classes/pichomevappdelete.php
 a3ad077bda18e4057e0b31e3b3b2eed4 *dzz/ffmpeg/class/class_fmpeg.php
-a8a30984a87248b934ef8747481b2e0e *dzz/ffmpeg/classes/info.php
+bc4ab81b4c26d1a67a97a9f105201e7e *dzz/ffmpeg/classes/info.php
-3ba0ebc60cd19158228e5c47f931aa80 *dzz/ffmpeg/classes/thumb.php
+d8ed7668f7e78a7618f80db40f88f2b8 *dzz/ffmpeg/classes/thumb.php
 b0ef25e19c4aa9e96c06f5fb6f091883 *dzz/ffmpeg/composer.json
 a962e01165e345d26a86a07e9e098239 *dzz/ffmpeg/composer.lock
 808d6119fa0a890a2554fa07e600ba7d *dzz/ffmpeg/convert.php
@@ -389,8 +409,8 @@ b49d7db7da975848af00a7597333d12e *dzz/ffmpeg/ffmpeg/avcodec-57.dll
 109731440511e75afa2c4dcbe5b2d069 *dzz/ffmpeg/ffmpeg/postproc-54.dll
 91ca5f81f37690d1e05772947b38e8a0 *dzz/ffmpeg/ffmpeg/swresample-2.dll
 4f49c26e951e69007d60edf054d2a37a *dzz/ffmpeg/ffmpeg/swscale-4.dll
-17d36f2ee186514a290fab9baaeac65e *dzz/ffmpeg/getinfo.php
+54eb4c59cb02380010cabc5d69aae021 *dzz/ffmpeg/getinfo.php
-671f1a782b7dc9395519933bffb967fe *dzz/ffmpeg/thumb.php
+c81877414511a5f8c1e919c61526da2a *dzz/ffmpeg/thumb.php
 723b27a2bb73cccf492ed827bc528a5c *dzz/ffmpeg/vendor/alchemy/binary-driver/LICENSE
 9608b8205db23a377edd4f328af949bd *dzz/ffmpeg/vendor/alchemy/binary-driver/src/Alchemy/BinaryDriver/AbstractBinary.php
 96d510df2561b5a55bc62b0d04db9861 *dzz/ffmpeg/vendor/alchemy/binary-driver/src/Alchemy/BinaryDriver/BinaryDriverTestCase.php
@@ -683,8 +703,8 @@ e0fbf93ee3e79762c694682e010f721d *dzz/ffmpeg/vendor/symfony/process/LICENSE
 882fab9690637ec4cf9746b825b21e15 *dzz/ffmpeg/vendor/symfony/process/Process.php
 2a3b661974c0cd7432f29595ccdb6a93 *dzz/ffmpeg/vendor/symfony/process/ProcessBuilder.php
 13625bd3819dabb00e70409aa8b8cc54 *dzz/ffmpeg/vendor/symfony/process/ProcessUtils.php
-848f904ac7e815cf4abc752639c32f68 *dzz/imageColor/classes/getcolor.php
+634039b168dae271922c99af9b144e4b *dzz/imageColor/classes/getcolor.php
-8fcedaed7fefce2be26a36d2ac4bf9af *dzz/imageColor/index.php
+be1fd6f396b2fda2f45217565298f52e *dzz/imageColor/index.php
 a35efffbc8ffb84994c399cac01fb592 *dzz/images/addUser.png
 325472601571f31e1bf00674c368d335 *dzz/images/b.gif
 87fadeff473ddcb5208b7af66ae5966a *dzz/images/close.png
@@ -969,9 +989,11 @@ bae84af37dba1b272ef439708d1b8e9f *dzz/images/extimg_small/xml.png
 a949e13639231f3ab4192465ff2538ac *dzz/images/logo-blue.png
 b92838cc79a788fc78a7685b5aae1f28 *dzz/index/index.php
 d615e6446bb74240281aa217d6f5ad01 *dzz/index/login.php
-9464641e570a5ef040351554605b519d *dzz/io/getImg.php
+f1f3a52260de623f37da59db88d5132f *dzz/io/getImg.php
 c922015b4938aea09a73ed7d1d759ee4 *dzz/language/en-US/lang.php
 d91b3ccebc18bcd41bc44e9da28d598f *dzz/language/zh-CN/lang.php
+d0cec69ef9e94897d184cee623497d3f *dzz/local/class/class_localexport.php
+6620d302f12ba470c79c46e17d94b87f *dzz/local/classes/deleteafter.php
 e6ff860b694692916c323609ac7697f8 *dzz/pdf/build/pdf.js
 81b75950e639b1439c398d62a6037686 *dzz/pdf/build/pdf.js.map
 f025b4d2dd3cd3eca72f347e2406101d *dzz/pdf/build/pdf.worker.js
@@ -1379,10 +1401,11 @@ badeea57fda90d27e54a9f9488ac4c43 *dzz/pdf/web/viewer.html
 f2dddeac144b9bbac3ef849464bdf74b *dzz/pdf/web/viewer.js
 9d8f7b8df2cf3dffa23febb3582928d4 *dzz/pdf/web/viewer.js.map
 57cbaacb499474a5ca6c14a86d411512 *dzz/pichome/admin.php
-ae17e4be72c28160524e6d0f15a08764 *dzz/pichome/ajax.php
+3d3aa981f09612419f1cffe5cfa4f4ab *dzz/pichome/ajax.php
 c550e347457729fb118592d6be50d050 *dzz/pichome/checkexport.php
-6433341eb6119db85c0d2001c5155150 *dzz/pichome/class/class_eagleexport.php
+b6201d143beca6278320d101db08695f *dzz/pichome/class/class_eagleexport.php
-d89bf384de0af51c78c3a40a680e1c89 *dzz/pichome/class/class_localexport.php
+ae068aea655bde669f255db1dd988024 *dzz/pichome/class/class_localexport.php
+8bd360df9ad3377d6ede3c4b56c73c6c *dzz/pichome/collection.php
 6293eb9bd5b473c7f178be5d6534341c *dzz/pichome/config/config.php
 29640dfed0df1100d9c8e4d819b4c593 *dzz/pichome/css/admin.css
 07f01151181178c663d669622ea927f3 *dzz/pichome/css/common.css
@@ -1396,55 +1419,66 @@ f09b1c7476e28ad67f1c2f2f314230a0 *dzz/pichome/css/fonts/remixicon.symbol.svg
 881fbc46361e0c0e5f003c159b2f3005 *dzz/pichome/css/fonts/remixicon.woff
 9915fef980fa539085da55b84dfde760 *dzz/pichome/css/fonts/remixicon.woff2
 beba9d9c0e6f710c90145d9e3cbbab2d *dzz/pichome/css/index.css
-393c3333716eea4c974db36b5a8630d5 *dzz/pichome/css/mobile/common.css
+87163334cb48cff22fdabe3e8e615cc7 *dzz/pichome/css/mobile/common.css
-577f7f31ca1ac0fe27b7c7e8f28f838f *dzz/pichome/css/mobile/details.css
+0f7c873eb385eefd56b37a025b978eb4 *dzz/pichome/css/mobile/details.css
-871bda5b39c93380460d42db713c2932 *dzz/pichome/css/mobile/index.css
+ed97c351d8b9390710c7421c4197bcf1 *dzz/pichome/css/mobile/image.css
+86078d14becfe840e42b75da9b7193ec *dzz/pichome/css/mobile/index.css
 f1e227b4a2e8a0345daaf6141e1856dd *dzz/pichome/css/mobile/personal.css
+3af6f1b9febc5c78806ac865f8d18ebb *dzz/pichome/css/mobile/screen.css
 cc6d3bf279ed780dd69d0dcc250bd442 *dzz/pichome/css/mobile/share.css
+d56b57b7000fef922f9031726810a467 *dzz/pichome/css/pc/AddcollectionDialog.css
 509deac393472e307756fc9deee67276 *dzz/pichome/css/pc/admin.css
-4616cbd4493d6a922221b5225605bf17 *dzz/pichome/css/pc/common.css
+670b7f2f61bdfd492b53e03e750ee531 *dzz/pichome/css/pc/collection.css
+6b6a57a59a5d6ee5bd3c3c501baf1b02 *dzz/pichome/css/pc/common.css
+7b846f80e058d874a9cb7106a18e5b78 *dzz/pichome/css/pc/components/addcollect.css
+e600f6b1841e3542bb948a5289e9363e *dzz/pichome/css/pc/components/collect.css
 e3123a0f6930b3d0a84387d3102c704d *dzz/pichome/css/pc/details.css
-0446460c4b1c238c4a17b4119c5c106e *dzz/pichome/css/pc/image.css
+1b81547e0d91292d2a77153774bbf013 *dzz/pichome/css/pc/image.css
-4e1559e2dada467206bec5c77b5a23f5 *dzz/pichome/css/pc/index.css
+c0a5a61c77eb071519b9e148edafdacd *dzz/pichome/css/pc/index.css
 16ceb77eb522e138548921aa5b024a36 *dzz/pichome/css/pc/screen.css
 69c8a20f13ee8eb40d35ddd497d35fd3 *dzz/pichome/css/pc/xuanzhuan/iconfont.ttf
 b006647cb9c39a657d354fcf0bdf88bf *dzz/pichome/css/pc/xuanzhuan/index.css
 48994b9f88c49cdb67a88116380cfb95 *dzz/pichome/css/theme/black/index.css
-fe6f435c4534024a6894473daec0845a *dzz/pichome/css/theme/black/root.css
+ec549d08e4bd82c18ac8a906e7c3ff0e *dzz/pichome/css/theme/black/root.css
 247be4f622b714c5745e69ebb932e197 *dzz/pichome/css/theme/darkgrey/index.css
-9925ea840cd52bf961eb4b1eb7b565b8 *dzz/pichome/css/theme/darkgrey/root.css
+3e59794617124cb119a6b0fc763a7c14 *dzz/pichome/css/theme/darkgrey/root.css
 732389ded34cb9c52dd88271f1345af9 *dzz/pichome/css/theme/fonts/element-icons.ttf
 535877f50039c0cb49a6196a5b7517cd *dzz/pichome/css/theme/fonts/element-icons.woff
 dce825b1ca6c3b1c18adc856618b8602 *dzz/pichome/css/theme/lightgrey/index.css
-74e133fde11f139ecfeedafb438a13ce *dzz/pichome/css/theme/lightgrey/root.css
+8e19f8f0afd86036d9e6b74e8fa25b4f *dzz/pichome/css/theme/lightgrey/root.css
 106204b58c77af1048a22bfe9cbd1d49 *dzz/pichome/css/theme/navyblue/index.css
-17018172c965f899a07fd8f53b789ecf *dzz/pichome/css/theme/navyblue/root.css
+9e60cad02523fcf3aac6c9d960294af0 *dzz/pichome/css/theme/navyblue/root.css
 6a3812a857dae07ed74b59d26c86d7e1 *dzz/pichome/css/theme/purple/index.css
-c514077b8965f7d3bd473f19d85620e3 *dzz/pichome/css/theme/purple/root.css
+48fcbcbd9d925541404038119bacdc9a *dzz/pichome/css/theme/purple/root.css
 4705cbd2d8a842635d69d2ace637212e *dzz/pichome/css/theme/white/index.css
-b6aae0d83f9163cf8a6acda2c77f573e *dzz/pichome/css/theme/white/root.css
+42223aa2673c8b81e62a8ebc481d9da2 *dzz/pichome/css/theme/white/root.css
-5c7db30e0823a778d5341db79a4ece27 *dzz/pichome/delete.php
+7dded9715f7c5c2408f7905b6cddf810 *dzz/pichome/delete.php
 0bc21a1af1a289191cf5a48523f2cf8c *dzz/pichome/details.php
-220a956534e1384a2c64cfc89ef48617 *dzz/pichome/download.php
+214cabed470fd756b227851860513e6b *dzz/pichome/download.php
 e245c8b1f860c8252eade7f3dec51879 *dzz/pichome/dzz_app_pichome.xml
-1ef6b3e8f2d9664ac3665b62f6c5f39b *dzz/pichome/exportfile.php
+43f2f7de28bea4de51cde2b4f1f8e82b *dzz/pichome/exportfile.php
-dd58cee1073dfc2907838fe3ec26235b *dzz/pichome/exportfilecheck.php
+af14eda8139abc2d09e421cc4b27a1b4 *dzz/pichome/exportfilecheck.php
-ba8263d806bb02f8c1cd5b3becdfaac0 *dzz/pichome/filelist.php
+f0b8396b0798d20e257802e0284c1c99 *dzz/pichome/filelist.php
 2d0185de715fe914af40ce715d15afca *dzz/pichome/function/function_common.php
 d211a97399d52fea48f94a45a06648d1 *dzz/pichome/image/eaglefile.webp
+8a53ae7b1997c5ddc37e06b74f47b6b2 *dzz/pichome/image/flashlight.png
 152ec265e38eb67acb6cb31026448e3d *dzz/pichome/image/img/t1.jpeg
 651d0b49012d763c7dda236756274a9d *dzz/pichome/image/img/t2.jpg
 309c31fa9200e0c9b4ee8fd3f1399dfc *dzz/pichome/image/img/t3.jpeg
 5f5562a16dad1fa33294b5c0a920f1d6 *dzz/pichome/image/img/t4.jpeg
+006790064e59717d811f6f1eec849e63 *dzz/pichome/image/library/billfish.png
+e6bda96407083273f2a6ef5ac3b1e819 *dzz/pichome/image/library/eagle.png
+cf4ad845fa202adf1c2c99dba55a6490 *dzz/pichome/image/library/file.png
+5d34d2b476b50156b594b9371dd38d1f *dzz/pichome/image/library/library.png
 08a26df5cbee8f21dbac8d646d1da218 *dzz/pichome/image/nodata.svg
 1f0ee3cd38e82bd18490a34fcec8c690 *dzz/pichome/image/notScreen.png
 f308fd14dbe2e06349ef366d6f9aa2c7 *dzz/pichome/image/palette.png
 d51db8efca781201f641a41b57420dfe *dzz/pichome/image/phlogo.png
 438384ffb6dbf09c63f9c0254c57340a *dzz/pichome/index.php
-bc4b3499031370aaa3fabf218806f65f *dzz/pichome/initexport.php
+9976279181804deb1113d4b3e6af7fab *dzz/pichome/initexport.php
 c9b191574ccc8ab6c8ff631302f10561 *dzz/pichome/install.php
 29b8b6254aaaa263cbb0fe8272f05a59 *dzz/pichome/js/audioPlay.js
-a088950fc4bf4348d87cda978e5ded97 *dzz/pichome/js/common.js
+ed875394497b550972b24c9b09d00955 *dzz/pichome/js/common.js
 b7a95d9f617863cf515a43e7b83978c5 *dzz/pichome/js/headerMethods.js
 d752d1878252e486cc0244887cfadbae *dzz/pichome/js/headerWatch.js
 d5843dbdc71ff8014a5eafd346a262da *dzz/pichome/js/jquery.mousewheel.min.js
@@ -1455,11 +1489,14 @@ d36c75e3d8880ebfece375fd7cd46787 *dzz/pichome/js/mobile/plug/colorPicker/jquery.
 b5d4479aca9121ce9ed95af5d77c10d9 *dzz/pichome/js/mobile/plug/vant/index.css
 3d5fcccab75bba76cc259351e875d42a *dzz/pichome/js/mobile/plug/vant/vant.min.js
 29b8b6254aaaa263cbb0fe8272f05a59 *dzz/pichome/js/pc/audioPlay.js
+27f51d96c2a6cca4ec0abbce6e0a24db *dzz/pichome/js/pc/components/addcollect.js
+1bfeb0538751df45e883d9751aae14a3 *dzz/pichome/js/pc/components/collect.js
+56972b38bc78798895d3bb917f4aeb5e *dzz/pichome/js/pc/components/collectdialog.js
 2ffc868ac18c18d948c3ae5576afa98b *dzz/pichome/js/pc/headerMethods.js
 84f0575bc959e85fc1abab5dc71d3079 *dzz/pichome/js/pc/headerWatch.js
 d5843dbdc71ff8014a5eafd346a262da *dzz/pichome/js/pc/jquery.mousewheel.min.js
 72dbef2b0dd2644f4fb4e72ddbb7013b *dzz/pichome/js/pc/plug/DomResize.js
-8a788a8d0bfb2d3c1988bddb4aef4b4b *dzz/pichome/js/pc/plug/element-ui.js
+693f98461ce3fa58cbe5ac24d9a21b1e *dzz/pichome/js/pc/plug/element-ui.js
 66fe9527aec8d8b68e3bc5036ea8f7f9 *dzz/pichome/js/pc/plug/sortable.min.js
 7292e14f4f8fad306d40a6d7d586b225 *dzz/pichome/js/pc/plug/wavesurfer.js
 ef4591bffb23a90c8d9e0d02a7b5c15f *dzz/pichome/js/pc/row-grid.js
@@ -1476,15 +1513,18 @@ b21b8531847604ab5f2f5caaef51ba31 *dzz/pichome/js/vue/vue.js
 69764bf35375a54256412f3c748b312d *dzz/pichome/js/waterfall.js
 c24f19d7061cdf5bae41e5e9b9f5600c *dzz/pichome/language/en-US/lang.php
 8a3e6ab24d873202b96c3acd9c1b0d2b *dzz/pichome/language/zh-CN/lang.php
-04a1d42c4c596325364400f866a2c143 *dzz/pichome/library.php
+9b1430e306b95dff41087a2fca148484 *dzz/pichome/library.php
 ccef8b340c90fc0061c6dd645fecc8df *dzz/pichome/setting.php
-cda7d5feb6b4ed907d8a1eeb7d0ba46d *dzz/pichome/share.php
+30a3b6a3143136ebf197c3e58e6bcfe8 *dzz/pichome/share.php
 892a7e59f327bc5f273fc0fe2cd2679b *dzz/pichome/template/mobile/components/classify.htm
-00be7e9bc0e92e22f9c7aa8fce703854 *dzz/pichome/template/mobile/components/index/JsCommon.htm
+23b99d3824aa02a61621667b100dbacb *dzz/pichome/template/mobile/components/index/image/classify.htm
+5752e1116e385c87552c6328125e14c3 *dzz/pichome/template/mobile/components/index/image/JsCollect.htm
+b5ff94d14983520fb465ffa78959b81f *dzz/pichome/template/mobile/components/index/image/more.htm
+643af4f4eabf3fd0f01d05f1e0fb6189 *dzz/pichome/template/mobile/components/index/JsCommon.htm
 3c0bae451668c060ae526d3253e9be73 *dzz/pichome/template/mobile/components/index/JsDetailMessage.htm
-b61252abe414de77e062e3f96aabccbd *dzz/pichome/template/mobile/components/index/JsImages.htm
+493f25784b802d691a49b22d55345e19 *dzz/pichome/template/mobile/components/index/JsImages.htm
-801d90ff93583268416fdc99faa91860 *dzz/pichome/template/mobile/components/index/JsIndex.htm
+507954354bef6b8905158c9037d38e8a *dzz/pichome/template/mobile/components/index/JsIndex.htm
-18939ca3c3ccb67156c1d2f3d059a3fa *dzz/pichome/template/mobile/components/index/JsMy.htm
+d1051b51dd34c88927309c4e82744553 *dzz/pichome/template/mobile/components/index/JsMy.htm
 a09a548c0637e1dfc7397410ac056711 *dzz/pichome/template/mobile/components/index/JsScreen.htm
 76399fc5b4e7a84ee75ed49e34e483c9 *dzz/pichome/template/mobile/components/index/JsSearch.htm
 aa8df8e4c660d9136bbff54070a2522a *dzz/pichome/template/mobile/components/index/JsSort.htm
@@ -1505,20 +1545,26 @@ ae8d0557008c6f19458bed5c49db2167 *dzz/pichome/template/mobile/components/index/s
 8f54b82e6d2f9cb4d7ba43d09a39f088 *dzz/pichome/template/mobile/frame/footer_simple.htm
 ae502b90b2b31175892efe56867bc2e7 *dzz/pichome/template/mobile/frame/header_simple_end.htm
 fdc74d5e180321fc338ae91a1a90e22e *dzz/pichome/template/mobile/frame/header_simple_start.htm
-f9c4288c838455ae487c2cc0c4d44890 *dzz/pichome/template/mobile/page/details.htm
+385067e1775bcc445b1dbc978d543ac0 *dzz/pichome/template/mobile/page/details.htm
-f9f65e35608efe6563e49abbc66c1249 *dzz/pichome/template/mobile/page/index.htm
+e34a4b13baa25f03bddc82608964ffd7 *dzz/pichome/template/mobile/page/index.htm
 be7755b8e73e2ffa49557e8c3891027a *dzz/pichome/template/mobile/page/personal.htm
-63845b99e6f7f14d1385b56a0c4ffebf *dzz/pichome/template/mobile/page/share.htm
+59d6f74af0683d8c3dee09e7e09f9787 *dzz/pichome/template/mobile/page/share.htm
-dd8403f5dbcfb5767f01143f12afff93 *dzz/pichome/template/pc/components/headerAdmin/index.htm
+de346d0b0da4cc4eceb143baf17f6812 *dzz/pichome/template/pc/components/collection/Jsimage.htm
+7705ce7827e5d3de8b4b41659ff0d9e9 *dzz/pichome/template/pc/components/collection/JsLeft.htm
+74a6088ee7aa0b3cf1201de5b6d30132 *dzz/pichome/template/pc/components/headerAdmin/index.htm
 e078614bb6d558d96006ec127f7c392c *dzz/pichome/template/pc/components/headerindex/index.htm
 0436c3ba601aa0804b0e51926f557988 *dzz/pichome/template/pc/components/headerindex/screen.htm
 105d244408ea6a9780677c28b376ea6c *dzz/pichome/template/pc/components/headerindex/searchScreen.htm
+e3cbbf2cf1281dfe69ee59584debe8dc *dzz/pichome/template/pc/components/image/ImageAudioPlay.htm
+8719049c86e5ed162ef840352086ee8f *dzz/pichome/template/pc/components/image/ImageList.htm
+7bd38f47edd65c05832edd108ef1479e *dzz/pichome/template/pc/components/image/ImageRowGrid.htm
+b146499d5bc505f37ec0d323394d1e27 *dzz/pichome/template/pc/components/image/ImageWaterfall.htm
 e52de01bb534c8ae8906aeea2a26e4bc *dzz/pichome/template/pc/components/index/header/JsHdeaderSearch1.htm
 710efaf3e9e92603f55599af84e07f2b *dzz/pichome/template/pc/components/index/header/JsHdeaderSearch2.htm
-0b560bcf32b9928e09a087efbe543405 *dzz/pichome/template/pc/components/index/header/JsHdeaderSearchInput.htm
+aa36103d6b45e77c11a97dc34f5fa38c *dzz/pichome/template/pc/components/index/header/JsHdeaderSearchInput.htm
 44afb76ddd1106c3081e901b74ccd350 *dzz/pichome/template/pc/components/index/header/JsHdeaderSearchScreen.htm
 cdfdeb7826e501fc2d0dabbe4545bba6 *dzz/pichome/template/pc/components/index/header/JsHeaderRight.htm
-82a1a57d683d58fd868fb91fac13ab25 *dzz/pichome/template/pc/components/index/header/JsHeaderRightAvatar.htm
+2dcef9d94e0d12773e17f32cf9c84720 *dzz/pichome/template/pc/components/index/header/JsHeaderRightAvatar.htm
 a5629a36eef6a8c0d3aec35f3a679d86 *dzz/pichome/template/pc/components/index/header/JsHeaderRightBtn.htm
 754c1ae954a2bd706a9ca808225927c9 *dzz/pichome/template/pc/components/index/image/ImageAudioPlay.htm
 8719049c86e5ed162ef840352086ee8f *dzz/pichome/template/pc/components/index/image/ImageList.htm
@@ -1526,10 +1572,10 @@ f394ee2d8177fe42a05aeb7c5d1b783a *dzz/pichome/template/pc/components/index/image
 506a3a316c9b37a48c65ed71c7435f33 *dzz/pichome/template/pc/components/index/image/ImageWaterfall.htm
 e75f2d5563b6d12d345ee4414e2840f9 *dzz/pichome/template/pc/components/index/images.htm
 0764f300b91acf6e60925fa91c528941 *dzz/pichome/template/pc/components/index/indexVuex.htm
-ac1a37ef71ff76f05435a47b8f13a6b8 *dzz/pichome/template/pc/components/index/JsCommon.htm
+f18d9fc925dd80b5682ea9b65afb96c0 *dzz/pichome/template/pc/components/index/JsCommon.htm
 d88649d33a48388af9e95f4b7b3aeea8 *dzz/pichome/template/pc/components/index/JsHeader1.htm
 eb3a364123d4c0982dfc2497683adc29 *dzz/pichome/template/pc/components/index/JsHeader2.htm
-5ecc3eabb026b20734c7bec319263ed3 *dzz/pichome/template/pc/components/index/Jsimage.htm
+203fade598d5f1f14bd0cbe612f400c9 *dzz/pichome/template/pc/components/index/Jsimage.htm
 e5f81267932b2e39355c4bff620d11b6 *dzz/pichome/template/pc/components/index/JsLibrary.htm
 7a925a4631acb01fc275bbb237250d92 *dzz/pichome/template/pc/components/index/JsScreen.htm
 ca1f90529303acc461fb2ce08fb6e7fc *dzz/pichome/template/pc/components/index/screen/btime/js.htm
@@ -1559,23 +1605,23 @@ ed778182594282451fdeaf533390504a *dzz/pichome/template/pc/components/index/scree
 ce8f0dddfb2446e04ed00da108a9d5ff *dzz/pichome/template/pc/components/index/screen/tag/js.htm
 12adf53eb950a45a47d2d80e8b246fa6 *dzz/pichome/template/pc/components/index/screen/tag/temp.htm
 c2953f2cc75684f3a777148ad8c5fce9 *dzz/pichome/template/pc/components/index/screen.htm
-78e4336426983a0ec62934217dee535c *dzz/pichome/template/pc/components/index/template2/JsLeft.htm
+56e224bc38e1eb8da17523729f62dfd8 *dzz/pichome/template/pc/components/index/template2/JsLeft.htm
 8f54b82e6d2f9cb4d7ba43d09a39f088 *dzz/pichome/template/pc/frame/footer_simple.htm
 ae502b90b2b31175892efe56867bc2e7 *dzz/pichome/template/pc/frame/header_simple_end.htm
 08154101159fde8eb21fe522cc937e4c *dzz/pichome/template/pc/frame/header_simple_start.htm
-42648cd5769edf01f824444c5acc98b2 *dzz/pichome/template/pc/page/adminBasic.htm
+f45c9ec8917e94bf4b61a7b5bbacf3e5 *dzz/pichome/template/pc/page/adminBasic.htm
 d46f3035458009aa3d87d579da8848c3 *dzz/pichome/template/pc/page/adminFileterset.htm
 ef3300e59bc7be272f56ade943326d88 *dzz/pichome/template/pc/page/adminImportsetting.htm
 ea578588242396cb021031f41dd4bc69 *dzz/pichome/template/pc/page/adminLeft.htm
 0e57e8ab9dbccead521f9b18fe8a2de2 *dzz/pichome/template/pc/page/adminLoginpage.htm
 624c95c6ba1998d1f0538493c510fed1 *dzz/pichome/template/pc/page/adminPagesetting.htm
-0920466b526ad2b5b6e20c8b2acead53 *dzz/pichome/template/pc/page/adminPersonal.htm
+3ad11c89ea7b41c55b63d2f5d29004fb *dzz/pichome/template/pc/page/adminPersonal.htm
-4adfd28ac9666c2aeb1af34040db7551 *dzz/pichome/template/pc/page/details.htm
+364cd2b3bba93563c86ebf33102a6ba9 *dzz/pichome/template/pc/page/details.htm
 8e351bacc90f2855e890cc3cb0ef9fc2 *dzz/pichome/template/pc/page/index.htm
-701ca3999a6f963e5dd8081f4ca73498 *dzz/pichome/template/pc/page/index1.htm
+22d1d385387e15a52c90b35eb6ed3a55 *dzz/pichome/template/pc/page/index1.htm
-dee08b61a3556659df1cb5daa3845b4e *dzz/pichome/template/pc/page/index2.htm
+b672309ad39f5e67246c0aabe7811306 *dzz/pichome/template/pc/page/index2.htm
-ecbf47343950b3ab1498a97c97d88771 *dzz/pichome/template/pc/page/library.htm
+c339f4670ef6db9e27f37f497e36f566 *dzz/pichome/template/pc/page/library.htm
-d05bbcc9ca122a830c924cfabed697c0 *dzz/pichome/template/pc/page/share.htm
+b3675471f7a9d279efd0162ac18f1505 *dzz/pichome/template/pc/page/share.htm
 3cd79761b99168c3f9faf607183df134 *dzz/pichome/uninstall.php
 b5221437a0c978e0caf63f2278759934 *dzz/pichome/uninstall_real.php
 a5c5705a5b9e3a2175d3633656ae614e *dzz/pichome/updatesearchvaldata.php
@@ -1607,8 +1653,8 @@ b0bb6c733a343afcddcd03baaeff31b0 *dzz/xgplayer/js/xgplayer.music.js
 5cb9422375b907e05eb6b7dc36fcd895 *favicon.ico
 8e55bdb192a3aefe82e03292527819ca *htaccess_default.txt
 55d39f5cf3916ab6a9336d95c671ab53 *index.php
-d47506e140e630a579c83fe4911972ae *install/data/install.sql
+b92e6bc4f11bbece12288d800321aa3c *install/data/install.sql
-53cf9484adc4e5d9a87f88a662df5dc8 *install/data/install_data.sql
+2630350d3ef08d868fcd36e678094709 *install/data/install_data.sql
 feabf4e4c8e20dc73548dfd6ba8400f9 *install/images/error.png
 fc25acefcabc066437d4b27550387954 *install/images/logo.png
 2ba93e93e0fbdfeb91e22f6d3bf8b6ca *install/images/logo.svg
@@ -1621,7 +1667,8 @@ a987af86766c27c565794ffa189cf664 *install/include/install_mysql.php
 249b244097610688130b93721d1c2bd1 *install/include/install_mysqli.php
 effd4ff5bdac95bbc9e360de443f335c *install/include/install_var.php
 4c34d50daace82774e12ef92efb93d18 *install/index.php
-672ea3abb501cb04f0708a5c69ac2161 *install/language/zh-cn/lang.php
+677cacb463b31ea65d0ce771f9c02422 *install/language/zh-cn/lang.php
+2938ca630f07497e9a4adedf25fbdae2 *install/update.php
 5aefe69b1ba16fe8a6f79c2156f8f281 *misc/ajax.php
 66ee773a4c2e373da92f48f81930cf3f *misc/classes/init.php
 f656adb0c1b2699a4d8c613f2b9dacab *misc/pichomeexport.php

admin/system/dist/css/chunk-801d4da6.a47ba236.css

@@ -0,0 +1 @@
+.el-avatar[data-v-663b95fa]{float:left;cursor:pointer}.el-divider--horizontal.el-divider[data-v-663b95fa]{margin:8px 0}.aboutPichome{padding:0;width:478px}.aboutPichome .el-message-box__btns,.aboutPichome .el-message-box__header{display:none}.aboutPichome .aboutlogo{text-align:center;line-height:0;padding-top:40px}.aboutPichome .aboutmessage{padding:65px 40px;font-size:19px;padding-bottom:15px}.aboutPichome .aboutmessage .aboutlist{margin-bottom:20px;overflow:hidden}.aboutPichome a{text-decoration:none}.aboutPichome .aboutmessage .aboutlist .title{float:left;width:95px}.aboutPichome .aboutmessage .aboutlist .mes{float:left;width:calc(100% - 95px)}.aboutPichome .aboutmessage .aboutlist .update{font-size:12px}

admin/system/dist/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html lang=zh><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title></title><link href=admin/system/dist/css/chunk-2b4f90f7.519dec70.css rel=prefetch><link href=admin/system/dist/css/chunk-494f643e.7502109f.css rel=prefetch><link href=admin/system/dist/css/chunk-5ae5cc35.d763cbce.css rel=prefetch><link href=admin/system/dist/css/chunk-5cdcd199.6f46c04d.css rel=prefetch><link href=admin/system/dist/css/chunk-74c32c70.4b7d665e.css rel=prefetch><link href=admin/system/dist/css/chunk-76f23146.6fc79cd8.css rel=prefetch><link href=admin/system/dist/css/chunk-7828662a.c81657ef.css rel=prefetch><link href=admin/system/dist/css/chunk-9f9c2568.5356ad7d.css rel=prefetch><link href=admin/system/dist/css/chunk-af3b1b98.b822363f.css rel=prefetch><link href=admin/system/dist/css/chunk-e730cc06.987283b7.css rel=prefetch><link href=admin/system/dist/css/system_temp.a56510eb.css rel=prefetch><link href=admin/system/dist/js/chunk-2b4f90f7.ec4ac270.js rel=prefetch><link href=admin/system/dist/js/chunk-2d0a3327.ad2684c9.js rel=prefetch><link href=admin/system/dist/js/chunk-2d0bdbc6.4ec7bc5e.js rel=prefetch><link href=admin/system/dist/js/chunk-2d0dd46d.e13ddeba.js rel=prefetch><link href=admin/system/dist/js/chunk-2d0efd3c.44a093d1.js rel=prefetch><link href=admin/system/dist/js/chunk-2d20fcd9.50f81306.js rel=prefetch><link href=admin/system/dist/js/chunk-2d21ddf7.9f7b329e.js rel=prefetch><link href=admin/system/dist/js/chunk-494f643e.77a11d42.js rel=prefetch><link href=admin/system/dist/js/chunk-5ae5cc35.25761a21.js rel=prefetch><link href=admin/system/dist/js/chunk-5cdcd199.070f9c94.js rel=prefetch><link href=admin/system/dist/js/chunk-74c32c70.1f5e9382.js rel=prefetch><link href=admin/system/dist/js/chunk-76f23146.0d2957ed.js rel=prefetch><link href=admin/system/dist/js/chunk-7828662a.e587f025.js rel=prefetch><link href=admin/system/dist/js/chunk-9f9c2568.538835dd.js rel=prefetch><link href=admin/system/dist/js/chunk-af3b1b98.850ec152.js rel=prefetch><link href=admin/system/dist/js/chunk-e730cc06.3ce9a994.js rel=prefetch><link href=admin/system/dist/js/system_temp.c7e32270.js rel=prefetch><link href=admin/system/dist/css/chunk-vendors.4d5d56a8.css rel=preload as=style><link href=admin/system/dist/css/index.7d0ec6bf.css rel=preload as=style><link href=admin/system/dist/js/chunk-vendors.3b95dfe3.js rel=preload as=script><link href=admin/system/dist/js/index.d36cff59.js rel=preload as=script><link href=admin/system/dist/css/chunk-vendors.4d5d56a8.css rel=stylesheet><link href=admin/system/dist/css/index.7d0ec6bf.css rel=stylesheet></head><body><div id=app></div><script src=admin/system/dist/js/chunk-vendors.3b95dfe3.js></script><script src=admin/system/dist/js/index.d36cff59.js></script></body></html>
+<!DOCTYPE html><html lang=zh><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title></title><link href=admin/system/dist/css/chunk-2b4f90f7.519dec70.css rel=prefetch><link href=admin/system/dist/css/chunk-494f643e.7502109f.css rel=prefetch><link href=admin/system/dist/css/chunk-5ae5cc35.d763cbce.css rel=prefetch><link href=admin/system/dist/css/chunk-74c32c70.4b7d665e.css rel=prefetch><link href=admin/system/dist/css/chunk-76f23146.6fc79cd8.css rel=prefetch><link href=admin/system/dist/css/chunk-7828662a.c81657ef.css rel=prefetch><link href=admin/system/dist/css/chunk-801d4da6.a47ba236.css rel=prefetch><link href=admin/system/dist/css/chunk-9f9c2568.5356ad7d.css rel=prefetch><link href=admin/system/dist/css/chunk-af3b1b98.b822363f.css rel=prefetch><link href=admin/system/dist/css/chunk-e730cc06.987283b7.css rel=prefetch><link href=admin/system/dist/css/system_temp.a56510eb.css rel=prefetch><link href=admin/system/dist/js/chunk-2b4f90f7.8dd0185d.js rel=prefetch><link href=admin/system/dist/js/chunk-2d0a3327.ad2684c9.js rel=prefetch><link href=admin/system/dist/js/chunk-2d0bdbc6.4ec7bc5e.js rel=prefetch><link href=admin/system/dist/js/chunk-2d0dd46d.e13ddeba.js rel=prefetch><link href=admin/system/dist/js/chunk-2d0efd3c.44a093d1.js rel=prefetch><link href=admin/system/dist/js/chunk-2d20fcd9.50f81306.js rel=prefetch><link href=admin/system/dist/js/chunk-2d21ddf7.9f7b329e.js rel=prefetch><link href=admin/system/dist/js/chunk-494f643e.77a11d42.js rel=prefetch><link href=admin/system/dist/js/chunk-5ae5cc35.25761a21.js rel=prefetch><link href=admin/system/dist/js/chunk-74c32c70.1f5e9382.js rel=prefetch><link href=admin/system/dist/js/chunk-76f23146.0d2957ed.js rel=prefetch><link href=admin/system/dist/js/chunk-7828662a.e587f025.js rel=prefetch><link href=admin/system/dist/js/chunk-801d4da6.0f74a3ea.js rel=prefetch><link href=admin/system/dist/js/chunk-9f9c2568.538835dd.js rel=prefetch><link href=admin/system/dist/js/chunk-af3b1b98.850ec152.js rel=prefetch><link href=admin/system/dist/js/chunk-e730cc06.3ce9a994.js rel=prefetch><link href=admin/system/dist/js/system_temp.c7e32270.js rel=prefetch><link href=admin/system/dist/css/chunk-vendors.4d5d56a8.css rel=preload as=style><link href=admin/system/dist/css/index.7d0ec6bf.css rel=preload as=style><link href=admin/system/dist/js/chunk-vendors.3b95dfe3.js rel=preload as=script><link href=admin/system/dist/js/index.5892fe49.js rel=preload as=script><link href=admin/system/dist/css/chunk-vendors.4d5d56a8.css rel=stylesheet><link href=admin/system/dist/css/index.7d0ec6bf.css rel=stylesheet></head><body><div id=app></div><script src=admin/system/dist/js/chunk-vendors.3b95dfe3.js></script><script src=admin/system/dist/js/index.5892fe49.js></script></body></html>

admin/system/dist/js/chunk-2b4f90f7.8dd0185d.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2b4f90f7"],{3685:function(t,e,a){},ec9e:function(t,e,a){"use strict";var n=a("3685"),i=a.n(n);i.a},fcc8f:function(t,e,a){"use strict";a.r(e);var n=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"resNav"},[a("div",{staticClass:"resNav-item resNav-left"},[a("a",{staticClass:"h-left",attrs:{href:"javascript:;"},on:{click:function(e){return t.goBack()}}},[a("el-image",{attrs:{src:"data/attachment/sitelogo/sitelogo.png",fit:"contain"}}),a("span",{staticClass:"text"},[t._v(t._s(t.navTitle))])],1)]),a("div",{staticClass:"resNav-item resNav-center"}),a("div",{staticClass:"resNav-item resNav-right"},[a("Mavatar")],1)])},i=[],c=(a("d3b7"),a("5530")),s=a("2f62"),r={props:["hideContent","apptype","hideBack"],data:function(){return{}},computed:Object(c["a"])(Object(c["a"])({},Object(s["c"])(["headerName","navTitle","IfuserAgent"])),Object(s["b"])(["GetNavMenu"])),methods:{handleClick:function(t){var e=this.GetNavMenu;for(var a in e)if(e[a].index==t){"admin"==e[a].type?window.location.href="admin.php?mod="+t:window.location.href="index.php?mod="+t;break}},goBack:function(){window.location.href="/"}},components:{Mavatar:function(){return a.e("chunk-801d4da6").then(a.bind(null,"6254"))}}},o=r,d=(a("ec9e"),a("2877")),l=Object(d["a"])(o,n,i,!1,null,"b9d2b62e",null);e["default"]=l.exports}}]);

admin/system/dist/js/chunk-801d4da6.0f74a3ea.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-801d4da6"],{"04d2":function(t,e,a){},6254:function(t,e,a){"use strict";a.r(e);var o=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticStyle:{"margin-left":"10px",display:"inherit"}},[a("el-dropdown",{staticStyle:{width:"35px",height:"35px"},attrs:{trigger:"click","hide-on-click":!1},on:{command:t.handleAvatar}},[t.GetUserData.icon?[a("el-tooltip",{staticClass:"item",attrs:{effect:"dark",content:t.GetUserData.username,placement:"left"}},[a("el-avatar",{attrs:{size:35,src:t.GetUserData.icon}})],1)]:[a("el-tooltip",{staticClass:"item",attrs:{effect:"dark",content:t.GetUserData.username,placement:"left"}},[a("el-avatar",{style:{background:t.GetUserData.headerColor},attrs:{size:35}},[t._v(t._s(t.GetUserData.firstword))])],1)],a("el-dropdown-menu",{staticClass:"avatar-dropdown",attrs:{slot:"dropdown"},slot:"dropdown"},[a("el-dropdown-item",{attrs:{command:"personal"}},[t._v("个人设置")]),a("el-dropdown-item",{attrs:{command:"help"}},[t._v("帮助文档")]),a("el-dropdown-item",{attrs:{command:"problem"}},[t._v("问题反馈")]),a("el-divider"),a("el-dropdown-item",{attrs:{command:"setting"}},[t._v("站点设置")]),a("el-dropdown-item",{attrs:{command:"library"}},[t._v("库设置")]),a("el-dropdown-item",{attrs:{command:"orguser"}},[t._v("用户管理")]),a("el-dropdown-item",{attrs:{command:"system"}},[a("span",{staticStyle:{position:"relative"}},[t._v(" 系统工具 "),t.GetUserData.upgrade?a("div",{staticClass:"tip",staticStyle:{width:"7px",height:"7px","border-radius":"50%",background:"red",position:"absolute",left:"-13px",top:"0",bottom:"0",margin:"auto"}}):t._e()])]),a("el-divider"),a("el-dropdown-item",{attrs:{command:"about"}},[t._v("关于PicHome")]),a("el-dropdown-item",{attrs:{command:"OutLogin"}},[t._v("退出站点")])],1)],2)],1)},s=[],n=(a("96cf"),a("1da1")),i=a("5530"),r=a("2f62"),c={data:function(){return{}},computed:Object(i["a"])({},Object(r["b"])(["GetUserData","GetFormHash","GetLanguage"])),methods:{handleAvatar:function(t){switch(t){case"collection":window.location.href="index.php?mod=collection";break;case"personal":window.location.href="index.php?mod=pichome&op=user&do=personal";break;case"help":window.open("https://www.yuque.com/pichome");break;case"problem":window.open("https://support.qq.com/products/340252");break;case"setting":window.location.href="index.php?mod=pichome&op=admin&do=basic";break;case"library":window.location.href="index.php?mod=pichome&op=library";break;case"about":this.$alert('<div class="aboutlogo">\n      \t\t\t<img src="dzz/pichome/image/phlogo.png" alt="">\n      \t\t</div>\n      \t\t<div class="aboutmessage">\n      \t\t\t<div class="aboutlist">\n      \t\t\t\t<span class="title">软件名称：</span><span class="mes">欧奥PicHome</span>\n      \t\t\t</div>\n      \t\t\t<div class="aboutlist">\n      \t\t\t\t<span class="title">版本信息：</span><span class="mes">'+this.GetUserData.version+'</span>\n      \t\t\t</div>\n      \t\t\t<div class="aboutlist">\n      \t\t\t\t<span class="title">版权信息：</span><span class="mes">Powered By oaooa PicHome © 2020-2022 欧奥图文</span>\n      \t\t\t</div>\n      \t\t\t<div class="aboutlist">\n      \t\t\t\t<span class="title">网站地址：</span><span class="mes"><a class="address" href="https://oaooa.com/" target="_blank">oaooa.com</a></span>\n      \t\t\t</div>\n      \t\t</div>',"",{customClass:"aboutPichome",showClose:!1,showConfirmButton:!1,dangerouslyUseHTMLString:!0,closeOnClickModal:!0});break;case"OutLogin":this.outLogin();break;case"system":window.open("admin.php?mod=system");break;case"orguser":window.open("admin.php?mod=orguser");break}return!1},outLogin:function(){var t=this;return Object(n["a"])(regeneratorRuntime.mark((function e(){var a;return regeneratorRuntime.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return e.next=2,t.axios.post(t.AxiosApi+"user.php?mod=login&op=logging&action=logout&formhash="+t.GetFormHash+"&t="+(new Date).getTime());case 2:a=e.sent,a.data,window.location.reload();case 5:case"end":return e.stop()}}),e)})))()}}},d=c,l=(a("a16b"),a("9c24"),a("2877")),p=Object(l["a"])(d,o,s,!1,null,"663b95fa",null);e["default"]=p.exports},"864f":function(t,e,a){},"9c24":function(t,e,a){"use strict";var o=a("864f"),s=a.n(o);s.a},a16b:function(t,e,a){"use strict";var o=a("04d2"),s=a.n(o);s.a}}]);

admin/system/intsystemupgrade.php

@@ -227,6 +227,8 @@ if ($operation == 'patch' || $operation == 'cross') {
         $file = DZZ_ROOT . './data/update/pichome' . $version . '/updatelist.tmp';
         @unlink($file);
         @unlink(DZZ_ROOT . './install/update.php');
+		//打开站点
+		C::t('setting')->update('bbclosed', 0);
         C::t('cache') -> delete('upgrade_step');
         C::t('cache') -> delete('upgrade_run');
         C::t('setting') -> update('upgrade', '');

core/class/dzz/dzz_mime.php

@@ -687,6 +687,7 @@ class dzz_mime{
 			'xbm' => 'image/x-xbitmap',
 			'xpm' => 'image/x-xpixmap',
 			'xwd' => 'image/x-xwindowdump',
+			'webp' => 'image/webp',
 			'mime' => 'message/rfc822',
 			'eml' => 'message/rfc822',
 			'iges' => 'model/iges',

core/class/table/table_pichome_folder.php

@@ -19,6 +19,8 @@
            foreach(DB::fetch_all("select fid from %t where appid = %s",array($this->_table,$appid)) as $v){
                $fids[] = $v['fid'];
            }
+           $hookdata = ['appid'=>$appid];
+           Hook::listen("delpichomefolderafter",$hookdata);
            return parent::delete($fids);
        }
        //插入和更新目录数据
@@ -53,6 +55,17 @@
            }
            return $folderarr;
        }
+
+       public function insert_data($setarr){
+           $fid = $setarr['fid'];
+           if($fname = DB::result_first("select count(*) from %t where fid = %s",array($this->_table,$setarr['fid']))){
+               unset($setarr['fid']);
+                parent::update($fid,$setarr);
+           }else{
+               parent::insert($setarr);
+           }
+           return $fid;
+       }
        //检查目录是否包含密码,多个目录时，只有都包含密码才视为包含密码
        public function check_haspasswrod($folderids,$appid){
             $haspassword = 0;
@@ -109,7 +122,7 @@
             
             $folderdata = [];
 			if(!empty($pfid)){
-				foreach(DB::fetch_all("select fid,fname,pathkey,appid,pfid,filenum as nosubfilenum from %t where appid = %s and pfid in(%n)",array($this->_table,$appid,$pfid)) as $v){
+				foreach(DB::fetch_all("select fid,fname,pathkey,appid,pfid,filenum as nosubfilenum from %t where appid = %s and pfid in(%n) order by disp asc",array($this->_table,$appid,$pfid)) as $v){
 				    $v['filenum'] = DB::result_first("SELECT count(DISTINCT fr.rid) FROM %t fr 
                     left join %t f on fr.fid = f.fid
                     where fr.appid = %s and f.pathkey  like %s",array('pichome_folderresources','pichome_folder',$appid,$v['pathkey'].'%'));
@@ -118,7 +131,7 @@
 				   
 				}
 			}else{
-				foreach(DB::fetch_all("select fid,fname,pathkey,appid,pfid,filenum as nosubfilenum from %t where appid = %s and pfid = ''",array($this->_table,$appid)) as $v){
+				foreach(DB::fetch_all("select fid,fname,pathkey,appid,pfid,filenum as nosubfilenum from %t where appid = %s and pfid = '' order by disp asc",array($this->_table,$appid)) as $v){
                     $v['filenum'] = DB::result_first("SELECT count(DISTINCT fr.rid) FROM %t fr 
                     left join %t f on fr.fid = f.fid
                     where fr.appid = %s and f.pathkey  like %s",array('pichome_folderresources','pichome_folder',$appid,$v['pathkey'].'%'));
@@ -150,4 +163,22 @@
             return $folderdata;
         }
 
+        public function createfidbyappid($appid){
+            $fid = random(13).$appid;
+            if(DB::result_first("select count(fid) from %t where fid = %s and appid = %s",array($this->_table,$fid,$appid))){
+                $fid = $this->createfidbyappid($appid);
+            }
+            return $fid;
+        }
+
+        public function delete_by_fids($fids){
+            if(!is_array($fids)) $fids = (array)$fids;
+            if(!empty($fids)){
+                DB::delete('pichome_folderresources',"fid in (".dimplode($fids).")");
+                parent::delete($fids);
+                return true;
+            }
+
+        }
+
     }

core/class/table/table_pichome_resources.php

@@ -35,7 +35,7 @@ class table_pichome_resources extends dzz_table
         foreach (DB::fetch_all("select rid from %t where appid = %s limit 0,100", array($this->_table, $appid)) as $v) {
             $rids[] = $v['rid'];
         }
-        if ($rids) $this->delete_by_rid($rids,$data['deluid'],$data['delusername']);
+        if ($rids) $this->delete_by_rid($rids, $data['deluid'], $data['delusername']);
         //return $i;
     }
 
@@ -45,7 +45,7 @@ class table_pichome_resources extends dzz_table
         return DB::result_first("select * from %t  where  path = %s", array($this->_table, $path));
     }
 
-    public function delete_by_rid($rids,$uid=0,$username='')
+    public function delete_by_rid($rids, $uid = 0, $username = '')
     {
         if (!is_array($rids)) $rids = (array)$rids;
         C::t('pichome_resources_attr')->delete_by_rid($rids);
@@ -56,12 +56,13 @@ class table_pichome_resources extends dzz_table
         C::t('pichome_share')->delete_by_rid($rids);
         C::t('pichome_ffmpeg_record')->delete($rids);
         C::t('pichome_imagickrecord')->delete($rids);
-        //$deldata = ['rids'=>$rids,'deluid'=>$uid,'delusername'=>$username];
+        $deldata = ['rids' => $rids, 'deluid' => $uid, 'delusername' => $username];
-        //Hook::listen('pichomedatadeleteafter',$deldata);
+        Hook::listen('pichomedatadeleteafter', $deldata);
 
         return $this->delete($rids);
     }
 
+
     public function fetch_by_rids($rids)
     {
         global $Opentype;
@@ -125,40 +126,7 @@ class table_pichome_resources extends dzz_table
         $resourcesdata['realpath'] = $downshare[$resourcesdata['appid']]['path'] . BS . $resourcesdata['path'];
         return $resourcesdata;
     }
-    /*public function getdatabyrid($rid){
-        global $Opentype;
-        $data = parent::fetch($rid);
-        $data['fsize'] = formatsize($data['size']);
-        $data['mtime'] = dgmdate(round($data['mtime'] / 1000), 'Y/m/d H:i');
-        $data['dateline'] = dgmdate(round($data['dateline'] / 1000), 'Y/m/d H:i');
-        $data['name'] = str_replace(strrchr($data['name'], "."), "", $data['name']);
-        $data['btime'] = dgmdate(round($data['btime'] / 1000), 'Y/m/d H:i');
-        $data['dpath'] = dzzencode($data['rid'], '', 0, 0);
-        if (in_array($data['ext'], $Opentype['video'])) {
-            $data['opentype'] = 'video';
-        } elseif (in_array($data['ext'], $Opentype['text'])) {
-            $data['opentype'] = 'text';
-        } elseif (in_array($data['ext'], $Opentype['pdf'])) {
-            $data['opentype'] = 'pdf';
-        } elseif (in_array($data['ext'], $Opentype['image'])) {
-            $data['opentype'] = 'image';
-        } else {
-            $data['opentype'] = 'other';
-        }
-        $attrdata = C::t('pichome_resources_attr')->fetch($rid);
-        $data = array_merge($data,$attrdata);
-        $colordata = C::t('pichome_palette')->fetch_colordata_by_rid($rid);
-        foreach ($colordata as $cv) {
-            $colorsarr[] = $cv;
-        }
-        $data['color'] = $colorsarr[0];
 
-        //array_multisort($datas, 'rid', SORT_ASC, $rids);
-        foreach (C::t('pichome_resourcestag')->fetch_all_tag_by_rids($rids) as $k => $v) {
-            $datas[$k]['tags'] = $v;
-            // $datas[$k]['tags'] = '•'.implode('•',$v);
-        }
-    }*/
     public function fetch_by_rid($rid)
     {
         global $Opentype;
@@ -167,7 +135,7 @@ class table_pichome_resources extends dzz_table
         //获取所有库分享和下载权限
         $downshare = C::t('pichome_vapp')->fetch_all_sharedownlod();
         $attrdata = C::t('pichome_resources_attr')->fetch($rid);
-        if($attrdata['desc']) $attrdata['desc'] = strip_tags($attrdata['desc']);
+        if ($attrdata['desc']) $attrdata['desc'] = strip_tags($attrdata['desc']);
         $resourcesdata = array_merge($resourcesdata, $attrdata);
         $resourcesdata['colors'] = C::t('pichome_palette')->fetch_colordata_by_rid($rid);
         $resourcesdata['ext'] = strtolower($resourcesdata['ext']);
@@ -182,86 +150,37 @@ class table_pichome_resources extends dzz_table
         } else {
             $resourcesdata['opentype'] = 'other';
         }
-        if ($resourcesdata['hasthumb']) {
+        $resourcesdata['icondata'] = getglobal('siteurl') . 'index.php?mod=io&op=getImg&path=' . dzzencode($rid, '', 0, 0);
-            //如果是本地文件
-            if ($resourcesdata['apptype'] == 1) {
-                $filename = 'pichomethumb' . BS . $resourcesdata['appid'] . BS . md5($resourcesdata['path']) . '.jpg';
 
-                $thumbpath = getglobal('setting/attachurl') . $filename;
+        $thumbwidth = getglobal('config/pichomethumbwidth') ? getglobal('config/pichomethumbwidth') : 900;
-                //echo $thumbpath;die;
+        $thumbheight = getglobal('config/pichomethumbheight') ? getglobal('config/pichomethumbheight') : 900;
-                $resourcesdata['icondata'] = str_replace('+', '%20', urlencode($thumbpath));
+        $thumsizearr = $this->getImageThumbsize($resourcesdata['width'], $resourcesdata['height'], $thumbwidth, $thumbheight);
-
+        $resourcesdata['iconwidth'] = $thumsizearr[0];
-            } elseif ($resourcesdata['apptype'] == 0) {
+        $resourcesdata['iconheight'] = $thumsizearr[1];
-                $resourcesdata['path'] = str_replace('\\', '/', $resourcesdata['path']);
-                $filepath = dirname($resourcesdata['path']);
-                $filename = substr($resourcesdata['path'], strrpos($resourcesdata['path'], '/') + 1);
-                $filename = str_replace(strrchr($filename, "."), "", $filename);
-                $filepath = str_replace('/', BS, $filepath);
-                if ($downshare[$resourcesdata['appid']]['iswebsitefile']) {
-                    $tmppath = str_replace(DZZ_ROOT, '', $downshare[$resourcesdata['appid']]['path']);
-                    $thumbpath = $tmppath . BS . $filepath . BS . $filename . '_thumbnail.png';
-                    $resourcesdata['icondata'] = str_replace('+', '%20', urlencode($thumbpath));
-                } else {
-                    $tmppath = $downshare[$resourcesdata['appid']]['path'];
-                    $thumbpath = $tmppath . BS . $filepath . BS . $filename . '_thumbnail.png';
-                    $resourcesdata['icondata'] = getglobal('siteurl') . 'index.php?mod=io&op=getImg&path=' . dzzencode($thumbpath, '', 0, 0);
-                }
-
-            } else {
-
-                $hookdata = ['rid' => $resourcesdata['rid'], 'apppath' => $downshare[$resourcesdata['appid']]['path'], 'appid' => $resourcesdata['appid']];
-                $return = Hook::listen('getpichomethumb', $hookdata);
-                $thumbpath = str_replace(DZZ_ROOT, '', $return[0]['icon']);
-                if ($downshare[$resourcesdata['appid']]['iswebsitefile']){
-                    $resourcesdata['icondata'] = str_replace('+', '%20', urlencode($thumbpath));
-                }else{
-                    $resourcesdata['icondata'] = getglobal('siteurl') . 'index.php?mod=io&op=getImg&path=' . dzzencode($thumbpath, '', 0, 0);
-                }
-
-            }
-
-
-            //}
-        } else {
-            if ($resourcesdata['type'] == 'commonimage') {
-                if ($downshare[$resourcesdata['appid']]['iswebsitefile']) {
-                    $tmppath = str_replace(DZZ_ROOT, '', $downshare[$resourcesdata['appid']]['path']);
-                    $thumbpath = $tmppath . BS . $resourcesdata['path'];
-                    $thumbpath = str_replace(BS, '/', $thumbpath);
-                    $resourcesdata['icondata'] = str_replace('+', '%20', urlencode($thumbpath));
-                } else {
-                    $tmppath = $downshare[$resourcesdata['appid']]['path'];
-                    $resourcesdata['icondata'] = getglobal('siteurl') . 'index.php?mod=io&op=getImg&path=' . dzzencode($tmppath, '', 0, 0);
-                }
-
-            } else {
-                $resourcesdata['icondata'] = geticonfromext($resourcesdata['ext'], $resourcesdata['type']);
-            }
-        }
         //echo $resourcesdata['icondata'];die;
-        $imginfo = @getimagesize($resourcesdata['icondata']);
+        //$imginfo = @getimagesize($resourcesdata['icondata']);
-        $resourcesdata['iconwidth'] = $imginfo[0] ? $imginfo[0] : $resourcesdata['width'];
+        // $resourcesdata['iconwidth'] = $imginfo[0] ? $imginfo[0] : $resourcesdata['width'];
-        $resourcesdata['iconheight'] = $imginfo[1] ? $imginfo[1] : $resourcesdata['height'];
+        //$resourcesdata['iconheight'] = $imginfo[1] ? $imginfo[1] : $resourcesdata['height'];
         $resourcesdata['icondata'] = str_replace('+', '%20', $resourcesdata['icondata']);
 
 
         $resourcesdata['share'] = $downshare[$resourcesdata['appid']]['share'];
         $resourcesdata['download'] = $downshare[$resourcesdata['appid']]['download'];
-        if ($downshare[$resourcesdata['appid']]['iswebsitefile']) {
+        /* if ($downshare[$resourcesdata['appid']]['iswebsitefile']) {
              $originalimg = str_replace(DZZ_ROOT, '', $downshare[$resourcesdata['appid']]['path'] . BS . $resourcesdata['path']);
              $originalimg = str_replace(BS, '/', $originalimg);
              $resourcesdata['originalimg'] = str_replace('+', '%20', urlencode($originalimg));
              $resourcesdata['realpath'] = str_replace('+', '%20', urlencode($originalimg));
-        } else {
+         } else {*/
         $originalimg = $downshare[$resourcesdata['appid']]['path'] . BS . $resourcesdata['path'];
-            $resourcesdata['originalimg'] = getglobal('siteurl') . 'index.php?mod=io&op=getImg&path=' . dzzencode($originalimg, '', 0, 0);
+        $resourcesdata['originalimg'] = getglobal('siteurl') . 'index.php?mod=io&op=getImg&fpath=' . dzzencode($originalimg, '', 0, 0);
         if (in_array($resourcesdata['opentype'], array('text', 'video', 'pdf'))) {
-                $resourcesdata['realpath'] = str_replace('+', '', urlencode(getglobal('siteurl') . 'index.php?mod=io&op=getImg&path=' . dzzencode($originalimg, '', 0, 0)));
+            $resourcesdata['realpath'] = str_replace('+', '', urlencode(getglobal('siteurl') . 'index.php?mod=io&op=getImg&fpath=' . dzzencode($originalimg, '', 0, 0)));
         } else {
-                $resourcesdata['realpath'] = getglobal('siteurl') . 'index.php?mod=io&op=getImg&path=' . dzzencode($originalimg, '', 0, 0);
+            $resourcesdata['realpath'] = getglobal('siteurl') . 'index.php?mod=io&op=getImg&fpath=' . dzzencode($originalimg, '', 0, 0);
         }
 
-        }
+        //}
 
         $resourcesdata['name'] = str_replace(strrchr($resourcesdata['name'], "."), "", $resourcesdata['name']);
         $resourcesdata['fsize'] = formatsize($resourcesdata['size']);
@@ -293,170 +212,72 @@ class table_pichome_resources extends dzz_table
             $v['annonationnum'] = $annonationnumdata[$v['rid']]['num'];
             $v['share'] = $downshare[$v['appid']]['share'];
             $v['download'] = $downshare[$v['appid']]['download'];
-            if ($v['hasthumb']) {
-                //如果是本地文件
-                if ($downshare[$v['appid']]['type'] == 1) {
-                    $filename = 'pichomethumb' . BS . $v['appid'] . BS . md5($v['path']) . '.jpg';
-                    $thumbpath = getglobal('setting/attachurl') . $filename;
-                    $v['icondata'] = str_replace('+', '%20', urlencode($thumbpath));
-                } elseif ($downshare[$v['appid']]['type'] == 0) {
-                    $v['path'] = str_replace('\\', '/', $v['path']);
-                    $filepath = dirname($v['path']);
-                    $filename = substr($v['path'], strrpos($v['path'], '/') + 1);
-                    $filepath = str_replace('/', BS, $filepath);
-                    $filename = str_replace(strrchr($filename, "."), "", $filename);
-                    $filepath = str_replace('/', BS, $filepath);
-                    if ($downshare[$v['appid']]['iswebsitefile']) {
-                        $tmppath = str_replace(DZZ_ROOT, '', $downshare[$v['appid']]['path']);
-                        $thumbpath = $tmppath . BS . $filepath . BS . $filename . '_thumbnail.png';
-                        $v['icondata'] = str_replace('+', '%20', urlencode($thumbpath));
-                    } else {
-                        $tmppath = $downshare[$v['appid']]['path'];
-                        $thumbpath = $tmppath . BS . $filepath . BS . $filename . '_thumbnail.png';
-                        $v['icondata'] = getglobal('siteurl') . 'index.php?mod=io&op=getImg&path=' . dzzencode($thumbpath);
-                    }
 
-                } else {
+            $v['icondata'] = getglobal('siteurl') . 'index.php?mod=io&op=getImg&path=' . dzzencode($v['rid'], '', 0, 0);
-                    $hookdata = ['rid' => $v['rid'], 'apppath' => $downshare[$v['appid']]['path'], 'appid' => $v['appid']];
-                    $return = Hook::listen('getpichomethumb', $hookdata);
-                    $thumbpath = str_replace(DZZ_ROOT, '', $return[0]['icon']);
-                    if ($downshare[$v['appid']]['iswebsitefile']){
-                        $v['icondata'] = str_replace('+', '%20', urlencode($thumbpath));
-                    }else{
-                        $v['icondata'] = getglobal('siteurl') . 'index.php?mod=io&op=getImg&path=' . dzzencode($thumbpath, '', 0, 0);
-                    }
-                }
-
-            } else {
-                if ($v['type'] == 'commonimage') {
-                    if ($downshare[$v['appid']]['iswebsitefile']) {
-                        $tmppath = str_replace(DZZ_ROOT, '', $downshare[$v['appid']]['path']);
-                        $thumbpath = $tmppath . BS . $v['path'];
-                        $thumbpath = str_replace(BS,'/',$thumbpath);
-                        $v['icondata'] = str_replace('+', '%20', urlencode($thumbpath));
-                    } else {
-                        $tmppath = $downshare[$v['appid']]['path'] . BS . $v['path'];
-                        $v['icondata'] = getglobal('siteurl') . 'index.php?mod=io&op=getImg&path=' . dzzencode($tmppath, '', 0, 0);
-                    }
-                } else {
-                    $v['icondata'] = geticonfromext($v['ext'], $v['type']);
-                    $v['width'] = 128;
-                    $v['height'] = 128;
-                }
-            }
             $thumbwidth = getglobal('config/pichomethumbwidth') ? getglobal('config/pichomethumbwidth') : 900;
             $thumbheight = getglobal('config/pichomethumbheight') ? getglobal('config/pichomethumbheight') : 900;
-            $thumsizearr = $this->getImageThumbsize($v['width'],$v['height'],$thumbwidth,$thumbheight);
+            $thumsizearr = $this->getImageThumbsize($v['width'], $v['height'], $thumbwidth, $thumbheight);
             $v['thumbwidth'] = $thumsizearr[0];
             $v['thumbheight'] = $thumsizearr[1];
-            //文件真实地址
+
-            if ($downshare[$v['appid']]['iswebsitefile']) {
-                $originalimg = str_replace(DZZ_ROOT, '', $downshare[$v['appid']]['path'] . BS . $v['path']);
-                $originalimg = str_replace(BS, '/', $originalimg);
-                $v['realpath'] = str_replace('+', '%20', urlencode($originalimg));
-            } else {
             $originalimg = $downshare[$v['appid']]['path'] . BS . $v['path'];
-                $v['realpath'] = getglobal('siteurl') . 'index.php?mod=io&op=getImg&path=' . dzzencode($originalimg, '', 0, 0);
+            $v['realpath'] = getglobal('siteurl') . 'index.php?mod=io&op=getImg&fpath=' . dzzencode($originalimg, '', 0, 0);
-            }
+
 
             unset($v['path']);
             $returndata[] = $v;
         }
         return $returndata;
     }
-    public function getImageThumbsize($owidth,$oheight,$width,$height){
-        if($owidth>$width || $oheight>$height){
-            $or=$owidth/$oheight;
-            $r=$width/$height;
-            if($r>$or){
-                if($oheight<$height){
-                    $height=$oheight;
-                    $width=$owidth;
-                }else{
 
-                    $width=ceil($height*$or);
+    public function getImageThumbsize($owidth, $oheight, $width, $height)
-                    if($width < 242){
+    {
+        if ($owidth > $width || $oheight > $height) {
+            $or = $owidth / $oheight;
+            $r = $width / $height;
+            if ($r > $or) {
+                if ($oheight < $height) {
+                    $height = $oheight;
+                    $width = $owidth;
+                } else {
+
+                    $width = ceil($height * $or);
+                    if ($width < 242) {
                         $width = 242;
-                        $height = ceil($width/$or);
+                        $height = ceil($width / $or);
                     }
                 }
 
-            }else{
+            } else {
-                if($owidth<$width){
+                if ($owidth < $width) {
-                    $height=$oheight;
+                    $height = $oheight;
-                    $width=$owidth;
+                    $width = $owidth;
-                }else{
+                } else {
-                    $height=ceil($width/$or);
+                    $height = ceil($width / $or);
-                    $width = ceil($height*$or);
+                    $width = ceil($height * $or);
-                    if($width < 242){
+                    if ($width < 242) {
                         $width = 242;
-                        $height = ceil($width/$or);
+                        $height = ceil($width / $or);
                     }
                 }
             }
 
-        }else{
+        } else {
-            $width=$owidth;
+            $width = $owidth;
-            $height=$oheight;
+            $height = $oheight;
         }
         //Return the results
-        return array($width,$height);
+        return array($width, $height);
 
     }
+
     public function geticondata_by_rid($rid)
     {
         $resourcesdata = DB::fetch_first("select r.rid,r.appid,r.hasthumb,r.ext,r.type,ra.path as fpath,
-            v.path,r.apptype,v.iswebsitefile from %t r 
+            v.path,r.apptype,v.iswebsitefile,v.version from %t r 
         left join %t ra on r.rid=ra.rid left join %t v on r.appid = v.appid where r.rid = %s and r.isdelete = 0",
             array($this->_table, 'pichome_resources_attr', 'pichome_vapp', $rid));
-        if ($resourcesdata['hasthumb']) {
+        $resourcesdata['icondata'] = getglobal('siteurl') . 'index.php?mod=io&op=getImg&path=' . dzzencode($rid, '', 0, 0);
-            //如果是本地文件
-            if ($resourcesdata['apptype'] == 1) {
-                $filename = 'pichomethumb' . BS . $resourcesdata['appid'] . BS . md5($resourcesdata['fpath']) . '.jpg';
-                $thumbpath = getglobal('setting/attachurl') . $filename;
-                $resourcesdata['icondata'] = str_replace('+', '%20', urlencode($thumbpath));
-            } elseif($resourcesdata['apptype'] == 0){
-                $resourcesdata['fpath'] = str_replace('\\', '/', $resourcesdata['fpath']);
-                $filepath = dirname($resourcesdata['fpath']);
-                $filename = substr($resourcesdata['fpath'], strrpos($resourcesdata['fpath'], '/') + 1);
-                $filename = str_replace(strrchr($filename, "."), "", $filename);
-                $filepath = str_replace('/', BS, $filepath);
-                if ($resourcesdata['iswebsitefile']) {
-                    $tmppath = str_replace(DZZ_ROOT, '', $resourcesdata['path']);
-                    $thumbpath = $tmppath . BS . $filepath . BS . $filename . '_thumbnail.png';
-                    $resourcesdata['icondata'] = str_replace('+', '%20', urlencode($thumbpath));
-                } else {
-                    $tmppath = $resourcesdata['path'];
-                    $thumbpath = $tmppath . BS . $filepath . BS . $filename . '_thumbnail.png';
-                    $resourcesdata['icondata'] = getglobal('siteurl') . 'index.php?mod=io&op=getImg&path=' . dzzencode($thumbpath, '', 0, 0);
-                }
-            } else {
-                $hookdata = ['rid' => $resourcesdata['rid'], 'apppath' => $resourcesdata['path'], 'appid' => $resourcesdata['appid']];
-                $return = Hook::listen('getpichomethumb', $hookdata);
-                $thumbpath = str_replace(DZZ_ROOT, '', $return[0]['icon']);
-                if ($resourcesdata['iswebsitefile']){
-                    $resourcesdata['icondata'] = str_replace('+', '%20', urlencode($thumbpath));
-                }else{
-                    $resourcesdata['icondata'] = getglobal('siteurl') . 'index.php?mod=io&op=getImg&path=' . dzzencode($thumbpath, '', 0, 0);
-                }
-            }
-        } else {
-            if ($resourcesdata['type'] == 'commonimage') {
-                if ($resourcesdata['iswebsitefile']) {
-                    $tmppath = str_replace(DZZ_ROOT, '', $resourcesdata['path']);
-                    $thumbpath = $tmppath . BS . $resourcesdata['fpath'];
-                    $thumbpath = str_replace(BS, '/', $thumbpath);
-                    $resourcesdata['icondata'] = str_replace('+', '%20', urlencode($thumbpath));
-                } else {
-                    $tmppath = $resourcesdata['path'];
-                    $resourcesdata['icondata'] = getglobal('siteurl') . 'index.php?mod=io&op=getImg&path=' . dzzencode($tmppath, '', 0, 0);
-                }
-
-            } else {
-                $resourcesdata['icondata'] = geticonfromext($resourcesdata['ext'], $resourcesdata['type']);
-            }
-
-        }
         return $resourcesdata;
     }
 

core/class/table/table_pichome_vapp.php

@@ -99,8 +99,9 @@
                 if(is_dir(getglobal('setting/attachdir').'pichomethumb/'.$appid)){
                     removedirectory(getglobal('setting/attachdir').'pichomethumb/'.$appid);
                 }
-                if($appdata['type'] > 1){
+                if($appdata['type'] !== 1){
-                    Hook::listen('pichomevappdelete',$appid);
+                    $hookdata = ['appid'=>$appid,'apptype'=>$appdata['type']];
+                    Hook::listen('pichomevappdelete',$hookdata);
                 }
                 return parent::delete($appid);
             }
@@ -114,4 +115,20 @@
             }
             return $downshare;
         }
+
+        public function add_getinfonum_by_appid($appid,$ceof = 1){
+            $appdata = C::t('pichome_vapp')->fetch($appid);
+            if($ceof < 0){
+                if($appdata['getinfonum'] == 0) return true;
+                elseif($appdata['getinfonum'] < abs($ceof))$ceof = -$appdata['getinfonum'];
+
+            }
+
+            if ($ceof > 0) {
+                DB::query("update %t set getinfonum=getinfonum+%d where appid = %s", array($this->_table, $ceof, $appid));
+            } else {
+                DB::query("update %t set getinfonum=getinfonum-%d where appid = %s", array($this->_table, abs($ceof), $appid));
+            }
+            $this->clear_cache($appid);
+        }
     }

core/core_version.php

@@ -11,8 +11,8 @@ if(!defined('IN_OAOOA')) {
 }
 
 if(!defined('CORE_VERSION')) {
-	define('CORE_VERSION', 'beta3.2');
+	define('CORE_VERSION', 'beta3.3');
 	define('CORE_VERSION_LEVEL', 'Pichome');
-	define('CORE_RELEASE', '20220128');
+	define('CORE_RELEASE', '20220224');
-	define('CORE_FIXBUG' , '03200000');
+	define('CORE_FIXBUG' , '03300000');
 }

dzz/billfish/class/class_billfishexport.php

@@ -31,7 +31,7 @@ class billfishxport
     private $donum = 0;
     private $lastid = '';
     private $charset = 'UTF-8';
-    private $allowext = '';
+    private $version = '';
     private $notallowext = '';
     private $db = null;
 
@@ -47,6 +47,7 @@ class billfishxport
         $this->donum = $data['donum'];
         $this->filenum = $data['filenum'];
         $this->lastid = $data['lastid'];
+        $this->version = $data['version'];
         if ($data['charset']) $this->charset = $data['charset'];
         //尝试连接数据库
         $connect = $this->connect_db();
@@ -85,7 +86,28 @@ class billfishxport
     public function initExport()
     {
         //修改导入状态为1
-        C::t('pichome_vapp')->update($this->appid, array('state' => 1));
+
+        $versionsql = " SELECT version from library where 1";
+        $versions = $this->fetch($versionsql);
+        $this->version = $versions['version'];
+        C::t('pichome_vapp')->update($this->appid, array('state' => 1,'version'=>intval($this->version)));
+        if($this->version >= 30){
+            //查询res_join_tag是否有文件id索引
+            $fecthsql = "SELECT * FROM sqlite_master WHERE type = 'index'";
+            $indexdata =  $this->fetch_all($fecthsql);
+            $indexarr = array_column($indexdata,'name');
+            //如果标签表iid没有索引创建res_join_tag_iid_idx索引
+            if(!in_array('res_join_tag_id',$indexarr)){
+                $createsql = "CREATE INDEX res_join_tag_id ON bf_tag_join_file (tag_id ASC )";
+                $this->db->query($createsql);
+            }
+
+            //查询待导入文件数
+            // $sql = "select count(f.id) as num from bf_file f left join bf_material m on f.id = m.file_id where m.is_recycle =0 ";
+            $sql = "select count(id) as num from bf_file where 1";
+            $data = $this->fetch($sql);
+            $this->filenum = $data['num'];
+        }else{
             //查询res_join_tag是否有文件id索引
             $fecthsql = "SELECT * FROM sqlite_master WHERE type = 'index'";
             $indexdata =  $this->fetch_all($fecthsql);
@@ -97,9 +119,11 @@ class billfishxport
             }
 
             //查询待导入文件数
-        $sql = "select count(s.id) as num from source s left join res_prop rp on s.id = rp.iid where rp.action =0 ";
+            //$sql = "select count(s.id) as num from source s left join res_prop rp on s.id = rp.iid where rp.action =0 ";
+            $sql = "select count(id) as num from source where 1 ";
             $data = $this->fetch($sql);
             $this->filenum = $data['num'];
+        }
         //如果没有数据，视为导入成功
         if (!$this->filenum) {
             C::t('pichome_vapp')->update($this->appid, array('state' => 4));
@@ -128,6 +152,264 @@ class billfishxport
 
     public function execExport($force = false)
     {
+
+        if($this->version < 30){
+            $this->oldexport($force);
+        }else{
+            $this->export($force);
+        }
+
+    }
+    public function export($force = false){
+        //开始页数
+        if ($this->lastid) {
+            $start = $this->lastid;
+        } else $start = 1;
+        $lastid = $start;
+        $start = ($start-1)*$this->onceexportnum;
+        $sql = "select f.*,m.w,m.h,m.is_recycle,m.thumb_tid,mu.comments_detail,mu.note,mu.score,mu.origin from bf_file f
+         left join  bf_material m on m.file_id = f.id 
+         left join bf_material_userdata mu on mu.file_id=f.id
+         where 1 limit $start,$this->onceexportnum";
+        $datas = $this->fetch_all($sql);
+
+        foreach ($datas as $v) {
+            //查询文件是否在回收站
+            $id = $v['id'];//文件id
+            $rid = md5($this->appid . $id);
+
+            //如果文件在回收站
+            if ($v['is_recycle'] > 0) {
+                //如果已经有数据,标记为已删除
+                if (DB::fetch_first("select count(rid) from %t where rid = %s", array('pichome_resources', $rid))) {
+                    C::t('pichome_resources')->update($rid, array('isdelete' => 1));
+                }
+                //文件总数减1
+                $this->filenum -= 1;
+            }
+            else {
+                //获取文件后缀
+                $ext = strtolower(substr(strrchr($v['name'], '.'), 1));
+                //获取文件类型
+                $type = getTypeByExt($ext);
+
+                //出入主表数据
+                $setarr = [
+                    'rid' => $rid,
+                    'uid'=>$this->uid,
+                    'username'=>$this->username,
+                    'appid' => $this->appid,
+                    'ext' => $ext,
+                    'type' => $type,
+                    'name' => $v['name'],
+                    'mtime' => ($v['mtime']) ? $v['mtime'] * 1000 : $v['born'] * 1000,
+                    'dateline' => $v['ctime'] ? $v['ctime'] * 1000:$v['born']*1000,
+                    'btime' => $v['born'] ? $v['born']*1000:$v['mtime'] * 1000,
+                    'size' => $v['file_size'],
+                    'width' => $v['w'],
+                    'height' => $v['h'],
+                    'grade' => $v['score'],
+                    'apptype' => 2,
+                    'hasthumb' => $v['thumb_tid'] ? 1 : 0,
+                    'thumb' => $v['thumb']
+                ];
+
+                //数据插入主表
+                if (C::t('#billfish#billfish_record')->inser_data($v['id'], $setarr)) {
+                    //定义属性表变量
+                    $attrdata = [];
+                    $attrdata['desc'] = $v['note'];
+                    $attrdata['link'] = $v['origin'];
+                    //将名字记入搜索字段
+                    $attrdata['searchval'] = $setarr['name'].$attrdata['desc'].$attrdata['link'];
+                    //处理目录数据
+                    if ($v['pid']) {
+                        $folderdata = $this->getFolderfid($v['pid']);
+                        //处理目录数据
+                        $fid = $folderdata['fid'];
+                        $folderarr = [
+                            'fid' => $fid,
+                            'appid' => $this->appid,
+                            'rid' => $rid
+                        ];
+                        C::t('pichome_folderresources')->insert($folderarr);
+                        $attrdata['path'] = $folderdata['dirpath'] . BS . $setarr['name'];
+                    } else {
+                        $attrdata['path'] = $setarr['name'];
+                    }
+                    //目录数据处理完成
+                    $attrdata['path']  = $this->getFileRealFileName($this->path,$attrdata['path']);
+                    //转码路径 记入属性表
+                    //$p = new Encode_Core();
+                    //$this->charset = $p->get_encoding($attrdata['path']);
+                    //if (CHARSET != $this->charset) $attrdata['path'] = diconv($attrdata['path'],CHARSET, $this->charset);;
+
+                    //标签数据开始
+
+                    //查询文件标签id
+
+                    $sql = "select tag_id from bf_tag_join_file where file_id = $id";//耗时最多
+                    $tiddata = $this->fetch_all($sql);
+
+                    $tids = [];
+                    foreach ($tiddata as $val) {
+                        $tids[] = $val['tag_id'];
+                    }
+                    if (!empty($tids)) {
+                        $tidstr = dimplode($tids);
+                        //查询标签分类数据
+                        $sql = "select jg.gid,g.name from bf_tag_join_group jg 
+                            left join bf_tag_group g on g.id = jg.gid 
+                            where jg.tag_id in($tidstr) group by jg.gid";
+                        $taggroupdata = $this->fetch_all($sql);
+                        $relationgroupdata = [];
+                        //插入标签分类关系表及pichome分类返回原分类id对应pichome标签分类id
+                        foreach ($taggroupdata as $val) {
+                            $tmpreturn = C::t('#billfish#billfish_taggrouprecord')->insert_data($val, $this->appid);
+                            $relationgroupdata[$tmpreturn['bcid']] = $tmpreturn['cid'];
+                        }
+                        //处理标签表数据
+                        //查询标签名称,id 插入标签对照表 返回原标签id对应pichome标签id 将标签加入searchval
+                        $sql = " select t.id,t.name,j.gid from bf_tag t 
+                            left join  bf_tag_join_group j on j.tag_id = t.id where t.id in($tidstr)";
+                        $tagdata = $this->fetch_all($sql);
+                        $tagrelativedata = [];
+                        $taggroups =[];
+                        foreach ($tagdata as $val) {
+                            $tagsetarr = ['name' => $val['name'], 'lid' => $val['id']];
+                            $tmptagrelativedata = C::t('#billfish#billfish_tagrecord')->insert_data($tagsetarr, $this->appid);
+                            $tagrelativedata[$tmptagrelativedata['lid']] = $tmptagrelativedata['tid'];
+                            $attrdata['searchval'] .= $val['name'];
+                            if($val['gid']) $taggroups[] = ['gid'=>$val['gid'],'lid'=>$val['id']];
+                        }
+
+                        //处理标签与分类关系数据 查询原标签分类和标签id 插入pichome标签分类对应标签id
+                        //$sql = "select gid,lid from tag_join_group where lid in($tidstr)";
+                        //$taggroups = $this->fetch_all($sql);
+                        foreach ($taggroups as $val) {
+                            $tagrelarr = [
+                                'tid' => $tagrelativedata[$val['lid']],
+                                'cid' => $relationgroupdata[$val['gid']],
+                                'appid' => $this->appid,
+                            ];
+                            C::t('pichome_tagrelation')->insert($tagrelarr);
+                        }
+                        //处理标签文件关系数据
+                        $inserttids = $ftids = array_values($tagrelativedata);
+                        //查询pichome是否有标签数据
+                        $oattrtag = DB::result_first("select tag from %t where rid = %s", array('pichome_resources_attr', $rid));
+                        if ($oattrtag) {
+                            $ottids = explode(',', $oattrtag);
+                            //取得删除的标签
+                            $deltids = array_diff($ftids, $ottids);
+                            if (!empty($deltids)) C::t('pichome_resourcestag')->delete_by_ridtid($rid, $deltids);
+                            //取得插入的标签
+                            $inserttids = $deltids = array_diff($ottids, $ftids);
+                        }
+                        //插入标签关系表
+                        foreach ($inserttids as $val) {
+                            $tagresourcesattr = ['tid' => $val, 'rid' => $rid, 'appid' => $this->appid];
+                            C::t('pichome_resourcestag')->insert($tagresourcesattr);
+                        }
+                        //更新属性表标签数据
+                        $attrdata['tag'] = implode(',', $ftids);
+                    }
+
+
+
+                    //标签数据结束
+
+                    //开始处理颜色数据
+                    //查询颜色数据
+                    $sql = "select * from bf_material_color where file_id = $id";
+                    $bcolordata = $this->fetch_all($sql);
+                    //删除原颜色数据
+                    DB::delete('pichome_palette', array('rid' => $rid));
+                    foreach ($bcolordata as $val) {
+                        $colorarr = ['rid' => $rid,
+                            'color' => $val['color'],
+                            'weight' => $val['precent'],
+                            'r' => $val['r'],
+                            'g' => $val['g'],
+                            'b' => $val['b']
+                        ];
+                        C::t('pichome_palette')->insert($colorarr);
+                    }
+
+                    //颜色数据处理结束
+
+
+                    //处理标注数据
+
+                    //删除原标注数据
+                    C::t('pichome_comments')->delete_by_rid($rid);
+                    if ($v['comments_detail']) {
+                        $commentdata = json_decode($v['comments_detail'],true);
+                        foreach ($commentdata as $commentval) {
+                            $tcommentval['id'] = random(13) . $this->appid;
+                            $tentval['appid'] = $this->appid;
+                            $tcommentval['rid'] = $rid;
+                            $tcommentval['x'] = number_format($commentval['x'], 2);
+                            $tcommentval['y'] = number_format($commentval['y'], 2);
+                            $tcommentval['width'] = number_format($commentval['cx'], 2);
+                            $tcommentval['height'] = number_format($commentval['cy'], 2);
+                            $tcommentval['annotation'] = $commentval['comment'];
+                            try {
+                                C::t('pichome_comments')->insert($tcommentval);
+                                $setarr['searchval'] .= $tcommentval['annotation'];
+                            } catch (Exception $e) {
+
+                            }
+
+                        }
+
+                    }
+                    //标注数据处理结束
+
+                    //处理音视频时长数据
+                    //查询音频时长
+                    $sql = "select duration from bf_material_video where file_id = $id";
+                    $videodata = $this->fetch($sql);
+                    if(isset($videodata['duration'])) $attrdata['duration'] = $videodata['duration'];
+                    //查询视频时长
+                    $sql = "select duration from bf_material_audio where file_id = $id";
+                    $audiodata = $this->fetch($sql);
+                    if(isset($audiodata['duration'])) $attrdata['duration'] = $audiodata['duration'];
+                    //时长处理结束
+
+                    //插入属性表数据
+                    $attrdata['rid'] = $rid;
+                    $attrdata['appid'] = $this->appid;
+                    C::t('pichome_resources_attr')->insert($attrdata);
+                    $this->donum += 1;
+
+                }
+                else{
+                    //文件总数减1
+                    $this->filenum -= 1;
+                }
+            }
+
+
+            //导入百分比
+            $percent = floor(($this->donum / $this->filenum) * 100);
+            $percent = ($percent > 100) ? 100 : $percent;
+            $state = ($percent >= 100) ? 3 : 2;
+            if ($state == 3) {
+                $lastid = 0;
+            }
+            //记录导入起始位置，以备中断后从此处,更改导入状态
+            C::t('pichome_vapp')->update($this->appid, array('percent' => $percent, 'donum' => $this->donum, 'state' => $state));
+
+        }
+        if($state == 2){
+            $lastid = $lastid+1;
+            C::t('pichome_vapp')->update($this->appid,array('lastid' => $lastid));
+        }
+
+        return array('success' => true);
+    }
+    public function oldexport($force = false){
         //开始页数
         if ($this->lastid) {
             $start = $this->lastid;
@@ -362,13 +644,12 @@ class billfishxport
             if ($state == 3) {
                 $lastid = 0;
             }
+
             //记录导入起始位置，以备中断后从此处,更改导入状态
             C::t('pichome_vapp')->update($this->appid, array('percent' => $percent, 'donum' => $this->donum, 'state' => $state));
         }
-        $time4= microtime(true);
 
         $lastid = $lastid+1;
-
         C::t('pichome_vapp')->update($this->appid,array('lastid' => $lastid));
         return array('success' => true);
 
@@ -377,8 +658,12 @@ class billfishxport
     public function getFolderfid($bfid, $dirpath = '')
     {
         $parentfolderdata = [];
-
+        if($this->version < 30){
             $sql = "select * from folder where id = $bfid";
+        }else{
+            $sql = "select * from bf_folder where id = $bfid";
+        }
+
         $folderdata = $this->fetch($sql);
         $dirpath = $folderdata['name'] . ($dirpath ? BS . $dirpath : '');
         if ($folderdata['pid']) {
@@ -389,7 +674,8 @@ class billfishxport
         $setarr = [
             'pfid' => isset($parentfolderdata['fid']) ? $parentfolderdata['fid'] : '',
             'fname' => $folderdata['name'],
-            'appid' => $this->appid
+            'appid' => $this->appid,
+            'disp'=>($this->version < 30) ? $folderdata['seq']:round($folderdata['seq']*1000000000)
         ];
         $return = C::t('#billfish#billfish_folderrecord')->insert_data($bfid, $setarr);
         $return['dirpath'] = $dirpath;
@@ -426,9 +712,15 @@ class billfishxport
             //检查不存在的标签删除
             $tagtotal = DB::result_first("select count(id) from %t where appid = %s",array('billfish_tagrecord',$this->appid));
             $this->check_notexists_tag($tagtotal);
+            if($this->version < 30){
                 //删除创建的索引
                 $sql = 'DROP INDEX res_join_tag_iid';
                 $this->db->query($sql);
+            }else{
+                $sql = 'DROP INDEX res_join_tag_id';
+                $this->db->query($sql);
+            }
+
 
             $hascatnum = DB::result_first("SELECT count(DISTINCT rid) FROM %t where appid = %s",array('pichome_folderresources',$this->appid));
             $nosubfilenum = $total - $hascatnum;
@@ -438,8 +730,14 @@ class billfishxport
         foreach ($data as $v) {
             $rid = $v['rid'];
             $iid = DB::result_first("select bid from %t where rid = %s and appid = %s",array('billfish_record',$rid,$this->appid));
+
+            if($this->version < 30){
+                $sql = "select count(s.id) as num from source s left join res_prop rp on s.id = rp.iid where rp.action =0 and s.id = $iid";
+            }else{
                 //查询billfish中是否有该数据
-            $sql = "select count(*) as num from source where id = $iid";
+                $sql = "select count(f.id) as num from bf_file f left join bf_material m on f.id = m.file_id where m.is_recycle =0 and  f.id = $iid";
+            }
+
             $numdata = $this->fetch($sql);
             if(!isset($numdata['num']) || !$numdata['num']){
                 $delrids[] = $rid;
@@ -468,7 +766,6 @@ class billfishxport
     }
     //检查目录数据
     public function check_notexists_folder($total){
-
         $tmpkey = 'pichomecheckfolder' . $this->appid;
         $folderstart = C::t('cache')->fetch($tmpkey);
         if (!$folderstart) {
@@ -487,8 +784,13 @@ class billfishxport
             }
 
             $bfidstr = dimplode($bfids);
-            //查询不存的目录
+            if($this->version < 30){
                 $sql = "select id from folder where id in($bfidstr)";
+            }else{
+                $sql = "select id from bf_folder where id in($bfidstr)";
+            }
+            //查询不存的目录
+
             $bfolder = $this->fetch_all($sql);
             $blfids = [];
             foreach ($bfolder as $val){
@@ -526,7 +828,10 @@ class billfishxport
                 return true;
             }
             $lidstr = dimplode(',',$lids);
+            if($this->version < 30){
                 $sql = "select id from tag where id in($lidstr)";
+            }
+            else $sql = "select id from bf_tag where id in($lidstr)";
             $blids =[] ;
             foreach($this->fetch_all($sql) as $v){
                 $blids[] = $v['id'];

dzz/billfish/classes/delpichomefolderafter.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace dzz\billfish\classes;
+
+use \core as C;
+use \DB as DB;
+use \fmpeg as fmpeg;
+
+class delpichomefolderafter
+{
+
+    public function run($appid)
+    {
+        C::t("#billfish#billfish_folderrecord")->delete_by_appid($appid);
+    }
+
+
+}

dzz/billfish/classes/getpichomethumb.php

@@ -11,8 +11,19 @@ class getpichomethumb
 
     public function run(&$data)
     {
-
         $thumbid = DB::result_first("select thumb from %t where appid = %s and rid = %s", array('billfish_record', $data['appid'], $data['rid']));
+        if(isset($data['version']) && $data['version'] >=30){
+            $bid = DB::result_first("select bid from %t where rid = %s",array('billfish_record',$data['rid']));
+            $thumbdir = dechex($bid);
+            $thumbdir = (string) $thumbdir;
+            if(strlen($thumbdir) < 2){
+                $thumbdir =str_pad($thumbdir,2,0,STR_PAD_LEFT);
+            }elseif(strlen($thumbdir) > 2){
+                $thumbdir = substr($thumbdir,-2);
+            }
+            $pathdir = $data['apppath'].BS.'.bf'.BS.'.preview'.BS.$thumbdir.BS.$bid.'.small.webp';
+            return array('icon'=>$pathdir);
+        }else{
             if (strlen($thumbid) < 9) {
                 $thumbid = str_pad($thumbid,9,0,STR_PAD_LEFT);
             }
@@ -23,6 +34,8 @@ class getpichomethumb
             return array('icon'=>$pathdir.BS.$thumbpath.BS.$thumbid.'.webp');
         }
 
+    }
+
     function mbStrSplit ($string, $len=1) {
         $start = 0;
         $strlen = mb_strlen($string);

dzz/billfish/classes/pichomevappdelete.php

@@ -9,12 +9,15 @@ use \fmpeg as fmpeg;
 class pichomevappdelete
 {
 
-    public function run($appid)
+    public function run($data)
     {
-        C::t("#billfish#billfish_record")->delete_by_appid($appid);
+        if($data['type'] == 2){
-        C::t("#billfish#billfish_folderrecord")->delete_by_appid($appid);
+            C::t("#billfish#billfish_record")->delete_by_appid($data['appid']);
-        C::t("#billfish#billfish_tagrecord")->delete_by_appid($appid);
+            C::t("#billfish#billfish_folderrecord")->delete_by_appid($data['appid']);
-        C::t("#billfish#billfish_taggrouprecord")->delete_by_appid($appid);
+            C::t("#billfish#billfish_tagrecord")->delete_by_appid($data['appid']);
+            C::t("#billfish#billfish_taggrouprecord")->delete_by_appid($data['appid']);
+        }
+        return true;
 
     }
 

dzz/eagle/class/class_eagleexport.php

@@ -0,0 +1,700 @@
+<?php
+if (!defined('IN_OAOOA')) {
+    exit('Access Denied');
+}
+@set_time_limit(0);
+@ini_set('max_execution_time', 0);
+require_once(DZZ_ROOT . './dzz/class/class_encode.php');
+require_once './core/class/class_Color.php';
+require_once libfile('function/user', '', 'user');
+
+class eagleexport
+{
+    private $path = '';//待执行数据path
+    private $appid = 0;//库id
+    private $uid = 0;//用户id
+    private $username = null;//用户名
+    private $filenum = 0;//总文件数
+    private $checkpage = 1;
+    private $checklimit = 1000;
+    private $onceexportnum = 1000;
+    private $checknum = 0;
+    private $eagledir = DZZ_ROOT . 'library';
+    private $readtxt = DZZ_ROOT . './data/attachment/cache/';
+    private $exportstatus = 0;
+    private $donum = 0;
+    private $lastid = '';
+
+    public function __construct($data = array())
+    {
+        //获取导入记录表基本数据
+        $this->path = str_replace('/', BS, $data['path']);;
+        $this->appid = $data['appid'];
+        $this->uid = $data['uid'];
+        $this->username = $data['username'];
+        $this->exportstatus = $data['state'];
+        $this->donum = $data['donum'];
+        $this->filenum = $data['filenum'];
+        $this->lastid = $data['lastid'];
+    }
+
+    public function getpathdata($folderdata, $appid, $pathdata = array())
+    {
+        foreach ($folderdata as $v) {
+            $pathdata[$v['id'] . $appid] = $v['name'];
+            if ($v['children']) {
+                $tmpchild = $v['children'];
+                $pathdata = $this->getpathdata($tmpchild, $appid, $pathdata);
+
+            }
+        }
+
+        return $pathdata;
+    }
+
+    public function initFoldertag()
+    {
+        $jsonfile = $this->path . BS . 'metadata.json';
+        $mtime = filemtime($jsonfile);
+        $appdatas = file_get_contents($jsonfile);
+        //解析出json数据
+        $appdatas = json_decode($appdatas, true);
+
+        //目录数据
+        $folderdata = $appdatas['folders'];
+        $efids = C::t('#eagle#eagle_folderrecord')->insert_folderdata_by_appid($this->appid, $folderdata);
+        $delids = DB::fetch_all("select id from %t where efid not in(%n) and appid = %s",array('eagle_folderrecord',$efids,$this->appid));
+
+       //对比目录数据
+        if($delids)C::t('#eagle#eagle_folderrecord')->delete_by_ids($delids);
+        //标签数据
+        $tagdata = $appdatas['tagsGroups'];
+        $currentcids = [];
+        $tids = [];
+
+        foreach ($tagdata as $v) {
+            $taggroupdata = [
+                'cid' => $v['id'] . $this->appid,
+                'catname' => $v['name'],
+                'appid' => $this->appid,
+                'dateline' => TIMESTAMP
+            ];
+            //插入或更新标签分类数据
+            $cid = C::t('pichome_taggroup')->insert($taggroupdata);
+            $currentcids[] = $cid;
+            foreach ($v['tags'] as $val) {
+                $tid = C::t('pichome_tag')->insert($val, 1);
+                $tids[] = $tid;
+                if ($cid) {
+                    $relasetarr = ['cid' => $cid, 'tid' => $tid, 'appid' => $this->appid];
+                    C::t('pichome_tagrelation')->insert($relasetarr);
+                }
+            }
+        }
+        if ($tids) {
+            //查询关系表中包含的不存在的标签关系
+            $drids = [];
+            foreach (DB::fetch_all("select id from %t where tid  not in(%n)  and appid = %s", array('pichome_tagrelation', $tids, $this->appid)) as $rv) {
+                $drids[] = $rv['id'];
+            }
+            //删除不存在的标签关系数据
+            C::t('pichome_tagrelation')->delete($drids);
+        }
+        $ocids = C::t('pichome_taggroup')->fetch_cid_by_appid($this->appid);
+        $delcids = array_diff($ocids, $currentcids);
+        C::t('pichome_taggroup')->delete_by_cids($delcids);
+        C::t('pichome_vapp')->update($this->appid, array('dateline' => $mtime));
+        return true;
+
+    }
+
+    public function initExport()
+    {
+        $filedir = $this->path . BS . 'images';
+        $readtxt = $this->readtxt . 'eagleexport' . md5($this->path) . '.txt';
+        $filenum = 0;
+        if (!is_file($readtxt) || filemtime($readtxt) < filemtime($this->path . BS . 'metadata.json')) {
+            C::t('pichome_vapp')->update($this->appid, array('state' => 1));
+            if ($dch = opendir($filedir)) {
+                $thandle = fopen($readtxt, 'w+');
+                while (($file = readdir($dch)) != false) {
+                    if ($file != '.' && $file != '..') {
+                        $filePath = $filedir . '/' . $file;
+                        if (is_dir($filePath) && is_file($filePath . '/metadata.json')) {
+                            $filenum++;
+                            fwrite($thandle, $file . "\n");
+                        }
+                        unset($filePath);
+                        unset($file);
+                    }
+                }
+                fclose($thandle);
+                closedir($dch);
+                if ($filenum) $this->filenum = $filenum;
+            } else {
+                C::t('pichome_vapp')->update($this->appid, array('state' => 0));
+                return array('error' => 'Read Dir Failer');
+            }
+
+            C::t('pichome_vapp')->update($this->appid, array('filenum' => $this->filenum, 'state' => 2));
+        }
+        C::t('pichome_vapp')->update($this->appid, array('state' => 2));
+        $this->initFoldertag();
+        return array('success' => true);
+    }
+
+    //获取文件可访问的真实地址
+    public function getFileRealFileName($filepath, $filename, $ext)
+    {
+        $charsetarr = ['GBK', 'GB18030'];
+        $returnname = $filename;
+        if (!is_file($filepath . BS . $filename . '.' . $ext)) {
+            foreach ($charsetarr as $v) {
+                $filemetadataname = diconv($filename, CHARSET, $v);
+                if (is_file($filepath . BS . $filemetadataname . '.' . $ext)) {
+                    $returnname = $filemetadataname;
+                    break;
+                }
+            }
+        }
+        return $returnname;
+
+    }
+
+    //生成主键rid
+    public function createrid()
+    {
+        $microtime = microtime();
+        list($msec, $sec) = explode(' ', $microtime);
+        $msec = $msec * 1000000;
+        $idstr = md5($sec . $msec . random(6) . $this->appid);
+        if (DB::result_first("select count(rid) from %t where rid = %s", array('pichome_resources', $idstr))) {
+            $this->create_id();
+        }
+        return $idstr;
+    }
+
+    public function execExport($force = false)
+    {
+        $filedir = $this->path . BS . 'images';
+        $readtxt = $this->readtxt . 'eagleexport' . md5($this->path) . '.txt';
+        if (filesize($readtxt) == 0) {
+            @unlink($readtxt);
+            C::t('pichome_vapp')->update($this->appid, array('lastid' => 0, 'percent' => 100, 'donum' => 0, 'state' => 3, 'filenum' => $this->filenum));
+            return array('success' => true);
+
+        }
+        if ($this->lastid) {
+            $start = $this->lastid;
+        } else $start = 0;
+        $spl_object = new SplFileObject($readtxt, 'rb');
+        $spl_object->seek($start);
+        if ($this->lastid < $this->filenum && $this->exportstatus == 2) {
+            $i = 0;
+            while (is_file($readtxt) && !$spl_object->eof()) {
+                $i++;
+                if ($i > $this->onceexportnum) {
+                    break;
+
+                }
+                $file = $spl_object->current();
+                $file = trim($file);
+                $filePath = $filedir . '/' . $file;
+
+                $id = trim(str_replace('.info', '', $file));
+
+                //文件路径
+                $tmppath = $filePath;
+                unset($filePath);
+                //文件信息文件路径
+                $metadatajsonfile = $tmppath . BS . 'metadata.json';
+                //尝试获取记录表记录
+                $rdata = C::t('#eagle#eagle_record')->fetch_by_eid($id,$this->appid);
+                $rid = '';
+                if (!isset($rdata['rid'])) {
+                    $orid = $id . $this->appid;//原来rid格式
+
+                    if ($lastdate = DB::result_first("select lastdate from %t where rid = %s", array('pichome_resources', $orid))) {
+                        $rid = $orid;
+                    }
+
+                } else {
+                    $rid = $rdata['rid'];
+                    $lastdate = $rdata['dateline'];
+                }
+                //判断是否含有数据信息文件
+                if (is_file($metadatajsonfile)) {
+                    $flastdate = filemtime($metadatajsonfile);
+
+                    $metadata = file_get_contents($metadatajsonfile);
+                    $filemetadata = json_decode($metadata, true);
+                    //如果是删除状态，并且已有数据则执行删除
+                    if ($filemetadata['isDeleted'] && $rid) {
+                        C::t('pichome_resources')->delete_by_rid($rid);
+                    } else {
+                        //如果不是新生成rid
+                        if ($rid) {
+                            $data = C::t('pichome_resources')->fetch($rid);
+                            //判断最后更新时间
+                            if ($force || $lastdate < $flastdate) {
+                                $filemetadataname = $this->getFileRealFileName($tmppath, $filemetadata['name'], $filemetadata['ext']);
+                                //文件名称
+                                $filename = $filemetadataname . '.' . $filemetadata['ext'];
+                                //缩略图名称
+                                $thumbname = $filemetadataname . '_thumbnail.png';
+                                //文件路径
+                                $file = $tmppath . BS . $filename;
+                                //缩略图路径
+                                $thumbfile = $tmppath . BS . $thumbname;
+
+                                //如果mtime发生变化则删除原数据，重新导入
+                                if ($data['mtime'] < $filemetadata['mtime']) {
+                                    C::t('pichome_resources')->delete_by_rid($rid);
+                                    $filemetadata['rid'] = $this->createrid();
+                                    $filemetadata['filename'] = $filemetadata['name'];
+                                    $filemetadata['file'] = $file;
+                                    $filemetadata['thumbfile'] = $thumbfile;
+                                    $filemetadata['rid'] = $rid;
+                                    $filemetadata['mtime'] = $filemetadata['mtime'] ? $filemetadata['mtime'] : $filemetadata['modificationTime'];
+                                    $filemetadata['btime'] = $filemetadata['btime'] ? $filemetadata['btime'] : $filemetadata['modificationTime'];
+                                    $filemetadata['dateline'] = $filemetadata['lastModified'];
+                                    $filemetadata['lastdate'] = $flastdate;
+                                    $this->exportfile($id,$filemetadata);
+                                    unset($filemetadata);
+                                }
+                                else {
+                                    //信息表数据记录
+                                    $setarr = [];
+                                    $setarr['searchval'] = $filemetadata['name'];
+                                    //查询原数据中的属性信息
+                                    $attrdata = C::t('pichome_resources_attr')->fetch($rid);
+                                    $filename = $filemetadata['name'] . '.' . $filemetadata['ext'];
+                                    //检查reources数据变化
+                                    $resourcesarr = [
+                                        'name' => $filename,
+                                        'dateline' => $filemetadata['lastModified'],
+                                        'isdelete' => $filemetadata['isDeleted'],
+                                        'grade' => $filemetadata['star'] ? intval($filemetadata['star']) : 0,
+                                        'lastdate' => $flastdate
+                                    ];
+                                    $file = str_replace('/', BS, $file);
+                                    $attachment = str_replace($this->path . BS, '', $file);
+                                    $path = str_replace('/', BS, $attachment);
+                                    $thumb = (is_file($thumbfile)) ? 1 : 0;
+                                    $setarr['path'] = $path;
+                                    $resourcesarr['hasthumb'] = $thumb;
+                                    $resourcesarr['rid'] = $rid;
+                                    if (C::t('#eagle#eagle_record')->insert_data($id, $resourcesarr)) {
+                                        //检查标签变化
+                                        //标签数据
+                                        $tags = $filemetadata['tags'];
+                                        $setarr['searchval'] .= implode('', $tags);
+                                        //现有标签
+                                        $tagids = [];
+                                        //原有标签
+                                        $oldtids = [];
+                                        if ($attrdata['tag']) $oldtids = explode(',', $attrdata['tag']);
+
+                                        if (!empty($tags)) {
+                                            $tagids = $this->addtag($tags);
+                                            $setarr['tag'] = implode(',', $tagids);
+                                        }
+                                        $addtags = array_diff($tagids, $oldtids);
+                                        $deltags = array_diff($oldtids, $tagids);
+
+                                        if (!empty($deltags)) C::t('pichome_resourcestag')->delete_by_ridtid($rid, $deltags);
+                                        foreach ($addtags as $tid) {
+                                            $rtag = ['appid' => $this->appid, 'rid' => $rid, 'tid' => $tid];
+                                            C::t('pichome_resourcestag')->insert($rtag);
+                                        }
+
+                                        //检查标注变化
+                                        if (isset($filemetadata['comments'])) {
+                                            $cids = [];
+                                            foreach ($filemetadata['comments'] as $commentval) {
+                                                $tcommentval['id'] = $commentval['id'] . $this->appid;
+                                                $tcommentval['appid'] = $this->appid;
+                                                $tcommentval['rid'] = $rid;
+                                                $tcommentval['x'] = number_format($commentval['x'], 2);
+                                                $tcommentval['y'] = number_format($commentval['y'], 2);
+                                                $tcommentval['width'] = $commentval['width'];
+                                                $tcommentval['height'] = $commentval['height'];
+                                                $tcommentval['annotation'] = $commentval['annotation'];
+                                                $tcommentval['lastModified'] = $commentval['lastModified'];
+                                                try {
+                                                    C::t('pichome_comments')->insert($tcommentval);
+                                                    $setarr['searchval'] .= $tcommentval['annotation'];
+                                                } catch (Exception $e) {
+
+                                                }
+                                                $cids[] = $tcommentval['id'];
+                                                unset($tcommentval);
+
+                                            }
+                                            $ocids = C::t('pichome_comments')->fetch_id_by_rid($rid);
+                                            $delcids = array_diff($ocids, $cids);
+                                            if (!empty($delcids)) C::t('pichome_comments')->delete($delcids);
+                                        } else {
+                                            C::t('pichome_comments')->delete_by_rid($rid);
+                                        }
+
+                                        $rfids = [];
+                                        $orfids = C::t('pichome_folderresources')->fetch_id_by_rid($rid);
+                                        C::t('pichome_folderresources')->delete($orfids);
+                                        $setarr['searchval'] .= $resourcesarr['name'];
+                                        //$fids = [];
+                                        if(!empty($filemetadata['folders'])){
+                                            $realfids = C::t('#eagle#eagle_folderrecord')->fetch_fid_by_efid($filemetadata['folders'],$this->appid);
+                                        }
+
+                                        //检查目录变化
+                                        foreach ($realfids as $fv) {
+                                            $fid = trim($fv) . $this->appid;
+                                            if (!C::t('pichome_folder')->check_password_byfid($fid)) {
+                                                $frsetarr = ['appid' => $this->appid, 'rid' => $rid, 'fid' => $fid];
+                                                C::t('pichome_folderresources')->insert($frsetarr);
+                                                // $fids[] = $fid;
+                                            }
+                                        }
+                                        //尝试更新属性表数据
+                                        $setarr['link'] = $filemetadata['url'] ? trim($filemetadata['url']) : '';
+                                        //描述数据
+                                        $setarr['desc'] = $filemetadata['annotation'] ? $filemetadata['annotation'] : '';
+                                        $setarr['searchval'] .= $setarr['desc'] . $setarr['link'];
+                                        if ($filemetadata['duration']) $setarr['duration'] = number_format($filemetadata['duration'], 2);
+                                        $setarr['rid'] = $rid;
+                                        C::t('pichome_resources_attr')->insert($setarr);
+                                        unset($filemetadata);
+                                        unset($setarr);
+                                    }
+                                }
+
+                            }
+                            else{
+                                if(!$rdata){
+                                    $setarr = [
+                                       'appid'=>$this->appid,
+                                       'rid'=>$rid,
+                                       'eid'=>$id,
+                                        'dateline'=>$flastdate
+                                    ];
+                                    C::t('#eagle#eagle_record')->insert($setarr);
+                                }
+                            }
+
+                        } else {
+                            if(!empty($filemetadata['folders'])){
+                                $realfids = C::t('#eagle#eagle_folderrecord')->fetch_fid_by_efid($filemetadata['folders'],$this->appid);
+                            }
+
+                            if(!empty($realfids)){
+                                //如果目录含有密码则不导入数据直接跳过
+                                $haspassword = C::t('pichome_folder')->check_haspasswrod($realfids, $this->appid);
+                            }else{
+                                $haspassword = false;
+                            }
+
+                            if (!$haspassword) {
+                                $filemetadataname = $this->getFileRealFileName($tmppath, $filemetadata['name'], $filemetadata['ext']);
+
+                                $filename = $filemetadataname . '.' . $filemetadata['ext'];
+                                $thumbname = $filemetadataname . '_thumbnail.png';
+                                //echo $i.'middle:'.memory_get_usage()/1024 . '<br>';
+                                $file = $tmppath . BS . $filename;
+                                $thumbfile = $tmppath . BS . $thumbname;
+                                //$filemd5 = md5_file($file);
+                                $filemetadata['filename'] = $filemetadata['name'];
+                                $filemetadata['file'] = $file;
+                                unset($file);
+                                $filemetadata['thumbfile'] = $thumbfile;
+                                $filemetadata['folders'] = $realfids;
+                                unset($thumbfile);
+                                $filemetadata['rid'] = $this->createrid();
+                                $filemetadata['mtime'] = $filemetadata['mtime'] ? $filemetadata['mtime'] : $filemetadata['modificationTime'];
+                                $filemetadata['btime'] = $filemetadata['btime'] ? $filemetadata['btime'] : $filemetadata['modificationTime'];
+                                $filemetadata['dateline'] = $filemetadata['lastModified'];
+                                $filemetadata['lastdate'] = $flastdate;
+
+                                $this->exportfile($id,$filemetadata);
+                                unset($filemetadata);
+                            }
+                        }
+
+                    }
+                } else {
+                    //如果已有数据删除，否则不做处理
+                    if (!$rid) C::t('pichome_resources')->delete_by_rid($rid);
+                }
+
+
+                $this->donum += 1;
+                $percent = floor(($this->donum / $this->filenum) * 100);
+                //防止因获取文件总个数不准确百分比溢出
+                $percent = ($percent > 100) ? 100 : $percent;
+                $state = ($percent >= 100) ? 3 : 2;
+                if ($state == 3) {
+                    $spl_object = false;
+                    @unlink($this->readtxt . 'eagleexport' . md5($this->path) . '.txt');
+                    $lastid = 0;
+                } else {
+                    $lastid = $this->donum;
+                }
+                //记录导入起始位置，以备中断后从此处,更改导入状态为正在导入
+                C::t('pichome_vapp')->update($this->appid, array('lastid' => $lastid, 'percent' => $percent, 'donum' => $this->donum, 'state' => $state, 'filenum' => $this->filenum));
+                if($spl_object) $spl_object->next();
+
+            }
+
+
+        }
+
+        return array('success' => true);
+
+    }
+
+    //校验文件
+    public function execCheckFile()
+    {
+        if ($this->exportstatus == 3) {
+            $total = DB::result_first("select count(rid) from %t where appid = %s ", array('pichome_resources', $this->appid));
+            //校验文件
+            $this->check_file($total);
+        }
+        return true;
+    }
+
+    public function check_file($total)
+    {
+        if ($this->lastid < 1) $this->lastid = 1;
+        $limitsql = ($this->lastid - 1) * $this->checklimit . ',' . $this->checklimit;
+        $delrids = [];
+        $data = DB::fetch_all("select rid,isdelete from %t where appid = %s order by lastdate asc limit $limitsql ", array('pichome_resources', $this->appid));
+        if (empty($data)) {
+            C::t('pichome_vapp')->update($this->appid, array('percent' => 0, 'state' => 4, 'lastid' => 0, 'donum' => 0));
+            //校验完成后更新目录文件数
+            foreach (DB::fetch_all("select count(rf.id) as num,f.fid  from %t f left join %t rf on rf.fid=f.fid where f.appid = %s group by f.fid", array('pichome_folder', 'pichome_folderresources', $this->appid)) as $v) {
+                C::t('pichome_folder')->update($v['fid'], array('filenum' => $v['num']));
+
+            }
+            //修正库中文件数
+            $total = DB::result_first("select count(rid) from %t where appid = %s ", array('pichome_resources', $this->appid));
+            $hascatnum = DB::result_first("SELECT count(DISTINCT rid) FROM %t where appid = %s", array('pichome_folderresources', $this->appid));
+            $nosubfilenum = $total - $hascatnum;
+            C::t('pichome_vapp')->update($this->appid, array('filenum' => $total, 'nosubfilenum' => $nosubfilenum));
+            return true;
+        }
+        foreach ($data as $v) {
+            if ($v['isdelete']) {
+                $delrids[] = $v['rid'];
+            } else {
+                $id = C::t('#eagle#eagle_record')->fetch_eid_by_rid($v['rid'],$this->appid);
+                if(!$id){
+                    $id = str_replace($this->appid, '', $v['rid']);
+                }
+                $filejson = $this->path . BS . 'images' . BS . $id . '.info' . BS . 'metadata.json';
+                if (!is_file($filejson)) {
+                    $delrids[] = $v['rid'];
+                }
+            }
+
+
+        }
+        if (!empty($delrids)) {
+            //如果有需要删除的，删除后，则重新查询上一页数据
+            C::t('pichome_resources')->delete_by_rid($delrids);
+            if ($this->lastid == 1) {
+                $percent = round(($this->checklimit / $total) * 100);
+            } else {
+                $percent = round((($this->lastid - 1) * $this->checklimit / $total) * 100);
+            }
+            C::t('pichome_vapp')->update($this->appid, array('lastid' => $this->lastid, 'percent' => $percent, 'state' => 3));
+        } else {
+            if ($this->lastid == 1) {
+                $percent = round(($this->checklimit / $total) * 100);
+            } else {
+                $percent = round((($this->lastid - 1) * $this->checklimit / $total) * 100);
+            }
+            $percent = ($percent > 100) ? 100 : $percent;
+            C::t('pichome_vapp')->update($this->appid, array('lastid' => $this->lastid + 1, 'percent' => $percent, 'state' => 3));
+        }
+    }
+
+    public function exportfile($id,$filemetadata)
+    {
+        $rid = $filemetadata['rid'];
+        if (!is_file($filemetadata['file'])) {
+            return;
+        }
+
+        $filemetadata['file'] = str_replace('/', BS, $filemetadata['file']);
+        $attachment = str_replace('/', BS, $filemetadata['file']);
+        $path = str_replace($this->path . BS, '', $attachment);
+        unset($attachment);
+        $thumb = (is_file($filemetadata['thumbfile'])) ? 1 : 0;
+        //echo 'middle1:'.memory_get_usage()/1024 . '<br>';
+        $type = getTypeByExt($filemetadata['ext']);
+        $resourcesarr = [
+            'rid' => $rid,
+            'uid' => $this->uid,
+            'username' => $this->username,
+            'appid' => $this->appid,
+            'width' => $filemetadata['width'] ? $filemetadata['width'] : 0,
+            'height' => $filemetadata['height'] ? $filemetadata['height'] : 0,
+            'name' => $filemetadata['filename'] . '.' . $filemetadata['ext'],
+            'ext' => $filemetadata['ext'],
+            'size' => $filemetadata['size'],
+            'dateline' => $filemetadata['dateline'],
+            'btime' => $filemetadata['btime'],
+            'mtime' => $filemetadata['mtime'],
+            'isdelete' => $filemetadata['isDeleted'],
+            'hasthumb' => $thumb,
+            'grade' => $filemetadata['star'] ? intval($filemetadata['star']) : 0,
+            'type' => $type,
+            'lastdate' => $filemetadata['lastdate']
+        ];
+        unset($type);
+        //插入文件表数据
+        if (C::t('#eagle#eagle_record')->insert_data($id,$resourcesarr)) {
+            DB::delete('pichome_folderresources', array('rid' => $rid));
+            //获取属性表数据
+            $setarr = [];
+            $setarr['searchval'] = $resourcesarr['name'];
+            //$fids = [];
+            //插入目录关联表数据
+            foreach ($filemetadata['folders'] as $fv) {
+                $fid = $fv;
+                if (!C::t('pichome_folder')->check_password_byfid($fid)) {
+                    $frsetarr = ['appid' => $this->appid, 'rid' => $rid, 'fid' => $fid];
+                    C::t('pichome_folderresources')->insert($frsetarr);
+                    //$fids[] = $fid;
+                    unset($frsetarr);
+                }
+            }
+            /* if(!empty($fids)){
+                 foreach(DB::fetch_all("select fname from %t where fid in(%n)",array('pichome_folder',$fids)) as $foldername){
+                     $setarr['searchval'] .= $foldername['fname'];
+                 }
+             }*/
+
+            //标签数据
+            $tags = $filemetadata['tags'];
+            $setarr['searchval'] .= implode('', $tags);
+            if (!empty($tags)) {
+                $tagids = $this->addtag($tags);
+                unset($tags);
+                foreach ($tagids as $tid) {
+                    $rtag = ['appid' => $this->appid, 'rid' => $rid, 'tid' => $tid];
+                    C::t('pichome_resourcestag')->insert($rtag);
+                }
+                $setarr['tag'] = implode(',', $tagids);
+                unset($tagids);
+            }
+            //颜色数据
+            if (isset($filemetadata['palettes'])) {
+                $returndata = $this->getColor($filemetadata['palettes'], $resourcesarr['width'], $resourcesarr['height'], $rid);
+                $setarr['colors'] = $returndata['colors'];
+                $setarr['gray'] = $returndata['gray'];
+                $setarr['shape'] = $returndata['shape'];
+                unset($returndata);
+            }
+            //标注数据
+            if (isset($filemetadata['comments'])) {
+                foreach ($filemetadata['comments'] as $commentval) {
+                    $tcommentval['id'] = $commentval['id'] . $this->appid;
+                    $tcommentval['appid'] = $this->appid;
+                    $tcommentval['rid'] = $rid;
+                    $tcommentval['x'] = number_format($commentval['x'], 2);
+                    $tcommentval['y'] = number_format($commentval['y'], 2);
+                    $tcommentval['width'] = $commentval['width'];
+                    $tcommentval['height'] = $commentval['height'];
+                    $tcommentval['annotation'] = $commentval['annotation'];
+                    $tcommentval['lastModified'] = $commentval['lastModified'];
+                    C::t('pichome_comments')->insert($tcommentval);
+                    $setarr['searchval'] .= $commentval['annotation'];
+                    unset($tcommentval);
+                }
+            }
+            //时长
+            if ($filemetadata['duration']) $setarr['duration'] = number_format($filemetadata['duration'], 2);
+            //链接数据
+            $setarr['link'] = $filemetadata['url'] ? trim($filemetadata['url']) : '';
+            //描述数据
+            $setarr['desc'] = $filemetadata['annotation'] ? $filemetadata['annotation'] : '';
+            $setarr['searchval'] .= $setarr['desc'] . $setarr['link'];
+            $setarr['rid'] = $rid;
+            $setarr['appid'] = $this->appid;
+            $setarr['path'] = $path;
+            //echo '属性插入前缓存:'.memory_get_usage()/1024 . '<br>';
+            //插入数据
+            C::t('pichome_resources_attr')->insert($setarr);
+            //echo '属性插入后缓存:'.memory_get_usage()/1024 . '<br>';
+        } else {
+            runlog('eagleexport', $rid);
+        }
+    }
+
+    //判断图片纯色
+    public function isgray($colors)
+    {
+        $i = 0;
+        if (count($colors) < 1) return 0;
+        foreach ($colors as $color) {
+            $color = new Color($color);
+            $rgb = $color->toRGB();
+            unset($color);
+            if (abs($rgb[0] - $rgb[1]) < 10 && abs($rgb[2] - $rgb[1]) < 10) {
+                $i++;
+            }
+            unset($rgb);
+        }
+        if ($i == count($colors)) {
+            return 1;
+        } else {
+            return 0;
+        }
+    }
+
+    //获取颜色数据
+    public function getColor($colors, $width, $height, $rid)
+    {
+        //echo '颜色处理前:'.memory_get_usage()/1024 . '<br>';
+        $intcolorsarr = $returndata = [];
+        $i = 1;
+        foreach ($colors as $c) {
+            $color = new \Color($c['color']);
+            //获取颜色整型值
+            $intcolor = $color->toInt();
+            $palattedataarr = ['rid' => $rid, 'color' => $intcolor, 'weight' => $c['ratio'], 'r' => $c['color'][0], 'g' => $c['color'][1], 'b' => $c['color'][2]];
+            $intcolorsarr[] = $intcolor;
+            //echo "颜色处理中前 $i :".memory_get_usage()/1024 . '<br>';
+            C::t('pichome_palette')->insert($palattedataarr);
+            //echo "颜色处理中后 $i :".memory_get_usage()/1024 . '<br>';
+            $i++;
+        }
+        unset($colors);
+        //颜色整型值数据
+        // $intcolorsarr= array_keys($palattedataarr);
+        $returndata['colors'] = implode(',', $intcolorsarr);
+        $returndata['gray'] = $this->isgray($intcolorsarr);
+        $returndata['shape'] = round(($width / $height) * 100);
+        unset($intcolorsarr);
+        //echo '颜色处理后缓存：'.memory_get_usage()/1024 . '<br>';
+        return $returndata;
+    }
+
+    //添加标签
+    public function addtag($tags)
+    {
+        $tagids = [];
+        foreach ($tags as $v) {
+            if (!preg_match('/^\s*$/', $v)) {
+                if ($tid = C::t('pichome_tag')->insert($v)) {
+                    $tagids[] = $tid;
+                }
+            }
+
+        }
+        unset($tags);
+        return $tagids;
+    }
+}

dzz/eagle/class/table/table_eagle_folderrecord.php

@@ -0,0 +1,92 @@
+<?php
+/*
+ * @copyright   QiaoQiaoShiDai Internet Technology(Shanghai)Co.,Ltd
+ * @license     https://www.oaooa.com/licenses/
+ *
+ * @link        https://www.oaooa.com
+ * @author      zyx(zyx@oaooa.com)
+ */
+if(!defined('IN_OAOOA')) {
+    exit('Access Denied');
+}
+
+class table_eagle_folderrecord extends dzz_table
+{
+    public function __construct() {
+        $this->_table = 'eagle_folderrecord';
+        $this->_pk    = 'id';
+        parent::__construct();
+    }
+
+    public function createfidby_efidappid($efid,$appid){
+        //如果没有记录值
+        if (!$fid = DB::result_first("select fid from %t where efid = %s", array($this->_table, $efid))){
+            //检查是否有旧版数据记录值
+            $fid = $efid.$appid;
+            if(!DB::result_first("select fid from %t where fid = %s",array('pichome_folder',$fid))){
+                $fid = C::t('pichome_folder')->createfidbyappid($appid);
+            }
+            $setarr = [
+                'appid'=>$appid,
+                'efid'=>$efid,
+                'fid'=>$fid
+            ];
+            parent::insert($setarr);
+        }
+        return $fid;
+    }
+    public function insert_folderdata_by_appid($appid,$folderdata,$pfid='',$pathkey='',$fids=[])
+    {
+        foreach ($folderdata as $k => $v) {
+            $id = $v['id'];
+            //获取或生成记录fid值
+            $fid = $this->createfidby_efidappid($id,$appid);
+            $setarr=['fid'=>$fid,'fname'=>$v['name'],'dateline'=>TIMESTAMP,'pfid'=>$pfid,'appid'=>$appid,'pathkey'=> ($pathkey)?$pathkey.$fid:$fid,'disp'=>$k];
+            $fid = C::t('pichome_folder')->insert_data($setarr);
+            $fids[] = $id;
+            if($v['children']){
+                $fids = $this->insert_folderdata_by_appid($appid,$v['children'],$fid,($pathkey)?$pathkey.$fid:$fid,$fids);
+
+            }
+
+        }
+        return $fids;
+
+    }
+
+
+    public function delete_by_fid($fids,$appid){
+        if(!is_array($fids)) $fids = (array)$fids;
+        $delfid = $delid = [];
+        foreach(DB::fetch_all("select fid,id from %t where fid in(%n) and appid = %s",array($this->_table,$fids,$appid)) as $v){
+            $delfid[] = $v['fid'];
+            $delid[] = $v['id'];
+        }
+        if(!empty($delfid))C::t('pichome_folder')->delete_by_fids($delfid);
+        parent::delete($delid);
+    }
+
+    public function delete_by_ids($ids){
+        if(!array($ids)) $ids = (array)$ids;
+        $fids = [];
+        foreach(DB::fetch_all("select fid from %t where id in(%n)",array($this->_table,$ids)) as $v){
+            $fids[] = $v['fid'];
+        }
+        if(!empty($fids))C::t('pichome_folder')->delete_by_fids($fids);
+        parent::delete($ids);
+    }
+
+    public function delete_by_appid($appid){
+        DB::delete($this->_table,array('appid'=>$appid));
+    }
+
+    public function fetch_fid_by_efid($efids,$appid){
+        $fids = [];
+        foreach(DB::fetch_all("select fid from %t where efid in(%n) and appid = %s",array($this->_table,$efids,$appid)) as $v){
+            $fids[] = $v['fid'];
+        }
+        return $fids;
+    }
+
+}
+

dzz/eagle/class/table/table_eagle_record.php

@@ -0,0 +1,54 @@
+<?php
+/*
+ * @copyright   QiaoQiaoShiDai Internet Technology(Shanghai)Co.,Ltd
+ * @license     https://www.oaooa.com/licenses/
+ *
+ * @link        https://www.oaooa.com
+ * @author      zyx(zyx@oaooa.com)
+ */
+if(!defined('IN_OAOOA')) {
+    exit('Access Denied');
+}
+
+class table_eagle_record extends dzz_table
+{
+    public function __construct() {
+        $this->_table = 'eagle_record';
+        $this->_pk    = 'id';
+        parent::__construct();
+    }
+
+    public function insert_data($eid,$setarr){
+            if(C::t('pichome_resources')->insert($setarr)){
+                $setarr1['rid'] = $setarr['rid'];
+                $setarr1['appid'] = $setarr['appid'];
+                $setarr1['eid'] = $eid;
+                $setarr1['dateline']=$setarr['lastdate'];
+                $id = DB::result_first("select id from %t where eid = %s and appid = %s",array($this->_table,$eid,$setarr['appid']));
+                if($id){
+                    parent::update($id,$setarr1);
+                }else{
+                    parent::insert($setarr1);
+                }
+            }
+            return true;
+
+    }
+    public function delete_by_appid($appid){
+        DB::delete($this->_table,array('appid'=>$appid));
+    }
+    public function delete_by_rids($rids){
+        if (!is_array($rids)) $rids = (array)$rids;
+        DB::delete($this->_table,'rid in ('.dimplode($rids).')');
+    }
+    public function fetch_by_eid($eid,$appid){
+        return DB::fetch_first("select * from %t where eid = %s and appid = %s",array($this->_table,$eid,$appid));
+    }
+
+    public function fetch_eid_by_rid($rid,$appid){
+        return DB::result_first("select eid from %t where rid = %s",array($this->_table,$rid,$appid));
+    }
+
+
+}
+

dzz/eagle/classes/deleteafter.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace dzz\eagle\classes;
+
+use \core as C;
+use \DB as DB;
+
+
+class deleteafter
+{
+
+    public function run($data)
+    {
+        C::t('#eagle#eagle_record')->delete_by_rids($data['rids']);
+
+    }
+
+
+
+}

dzz/eagle/classes/delpichomefolderafter.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace dzz\eagle\classes;
+
+use \core as C;
+use \DB as DB;
+use \fmpeg as fmpeg;
+
+class delpichomefolderafter
+{
+
+    public function run($appid)
+    {
+        C::t("#eagle#eagle_folderrecord")->delete_by_appid($appid);
+    }
+
+
+}

dzz/eagle/classes/getpichomethumb.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace dzz\eagle\classes;
+
+use \core as C;
+use \DB as DB;
+
+class getpichomethumb
+{
+
+    public function run(&$data)
+    {
+        /*$thumbid = DB::result_first("select thumb from %t where appid = %s and rid = %s", array('billfish_record', $data['appid'], $data['rid']));
+        if(isset($data['version']) && $data['version'] > 16){
+            $bid = DB::result_first("select bid from %t where rid = %s",array('billfish_record',$data['rid']));
+            $thumbdir = dechex($bid);
+            $thumbdir = (string) $thumbdir;
+            if(strlen($thumbdir) < 2){
+                $thumbdir =str_pad($thumbdir,2,0,STR_PAD_LEFT);
+            }
+            $pathdir = $data['apppath'].BS.'.bf'.BS.'.preview'.BS.$thumbdir.BS.$bid.'.small.webp';
+            return array('icon'=>$pathdir);
+        }else{
+            if (strlen($thumbid) < 9) {
+                $thumbid = str_pad($thumbid,9,0,STR_PAD_LEFT);
+            }
+            $pathdir = $data['apppath'].BS.'.bf'.BS.'.preview';
+            $thumbpatharr = $this->mbStrSplit($thumbid,3);
+            array_pop($thumbpatharr);
+            $thumbpath = implode(BS,$thumbpatharr);
+            return array('icon'=>$pathdir.BS.$thumbpath.BS.$thumbid.'.webp');
+        }*/
+
+    }
+
+   /* function mbStrSplit ($string, $len=1) {
+        $start = 0;
+        $strlen = mb_strlen($string);
+        while ($strlen) {
+            $array[] = mb_substr($string,$start,$len,"utf8");
+            $string = mb_substr($string, $len, $strlen,"utf8");
+            $strlen = mb_strlen($string);
+        }
+        return $array;
+    }*/
+
+
+}

dzz/eagle/classes/pichomevappdelete.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace dzz\eagle\classes;
+
+use \core as C;
+use \DB as DB;
+use \fmpeg as fmpeg;
+
+class pichomevappdelete
+{
+
+    public function run($data)
+    {
+        if($data['apptype'] == 0){
+            C::t("#eagle#eagle_record")->delete_by_appid($data['appid']);
+            C::t("#eagle#eagle_folderrecord")->delete_by_appid($data['appid']);
+        }
+        return true;
+
+    }
+
+
+
+}

dzz/ffmpeg/classes/info.php

@@ -43,6 +43,14 @@ class info
                 if (isset($info['duration'])) C::t('pichome_resources_attr')->update($data['rid'], array('duration' => $info['duration']));
                 if (isset($info['width'])) C::t('pichome_resources')->update($data['rid'], array('width' => $info['width'], 'height' => $info['height']));
                 C::t('pichome_ffmpeg_record')->update($data['rid'],array('infostatus'=>1));
+                $fdata = C::t('pichome_ffmpeg_record')->fetch($data['rid']);
+                if($fdata['thumbstatus'] == 1 && $fdata['infostatus'] == 1){
+                    if(!DB::result_first("select isget from %t where rid = %s",array('pichome_resources_attr',$data['rid']))) {
+                        C::t('pichome_resources_attr')->update($data['rid'],array('isget'=>1));
+                        C::t('pichome_vapp')->add_getinfonum_by_appid($data['appid'], 1);
+                    }
+
+                }
             }
 
         } catch (\Exception $e) {

dzz/ffmpeg/classes/thumb.php

@@ -56,6 +56,13 @@ class thumb
                 C::t('pichome_resources')->update($data['rid'],$resourcesarr);
                 C::t('pichome_resources')->update($data['rid'], array('hasthumb' => 1));
                 C::t('pichome_ffmpeg_record')->update($data['rid'], array('thumbstatus' => 1,'thumb'=>$target));
+                $fdata = C::t('pichome_ffmpeg_record')->fetch($data['rid']);
+                if($fdata['thumbstatus'] == 1 && $fdata['infostatus'] == 1){
+                    if(!DB::result_first("select isget from %t where rid = %s",array('pichome_resources_attr',$data['rid']))) {
+                        C::t('pichome_resources_attr')->update($data['rid'],array('isget'=>1));
+                        C::t('pichome_vapp')->add_getinfonum_by_appid($data['appid'], 1);
+                    }
+                }
             }
         }
 

dzz/ffmpeg/getinfo.php

@@ -14,13 +14,14 @@ if(empty($appids)){
     exit('success');
 }
 $locked = true;
-for($i=0;$i<1;$i++){
+/*for($i=0;$i<1;$i++){
     $processname = 'DZZ_LOCK_PICHOMEGETINFO'.$i;
     if (!dzz_process::islocked($processname, 60*60)) {
         $locked=false;
         break;
     }
-}
+}*/
+$i = 0;
 $processname = 'DZZ_LOCK_PICHOMEGETINFO'.$i;
 $limit = 10;
 $start=$i*$limit;
@@ -55,7 +56,10 @@ order by infodonum asc limit $start,$limit",array('pichome_ffmpeg_record',$appid
         }
         //如果信息和缩略图标记为已生成，标记该文件信息状态为已获取
         if($v['thumbstatus'] == 1 && $v['infostatus'] == 1){
-            C::t('pichome_resources_attr')->update($v['rid'],array('isget'=>1));
+            if(!DB::result_first("select isget from %t where rid = %s",array('pichome_resources_attr',$v['rid']))) {
+                C::t('pichome_resources_attr')->update($v['rid'], array('isget' => 1));
+                C::t('pichome_vapp')->add_getinfonum_by_appid($v['appid'], 1);
+            }
             dzz_process::unlock($processname1);
             continue;
         }
@@ -66,6 +70,6 @@ order by infodonum asc limit $start,$limit",array('pichome_ffmpeg_record',$appid
 }
 dzz_process::unlock($processname);
 if(DB::result_first("select * from %t where infostatus = 0  ",array('pichome_ffmpeg_record'))){
-    dfsockopen(getglobal('localurl') . 'index.php?mod=ffmpeg&op=getinfo', 0, '', '', false, '', 0.1);
+    dfsockopen(getglobal('localurl') . 'index.php?mod=ffmpeg&op=getinfo', 0, '', '', false, '', 5*60);
 }
 exit('success');

dzz/ffmpeg/thumb.php

@@ -20,13 +20,14 @@ if(empty($appids)){
     exit('success');
 }
 $locked = true;
-for($i=0;$i<1;$i++){
+/*for($i=0;$i<1;$i++){
     $processname = 'DZZ_LOCK_PICHOMEGETVIDOTHUMB'.$i;
     if (!dzz_process::islocked($processname, 60*60)) {
         $locked=false;
         break;
     }
-}
+}*/
+$i = 0;
 $processname = 'DZZ_LOCK_PICHOMEGETVIDOTHUMB'.$i;
 $limit = 10;
 $start=$i*$limit;
@@ -60,7 +61,10 @@ order by thumbdonum asc limit $start,$limit",array('pichome_ffmpeg_record',$appi
         }
         //如果信息和缩略图标记为已生成，标记该文件信息状态为已获取
         if($v['thumbstatus'] == 1 && $v['infostatus'] == 1){
-            C::t('pichome_resources_attr')->update($v['rid'],array('isget'=>1));
+            if(!DB::result_first("select isget from %t where rid = %s",array('pichome_resources_attr',$v['rid']))) {
+                C::t('pichome_resources_attr')->update($v['rid'], array('isget' => 1));
+                C::t('pichome_vapp')->add_getinfonum_by_appid($v['appid'], 1);
+            }
             dzz_process::unlock($processname1);
             continue;
         }
@@ -72,6 +76,6 @@ order by thumbdonum asc limit $start,$limit",array('pichome_ffmpeg_record',$appi
 }
 dzz_process::unlock($processname);
 if(DB::result_first("select * from %t where thumbstatus = 0  ",array('pichome_ffmpeg_record'))){
-    dfsockopen(getglobal('localurl') . 'index.php?mod=ffmpeg&op=thumb', 0, '', '', false, '', 0.1);
+    dfsockopen(getglobal('localurl') . 'index.php?mod=ffmpeg&op=thumb', 0, '', '', false, '', 5*60);
 }
 exit('success');

dzz/imageColor/classes/getcolor.php

@@ -75,6 +75,8 @@ class getColor
                 $palette = new ImagePalette($img, 1, 10, $lib, $this->palette);
                 $palettes = $palette->palette;
             } catch (\Exception $e) {
+                $processname1 = 'PICHOMEGETCOLOR_'.$data['rid'];
+                dzz_process::unlock($processname1);
                 runlog('imageColor', $e->getMessage() . ' img=' . $img);
             }
 
@@ -87,7 +89,7 @@ class getColor
                 foreach ($palettes as $k => $v) {
                     $color = new \Color($k);
                     $rgbcolor = $color->toRgb();
-                    $data = [
+                    $tdata = [
                         'rid' => $data['rid'],
                         'color' => $k,
                         'r' => $rgbcolor[0],
@@ -95,9 +97,12 @@ class getColor
                         'b' => $rgbcolor[2],
                         'weight' => $v
                     ];
-                    C::t('pichome_palette')->insert($data);
+                    C::t('pichome_palette')->insert($tdata);
                     C::t('pichome_imagickrecord')->update($data['rid'], array('colorstatus' => 1));
-                    C::t('pichome_resources_attr')->update($data['rid'], array('isget' => 1));
+                    if(!DB::result_first("select isget from %t where rid = %s",array('pichome_resources_attr',$data['rid']))) {
+                        C::t('pichome_resources_attr')->update($data['rid'],array('isget'=>1));
+                        C::t('pichome_vapp')->add_getinfonum_by_appid($data['appid'], 1);
+                    }
                 }
 
 
@@ -144,15 +149,21 @@ class getColor
         $im->setResolution($width, $height);   //设置图像分辨率
         $im->setCompressionQuality(80); //压缩比
         try {
+
             $im->readImage($data['realpath'] . '[0]'); //设置读取pdf的第一页
         } catch (\Exception $e) {
             runlog('pdfthumb', iconv("gbk", 'utf-8', $e->getMessage()));
         }
 
         //$im->thumbnailImage(200, 100, true); // 改变图像的大小
-        $im->scaleImage($width, $height, true); //缩放大小图像
+        //缩放大小图像
+        try {
+            $im->scaleImage($width, $height, true);
+        }catch (\Exception $e){
+            runlog('pdfthumb', iconv("gbk", 'utf-8', $e->getMessage()));
+        }
         $filename = getglobal('setting/attachdir') . './' . $target;
-
+        try {
             if ($im->writeImage($filename) == true) {
                 $imginfo = @getimagesize($filename);
                 $resourcesarr = [
@@ -164,5 +175,9 @@ class getColor
                 C::t('pichome_resources')->update($data['rid'], array('hasthumb' => 1));
             }
 
+        }catch (\Exception $e){
+            runlog('pdfthumb', iconv("gbk", 'utf-8', $e->getMessage()));
+        }
+
     }
 }

dzz/imageColor/index.php

@@ -14,19 +14,21 @@ if(empty($appids)){
     exit('success');
 }
 $locked = true;
-for($i=0;$i<1;$i++){
+/*for($i=0;$i<1;$i++){
     $processname = 'DZZ_LOCK_PICHOMEGETCOLOR'.$i;
     if (!dzz_process::islocked($processname, 60*60)) {
         $locked=false;
         break;
     }
-}
+}*/
+$i = 0;
 $processname = 'DZZ_LOCK_PICHOMEGETCOLOR'.$i;
 $limit = 10;
 $start=$i*$limit;
 if (!dzz_process::islocked($processname, 60*60)) {
     $locked=false;
 }
+//dzz::unlock($processname);
 if ($locked) {
     exit(json_encode( array('error'=>'进程已被锁定请稍后再试')));
 }
@@ -62,7 +64,11 @@ order by thumbdonum asc,colordonum asc limit $start,$limit",array('pichome_imagi
         }
         //如果颜色和缩略图标记为已生成，标记该文件信息状态为已获取
         if($v['thumbstatus'] == 1 && $v['colorstatus'] == 1){
+            if(!DB::result_first("select isget from %t where rid = %s",array('pichome_resources_attr',$v['rid']))){
                 C::t('pichome_resources_attr')->update($v['rid'],array('isget'=>1));
+                C::t('pichome_vapp')->add_getinfonum_by_appid($v['appid'], 1);
+            }
+
             dzz_process::unlock($processname1);
             continue;
         }
@@ -81,6 +87,6 @@ order by thumbdonum asc,colordonum asc limit $start,$limit",array('pichome_imagi
 }
 dzz_process::unlock($processname);
 if(DB::result_first("select count(*) from %t where thumbstatus = 0 or colorstatus = 0 ",array('pichome_imagickrecord'))){
-    dfsockopen(getglobal('localurl') . 'index.php?mod=imageColor&op=index', 0, '', '', false, '', 0.1);
+    dfsockopen(getglobal('localurl') . 'index.php?mod=imageColor&op=index', 0, '', '', false, '', 5*60);
 }
 exit('success'.$i);

dzz/io/getImg.php

@@ -6,65 +6,103 @@
  * @link        https://www.oaooa.com
  * @author      zyx(zyx@oaooa.com)
  */
-if ( !defined( 'IN_OAOOA' ) ) {
+if (!defined('IN_OAOOA')) {
-    exit( 'Access Denied' );
+    exit('Access Denied');
+}
+$fpath = isset($_GET['fpath']) ? trim($_GET['fpath']):'';
+if(!$fpath = dzzdecode(rawurldecode($fpath), '', 0)){
+    if (!$path = dzzdecode(rawurldecode($_GET['path']), '', 0)) {
+        @header('HTTP/1.1 404 Not Found');
+        @header('Status: 404 Not Found');
+
+    }
+    $rid = $path;
+    $resourcesdata = C::t('pichome_resources')->fetch($rid);
+    if(!$resourcesdata){
+        exit('file is not exists');
+    }
+    $resourattrdata = C::t('pichome_resources_attr')->fetch($rid);
+    $resourcesdata = array_merge($resourcesdata, $resourattrdata);
+    $appdata = C::t('pichome_vapp')->fetch($resourcesdata['appid']);
+    if ($resourcesdata['hasthumb']) {
+        //如果是本地文件
+        if ($appdata['type'] == 1) {
+            $filename = 'pichomethumb' . BS . $resourcesdata['appid'] . BS . md5($resourcesdata['path']) . '.jpg';
+            $thumbpath = getglobal('setting/attachurl') . $filename;
+        } elseif ($resourcesdata['apptype'] == 0) {
+            $resourcesdata['path'] = str_replace('\\', '/', $resourcesdata['path']);
+            $filepath = dirname($resourcesdata['path']);
+            $filename = substr($resourcesdata['path'], strrpos($resourcesdata['path'], '/') + 1);
+            $filename = str_replace(strrchr($filename, "."), "", $filename);
+            $filepath = str_replace('/', BS, $filepath);
+            $tmppath = $appdata['path'];
+            $thumbpath = $tmppath . BS . $filepath . BS . $filename . '_thumbnail.png';
+        } else {
+            $hookdata = ['rid' => $resourcesdata['rid'], 'apppath' => $appdata['path'], 'appid' => $resourcesdata['appid'], 'version' => $appdata['version']];
+            $return = Hook::listen('getpichomethumb', $hookdata);
+            $thumbpath = str_replace(DZZ_ROOT, '', $return[0]['icon']);
+        }
+
+    } else {
+        if ($resourcesdata['type'] == 'commonimage') {
+            $thumbpath = $appdata['path'] . BS . $resourcesdata['path'];
+        } else {
+            $thumbpath = geticonfromext($resourcesdata['ext'], $resourcesdata['type']);
+        }
+    }
+}else{
+    $thumbpath = $fpath;
 }
 
-if ( !$path = dzzdecode(rawurldecode( $_GET[ 'path' ] ),'',0 ) ) {
+$url = $thumbpath;
-    @header( 'HTTP/1.1 404 Not Found' );
+$filename = rtrim($_GET['n'], '.dzz');
-    @header( 'Status: 404 Not Found' );
+$ext = strtolower(substr(strrchr($filename, '.'), 1, 10));
-    exit( 'Access Denied' );
+if (!$ext) $ext = strtolower(substr(strrchr(preg_replace("/\.dzz$/i", '', preg_replace("/\?.*/i", '', $url)), '.'), 1, 10));
-}
+$mime = dzz_mime::get_type($ext);
-
+if (is_file($url)) {
-$url = $path;
-$filename = rtrim( $_GET[ 'n' ], '.dzz' );
-$ext = strtolower( substr( strrchr( $filename, '.' ), 1, 10 ) );
-if ( !$ext )$ext = strtolower( substr( strrchr( preg_replace( "/\.dzz$/i", '', preg_replace( "/\?.*/i", '', $url ) ), '.' ), 1, 10 ) );
-$mime = dzz_mime::get_type( $ext );
-if ( is_file( $url ) ) {
     $filename = $url;
     $start = 0;
-    $total = filesize( $filename );
+    $total = filesize($filename);
     header("Cache-Control: private, max-age=2592000, pre-check=2592000");
     header("Pragma: private");
-	header("Expires: ".date(DATE_RFC822,strtotime(" 30 day")));
+    header("Expires: " . date(DATE_RFC822, strtotime(" 30 day")));
-	header('Last-Modified: '.gmdate('D, d M Y H:i:s',filemtime($filename)).' GMT');
+    header('Last-Modified: ' . gmdate('D, d M Y H:i:s', filemtime($filename)) . ' GMT');
-    if ( isset( $_SERVER[ 'HTTP_RANGE' ] ) ) {
+    if (isset($_SERVER['HTTP_RANGE'])) {
-        $range = str_replace( '=', '-', $_SERVER[ 'HTTP_RANGE' ] );
+        $range = str_replace('=', '-', $_SERVER['HTTP_RANGE']);
-        $range = explode( '-', $range );
+        $range = explode('-', $range);
-        if ( isset( $range[ 2 ] ) && intval( $range[ 2 ] ) > 0 ) {
+        if (isset($range[2]) && intval($range[2]) > 0) {
-            $end = trim( $range[ 2 ] );
+            $end = trim($range[2]);
         } else {
             $end = $total - 1;
         }
-        $start = trim( $range[ 1 ] );
+        $start = trim($range[1]);
         $size = $end - $start + 1;
 
-        header( 'HTTP/1.1 206 Partial Content' );
+        header('HTTP/1.1 206 Partial Content');
-        header( 'Content-Length:' . $size );
+        header('Content-Length:' . $size);
-        header( 'Content-Range: bytes ' . $start . '-' . $end . '/' . $total );
+        header('Content-Range: bytes ' . $start . '-' . $end . '/' . $total);
 
     } else {
         $size = $end = $total;
 
-        header( 'HTTP/1.1 200 OK' );
+        header('HTTP/1.1 200 OK');
-        header( 'Content-Length:' . $size );
+        header('Content-Length:' . $size);
-        header( 'Content-Range: bytes 0-' . ( $total - 1 ) . '/' . $total );
+        header('Content-Range: bytes 0-' . ($total - 1) . '/' . $total);
     }
-    header( 'Accenpt-Ranges: bytes' );
+    header('Accenpt-Ranges: bytes');
-    header( 'Content-Type:' . $mime );
+    header('Content-Type:' . $mime);
-    $fp = fopen( $filename, 'rb' );
+    $fp = fopen($filename, 'rb');
-    fseek( $fp, $start, 0 );
+    fseek($fp, $start, 0);
 
     $cur = $start;
     @ob_end_clean();
-    if ( getglobal( 'gzipcompress' ) )@ob_start( 'ob_gzhandler' );
+    if (getglobal('gzipcompress')) @ob_start('ob_gzhandler');
-    while ( !feof( $fp ) && $cur <= $end && ( connection_status() == 0 ) ) {
+    while (!feof($fp) && $cur <= $end && (connection_status() == 0)) {
-        print fread( $fp, min( 1024 * 16, ( $end - $cur ) + 1 ) );
+        print fread($fp, min(1024 * 16, ($end - $cur) + 1));
         $cur += 1024 * 16;
     }
 
-    fclose( $fp );
+    fclose($fp);
     exit();
 } else {
     //$cachefile=$_G['siteurl']['attachdir'].'cache/'.play_cache_md5(file).'.'.$ext;
@@ -73,14 +111,14 @@ if ( is_file( $url ) ) {
 
     header("Cache-Control: private, max-age=2592000, pre-check=2592000");
     header("Pragma: private");
-	header("Expires: ".date(DATE_RFC822,strtotime(" 30 day")));
+    header("Expires: " . date(DATE_RFC822, strtotime(" 30 day")));
-    header('Last-Modified: '.gmdate('D, d M Y H:i:s',filemtime($url)).' GMT');
+    header('Last-Modified: ' . gmdate('D, d M Y H:i:s', filemtime($url)) . ' GMT');
-    header( 'Content-Type: ' . $mime );
+    header('Content-Type: ' . $mime);
     //header('Content-Length:'.$size);
     //header('Content-Range: bytes 0-'.($size-1).'/'.$size);
     @ob_end_clean();
-    if ( getglobal( 'gzipcompress' ) )@ob_start( 'ob_gzhandler' );
+    if (getglobal('gzipcompress')) @ob_start('ob_gzhandler');
-    @readfile( $url );
+    @readfile($url);
     @flush();
     @ob_flush();
     exit();

dzz/local/class/class_localexport.php

@@ -0,0 +1,464 @@
+<?php
+if (!defined('IN_OAOOA')) {
+    exit('Access Denied');
+}
+@set_time_limit(0);
+@ini_set('max_execution_time', 0);
+require_once(DZZ_ROOT . './dzz/class/class_encode.php');
+require_once libfile('function/user', '', 'user');
+
+use \core as C;
+use \DB as DB;
+use \IO as IO;
+use \ImagePalette as ImagePalette;
+use \Color as Color;
+
+class localexport
+{
+    public $palette = array(
+        0x111111, 0xFFFFFF, 0x9E9E9E, 0xA48057, 0xFC85B3, 0xFF2727, 0xFFA34B, 0xFFD534, 0x47C595, 0x51C4C4, 0x2B76E7, 0x6D50ED
+    );
+    private $path = '';//待执行数据path
+    private $appid = 0;//库id
+    private $uid = 0;//用户id
+    private $username = null;//用户名
+    private $filenum = 0;//总文件数
+    private $getinfosizelimit = 100;//限制获取信心文件大小，单位M
+    private $checklimit = 1000;
+    private $onceexportnum = 1000;
+    private $oncegetinfonum = 10000;
+    private $getinfonum = 0;
+    private $readtxt = DZZ_ROOT . './data/attachment/cache/';
+    private $exportstatus = 0;
+    private $donum = 0;
+    private $lastid = '';
+    private $charset = 'UTF-8';
+    private $allowext = '';
+    private $notallowext = '';
+    private $notallowdir = '';
+    private $getinfo = 0;
+
+    public function __construct($data = array())
+    {
+        global $Defaultallowext;
+        //获取导入记录表基本数据
+        $this->path = str_replace(BS, '/', $data['path']);
+        $this->appid = $data['appid'];
+        $this->uid = $data['uid'];
+        $this->username = $data['username'];
+        $this->exportstatus = $data['state'];
+        $this->donum = $data['donum'];
+        $this->filenum = $data['filenum'];
+        $this->lastid = $data['lastid'];
+        $this->getinfonum = $data['getinfonum'];
+        $this->getinfo = $data['getinfo'];
+        $data['allowext'] = ($data['allowext']) ? $data['allowext']:getglobal('setting/pichomeimportallowext');
+        //允许导入后缀
+        if ($data['allowext']) {
+            $allowext = str_replace(array('.', ',','+','$',"'",'^','(',')','[',']','{','}'), array('\.', '|','\+','\$',"'",'\^','\(',')','\[','\]','\{','\}'),$data['allowext']);
+            $this->allowext = str_replace('*', '.*', $allowext);
+
+        }
+        $data['notallowext'] = ($data['notallowext']) ? $data['notallowext']:getglobal('setting/pichomeimportnotallowext');
+        //禁止导入后缀
+        if ($data['notallowext']) {
+            $notallowext = str_replace(array('.', ',','+','$',"'",'^','(',')','[',']','{','}'), array('\.', '|','\+','\$',"'",'\^','\(',')','\[','\]','\{','\}'),$data['notallowext']);
+            $this->notallowext = str_replace('*', '.*', $notallowext);
+
+        }
+        //获取pichome设置的默认禁止导入目录
+        $notallowdir = getglobal('setting/pichomeimportnotdir') ? getglobal('setting/pichomeimportnotdir'):implode(',',$Defaultallowext);
+        //禁止导入目录
+        if ($notallowdir) {
+            $notallowdir = str_replace(array('.', ',','+','$',"'",'^','(',')','[',']','{','}'), array('\.', '|','\+','\$',"'",'\^','\(',')','\[','\]','\{','\}'), $notallowdir);
+            $this->notallowdir = str_replace('*', '.*', $notallowdir);
+
+        }
+        if ($data['charset']) $this->charset = $data['charset'];
+    }
+
+    //获取文件名
+    public function getbasename($filename)
+    {
+        return preg_replace('/^.+[\\\\\\/]/', '', $filename);
+    }
+
+
+    public function initExport()
+    {
+        $filedir = $this->path;
+        $readtxt = $this->readtxt . 'loaclexport' . md5($this->path) . '.txt';
+
+        $filenum = 0;
+        if (!is_file($readtxt)) {
+            C::t('pichome_vapp')->update($this->appid, array( 'state' => 1));
+            $thandle = fopen($readtxt, 'w+');
+            $fileinfo = $this->readdir($filedir, $thandle, $filenum);
+            fclose($thandle);
+            if ($fileinfo['error']) {
+                C::t('pichome_vapp')->update($this->appid, array('state' => 0));
+                return $fileinfo;
+            } else {
+                C::t('pichome_vapp')->update($this->appid, array('filenum' => $fileinfo['filenum'], 'state' => 2));
+            }
+        }
+        C::t('pichome_vapp')->update($this->appid, array('state' => 2));
+        return array('success' => true);
+    }
+
+    public function readdir($path, $thandle, &$filenum)
+    {
+       
+        if (!is_dir($path)) {
+            return [];
+        }
+        $handle = dir($path);
+        if ($handle) {
+            while (($filename = $handle->read()) !== false) {
+                if ($this->charset != CHARSET) $convertfilename = diconv($filename, $this->charset, CHARSET);;
+                $newPath = $path . BS . $filename;
+                if (is_dir($newPath) && $filename != '.' && $filename != '..') {
+                    if ((preg_match('/^(' . $this->notallowdir . ')$/i', $convertfilename))) {
+                        continue;
+                    }
+                    fwrite($thandle, $newPath . "\t" . 'folder' . "\n");
+                    $this->readdir($newPath, $thandle, $filenum);
+                } elseif (is_file($newPath)) {
+                    if (($this->allowext && !preg_match('/^(' . $this->allowext . ')$/i', $convertfilename)) || ($this->notallowext && preg_match('/^(' . $this->notallowext . ')$/i', $convertfilename))) {
+                        continue;
+                    }
+                    $filenum++;
+                    fwrite($thandle, $newPath . "\n");
+                }
+            }
+        } else {
+            return array('error' => 'Read Dir Failer');
+
+        }
+
+        $handle->close();
+        return array('filenum' => $filenum);
+
+    }
+
+    public function execExport($force = false)
+    {
+        $filedir = $this->path;
+        $filedir = str_replace(array('/', './', '\\'), BS, $filedir);
+        $readtxt = $this->readtxt . 'loaclexport' . md5($this->path) . '.txt';
+        //如果txt为空直接进入下一步
+        if(filesize($readtxt) == 0){
+            @unlink($readtxt);
+            C::t('pichome_vapp')->update($this->appid, array('lastid' => 0, 'percent' => 100, 'donum' => 0, 'state' => 3, 'filenum' => $this->filenum));
+
+            return array('success' => true);
+        }
+
+        //检测是否安装了ffmpeg
+
+        if ($this->lastid) {
+            $start = $this->lastid;
+        } else $start = 0;
+
+        $spl_object = new SplFileObject($readtxt, 'rb');
+        $spl_object->seek($start);
+        if ($this->lastid < $this->filenum && $this->exportstatus == 2) {
+            $i = 0;
+            while (is_file($readtxt) && !$spl_object->eof()) {
+                $i++;
+                if ($i > $this->onceexportnum) {
+                    break;
+
+                }
+                $file = $spl_object->current();
+
+                $file = trim($file);
+                $file = str_replace(array('/', './', '\\'), BS, $file);
+                $filearr = explode("\t", $file);
+                $filerelativepath = $filearr[0];
+                $filepath = str_replace($filedir . BS, '', $filerelativepath);
+                $p = new Encode_Core();
+                $this->charset = $p->get_encoding($filepath);
+                //如果是目录直接执行目录导入
+                if (isset($filearr[1]) && $filearr[1] == 'folder') {
+                    if ($this->charset != CHARSET) $filepath = diconv($filepath, $this->charset, CHARSET);
+                    $fid = $this->createfolerbypath($filepath);
+
+                    $spl_object->next();
+                    continue;
+                } else {
+                    $hasrid = 0;
+                    //保存路径，用于之后获取文件使用
+                    $savepath = str_replace(array('/', './', '\\'), '/', $filearr[0]);
+                    $savepath = str_replace($this->path . '/', '', $savepath);
+                    if($rid = DB::result_first("select rid from %t where path = %s and appid = %s",
+                        array('pichome_resources_attr',$savepath,$this->appid))){
+                        $hasrid = 1;
+                    }else{
+                        //生成rid
+                        $rid = $this->createRid();
+                    }
+                    $realfilepath = $filedir.BS.$filepath;
+                    //如果文件不存在则删除记录
+                    if (!is_file($realfilepath)) {
+                        if($hasrid)C::t('pichome_resources')->delete_by_rid($rid);
+                        $this->filenum -= 1;
+                    } else {
+                        //修改时间
+                        $mtime = filemtime($realfilepath);
+                        //创建时间
+                        $ctime = filectime($realfilepath);
+                        //获取文件后缀
+                        $ext = substr(strrchr($realfilepath, '.'), 1);
+                        $ext = strtolower($ext);
+                        //获取文件类型
+                        $type = getTypeByExt($ext);
+                        //获取文件大小
+                        $size = filesize($realfilepath);
+                        //获取图片信息，以取得宽高
+                        $imginfo = @getimagesize($realfilepath);
+
+
+
+                        //去掉库路径，以便获取文件相对目录
+                        $filepath = str_replace($filedir . BS, '', $filepath);
+
+                        if ($this->charset != CHARSET) $filepath = diconv($filepath, $this->charset, CHARSET);
+                        //获取文件名
+                        $filename = $this->getbasename($filepath);
+                        //不符合导入规则文件不允许导入，并减少总数
+                        if (($this->allowext && !preg_match('/^(' . $this->allowext . ')$/i', $filename)) || ($this->notallowext && preg_match('/^(' . $this->notallowext . ')$/i', $filename))) {
+                            $this->filenum -= 1;
+                        } else {
+                            //查询是否已有数据
+                            $data = C::t('pichome_resources')->fetch($rid);
+                            if (!$data) {
+                                $setarr = [
+                                    'rid' => $rid,
+                                    'name' => $filename,
+                                    'lastdate' => $mtime,
+                                    'appid' => $this->appid,
+                                    'apptype' => 1,
+                                    'size' => $size,
+                                    'type' => $type,
+                                    'ext' => $ext,
+                                    'width' => ($imginfo[0]) ? $imginfo[0] : 0,
+                                    'height' => ($imginfo[1]) ? $imginfo[1] : 0,
+                                    'mtime' => $ctime * 1000,
+                                    'dateline' => $mtime * 1000,
+                                    'btime' => TIMESTAMP * 1000
+                                ];
+                                if (C::t('pichome_resources')->insert($setarr)) {
+                                    $attrdata = [
+                                        'rid' => $rid,
+                                        'appid' => $this->appid,
+                                        'isget' => 0,
+                                        'path' => $savepath,
+                                        'searchval'=>$filename
+
+                                    ];
+
+                                    C::t('pichome_resources_attr')->insert($attrdata);
+                                    $dirstr = dirname($filepath);
+                                    if ($dirstr != '.' && $dirstr != '..') {
+                                        $fid = $this->createfolerbypath($dirstr);
+                                        if ($fid) {
+                                            $frsetarr = ['appid' => $this->appid, 'rid' => $rid, 'fid' => $fid];
+                                            C::t('pichome_folderresources')->insert($frsetarr);
+                                        }
+                                    }
+                                    //插入获取信息数据
+                                    Hook::listen('pichomegetinfo',$setarr);
+                                }
+                            }
+                            else {
+                                if ($mtime > $data['lastdate']) {
+                                    $setarr = [
+                                        'lastdate' => $mtime,
+                                        'appid' => $this->appid,
+                                        'apptype' => 1,
+                                        'size' => $size,
+                                        'type' => $type,
+                                        'ext' => $ext,
+                                        'mtime' => $ctime * 1000,
+                                        'dateline' => $mtime * 1000,
+                                        'btime' => TIMESTAMP * 1000,
+                                        'width' => ($imginfo[0]) ? $imginfo[0] : 0,
+                                        'height' => ($imginfo[1]) ? $imginfo[1] : 0,
+                                    ];
+                                    if (C::t('pichome_resources')->update($rid, $setarr)) {
+                                        $attrdata = [
+                                            'rid' => $rid,
+                                            'appid' => $this->appid,
+                                            'isget' => 0,
+                                            'path' => $savepath,
+                                            'searchval'=>$filename
+
+                                        ];
+                                        C::t('pichome_resources_attr')->insert($attrdata);
+                                        //如果文件被替换强制插入获取信息数据
+                                        $setarr['isforce'] = 1;
+                                        Hook::listen('pichomegetinfo',$data);
+
+                                    }
+
+                                }else{
+                                    //如果文件已存在，尝试插入获取信息数据
+                                    Hook::listen('pichomegetinfo',$data);
+                                }
+                            }
+                            $this->donum += 1;
+                        }
+
+                    }
+                    $percent = floor(($this->donum / $this->filenum) * 100);
+                    $percent = ($percent > 100) ? 100 : $percent;
+                    $state = ($percent >= 100) ? 3 : 2;
+                    if ($state == 3) {
+                        @unlink($readtxt);
+                        $lastid = 0;
+                    } else {
+                        $lastid = $this->donum;
+                    }
+                    //记录导入起始位置，以备中断后从此处,更改导入状态为正在导入
+                    C::t('pichome_vapp')->update($this->appid, array('lastid' => $lastid, 'percent' => $percent, 'donum' => $this->donum, 'state' => $state, 'filenum' => $this->filenum));
+                }
+                $spl_object->next();
+            }
+
+        }
+
+        return array('success' => true);
+
+    }
+    //生成rid
+    public function createRid(){
+
+        //订单年月
+        $ridmd = strtoupper(dechex(date('m'))) . date('d');
+        //订单时间戳
+        $ridms = substr(time(), -5) . substr(microtime(), 2, 5);
+        //订单号
+        $rid =  md5($ridmd.$ridms. sprintf('%02d', rand(0, 99)).$this->appid);
+        return $rid;
+    }
+    //根据路径创建目录
+    public function createfolerbypath($path, $pfid = '')
+    {
+        if (!$path) {
+            return $pfid;
+        } else {
+            $patharr = explode(BS, $path);
+
+            //生成目录
+            foreach ($patharr as $fname) {
+                if (!$fname) continue;
+                //判断是否含有此目录
+                if ($fid = DB::result_first("select fid from %t where pfid=%s and appid=%s and fname=%s", array('pichome_folder', $pfid, $this->appid, $fname))) {
+                    $pfid = $fid;
+                } else {
+                    $parentfolder = C::t('pichome_folder')->fetch($pfid);
+
+                    $fid = random(13) . $this->appid;
+
+                    if (DB::result_first("select fid from %t where fid = %s", array('pichome_folder', $fid))) {
+                        $fid = random(13) . $this->appid;
+                    }
+                    if ($parentfolder) {
+                        $pathkey = $parentfolder['pathkey'] . $fid;
+                    } else {
+                        $pathkey = $fid;
+                    }
+                    $setarr = [
+                        'fid' => $fid,
+                        'fname' => $fname,
+                        'appid' => $this->appid,
+                        'dateline' => TIMESTAMP,
+                        'pfid' => $pfid,
+                        'pathkey' => $pathkey
+                    ];
+                    if (C::t('pichome_folder')->insert($setarr)) $pfid = $fid;
+                }
+            }
+        }
+        return $pfid;
+    }
+
+
+    //校验文件
+    public function execCheckFile()
+    {
+        if ($this->exportstatus == 3) {
+            $total = DB::result_first("select count(rid) from %t where appid = %s ", array('pichome_resources', $this->appid));
+            //校验文件
+            $this->check_file($total);
+        }
+        return true;
+    }
+
+    public function check_file($total)
+    {
+        if ($this->lastid < 1) $this->lastid = 1;
+        $limitsql = ($this->lastid - 1) * $this->checklimit . ',' . $this->checklimit;
+        $delrids = [];
+        $data = DB::fetch_all("select rid,name,ext from %t where appid = %s order by lastdate asc limit $limitsql ", array('pichome_resources', $this->appid));
+        if (empty($data)) {
+            C::t('pichome_vapp')->update($this->appid, array('percent' => 0, 'state' => 4, 'lastid' => 0, 'donum' => 0));
+            //校验完成后更新目录文件数
+            foreach (DB::fetch_all("select count(rf.id) as num,f.fid  from %t f left join %t rf on rf.fid=f.fid where f.appid = %s group by f.fid", array('pichome_folder', 'pichome_folderresources', $this->appid)) as $v) {
+                C::t('pichome_folder')->update($v['fid'], array('filenum' => $v['num']));
+
+            }
+            if($this->getinfo){
+
+                //开启器获取信息后执行获取文件信息
+                dfsockopen(getglobal('localurl') . 'index.php?mod=imageColor&op=index', 0, '', '', false, '', 1);
+                dfsockopen(getglobal('localurl') . 'index.php?mod=ffmpeg&op=getinfo', 0, '', '', false, '', 1);
+                dfsockopen(getglobal('localurl') . 'index.php?mod=ffmpeg&op=thumb', 0, '', '', false, '', 1);
+            }
+            $total = DB::result_first("select count(rid) from %t where appid = %s ", array('pichome_resources', $this->appid));
+            $hascatnum = DB::result_first("SELECT count(DISTINCT rid) FROM %t where appid = %s",array('pichome_folderresources',$this->appid));
+            $nosubfilenum = $total - $hascatnum;
+            $getinfonum = DB::result_first("SELECT count(ra.rid) FROM %t ra left join %t fc on ra.rid = fc.rid left join %t  ic on ra.rid= ic.rid
+where ra.appid = %s and ((ra.isget = 0 and ISNULL(fc.rid) and ISNULL(ic.rid)) or (ra.isget=1))",
+                array('pichome_resources_attr','pichome_ffmpeg_record','pichome_imagickrecord',$this->appid));
+            C::t('pichome_vapp')->update($this->appid,array('filenum'=>$total,'nosubfilenum'=>$nosubfilenum,'getinfonum'=>$getinfonum));
+            return true;
+        }
+        foreach ($data as $v) {
+            $rid = $v['rid'];
+            $filepath = DB::result_first("select `path` from %t where rid = %s and appid = %s", array('pichome_resources_attr', $rid, $this->appid));
+            $filepath = str_replace(array('/', './', '\\'), BS, $this->path . BS . $filepath);
+            //echo $v['name'].'<br>';
+            if (!is_file($filepath) || ($this->allowext && !preg_match('/^(' . $this->allowext . ')$/i', $v['name'])) || ($this->notallowext && preg_match('/^(' . $this->notallowext . ')$/i', $v['name']))) {
+                //echo $rid;
+               // echo $v['name']."\n";
+//                var_dump((!preg_match('/^(' . $this->allowext . ')$/i', $v['name'])));
+                //die;
+                $delrids[] = $rid;
+            }
+
+        }
+        if (!empty($delrids)) {
+            $this->filenum = $this->filenum - count($delrids);
+            //如果有需要删除的，删除后，则重新查询上一页数据
+            C::t('pichome_resources')->delete_by_rid($delrids);
+            if($this->lastid == 1){
+                $percent = round(($this->checklimit / $total) * 100);
+            }else{
+                $percent = round((($this->lastid - 1) * $this->checklimit / $total) * 100);
+            }
+            $percent = ($percent > 100) ? 100:$percent;
+            C::t('pichome_vapp')->update($this->appid, array('lastid' => $this->lastid, 'percent' => $percent, 'state' => 3, 'filenum' => $this->filenum));
+        } else {
+            if($this->lastid == 1){
+                $percent = round(($this->checklimit / $total) * 100);
+            }else{
+                $percent = round((($this->lastid - 1) * $this->checklimit / $total) * 100);
+            }
+            $percent = ($percent > 100) ? 100:$percent;
+            C::t('pichome_vapp')->update($this->appid, array('lastid' => $this->lastid + 1, 'percent' => $percent, 'state' => 3));
+        }
+    }
+    
+}

dzz/local/classes/deleteafter.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace dzz\local\classes;
+
+use \core as C;
+use \DB as DB;
+
+
+class deleteafter
+{
+
+    public function run($data)
+    {
+        if(!empty($data['rids'])){
+            $appid = DB::result_first("select appid from %t where rid = %s",array('pichome_resources',$data['rids'][0]));
+            $appdata = C::t('pichome_vapp')->fetch($appid);
+            if($appdata['type'] == 1){
+                $delnum = count($data['rids']);
+                C::t('pichome_vapp')->add_getinfonum_by_appid($appid,-$delnum);
+            }
+        }
+
+
+    }
+
+
+
+}

dzz/pichome/ajax.php

@@ -516,7 +516,8 @@ if ($operation == 'addsearch') {//增加关键词搜索次数
         $cid = isset($_GET['cid']) ? $_GET['cid']:'';
         if ($cid) {
             if ($cid == -1) {
-                $sql .= "  left join %t tr on isnull(tr.cid)";
+                $sql .= "  left join %t tr  on rt.tid=tr.tid ";
+                $wheresql .= " and isnull(tr.cid) ";
                 $params[] = 'pichome_tagrelation';
             } else {
                 $sql .= "  left join %t tr on tr.tid = rt.tid ";
@@ -1413,9 +1414,15 @@ if ($operation == 'addsearch') {//增加关键词搜索次数
         $folderdata[$v['fid']] = ['fname'=>$v['fname'],'pathkey'=>$v['pathkey'],'appid'=>$v['appid']];
         $folderdata[$v['fid']]['leaf'] = DB::result_first("select count(*) from %t where pfid = %s",array('pichome_folder',$v['fid'])) ? false:true;
     }
+    if(!isset($_G['setting']['pichomefilterfileds'])){
+        $pichomefilterfileds = C::t('setting')->fetch_all('pichomefilterfileds');
+    }else{
+        $pichomefilterfileds = $_G['setting']['pichomefilterfileds'];
+    }
     if ($appid) {
         if ($data = DB::fetch_first("select * from %t where appid=%s ", array('pichome_vapp', $appid))) {
-            $data['filter'] = unserialize($data['filter']);
+
+            $data['filter'] = ($data['filter']) ? unserialize($data['filter']):$pichomefilterfileds;
             // if($data['filter']){
             foreach ($data['filter'] as $k => $v) {
                 if ($v['key'] == 'tag' && $v['chacked'] == 1) {
@@ -1438,13 +1445,10 @@ if ($operation == 'addsearch') {//增加关键词搜索次数
         } else {
             exit(json_encode(array('error' => true)));
         }
-    } else {
+    } else{
-        if (isset($_G['setting']['pichomefilterfileds'])) {
+
-            exit(json_encode(array('success' => true, 'data' => $_G['setting']['pichomefilterfileds'],'folderdata'=>$folderdata,'tagdata'=>$tagdata,'shape'=>$shapelable)));
+        exit(json_encode(array('success' => true, 'data' => $pichomefilterfileds,'folderdata'=>$folderdata,'tagdata'=>$tagdata,'shape'=>$shapelable)));
-        } else {
+
-            $setting = C::t('setting')->fetch_all('pichomefilterfileds');
-            exit(json_encode(array('success' => true, 'data' => $setting['pichomefilterfileds'],'folderdata'=>$folderdata,'tagdata'=>$tagdata,'shape'=>$shapelable)));
-        }
     }
 
 } elseif ($operation == 'createshare') {//分享

dzz/pichome/css/mobile/index.css

@@ -107,7 +107,7 @@
 	z-index: 1;
 }
 .seasrch-popup .search-val-box .highlight{
-	color: var(--header-active);
+	color: var(--leftTreeColor);
 	font-weight: 700;
 }
 

dzz/pichome/css/pc/common.css

@@ -57,7 +57,10 @@ body{
 	line-height: 20px;
 	margin-top: 6px;
 }
-
+.highlight {
+    color: var(--leftTreeColor);
+    font-weight: 700;
+}
 .tipTxt:hover {
 	color: var(--content-text);
 }

dzz/pichome/delete.php

@@ -10,6 +10,7 @@ $processname = 'DZZ_LOCK_PICHOMEDELETE';
 if (!dzz_process::islocked($processname, 60*60)) {
     $locked=false;
 }
+//dzz_process::unlock($processname);
 if ($locked) {
     exit(json_encode( array('error'=>'进程已被锁定请稍后再试')));
 }

dzz/pichome/exportfile.php

@@ -24,18 +24,33 @@
     if(!$data) exit(json_encode(array('error'=>'no data')));
     if($data['state'] != 2  && $data['isdelete'] != 0) exit(json_encode(array('error'=>'is deleted or state is not allow')));
     if($data['type'] == 0){
-        include_once dzz_libfile('eagleexport');
+        include_once DZZ_ROOT.'dzz'.BS.'eagle'.BS.'class'.BS.'class_eagleexport.php';
+        //include_once dzz_libfile('eagleexport');
         $eagleexport = new eagleexport($data);
+        try{
             $return = $eagleexport->execExport($force);
+        }catch (Exception $e){
+            dzz_process::unlock($processname);
+        }
+
     }elseif($data['type'] == 1){
-        include_once dzz_libfile('localexport');
+        include_once DZZ_ROOT.'dzz'.BS.'local'.BS.'class'.BS.'class_localexport.php';
+        //include_once dzz_libfile('localexport');
         $localexport = new localexport($data);
         //执行导入文件
+        try{
             $return = $localexport->execExport($force);
+        }catch (Exception $e){
+            dzz_process::unlock($processname);
+        }
     }elseif ($data['type'] == 2){
         include_once DZZ_ROOT.'dzz'.BS.'billfish'.BS.'class'.BS.'class_billfishexport.php';
         $billfishxport = new billfishxport($data);
-        $return = $billfishxport->execExport();
+        try{
+            $return = $billfishxport->execExport($force);
+        }catch (Exception $e){
+            dzz_process::unlock($processname);
+        }
     }
     dzz_process::unlock($processname);
     $data = C::t('pichome_vapp')->fetch($appid);

dzz/pichome/exportfilecheck.php

@@ -23,11 +23,13 @@ $data = C::t('pichome_vapp')->fetch($appid);
 if (!$data) exit(json_encode(array('error' => 'no data')));
 if ($data['state'] != 3 && $data['isdelete'] != 0) exit(json_encode(array('error' => 'is deleted or state is not allow')));
 if ($data['type'] == 0) {
-    include_once dzz_libfile('eagleexport');
+    include_once DZZ_ROOT.'dzz'.BS.'eagle'.BS.'class'.BS.'class_eagleexport.php';
+    //include_once dzz_libfile('eagleexport');
     $eagleexport = new eagleexport($data);
     $return = $eagleexport->execCheckFile();
 } elseif ($data['type'] == 1) {
-    include_once dzz_libfile('localexport');
+    include_once DZZ_ROOT.'dzz'.BS.'local'.BS.'class'.BS.'class_localexport.php';
+    //include_once dzz_libfile('localexport');
     $localexport = new localexport($data);
     $return = $localexport->execCheckFile();
 }elseif ($data['type'] == 2){

dzz/pichome/filelist.php

@@ -484,6 +484,7 @@ if ($operation == 'filelist') {
         default:
             $orderarr[] = ' r.dateline ' . $asc;
     }
+    $orderarr[] = " r.rid ".$asc;
     $ordersql = implode(',', $orderarr);
     if (!empty($para)) $params = array_merge($params, $para);
     if (!empty($orderparams)) $params = array_merge($params, $orderparams);

dzz/pichome/initexport.php

@@ -13,11 +13,13 @@
     if(!$data) exit(json_encode(array('error'=>'no data')));
     if(($data['state'] > 1 &&  $data['state'] < 4) || $data['isdelete'] != 0) exit(json_encode(array('error'=>'export is runing or is deleted')));
     if($data['type'] == 0){
-        include_once dzz_libfile('eagleexport');
+        include_once DZZ_ROOT.'dzz'.BS.'eagle'.BS.'class'.BS.'class_eagleexport.php';
+        //include_once dzz_libfile('eagleexport');
         $eagleexport = new eagleexport($data);
         $return = $eagleexport->initExport();
     }elseif($data['type'] == 1  ){
-        include_once dzz_libfile('localexport');
+        include_once DZZ_ROOT.'dzz'.BS.'local'.BS.'class'.BS.'class_localexport.php';
+        //include_once dzz_libfile('localexport');
         $localexport = new localexport($data);
         $return = $localexport->initExport();
     }elseif ($data['type'] == 2){

dzz/pichome/library.php

@@ -11,6 +11,7 @@ if ($operation == 'fetch') {
     if (submitcheck('settingsubmit')) {
         if (!$appid) exit(json_encode(array('error' => true)));
         $setarr = [
+            'appname' => isset($_GET['appname']) ? trim($_GET['appname']) : '',
             'filter' => isset($_GET['filter']) ? serialize($_GET['filter']) : '',
             'share' => isset($_GET['share']) ? intval($_GET['share']) : 0,
             'download' => isset($_GET['download']) ? intval($_GET['download']) : 0,
@@ -27,15 +28,20 @@ if ($operation == 'fetch') {
         }
         exit(json_encode(array('success' => true)));
     } else {
+        require_once(DZZ_ROOT . './dzz/class/class_encode.php');
         if ($data = DB::fetch_first("select * from %t where appid=%s and isdelete = 0 ", array('pichome_vapp', $appid))) {
-            if($data['charset'] != CHARSET)$data['convertpath'] = diconv($data['path'],$data['charset'],CHARSET);
+            $p = new Encode_Core();
-            else $data['convertpath'] = $data['path'];
+            $charset = $p->get_encoding($data['path']);
+            //echo $charset;die
+            if($data['charset'] != CHARSET){
+                //echo $val['path'];die;
+                $data['convertpath'] = diconv($data['path'], $charset, CHARSET);
+            } else $data['convertpath'] = $data['path'];
             $data['path'] = urlencode($data['path']);
             $data['filter'] = unserialize($data['filter']);
-            $getinfonum = 0;
+            /*$data['getinfonum'] = DB::result_first("SELECT count(ra.rid) FROM %t ra left join %t fc on ra.rid = fc.rid left join %t  ic on ra.rid= ic.rid
-            $data['getinfonum'] = DB::result_first("SELECT count(ra.rid) FROM %t ra left join %t fc on ra.rid = fc.rid left join %t  ic on ra.rid= ic.rid 
 where ra.appid = %s and ((ra.isget = 0 and ISNULL(fc.rid) and ISNULL(ic.rid)) or (ra.isget=1))",
-                array('pichome_resources_attr','pichome_ffmpeg_record','pichome_imagickrecord',$appid));
+                array('pichome_resources_attr','pichome_ffmpeg_record','pichome_imagickrecord',$appid));*/
             $catdata = C::t('pichome_taggroup')->fetch_by_appid($appid);
             if (($data['state'] == 2)) {
                 $processname = 'DZZ_PAGEEXPORTFILE_LOCK_' . $appid;
@@ -43,7 +49,7 @@ where ra.appid = %s and ((ra.isget = 0 and ISNULL(fc.rid) and ISNULL(ic.rid)) or
                 if (!dzz_process::islocked($processname, 60 * 5)) {
                     $locked = false;
                 }
-                if ($locked) {
+                if (!$locked) {
                     dfsockopen(getglobal('localurl') . 'index.php?mod=pichome&op=exportfile&appid=' . $appid, 0, '', '', false, '', 1);
                 }
 
@@ -53,7 +59,7 @@ where ra.appid = %s and ((ra.isget = 0 and ISNULL(fc.rid) and ISNULL(ic.rid)) or
                 if (!dzz_process::islocked($processname, 60 * 5)) {
                     $locked = false;
                 }
-                if ($locked) {
+                if (!$locked) {
                     dfsockopen(getglobal('localurl') . 'index.php?mod=pichome&op=exportfilecheck&appid=' . $appid, 0, '', '', false, '', 1);
                 }
             }
@@ -65,24 +71,24 @@ where ra.appid = %s and ((ra.isget = 0 and ISNULL(fc.rid) and ISNULL(ic.rid)) or
 }
 elseif ($operation == 'getdata') {
     $data = array();
+    require_once(DZZ_ROOT . './dzz/class/class_encode.php');
     foreach (DB::fetch_all("select * from %t where isdelete = 0 order by disp", array('pichome_vapp')) as $val) {
         $val['connect'] = (is_dir($val['path'])) ? 1:0;
+        $p = new Encode_Core();
+        $charset = $p->get_encoding($val['path']);
+        //echo $charset;die
         if($val['charset'] != CHARSET){
             //echo $val['path'];die;
-            $val['path'] = diconv($val['path'], $val['charset'], CHARSET);
+            $val['path'] = diconv($val['path'], $charset, CHARSET);
         }
         $data[] = $val;
     }
     exit(json_encode(array('data' => $data)));
 
-} elseif($operation == 'getinfonum'){//已获取文件信息个数
+}elseif($operation == 'getinfonum'){//已获取文件信息个数
     $returndata = [];
-    foreach(DB::fetch_all("select appid from %t where isdelete = 0 and getinfo = 1 and `type` = 1 and getinfonum < filenum", array('pichome_vapp')) as $v){
+    foreach(DB::fetch_all("select appid,getinfonum from %t where isdelete = 0 and getinfo = 1 and `type` = 1 and getinfonum < filenum", array('pichome_vapp')) as $v){
-         $getinfonum= DB::result_first("SELECT count(ra.rid) FROM %t ra left join %t fc on ra.rid = fc.rid left join %t  ic on ra.rid= ic.rid 
+        $returndata[$v['appid']] = $v['getinfonum'];
-where ra.appid = %s and ((ra.isget = 0 and ISNULL(fc.rid) and ISNULL(ic.rid)) or (ra.isget=1))",
-            array('pichome_resources_attr','pichome_ffmpeg_record','pichome_imagickrecord',$v['appid']));
-        C::t('pichome_vapp')->update($v['appid'],array('getinfonum'=>$getinfonum));
-            $returndata['appid'] = $getinfonum;
     }
     exit(json_encode(array('data' => $returndata)));
 }

dzz/pichome/share.php

@@ -4,9 +4,9 @@
     }
 	
 $sid = isset($_GET['sid']) ? dzzdecode($_GET['sid'],'',0):'';
-$sharedata = C::t('pichome_share')->fetch_by_idandtype($sid);
+$sharedata = C::t('pichome_share')->fetch_by_id($sid);
 $resourcesdata = $sharedata['resourcesdata'];
-$resourcesdata['share'] = 0;
+
 $colors = array();
 foreach($resourcesdata['colors'] as $cval){
 	$colors[] = $cval;
@@ -26,11 +26,6 @@ foreach($resourcesdata['foldernames'] as $fval){
 	$foldernames[] = $fval;
 }
 $resourcesdata['foldernames'] = json_encode($foldernames);
-$theme = GetThemeColor();
-$ismobile = helper_browser::ismobile();
 
-if (($ismobile)) {
+$theme = GetThemeColor();
-	include template('mobile/page/share');
+include template('pc/page/share');
-} else {
-	include template('pc/page/share');
-}

dzz/pichome/template/mobile/components/index/JsMy.htm

@@ -43,7 +43,7 @@
 				<span class="title">版本信息：</span><span class="mes">$_G[setting][version]</span>
 			</div>
 			<div class="aboutlist">
-				<span class="title">版权信息：</span><span class="mes">Powered By oaooa PicHome © 2020-2021 欧奥图文</span>
+				<span class="title">版权信息：</span><span class="mes">Powered By oaooa PicHome © 2020-2022 欧奥图文</span>
 			</div>
 			<div class="aboutlist">
 				<span class="title">网站地址：</span><span class="mes"><a class="address" href="https://oaooa.com/" target="_blank">oaooa.com</a></span>

dzz/pichome/template/mobile/components/index/image/more.htm

@@ -12,7 +12,7 @@
 			visible:false,
 			dpath:'',
 			data:[
-				{ name: '收藏',type:'collect' },
+				// { name: '收藏',type:'collect' },
 				{ name: '分享',type:'share' },
 				{ name: '下载',type:'down' },
 			]

dzz/pichome/template/pc/components/headerAdmin/index.htm

@@ -23,13 +23,17 @@
 						<el-dropdown v-cloak trigger="click" @command="handleavatar">
 							<div id="dzz_avatar_img">{eval echo avatar_block($_G[uid]);} </div>
 							<el-dropdown-menu slot="dropdown" style="width: 165px;">
+								<!-- <el-dropdown-item command="collection">收藏夹</el-dropdown-item> -->
 								<el-dropdown-item command="personal">个人设置</el-dropdown-item>
 								<el-dropdown-item command="help">帮助文档</el-dropdown-item>
 								<el-dropdown-item command="problem">问题反馈</el-dropdown-item>
+								<!--{if $_G['adminid']==1}-->
 								<el-divider></el-divider>
 								<el-dropdown-item command="setting">站点设置</el-dropdown-item>
 								<el-dropdown-item command="library">库设置</el-dropdown-item>
+								<!-- <el-dropdown-item command="orguser">用户管理</el-dropdown-item> -->
 								<el-dropdown-item command="system">系统工具</el-dropdown-item>
+								<!--{/if}-->
 								<el-divider></el-divider>
 								<el-dropdown-item command="about">关于PicHome</el-dropdown-item>
 								<el-dropdown-item command="OutLogin">退出站点</el-dropdown-item>
@@ -57,6 +61,9 @@
 		methods:{
 			handleavatar(type) {//头像点击
 				switch(type){
+					case 'collection':
+						window.location.href = DZZSCRIPT + '?mod=collection';
+					break;
 					case 'personal':
 						window.location.href = MOD_URL + '&op=user&do=personal';
 					break;
@@ -85,7 +92,7 @@
 								<span class="title">版本信息：</span><span class="mes">$_G[setting][version]</span>
 							</div>
 							<div class="aboutlist">
-								<span class="title">版权信息：</span><span class="mes">Powered By oaooa PicHome © 2020-2021 欧奥图文</span>
+								<span class="title">版权信息：</span><span class="mes">Powered By oaooa PicHome © 2020-2022 欧奥图文</span>
 							</div>
 							<div class="aboutlist">
 								<span class="title">网站地址：</span><span class="mes"><a class="address" href="https://oaooa.com/" target="_blank">oaooa.com</a></span>
@@ -116,6 +123,9 @@
 					case 'system':
 						window.open(SITEURL+'admin.php?mod=system');
 					break;
+					case 'orguser':
+						window.open(SITEURL+'admin.php?mod=orguser');
+					break;
 				}
 				
 			},

dzz/pichome/template/pc/components/index/JsCommon.htm

@@ -109,6 +109,24 @@
 				return decodeURIComponent(r[2]);
 			}
 		},
+		CommonHighlight(text,words){
+			// 默认的标签，如果没有指定，使用span
+			var i, len = words.length,
+			re;
+			//匹配每一个特殊字符 ，进行转义
+			var specialStr = ["*", ".", "?", "+", "$", "^", "[", "]", "{", "}", "|", "\\", "(", ")", "/", "%"]; 
+			$.each(specialStr, function(i, item) {
+				if(words.indexOf(item) != -1) {
+					words = words.replace(new RegExp("\\" + item, 'g'), "\\" + item);
+				}
+			});
+			//匹配整个关键词
+			re = new RegExp(words, 'g');
+			if(re.test(text)) {
+				text = text.replace(re, '<span class="highlight">$&</span>');
+			}
+			return text;
+		},
 		CommonDeleteAll(){
 			this.HeaderKeyword = '';
 			this.ScreenDeleteAll();

dzz/pichome/template/pc/components/index/Jsimage.htm

@@ -3,7 +3,7 @@
 		<!-- <div class="left" v-cloak>找到文件&nbsp;{{ImageParams.counttotal}}&nbsp;个</div> -->
 		<div class="right" v-if="DocumentTemplate==2 && ImageDataIsExpanded"><el-checkbox v-model="ImageParams.expanded" @change="ImageExpandedChange">显示子分类内容</el-checkbox></div>
 	</div>
-	<div class="collects-move-btn-box" v-if="ImageCollect.show" :style="{'padding-left':DocumentLeftWidth+'px'}">
+	<!-- <div class="collects-move-btn-box" v-if="ImageCollect.show" :style="{'padding-left':DocumentLeftWidth+'px'}">
 		<el-tooltip class="item" effect="dark" content="收藏" placement="top">
 		    <div class="item" @click="ImageCollect.dialogVisible=true">
 		     	<i class="ri-star-fill"></i>
@@ -14,7 +14,7 @@
 		     	<i class="ri-close-circle-fill"></i>
 		    </div>
 		</el-tooltip>
-	</div>
+	</div> -->
 	<div class="image-container">
 		<div class="image-wrapper">
 			<template v-for="item in ImageDataListShow">

dzz/pichome/template/pc/components/index/header/JsHeaderRightAvatar.htm

@@ -6,9 +6,11 @@
 		<el-dropdown-item command="personal">个人设置</el-dropdown-item>
 		<el-dropdown-item command="help">帮助文档</el-dropdown-item>
 		<el-dropdown-item command="problem">问题反馈</el-dropdown-item>
+		<!--{if $_G['adminid']==1}-->
 		<el-divider></el-divider>
 		<el-dropdown-item command="setting">站点设置</el-dropdown-item>
 		<el-dropdown-item command="library">库设置</el-dropdown-item>
+		<!-- <el-dropdown-item command="orguser">用户管理</el-dropdown-item> -->
 		<el-dropdown-item command="system">
 			<span style="position: relative;">
 				系统工具
@@ -17,6 +19,7 @@
 				<!--{/if}-->
 			</span>
 		</el-dropdown-item>
+		<!--{/if}-->
 		<el-divider></el-divider>
 		<el-dropdown-item command="about">关于PicHome</el-dropdown-item>
 		<el-dropdown-item command="OutLogin">退出站点</el-dropdown-item>
@@ -33,6 +36,9 @@
 				case 'collection':
 					window.location.href = DZZSCRIPT + '?mod=collection';
 				break;
+				case 'orguser':
+					window.open(SITEURL+'admin.php?mod=orguser');
+				break;
 				case 'personal':
 					window.location.href = MOD_URL + '&op=user&do=personal';
 				break;
@@ -61,7 +67,7 @@
 							<span class="title">版本信息：</span><span class="mes">$_G[setting][version]</span>
 						</div>
 						<div class="aboutlist">
-							<span class="title">版权信息：</span><span class="mes">Powered By oaooa PicHome © 2020-2021 欧奥图文</span>
+							<span class="title">版权信息：</span><span class="mes">Powered By oaooa PicHome © 2020-2022 欧奥图文</span>
 						</div>
 						<div class="aboutlist">
 							<span class="title">网站地址：</span><span class="mes"><a class="address" href="https://oaooa.com/" target="_blank">oaooa.com</a></span>

dzz/pichome/template/pc/components/index/template2/JsLeft.htm

@@ -26,7 +26,7 @@
 				:filter-node-method="LeftTreeFilterNode"
 				highlight-current>
 				<div class="custom-tree-node" slot-scope="{ node, data }" :class="{'tree-node-color':node.level==1?Appid==data.fid:Appid==data.appid}">
-					<div class="name" v-cloak>{{ node.label }}</div>
+					<div class="name" v-cloak v-html="data.pfname"></div>
 					<div class="num" v-if="node.expanded && parseInt(data.nosubfilenum)>0">{{data.nosubfilenum}}</div>
 					<div class="num" v-if="!node.expanded && parseInt(data.filenum)>0">{{data.filenum}}</div>
 				</div>
@@ -59,6 +59,7 @@
 			defaultChecked:'',
 			defaultOpenkeysInit:[],
 			defaultOpenkeys:[],
+			defaultOpenkeysSearch:[],
 			arrangement:[],
 			arrangementLast:[],
 		}
@@ -138,6 +139,7 @@
 					self.LeftTree.defaultChecked = self.Appid;
 					self.LeftTree.defaultOpenkeys = [];
 					self.LeftTree.defaultOpenkeysInit = [];
+					self.LeftTree.defaultOpenkeysSearch = [];
 					this.CommonGetImageData();
 				}
 			}
@@ -149,6 +151,7 @@
 		LeftClassifyFilterInput:debounce(function(val){//输入
 			var self = this;
 			self.LeftTree.defaultOpenkeys = [];
+			self.LeftTree.defaultOpenkeysSearch = [];
 			self.LeftTree.arrangementLast = [];
 			self.LeftTree.show = false;
 			self.Leftloading = true;
@@ -156,6 +159,12 @@
 				$.post(MOD_URL+'&op=ajax&operation=searchfolderbyname',{
 					keyword:val
 				},function(data){
+					for(var i in self.Librarys){
+						var item = self.Librarys[i];
+						if(item.appname.indexOf(val)>-1){
+							self.LeftTree.defaultOpenkeys.push(item.appid);
+						}
+					}
 					for(var b in data.folderdata){
 						var bitem = data.folderdata[b];
 						var pathkey = [];
@@ -163,7 +172,7 @@
 							self.LeftTree.arrangementLast.push(bitem.fid);
 						}
 						if(self.LeftTree.defaultOpenkeys.indexOf(bitem.appid)<0){
-							self.LeftTree.defaultOpenkeys.push(bitem.appid)
+							self.LeftTree.defaultOpenkeys.push(bitem.appid);
 						}
 						self.LeftTree.arrangement = [];
 						if(bitem.pathkey){
@@ -207,14 +216,15 @@
 		},
 		LeftGetTreeDataSubstringFinish(){
 			var self = this;
-			if(this.LeftTree.defaultOpenkeys.length){
+			if(self.LeftTree.defaultOpenkeys.length){
 				var status = false;
-				for(var i in this.LeftTree.defaultOpenkeys){
+				for(var i in self.LeftTree.defaultOpenkeys){
-					var node = self.$refs.lefttree.getNode(this.LeftTree.defaultOpenkeys[i]);
+					var id = self.LeftTree.defaultOpenkeys[i];
-					if(!node){
+					if(self.LeftTree.defaultOpenkeysSearch.indexOf(id)>-1){
+						status = true;
+					}else{
 						return false;
 					}
-					status = true;
 				}
 				if(status){
 					self.Leftloading = false;
@@ -227,43 +237,44 @@
 			var self = this;
 			if(node.level == 0){
 				var arr = [];
-				if(self.LeftTree.filterText){
+				var num = 0;
 				for(var i in self.Librarys){
 					var item = self.Librarys[i];
+					num += parseInt(item.filenum);
+					if(self.LeftTree.filterText){
 						if(self.LeftTree.defaultOpenkeys.indexOf(item.appid)>-1){
 							arr.push({
 								fid:item.appid,
 								fname:item.appname,
 								leaf:item.leaf,
 								filenum:item.filenum,
-								nosubfilenum:item.nosubfilenum
+								nosubfilenum:item.nosubfilenum,
+								pfname:self.CommonHighlight(item.appname,self.LeftTree.filterText)
 							});
-						}
+							self.LeftTree.defaultOpenkeysSearch.push(item.appid);
 						}
 					}else{
-					var num = 0;
-					for(var i in self.Librarys){
-						var item = self.Librarys[i];
-						num += parseInt(item.filenum);
 						arr.push({
 							fid:item.appid,
 							fname:item.appname,
 							leaf:item.leaf,
 							filenum:item.filenum,
-							nosubfilenum:item.nosubfilenum
+							nosubfilenum:item.nosubfilenum,
+							pfname:self.CommonHighlight(item.appname,self.LeftTree.filterText)
 						});
+						self.LeftTree.defaultOpenkeysSearch.push(item.appid);
 					}
-					if(self.Librarys.length>1){
+					
+				}
+				if(!self.LeftTree.filterText && self.Librarys.length>1){
 					arr.unshift({
 						fid:'all',
 						fname:'全部库',
+						pfname:'全部库',
 						filenum:num,
 						leaf:true
 					});
 				}
-					
-				}
-				
 				resolve(arr);
 				self.$nextTick(function(){
 					self.LeftGetTreeDataSubstringFinish();
@@ -277,11 +288,14 @@
 					var num = 0;
 					for(var i in data.folderdatanum){
 						var item = data.folderdatanum[i];
+						self.LeftTree.defaultOpenkeysSearch.push(item.fid);
 						if(self.LeftTree.filterText){
+							item['pfname'] = self.CommonHighlight(item['fname'],self.LeftTree.filterText);
 							if(self.LeftTree.defaultOpenkeys.indexOf(item.fid)>-1 || self.LeftTree.arrangementLast.indexOf(item.fid)>-1){
 								arr.push(item);
 							}
 						}else{
+							item['pfname'] = item['fname'];
 							arr.push(item);
 						}
 					}
@@ -300,11 +314,14 @@
 					var num = 0;
 					for(var i in data.folderdatanum){
 						var item = data.folderdatanum[i];
+						self.LeftTree.defaultOpenkeysSearch.push(item.fid);
 						if(self.LeftTree.filterText){
+							item['pfname'] = self.CommonHighlight(item['fname'],self.LeftTree.filterText);
 							if(self.LeftTree.defaultOpenkeys.indexOf(item.fid)>-1 || self.LeftTree.arrangementLast.indexOf(item.fid)>-1){
 								arr.push(item);
 							}
 						}else{
+							item['pfname'] = item['fname'];
 							arr.push(item);
 						}
 					}

dzz/pichome/template/pc/page/details.htm

@@ -833,10 +833,10 @@
 			handleCommandColor(val){
 				if(val == 'common'){
 					<!--{if $opentype=='current'}-->
-					window.parent.window.location.hash = '#appid=' + this.imagesData.appid + '&color=' + this.ColorPopver.base;
+					window.parent.window.location.hash = '#color=' + this.ColorPopver.base;
 					window.parent.window.location.reload()
 					<!--{else}-->
-					window.location.href = '#appid=' + this.imagesData.appid + '&color=' + this.ColorPopver.base;
+					window.location.href = '#color=' + this.ColorPopver.base;
 					<!--{/if}-->
 				}else{
 					CopyTxt(this,val)
@@ -844,7 +844,7 @@
 			},
 
 			handleView(){
-				window.open(SITEURL+this.imagesData.icondata);
+				window.open(this.imagesData.originalimg);
 			},
 			handleShare() {
 				var self = this;
@@ -889,10 +889,10 @@
 			},
 			handleClickTag(tid){
 				<!--{if $opentype=='current'}-->
-				window.parent.window.location.hash = '#appid=' + this.imagesData.appid + '&tag=' + tid;
+				window.parent.window.location.hash = '#tag=' + tid;
 				window.parent.window.location.reload()
 				<!--{else}-->
-				window.location.href = '#appid=' + this.imagesData.appid + '&tag=' + tid;
+				window.location.href = '#tag=' + tid;
 				<!--{/if}-->
 				
 			},
@@ -1024,7 +1024,7 @@
 								<span class="title">版本信息：</span><span class="mes">Beat 1</span>
 							</div>
 							<div class="aboutlist">
-								<span class="title">版权信息：</span><span class="mes">Powered By oaooa PicHome © 2020-2021 欧奥图文</span>
+								<span class="title">版权信息：</span><span class="mes">Powered By oaooa PicHome © 2020-2022 欧奥图文</span>
 							</div>
 							<div class="aboutlist">
 								<span class="title">网站地址：</span><span class="mes"><a class="address" href="https://oaooa.com/" target="_blank">oaooa.com</a></span>

dzz/pichome/template/pc/page/library.htm

@@ -96,12 +96,14 @@
 							<el-dropdown v-cloak trigger="click" @command="handleavatar">
 								<div id="dzz_avatar_img" class="small">{eval echo avatar_block($_G[uid]);} </div>
 								<el-dropdown-menu slot="dropdown" style="width: 165px;">
+									<!-- <el-dropdown-item command="collection">收藏夹</el-dropdown-item> -->
 									<el-dropdown-item command="personal">个人设置</el-dropdown-item>
 									<el-dropdown-item command="help">帮助文档</el-dropdown-item>
 									<el-dropdown-item command="problem">问题反馈</el-dropdown-item>
 									<el-divider></el-divider>
 									<el-dropdown-item command="setting">站点设置</el-dropdown-item>
 									<el-dropdown-item command="library">库设置</el-dropdown-item>
+									<!-- <el-dropdown-item command="orguser">用户管理</el-dropdown-item> -->
 									<el-dropdown-item command="system">系统工具</el-dropdown-item>
 									<el-divider></el-divider>
 									<el-dropdown-item command="about">关于PicHome</el-dropdown-item>
@@ -378,7 +380,7 @@
 				<el-button type="warning" @click="ImportDataDialogClick('eagle')" size="small">作为Eagle库导入</el-button>
 		  </span>
 		</el-dialog>
-		<el-dialog :title="dialog.title" :visible.sync="dialog.Visible" :close-on-click-modal="false">
+		<el-dialog :title="dialog.title" :visible.sync="dialog.Visible" :close-on-click-modal="false" :show-close="formdta.loading?false:true">
 			<el-form :model="formdta" label-width="140px">
 	<!-- 					<el-form-item label="开放权限：">
 					<el-radio-group v-model="formdta.personal">
@@ -386,6 +388,9 @@
 						<el-radio :label="1">私有</el-radio>
 					</el-radio-group>
 				</el-form-item> -->
+				<el-form-item label="库名称：">
+				    <el-input v-model="formdta.appname"></el-input>
+				  </el-form-item>
 				<el-form-item label="库位置：">
 				    <el-input v-model="formdta.path" readonly style="border: 0;">
 						<i slot="suffix" style="cursor: pointer;" class="el-input__icon el-icon-edit" @click="FormdtaPathClick"></i>
@@ -437,8 +442,8 @@
 <!-- 				<el-popconfirm title="确定删除该库？确定后无法恢复" @Confirm="deleteLibrary">
 					<el-button slot="reference" style="float: left;">删除</el-button>
 				</el-popconfirm> -->
-				<el-button @click="dialog.Visible = false">取 消</el-button>
+				<el-button @click="dialog.Visible = false" :disabled="formdta.loading">取 消</el-button>
-				<el-button type="primary" @click="handleSubmit">确 定</el-button>
+				<el-button type="primary" @click="handleSubmit" :loading="formdta.loading">确 定</el-button>
 			</div>
 		</el-dialog>
 	</el-container>
@@ -456,6 +461,8 @@
 					Visible:false,
 				},
 				formdta:{
+					appname:'',
+					loading:false,
 					appid:'',
 					path:'',
 					share:'0',
@@ -467,7 +474,8 @@
 					eagle:0,
 					allowext:'',
 					notallowext:'',
-					charset:''
+					charset:'',
+					
 				},
 				newscreens:[],
 				newClassfiy:[],
@@ -490,7 +498,8 @@
 					charset:'utf8',
 					force:0
 				},
-				ImportDataVisible:false
+				ImportDataVisible:false,
+				getinfonumtimestatus:''
 			}
 		},
 		watch:{
@@ -560,6 +569,7 @@
 			handleSubmit(){
 				var self = this;
 				var filter = [];
+				self.formdta.loading = true;
 				for(var c in self.newscreens){
 					var citem = self.newscreens[c];
 					if(self.formdta.screen.indexOf(citem.key)>-1){
@@ -590,6 +600,7 @@
 					settingsubmit:true,
 					formhash:'{FORMHASH}',
 					appid:self.formdta.appid,
+					appname:self.formdta.appname,
 					getinfo:self.formdta.getinfo,
 					share:self.formdta.share,
 					download:self.formdta.download,
@@ -600,6 +611,13 @@
 				$.post(MOD_URL+'&op=library&operation=fetch',param,function(data){
 					self.dialog.Visible = false;
 					if(data.success){
+						for(var x in self.tableData){
+							if(self.tableData[x].appid == self.formdta.appid){
+								self.tableData[x].getinfo = self.formdta.getinfo;
+								self.tableData[x].appname = self.formdta.appname;
+								self.tableDataForEach();
+							}
+						}
 						self.$message({
 							type:'success',
 							message:'设置成功'
@@ -607,6 +625,7 @@
 					}else{
 						self.$message.error('设置失败');
 					}
+					self.formdta.loading = false;
 				},'json');
 			},
 			handleSetting(appid,title){
@@ -674,6 +693,7 @@
 						self.dialog.Visible = true;
 						self.formdta = {
 							appid:appid,
+							appname:data.data.appname,
 							path:showVal,
 							type:data.data.type,
 							getinfo:data.data.getinfo,
@@ -686,6 +706,7 @@
 							eagle:parseInt(data.data.type),
 							allowext:data.data.allowext,
 							notallowext:data.data.notallowext,
+							loading:false
 						};
 					}else{
 						self.$message.error('数据获取失败');
@@ -785,12 +806,10 @@
 							
 						}else{
 							param['path'] = self.catalogue.defaultsearch+'/'+node.data.label;
-							
 						}
 					}else{
 						param['path'] = self.catalogue.search;
 					}
-					
 				}else{
 					if(node.level > 0){
 						if(node.level > 1){
@@ -924,6 +943,8 @@
 							fdata['percent'] = 0;
 							fdata['connect'] = 1;
 							fdata['type'] = self.catalogue.type;
+							fdata['getinfonum'] = 0;
+							
 							self.tableData.push(fdata);
 						}
 						
@@ -948,10 +969,8 @@
 								index = i;
 							}
 						}
-						if(self.tableData[index]['time']){
-							clearInterval(self.tableData[index]['time']);
-						}
 						self.tableData.splice(index,1);
+						self.tableDataForEach();
 					}else{
 						self.$message.error('删除失败');
 					}
@@ -966,41 +985,63 @@
 						if(parseInt(self.tableData[i].state) == 1 || parseInt(self.tableData[i].state) == 2 || parseInt(self.tableData[i].state) == 3){
 							self.handleimplement(i,self.tableData[i].appid)
 						}
-						self.getinfonum(self.tableData[i]);
+						self.tableDataForEach();
 					}
 					self.$nextTick(function(){
 						self.TableSortable();
 					});
 				},'json');
 			},
-			getinfonum(item){
+			tableDataForEach(){
 				var self = this;
-				if(parseInt(item.state) == 4 && parseInt(item.type) == 1 && parseInt(item.getinfo) == 1 && parseInt(item.getinfonum)<parseInt(item.filenum)){
+				var isInterval = false;
-					var index = 0;
+				
 				for(var i in self.tableData){
-						if(self.tableData[i].appid == item.appid){
+					var item = self.tableData[i];
-							index = i;
+					if(parseInt(item.state) == 4 && parseInt(item.type) == 1 && parseInt(item.getinfo) == 1 && parseInt(item.getinfonum)<parseInt(item.filenum)){
+						isInterval = true;
+						break;
 					}
 				}
-					if(!self.tableData[index]['getinfotime']){
+				if(isInterval){
-						self.tableData[index]['getinfotime'] = '';
+					self.getinfonumtime();
+				}else{
+					if(self.getinfonumtimestatus){
+						clearInterval(self.getinfonumtimestatus);
 					}
-					this.getinfonumtime(index,item.appid);
 				}
 			},
-			getinfonumtime(index,appid){
+			getinfonumtime(){
 				var self = this;
-				self.tableData[index]['getinfotime'] = setInterval(function(){
+				self.getinfonumtimestatus = setInterval(function(){
-					$.post(MOD_URL+'&op=library&operation=getinfonum',{
+					$.get(MOD_URL+'&op=library&operation=getinfonum',function(data){
-						appid:appid
+						var status = true;
-					},function(data){
+						for(var i in self.tableData){
-						if(parseInt(self.tableData[index].getinfonum)==parseInt(self.tableData[index].filenum)){
+							for(var a in data.data){
-							clearInterval(self.tableData[index]['getinfotime']);
+								if(self.tableData[i].appid == a){
+									if(parseInt(data.data[a])>0){
+										self.tableData[i].getinfonum = data.data[a];
 									}else{
-							self.tableData[index].getinfonum = data.data.appid;
+										self.tableData[i].getinfonum = 0;
+									}
+								}
+							}
+						}
+						for(var x in self.tableData){
+							for(var t in data.data){
+								if(self.tableData[x].appid == t){
+									if(parseInt(self.tableData[x].filenum) != parseInt(data.data[t])){
+										status = false;
+										return false;
+									}
+								}
+							}
+						}
+						if(status){
+							clearInterval(self.getinfonumtimestatus);
 						}
 					},'json');
-				},8000)
+				},5000)
 				
 			},
 			handleRefresh(appid){
@@ -1116,6 +1157,12 @@
 			},
 			handleavatar(type) {//头像点击
 				switch(type){
+					case 'collection':
+						window.location.href = DZZSCRIPT + '?mod=collection';
+					break;
+					case 'orguser':
+						window.open(SITEURL+'admin.php?mod=orguser');
+					break;
 					case 'personal':
 						window.location.href = MOD_URL + '&op=user&do=personal';
 					break;
@@ -1144,7 +1191,7 @@
 								<span class="title">版本信息：</span><span class="mes">$_G[setting][version]</span>
 							</div>
 							<div class="aboutlist">
-								<span class="title">版权信息：</span><span class="mes">Powered By oaooa PicHome © 2020-2021 欧奥图文</span>
+								<span class="title">版权信息：</span><span class="mes">Powered By oaooa PicHome © 2020-2022 欧奥图文</span>
 							</div>
 							<div class="aboutlist">
 								<span class="title">网站地址：</span><span class="mes"><a class="address" href="https://oaooa.com/" target="_blank">oaooa.com</a></span>

dzz/pichome/template/pc/page/share.htm

@@ -711,7 +711,7 @@
 			},
 
 			handleView(){
-				window.open(SITEURL+this.imagesData.icondata);
+				window.open(this.imagesData.originalimg);
 			},
 			handleShare() {
 				var self = this;
@@ -863,7 +863,7 @@
 								<span class="title">版本信息：</span><span class="mes">Beat 1</span>
 							</div>
 							<div class="aboutlist">
-								<span class="title">版权信息：</span><span class="mes">Powered By oaooa PicHome © 2020-2021 欧奥图文</span>
+								<span class="title">版权信息：</span><span class="mes">Powered By oaooa PicHome © 2020-2022 欧奥图文</span>
 							</div>
 							<div class="aboutlist">
 								<span class="title">网站地址：</span><span class="mes"><a class="address" href="https://oaooa.com/" target="_blank">oaooa.com</a></span>

install/data/install_data.sql

@@ -47,7 +47,12 @@ INSERT INTO dzz_hooks (id, app_market_id, `name`, description, `type`, update_ti
 (21, 0, 'pichomegetinfo', ' ', 1, 0, 'dzz\\imageColor\\classes\\getcolor', 1, 0),
 (22, 0, 'pichomegetinfo', ' ', 1, 0, 'dzz\\ffmpeg\\classes\\info', 1, 0),
 (23, 0, 'getpichomethumb', ' ', 1, 0, 'dzz\\billfish\\classes\\getpichomethumb', 1, 0),
-(24, 0, 'pichomevappdelete', ' ', 1, 0, 'dzz\\billfish\\classes\\pichomevappdelete', 1, 0);
+(24, 0, 'pichomevappdelete', ' ', 1, 0, 'dzz\\billfish\\classes\\pichomevappdelete', 1, 0),
+(25, 0, 'pichomedatadeleteafter', ' ', 1, 0, 'dzz\\eagle\\classes\\deleteafter', 1, 0),
+(26, 0, 'pichomevappdelete', ' ', 1, 0, 'dzz\\eagle\\classes\\pichomevappdelete', 1, 0),
+(27, 0, 'delpichomefolderafter', ' ', 1, 0, 'dzz\\billfish\\classes\\delpichomefolderafter', 1, 0),
+(28, 0, 'delpichomefolderafter', ' ', 1, 0, 'dzz\\eagle\\classes\\delpichomefolderafter', 1, 0),
+(29, 0, 'pichomedatadeleteafter', ' ', 1, 0, 'dzz\\local\\classes\\deleteafter', 1, 0);