修复上传成功但是返回目录创建失败的提示
parent
0145ea9203
commit
82d25fdab3
|
@ -2,7 +2,10 @@
|
|||
<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$/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" />
|
||||
|
@ -17,23 +20,11 @@
|
|||
</component>
|
||||
<component name="FileEditorManager">
|
||||
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
||||
<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="465">
|
||||
<caret line="70" column="33" lean-forward="true" selection-start-line="70" selection-start-column="33" selection-end-line="70" selection-end-column="33" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/README.md">
|
||||
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
|
||||
<state split_layout="SPLIT">
|
||||
<first_editor relative-caret-position="428">
|
||||
<caret line="18" column="72" lean-forward="true" selection-start-line="18" selection-start-column="72" selection-end-line="18" selection-end-column="72" />
|
||||
</first_editor>
|
||||
<second_editor />
|
||||
<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>
|
||||
</provider>
|
||||
</entry>
|
||||
|
@ -41,15 +32,8 @@
|
|||
<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="-1950" />
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/index.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="572">
|
||||
<caret line="22" column="30" selection-start-line="22" selection-start-column="30" selection-end-line="22" selection-end-column="30" />
|
||||
<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>
|
||||
|
@ -57,48 +41,8 @@
|
|||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/libs/function.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="390">
|
||||
<caret line="15" column="36" selection-start-line="15" selection-start-column="36" selection-end-line="15" selection-end-column="36" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/tinyfilemanager.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="462">
|
||||
<caret line="1756" column="344" lean-forward="true" selection-start-line="1756" selection-start-column="344" selection-end-line="1756" selection-end-column="344" />
|
||||
<folding>
|
||||
<element signature="n#style#0;n#textarea#0;n#!!top" expanded="true" />
|
||||
<element signature="e#1#7#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/libs/footer.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1040">
|
||||
<caret line="39" column="180" selection-start-line="39" selection-start-column="180" selection-end-line="39" selection-end-column="180" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/check.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="26">
|
||||
<caret line="27" column="33" selection-start-line="27" selection-start-column="33" selection-end-line="27" selection-end-column="33" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/libs/header.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="517">
|
||||
<caret line="28" column="88" selection-start-line="28" selection-start-column="85" selection-end-line="28" selection-end-column="88" />
|
||||
<state relative-caret-position="338">
|
||||
<caret line="49" column="8" lean-forward="true" selection-start-line="49" selection-start-column="8" selection-end-line="49" selection-end-column="9" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
@ -111,6 +55,10 @@
|
|||
<find><img</find>
|
||||
<find>class="custom-control-input"</find>
|
||||
<find>custom-control custom-checkbox</find>
|
||||
<find>.png</find>
|
||||
<find>png</find>
|
||||
<find>imgs</find>
|
||||
<find>imagecreatetruecolor</find>
|
||||
</findStrings>
|
||||
</component>
|
||||
<component name="Git.Settings">
|
||||
|
@ -126,13 +74,22 @@
|
|||
<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$/libs/WaterMask.php" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectFrameBounds" extendedState="6">
|
||||
<option name="x" value="170" />
|
||||
<option name="y" value="258" />
|
||||
<component name="PhpWorkspaceProjectConfiguration" interpreter_name="PHP">
|
||||
<include_path>
|
||||
<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" />
|
||||
<option name="width" value="1400" />
|
||||
<option name="height" value="1000" />
|
||||
</component>
|
||||
|
@ -141,7 +98,6 @@
|
|||
<foldersAlwaysOnTop value="true" />
|
||||
</navigator>
|
||||
<panes>
|
||||
<pane id="Scope" />
|
||||
<pane id="ProjectPane">
|
||||
<subPane>
|
||||
<expand>
|
||||
|
@ -158,12 +114,14 @@
|
|||
<select />
|
||||
</subPane>
|
||||
</pane>
|
||||
<pane id="Scope" />
|
||||
</panes>
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
|
||||
<property name="WebServerToolWindowFactoryState" value="false" />
|
||||
<property name="last_opened_file_path" value="C:/Program Files/Git/bin/git.exe" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../php/php-7.1.13-nts/ext" />
|
||||
<property name="nodejs_package_manager_path" value="npm" />
|
||||
<property name="settings.editor.selected.configurable" value="settings.github" />
|
||||
</component>
|
||||
<component name="RunDashboard">
|
||||
|
@ -178,6 +136,19 @@
|
|||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="RunManager" selected="PHP Script.test.php">
|
||||
<configuration name="WaterMask.php" type="JavascriptDebugType" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/EasyImages2.0/libs/WaterMask.php" useBuiltInWebServerPort="true">
|
||||
<method v="2" />
|
||||
</configuration>
|
||||
<configuration name="test.php" type="PhpLocalRunConfigurationType" factoryName="PHP Console" path="$PROJECT_DIR$/libs/test.php">
|
||||
<method v="2" />
|
||||
</configuration>
|
||||
<recent_temporary>
|
||||
<list>
|
||||
<item itemvalue="JavaScript Debug.WaterMask.php" />
|
||||
</list>
|
||||
</recent_temporary>
|
||||
</component>
|
||||
<component name="SvnConfiguration">
|
||||
<configuration />
|
||||
</component>
|
||||
|
@ -194,22 +165,24 @@
|
|||
<workItem from="1560142133412" duration="854000" />
|
||||
<workItem from="1560164098979" duration="13000" />
|
||||
<workItem from="1560444856509" duration="3460000" />
|
||||
<workItem from="1560511153119" duration="2276000" />
|
||||
<workItem from="1560513441936" duration="4727000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="5600000" />
|
||||
<option name="totallyTimeSpent" value="12603000" />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="-8" y="-8" width="1936" height="1066" extended-state="6" />
|
||||
<editor active="true" />
|
||||
<layout>
|
||||
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13539445" />
|
||||
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1380597" />
|
||||
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
||||
<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" />
|
||||
<window_info anchor="bottom" id="Run" order="2" visible="true" 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" />
|
||||
|
@ -219,6 +192,8 @@
|
|||
<window_info anchor="bottom" id="Version Control" order="9" />
|
||||
<window_info anchor="bottom" id="Terminal" order="10" />
|
||||
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" weight="0.32869378" />
|
||||
<window_info anchor="bottom" id="PHP-CGI Server" order="12" />
|
||||
<window_info anchor="bottom" id="调试" order="13" />
|
||||
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
||||
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
||||
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
||||
|
@ -229,22 +204,24 @@
|
|||
<option name="version" value="1" />
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<entry file="file://$PROJECT_DIR$/libs/header.php">
|
||||
<entry file="file://$PROJECT_DIR$/config.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="517">
|
||||
<caret line="28" column="88" selection-start-line="28" selection-start-column="85" selection-end-line="28" selection-end-column="88" />
|
||||
<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$/file.php">
|
||||
<entry file="file://$PROJECT_DIR$/index.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-1950" />
|
||||
<state relative-caret-position="572">
|
||||
<caret line="22" column="30" selection-start-line="22" selection-start-column="30" selection-end-line="22" selection-end-column="30" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/libs/function.php">
|
||||
<entry file="file://$PROJECT_DIR$/tinyfilemanager.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="390">
|
||||
<caret line="15" column="36" selection-start-line="15" selection-start-column="36" selection-end-line="15" selection-end-column="36" />
|
||||
<state relative-caret-position="47008">
|
||||
<caret line="1756" column="344" selection-start-line="1756" selection-start-column="344" selection-end-line="1756" selection-end-column="344" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
@ -257,45 +234,55 @@
|
|||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/check.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="26">
|
||||
<state relative-caret-position="702">
|
||||
<caret line="27" column="33" selection-start-line="27" selection-start-column="33" selection-end-line="27" selection-end-column="33" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/index.php">
|
||||
<entry file="file://$PROJECT_DIR$/libs/header.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="572">
|
||||
<caret line="22" column="30" selection-start-line="22" selection-start-column="30" selection-end-line="22" selection-end-column="30" />
|
||||
<state relative-caret-position="728">
|
||||
<caret line="28" column="88" selection-start-line="28" selection-start-column="85" selection-end-line="28" selection-end-column="88" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/config.php">
|
||||
<entry file="file://$PROJECT_DIR$/libs/test.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="465">
|
||||
<caret line="70" column="33" lean-forward="true" selection-start-line="70" selection-start-column="33" selection-end-line="70" selection-end-column="33" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/tinyfilemanager.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="462">
|
||||
<caret line="1756" column="344" lean-forward="true" selection-start-line="1756" selection-start-column="344" selection-end-line="1756" selection-end-column="344" />
|
||||
<folding>
|
||||
<element signature="n#style#0;n#textarea#0;n#!!top" expanded="true" />
|
||||
<element signature="e#1#7#0" expanded="true" />
|
||||
</folding>
|
||||
<state relative-caret-position="156">
|
||||
<caret line="6" selection-start-line="6" selection-end-line="9" selection-end-column="26" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/README.md">
|
||||
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
|
||||
<state split_layout="SPLIT">
|
||||
<first_editor relative-caret-position="428">
|
||||
<caret line="18" column="72" lean-forward="true" selection-start-line="18" selection-start-column="72" selection-end-line="18" selection-end-column="72" />
|
||||
<first_editor relative-caret-position="338">
|
||||
<caret line="107" column="19" selection-start-line="107" selection-start-column="19" selection-end-line="107" selection-end-column="19" />
|
||||
</first_editor>
|
||||
<second_editor />
|
||||
</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">
|
||||
<caret line="49" column="8" lean-forward="true" selection-start-line="49" selection-start-column="8" selection-end-line="49" selection-end-column="9" />
|
||||
</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>
|
||||
</provider>
|
||||
</entry>
|
||||
</component>
|
||||
</project>
|
|
@ -104,6 +104,8 @@ header('Access-Control-Allow-Origin:https://A.com/')
|
|||
- 修复在centos64 lnmp1.6 php7.1环境下的图片信息读取问题
|
||||
- 修复安装时候的权限
|
||||
- 修复管理无法多选的问题
|
||||
- 修复上传透明png背景变为纯黑的问题
|
||||
- 修复成功上传图片但前端无法获取链接
|
||||
- 更改管理路径
|
||||
- 更改上传路径,文件名更短
|
||||
- 更改上传显示方式为缩略图
|
||||
|
|
10
file.php
10
file.php
|
@ -98,30 +98,32 @@ if ($handle->uploaded) {
|
|||
$newwidth = $width * $percent;
|
||||
$newheight = $height * $percent;
|
||||
|
||||
// 创建一个透明的背景图片
|
||||
$dst_im = imagecreatetruecolor($newwidth, $newheight);
|
||||
$bg = imagecolorallocatealpha($dst_im, 0, 0, 0, 127);
|
||||
imagefill($dst_im, 0, 0, $bg);
|
||||
imagesavealpha($dst_im, true);
|
||||
|
||||
if ($handle->file_dst_name_ext === 'jpg') {
|
||||
$src_im = imagecreatefromjpeg($handle->file_dst_pathname);
|
||||
$dst_im = imagecreatetruecolor($newwidth, $newheight);
|
||||
imagecopyresized($dst_im, $src_im, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
|
||||
imagejpeg($dst_im, $handle->file_dst_pathname); //输出压缩后的图片
|
||||
imagedestroy($dst_im);
|
||||
imagedestroy($src_im);
|
||||
} elseif ($handle->file_dst_name_ext === 'png') {
|
||||
$src_im = imagecreatefrompng($handle->file_dst_pathname);
|
||||
$dst_im = imagecreatetruecolor($newwidth, $newheight);
|
||||
imagecopyresized($dst_im, $src_im, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
|
||||
imagepng($dst_im, $handle->file_dst_pathname); //输出压缩后的图片
|
||||
imagedestroy($dst_im);
|
||||
imagedestroy($src_im);
|
||||
} elseif ($handle->file_dst_name_ext === 'gif') {
|
||||
$src_im = imagecreatefromgif($handle->file_dst_pathname);
|
||||
$dst_im = imagecreatetruecolor($newwidth, $newheight);
|
||||
imagecopyresized($dst_im, $src_im, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
|
||||
imagegif($dst_im, $handle->file_dst_pathname); //输出压缩后的图片
|
||||
imagedestroy($dst_im);
|
||||
imagedestroy($src_im);
|
||||
} elseif ($handle->file_dst_name_ext === 'wbmp') {
|
||||
$src_im = imagecreatefromwbmp($handle->file_dst_pathname);
|
||||
$dst_im = imagecreatetruecolor($newwidth, $newheight);
|
||||
imagecopyresized($dst_im, $src_im, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
|
||||
imagewbmp($dst_im, $handle->file_dst_pathname); //输出压缩后的图片
|
||||
imagedestroy($dst_im);
|
||||
|
|
|
@ -47,11 +47,11 @@ function config_path(){
|
|||
$img_path = $config['path'].date('Y').'/'.date('m').'/'.date('d');
|
||||
|
||||
if (!is_dir($img_path)){
|
||||
mkdir($img_path,0755,true);
|
||||
@mkdir($img_path,0755,true);
|
||||
}
|
||||
|
||||
if (!is_writable($img_path)){
|
||||
chmod($img_path,0755);
|
||||
@chmod($img_path,0755);
|
||||
}
|
||||
|
||||
return $img_path.'/';
|
||||
|
|
Loading…
Reference in New Issue