github
/
EasyImages2.0
mirror of https://github.com/icret/EasyImages2.0
1
0
Fork 0
Code Issues Releases Wiki Activity

fix

pull/18/head
icret 2019-06-15 00:11:01 +08:00
parent 82d25fdab3
commit ecef2272d8
3 changed files with 61 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
.idea/workspace.xml
View File

@ -2,10 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="b2ee2f11-40d4-43c6-9de2-9c41691ca848" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config.php" beforeDir="false" afterPath="$PROJECT_DIR$/config.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/file.php" beforeDir="false" afterPath="$PROJECT_DIR$/file.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/libs/function.php" beforeDir="false" afterPath="$PROJECT_DIR$/libs/function.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@ -23,8 +21,8 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/libs/WaterMask.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="133" column="67" selection-start-line="133" selection-start-column="67" selection-end-line="133" selection-end-column="67" />
<state relative-caret-position="442">
<caret line="76" column="22" lean-forward="true" selection-start-line="76" selection-start-column="22" selection-end-line="76" selection-end-column="22" />
</state>
</provider>
</entry>
@ -32,7 +30,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/file.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1918">
<state relative-caret-position="124">
<caret line="102" column="8" selection-start-line="102" selection-start-column="8" selection-end-line="104" selection-end-column="38" />
</state>
</provider>
@ -47,6 +45,15 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="416">
<caret line="59" column="30" selection-start-line="59" selection-start-column="30" selection-end-line="59" selection-end-column="30" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FindInProjectRecents">
@ -58,7 +65,14 @@
<find>.png</find>
<find>png</find>
<find>imgs</find>
<find>setWater</find>
<find>$def</find>
<find>127</find>
<find>compress</find>
<find>imgcompress_percent</find>
<find>res</find>
<find>imagecreatetruecolor</find>
<find>def</find>
</findStrings>
</component>
<component name="Git.Settings">
@ -73,11 +87,11 @@
<option value="$PROJECT_DIR$/libs/header.php" />
<option value="$PROJECT_DIR$/tinyfilemanager.php" />
<option value="$PROJECT_DIR$/index.php" />
<option value="$PROJECT_DIR$/config.php" />
<option value="$PROJECT_DIR$/libs/test.php" />
<option value="$PROJECT_DIR$/file.php" />
<option value="$PROJECT_DIR$/libs/function.php" />
<option value="$PROJECT_DIR$/README.md" />
<option value="$PROJECT_DIR$/config.php" />
<option value="$PROJECT_DIR$/file.php" />
<option value="$PROJECT_DIR$/libs/WaterMask.php" />
</list>
</option>
@ -87,9 +101,9 @@
<path value="$PROJECT_DIR$/../../php/php-7.1.13-nts" />
</include_path>
</component>
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="398" />
<option name="y" value="174" />
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="304" />
<option name="y" value="67" />
<option name="width" value="1400" />
<option name="height" value="1000" />
</component>
@ -110,6 +124,19 @@
<item name="EasyImages2.0" type="462c0819:PsiDirectoryNode" />
<item name="libs" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="EasyImages2.0" type="b2602c69:ProjectViewProjectNode" />
<item name="EasyImages2.0" type="462c0819:PsiDirectoryNode" />
<item name="libs" type="462c0819:PsiDirectoryNode" />
<item name="WaterMask.php" type="88303cf5:PhpFileNode" />
</path>
<path>
<item name="EasyImages2.0" type="b2602c69:ProjectViewProjectNode" />
<item name="EasyImages2.0" type="462c0819:PsiDirectoryNode" />
<item name="libs" type="462c0819:PsiDirectoryNode" />
<item name="WaterMask.php" type="88303cf5:PhpFileNode" />
<item name="Imgs" type="e2efd96b:PhpElementNode" />
</path>
</expand>
<select />
</subPane>
@ -166,12 +193,12 @@
<workItem from="1560164098979" duration="13000" />
<workItem from="1560444856509" duration="3460000" />
<workItem from="1560511153119" duration="2276000" />
<workItem from="1560513441936" duration="4727000" />
<workItem from="1560513441936" duration="8506000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="12603000" />
<option name="totallyTimeSpent" value="16382000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1066" extended-state="6" />
@ -182,7 +209,7 @@
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.16720258" />
<window_info anchor="bottom" id="Run" order="2" weight="0.16720258" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@ -204,13 +231,6 @@
<option name="version" value="1" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1612">
<caret line="70" column="33" selection-start-line="70" selection-start-column="33" selection-end-line="70" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="572">
@ -263,13 +283,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/file.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1918">
<caret line="102" column="8" selection-start-line="102" selection-start-column="8" selection-end-line="104" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/libs/function.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="338">
@ -277,10 +290,24 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="416">
<caret line="59" column="30" selection-start-line="59" selection-start-column="30" selection-end-line="59" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/file.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="124">
<caret line="102" column="8" selection-start-line="102" selection-start-column="8" selection-end-line="104" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/libs/WaterMask.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="133" column="67" selection-start-line="133" selection-start-column="67" selection-end-line="133" selection-end-column="67" />
<state relative-caret-position="442">
<caret line="76" column="22" lean-forward="true" selection-start-line="76" selection-start-column="22" selection-end-line="76" selection-end-column="22" />
</state>
</provider>
</entry>

2
config.php
View File

@ -68,7 +68,7 @@ $config = array(
'imgConvert' => '',
// 是否通过缩放来压缩，如果要保持源图比例，把参数$percent保持为1，范围 0.1-1
// 即使原比例压缩，也可大幅度缩小。如果缩小比例，则体积会更小。
'imgcompress_percent' => 0.95,
'compress' => 0.95,
//最大宽度
'maxWidth' => 10240,
// 最大高度

6
file.php
View File

@ -90,9 +90,9 @@ if ($handle->uploaded) {
echo json_encode($reJson,JSON_UNESCAPED_UNICODE);
}
// 利用 imagecreatefrom*压缩不太好用，不过可以预防病毒
if ($config['imgcompress_percent'] > 0 && $handle->file_dst_name_ext != 'gif') {
$percent = $config['imgcompress_percent']; //图片压缩比
// 利用 imagecreatefrom*压缩 同时避免设置水印后重复压缩
if ($config['compress'] > 0 && $handle->file_dst_name_ext != 'gif' && $config['watermark'] == 0) {
$percent = $config['compress']; //图片压缩比
list($width, $height) = getimagesize($handle->file_dst_pathname); //获取原图尺寸
//缩放尺寸
$newwidth = $width * $percent;