From 60cbb3846e2a518c77662a113e24f773b6e881ae Mon Sep 17 00:00:00 2001
From: tianya <tianya@benshar.com>
Date: Wed, 30 Mar 2022 21:18:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=9B=BE=E7=89=87=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/album_add.php                 | 13 -------
 src/admin/album_edit.php                | 13 -------
 src/admin/archives_add.php              | 14 --------
 src/admin/archives_do.php               | 27 +++++++++++++++
 src/admin/archives_edit.php             | 14 --------
 src/admin/archives_sg_add.php           | 14 --------
 src/admin/archives_sg_edit.php          | 14 --------
 src/admin/article_add.php               | 16 +--------
 src/admin/article_edit.php              | 14 --------
 src/admin/js/main.js                    | 46 +++++++++++++++++++++----
 src/admin/soft_add.php                  | 13 -------
 src/admin/soft_edit.php                 | 13 -------
 src/admin/spec_add.php                  | 13 -------
 src/admin/spec_edit.php                 | 13 -------
 src/admin/templets/album_add.htm        |  4 ++-
 src/admin/templets/album_edit.htm       |  4 ++-
 src/admin/templets/archives_add.htm     |  4 ++-
 src/admin/templets/archives_edit.htm    |  4 ++-
 src/admin/templets/archives_sg_add.htm  |  4 ++-
 src/admin/templets/archives_sg_edit.htm |  4 ++-
 src/admin/templets/article_add.htm      |  4 ++-
 src/admin/templets/article_edit.htm     |  4 ++-
 src/admin/templets/soft_add.htm         |  4 ++-
 src/admin/templets/soft_edit.htm        |  4 ++-
 src/admin/templets/spec_add.htm         |  4 ++-
 src/admin/templets/spec_edit.htm        |  4 ++-
 26 files changed, 103 insertions(+), 182 deletions(-)

diff --git a/src/admin/album_add.php b/src/admin/album_add.php
index 27dba502..0487874a 100644
--- a/src/admin/album_add.php
+++ b/src/admin/album_add.php
@@ -95,19 +95,6 @@ else if ($dopost == 'save') {
     //处理上传的缩略图
     if (empty($ddisremote)) $ddisremote = 0;
     $litpic = GetDDImage('none', $picname, $ddisremote);
-    //处理新的缩略图上传
-    if ($litpic_b64 != "") {
-        $data = explode(',', $litpic_b64);
-        $ntime = time();
-        $savepath = $ddcfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
-        CreateDir($savepath);
-        $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
-        $fullUrl = $fullUrl.".png";
-        file_put_contents($cfg_basedir.$fullUrl, base64_decode($data[1]));
-        //加水印
-        WaterImg($cfg_basedir.$fullUrl, 'up');
-        $litpic = $fullUrl;
-    }
     //生成文档ID
     $arcID = GetIndexKey($arcrank, $typeid, $sortrank, $channelid, $senddate, $adminid);
     if (empty($arcID)) {
diff --git a/src/admin/album_edit.php b/src/admin/album_edit.php
index 9532bdb4..041d235a 100644
--- a/src/admin/album_edit.php
+++ b/src/admin/album_edit.php
@@ -112,19 +112,6 @@ else if ($dopost == 'save') {
         $ddisremote = 0;
     }
     $litpic = GetDDImage('none', $picname, $ddisremote);
-    //处理新的缩略图上传
-    if ($litpic_b64 != "") {
-        $data = explode(',', $litpic_b64);
-        $ntime = time();
-        $savepath = $ddcfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
-        CreateDir($savepath);
-        $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
-        $fullUrl = $fullUrl.".png";
-        file_put_contents($cfg_basedir.$fullUrl, base64_decode($data[1]));
-        //加水印
-        WaterImg($cfg_basedir.$fullUrl, 'up');
-        $litpic = $fullUrl;
-    }
     //分析body里的内容
     $body = AnalyseHtmlBody($body, $description, $litpic, $keywords, 'htmltext');
     //处理图片文档的自定义属性
diff --git a/src/admin/archives_add.php b/src/admin/archives_add.php
index 7c93355c..b4bdae85 100644
--- a/src/admin/archives_add.php
+++ b/src/admin/archives_add.php
@@ -46,7 +46,6 @@ else if ($dopost == 'save') {
     $flag = isset($flags) ? join(',', $flags) : '';
     $notpost = isset($notpost) && $notpost == 1 ? 1 : 0;
     if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(50, 200) : $cfg_arc_click);
-    if (empty($litpic_b64)) $litpic_b64 = '';
     if (empty($typeid2)) $typeid2 = 0;
     if (!isset($autokey)) $autokey = 0;
     if (!isset($remote)) $remote = 0;
@@ -97,19 +96,6 @@ else if ($dopost == 'save') {
         $ddisremote = 0;
     }
     $litpic = GetDDImage('none', $picname, $ddisremote);
-    //处理新的缩略图上传
-    if ($litpic_b64 != "") {
-        $data = explode(',', $litpic_b64);
-        $ntime = time();
-        $savepath = $ddcfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
-        CreateDir($savepath);
-        $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
-        $fullUrl = $fullUrl.".png";
-        file_put_contents($cfg_basedir.$fullUrl, base64_decode($data[1]));
-        //加水印
-        WaterImg($cfg_basedir.$fullUrl, 'up');
-        $litpic = $fullUrl;
-    }
     //生成文档ID
     $arcID = GetIndexKey($arcrank, $typeid, $sortrank, $channelid, $senddate, $adminid);
     if (empty($arcID)) {
diff --git a/src/admin/archives_do.php b/src/admin/archives_do.php
index f07be2af..4dc28451 100644
--- a/src/admin/archives_do.php
+++ b/src/admin/archives_do.php
@@ -34,6 +34,33 @@ if ($dopost == 'editArchives') {
     if ($gurl == '') $gurl = 'article_edit.php';
     header("location:{$gurl}?aid=$aid");
     exit();
+} else if($dopost == 'upload_base64_image') {
+    if ($litpic_b64 != "") {
+        $data = explode(',', $litpic_b64);
+        $ntime = time();
+        $savepath = $ddcfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
+        CreateDir($savepath);
+        $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
+        $fullUrl = $fullUrl.".png";
+        file_put_contents($cfg_basedir.$fullUrl, base64_decode($data[1]));
+        //加水印
+        WaterImg($cfg_basedir.$fullUrl, 'up');
+        $litpic = $fullUrl;
+        $result = array(
+            "code" => 200,
+            "data" => array(
+                'image_url' => $litpic,
+            ),
+        );
+        echo json_encode($result);
+    } else {
+        $result = array(
+            "code" => -1,
+            "msg" => 'no image',
+        );
+        echo json_encode($result);
+    }
+    exit();
 }
 /*--------------------------
 //浏览文档
diff --git a/src/admin/archives_edit.php b/src/admin/archives_edit.php
index 6b231b9b..2d55eeb1 100644
--- a/src/admin/archives_edit.php
+++ b/src/admin/archives_edit.php
@@ -49,7 +49,6 @@ else if ($dopost == 'save') {
     require_once(DEDEINC.'/libraries/oxwindow.class.php');
     $flag = isset($flags) ? join(',', $flags) : '';
     $notpost = isset($notpost) && $notpost == 1 ? 1 : 0;
-    if (empty($litpic_b64)) $litpic_b64 = '';
     if (empty($typeid2)) $typeid2 = 0;
     if (!isset($autokey)) $autokey = 0;
     if (!isset($remote)) $remote = 0;
@@ -94,19 +93,6 @@ else if ($dopost == 'save') {
     //处理上传的缩略图
     if (empty($ddisremote)) $ddisremote = 0;
     $litpic = GetDDImage('none', $picname, $ddisremote);
-    //处理新的缩略图上传
-    if ($litpic_b64 != "") {
-        $data = explode(',', $litpic_b64);
-        $ntime = time();
-        $savepath = $ddcfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
-        CreateDir($savepath);
-        $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
-        $fullUrl = $fullUrl.".png";
-        file_put_contents($cfg_basedir.$fullUrl, base64_decode($data[1]));
-        //加水印
-        WaterImg($cfg_basedir.$fullUrl, 'up');
-        $litpic = $fullUrl;
-    }
     //分析处理附加表数据
     $inadd_f = '';
     $inadd_v = '';
diff --git a/src/admin/archives_sg_add.php b/src/admin/archives_sg_add.php
index e4cb83ac..f821082b 100644
--- a/src/admin/archives_sg_add.php
+++ b/src/admin/archives_sg_add.php
@@ -62,7 +62,6 @@ else if ($dopost == 'save') {
     if (empty($flags)) $flag = '';
     else $flag = join(',', $flags);
     $senddate = time();
-    if (empty($litpic_b64)) $litpic_b64 = '';
     $title = cn_substrR($title, $cfg_title_maxlen);
     $isremote  = 0;
     $serviterm = empty($serviterm) ? "" : $serviterm;
@@ -71,19 +70,6 @@ else if ($dopost == 'save') {
     $userip = GetIP();
     if (empty($ddisremote)) $ddisremote = 0;
     $litpic = GetDDImage('none', $picname, $ddisremote);
-    //处理新的缩略图上传
-    if ($litpic_b64 != "") {
-        $data = explode(',', $litpic_b64);
-        $ntime = time();
-        $savepath = $ddcfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
-        CreateDir($savepath);
-        $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
-        $fullUrl = $fullUrl.".png";
-        file_put_contents($cfg_basedir.$fullUrl, base64_decode($data[1]));
-        //加水印
-        WaterImg($cfg_basedir.$fullUrl, 'up');
-        $litpic = $fullUrl;
-    }
     //生成文档ID
     $arcID = GetIndexKey($arcrank, $typeid, $senddate, $channelid, $senddate, $adminid);
     if (empty($arcID)) {
diff --git a/src/admin/archives_sg_edit.php b/src/admin/archives_sg_edit.php
index 7e6a1d61..a11af00b 100644
--- a/src/admin/archives_sg_edit.php
+++ b/src/admin/archives_sg_edit.php
@@ -64,25 +64,11 @@ else if ($dopost == 'save') {
     $title = cn_substrR($title, $cfg_title_maxlen);
     $isremote  = 0;
     $serviterm = empty($serviterm) ? "" : $serviterm;
-    if (empty($litpic_b64)) $litpic_b64 = '';
     if (!TestPurview('a_Check,a_AccCheck,a_MyCheck')) $arcrank = -1;
     $adminid = $cuserLogin->getUserID();
     //处理上传的缩略图
     if (empty($ddisremote)) $ddisremote = 0;
     $litpic = GetDDImage('none', $picname, $ddisremote);
-    //处理新的缩略图上传
-    if ($litpic_b64 != "") {
-        $data = explode(',', $litpic_b64);
-        $ntime = time();
-        $savepath = $ddcfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
-        CreateDir($savepath);
-        $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
-        $fullUrl = $fullUrl.".png";
-        file_put_contents($cfg_basedir.$fullUrl, base64_decode($data[1]));
-        //加水印
-        WaterImg($cfg_basedir.$fullUrl, 'up');
-        $litpic = $fullUrl;
-    }
     //分析处理附加表数据
     $inadd_f = '';
     $inadd_v = '';
diff --git a/src/admin/article_add.php b/src/admin/article_add.php
index eba7ba9b..a5a3ce55 100644
--- a/src/admin/article_add.php
+++ b/src/admin/article_add.php
@@ -22,14 +22,13 @@ if ($dopost != 'save') {
     ClearMyAddon();
     $channelid = empty($channelid) ? 0 : intval($channelid);
     $cid = empty($cid) ? 0 : intval($cid);
-    if (empty($litpic_b64)) $litpic_b64 = '';
     if (empty($geturl)) $geturl = '';
     $keywords = $writer = $source = $body = $description = $title = '';
     //采集单个网页
     if (preg_match("#^http:\/\/#", $geturl)) {
         require_once(DEDEADMIN."/inc/inc_coonepage.php");
         $redatas = CoOnePage($geturl);
-        extract($redatas);
+        extract((array)$redatas);
     }
     //获得频道模型ID
     if ($cid > 0 && $channelid == 0) {
@@ -105,19 +104,6 @@ else if ($dopost == 'save') {
         $ddisremote = 0;
     }
     $litpic = GetDDImage('none', $picname, $ddisremote);
-    //处理新的缩略图上传
-    if ($litpic_b64 != "") {
-        $data = explode(',', $litpic_b64);
-        $ntime = time();
-        $savepath = $ddcfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
-        CreateDir($savepath);
-        $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
-        $fullUrl = $fullUrl.".png";
-        file_put_contents($cfg_basedir.$fullUrl, base64_decode($data[1]));
-        //加水印
-        WaterImg($cfg_basedir.$fullUrl, 'up');
-        $litpic = $fullUrl;
-    }
     //生成文档ID
     $arcID = GetIndexKey($arcrank, $typeid, $sortrank, $channelid, $senddate, $adminid);
     if (empty($arcID)) {
diff --git a/src/admin/article_edit.php b/src/admin/article_edit.php
index 1d4d5809..80d7af87 100644
--- a/src/admin/article_edit.php
+++ b/src/admin/article_edit.php
@@ -61,7 +61,6 @@ else if ($dopost == 'save') {
     if (!isset($remote)) $remote = 0;
     if (!isset($dellink)) $dellink = 0;
     if (!isset($autolitpic)) $autolitpic = 0;
-    if (empty($litpic_b64)) $litpic_b64 = '';
     if (empty($typeid)) {
         ShowMsg("请指定文档的栏目", "-1");
         exit();
@@ -133,19 +132,6 @@ else if ($dopost == 'save') {
             }
         }
     }
-    //处理新的缩略图上传
-    if ($litpic_b64 != "") {
-        $data = explode(',', $litpic_b64);
-        $ntime = time();
-        $savepath = $ddcfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
-        CreateDir($savepath);
-        $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
-        $fullUrl = $fullUrl.".png";
-        file_put_contents($cfg_basedir.$fullUrl, base64_decode($data[1]));
-        //加水印
-        WaterImg($cfg_basedir.$fullUrl, 'up');
-        $litpic = $fullUrl;
-    }
     //处理图片文档的自定义属性
     if ($litpic != '' && !preg_match("#p#", $flag)) {
         $flag = ($flag == '' ? 'p' : $flag.',p');
diff --git a/src/admin/js/main.js b/src/admin/js/main.js
index 45b0cd21..9d664f9c 100644
--- a/src/admin/js/main.js
+++ b/src/admin/js/main.js
@@ -642,8 +642,8 @@ function ShowMsg(content, ...args) {
 		}
 	}
 
-	footer = footer.replace("~modalID~", modalID);
-	content = content.replace("~modalID~", modalID);
+	footer = footer.replaceAll("~modalID~", modalID);
+	content = content.replaceAll("~modalID~", modalID);
 
 	var modal = `<div id="GKModal${modalID}" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="GKModalLabel${modalID}" aria-hidden="true">
 <div class="modal-dialog" role="document">
@@ -691,7 +691,6 @@ var optCropper = {
 			.toDataURL();
 		litpicImg = dataUrl;
 		$("#litPic").attr("src", litpicImg);
-		$("#litpic_b64").val(litpicImg);
 	},
 	aspectRatio: 4 / 3,
 	// 拖动截取缩略图后，截取的缩略图更新到imageItems中
@@ -719,18 +718,46 @@ function setAspectRatio(ar) {
 	$("#cropImg" + mdlCropperID).cropper('destroy').cropper(opts);
 }
 
+function okImage(modalID) {
+	uploadImage(litpicImg);
+	$("#litPic").attr("src", litpicImg);
+	CloseModal('GKModal' + modalID);
+}
+
 function useDefault(modalID) {
-	$("#litpic_b64").val(litpicImgSrc);
+	uploadImage(litpicImgSrc);
 	$("#litPic").attr("src", litpicImgSrc);
 	CloseModal('GKModal' + modalID);
 }
 
+function uploadImage(litpicImgSrc) {
+    const formData = new FormData()
+    formData.append('litpic_b64', litpicImgSrc);
+    fetch('archives_do.php?dopost=upload_base64_image', {
+        method: 'POST',
+        body: formData
+    })
+    .then(r => {
+        if (r.ok) {
+            return r.json()
+        }
+        throw new Error(errMsg);
+    })
+    .then(d => {
+		if (d.code == 200) {
+			$("#picname").val(d.data.image_url);
+		}
+    }).catch((error) => {
+        alert("上传缩略图错误");
+    });
+}
+
 $(document).ready(function () {
 
 	$("#btnClearAll").click(function (event) {
 		litpicImgSrc = "";
 		litpicImg = "";
-		$("#litpic_b64").val(litpicImg);
+		$("#picname").val(litpicImg);
 		$("#litPic").attr("src", "../../static/web/img/defaultpic.jpg");
 	})
 
@@ -748,7 +775,12 @@ $(document).ready(function () {
 			reader.onload = (function (theFile) {
 				return function (e) {
 					litpicImgSrc = e.target.result;
-					SetThumb(litpicImgSrc);
+					if (cfg_uplitpic_cut=='Y') {
+						SetThumb(litpicImgSrc);
+					} else {
+						uploadImage(litpicImgSrc);
+						$("#litPic").attr("src", litpicImgSrc);
+					}
 				};
 			})(f);
 			reader.readAsDataURL(f);
@@ -759,7 +791,7 @@ $(document).ready(function () {
 	// 截取缩略图
 	function SetThumb(srcURL) {
 		var footer =
-			"<p><a href='javascript:useDefault(\"~modalID~\");' class='btn btn-success'>使用原图</a> <a href='?' class='btn btn-success' data-dismiss='modal' aria-label='Close'>确定</a></p>";
+			"<p><a href='javascript:useDefault(\"~modalID~\");' class='btn btn-success'>使用原图</a> <a href='javascript:okImage(\"~modalID~\")' class='btn btn-success'>确定</a></p>";
 		var optButton = `<p><div class="form-group">
 			  <label for="aspectRatio">比例</label>
 			  <select class="form-control" id="aspectRatio" onchange="setAspectRatio(this.selectedIndex)">
diff --git a/src/admin/soft_add.php b/src/admin/soft_add.php
index b5850bb6..1274d4c5 100644
--- a/src/admin/soft_add.php
+++ b/src/admin/soft_add.php
@@ -94,19 +94,6 @@ else if ($dopost == 'save') {
         $ddisremote = 0;
     }
     $litpic = GetDDImage('none', $picname, $ddisremote);
-    //处理新的缩略图上传
-    if ($litpic_b64 != "") {
-        $data = explode(',', $litpic_b64);
-        $ntime = time();
-        $savepath = $ddcfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
-        CreateDir($savepath);
-        $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
-        $fullUrl = $fullUrl.".png";
-        file_put_contents($cfg_basedir.$fullUrl, base64_decode($data[1]));
-        //加水印
-        WaterImg($cfg_basedir.$fullUrl, 'up');
-        $litpic = $fullUrl;
-    }
     //生成文档ID
     $arcID = GetIndexKey($arcrank, $typeid, $sortrank, $channelid, $senddate, $adminid);
     if (empty($arcID)) {
diff --git a/src/admin/soft_edit.php b/src/admin/soft_edit.php
index f2b92792..e88244a5 100644
--- a/src/admin/soft_edit.php
+++ b/src/admin/soft_edit.php
@@ -134,19 +134,6 @@ else if ($dopost == 'save') {
         $ddisremote = 0;
     }
     $litpic = GetDDImage('litpic', $picname, $ddisremote);
-    //处理新的缩略图上传
-    if ($litpic_b64 != "") {
-        $data = explode(',', $litpic_b64);
-        $ntime = time();
-        $savepath = $ddcfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
-        CreateDir($savepath);
-        $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
-        $fullUrl = $fullUrl.".png";
-        file_put_contents($cfg_basedir.$fullUrl, base64_decode($data[1]));
-        //加水印
-        WaterImg($cfg_basedir.$fullUrl, 'up');
-        $litpic = $fullUrl;
-    }
     //分析处理附加表数据
     $inadd_f = '';
     $inadd_v = '';
diff --git a/src/admin/spec_add.php b/src/admin/spec_add.php
index 8c9a46bd..7baf829a 100644
--- a/src/admin/spec_add.php
+++ b/src/admin/spec_add.php
@@ -68,19 +68,6 @@ else if ($dopost == 'save') {
         $ddisremote = 0;
     }
     $litpic = GetDDImage('none', $picname, $ddisremote);
-    //处理新的缩略图上传
-    if ($litpic_b64 != "") {
-        $data = explode(',', $litpic_b64);
-        $ntime = time();
-        $savepath = $ddcfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
-        CreateDir($savepath);
-        $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
-        $fullUrl = $fullUrl.".png";
-        file_put_contents($cfg_basedir.$fullUrl, base64_decode($data[1]));
-        //加水印
-        WaterImg($cfg_basedir.$fullUrl, 'up');
-        $litpic = $fullUrl;
-    }
     //生成文档ID
     $arcID = GetIndexKey($arcrank, $typeid, $sortrank, $channelid, $senddate, $adminid);
     if (empty($arcID)) {
diff --git a/src/admin/spec_edit.php b/src/admin/spec_edit.php
index fb4e96cc..07417faf 100644
--- a/src/admin/spec_edit.php
+++ b/src/admin/spec_edit.php
@@ -78,19 +78,6 @@ else if ($dopost == 'save') {
         $ddisremote = 0;
     }
     $litpic = GetDDImage('none', $picname, $ddisremote);
-    //处理新的缩略图上传
-    if ($litpic_b64 != "") {
-        $data = explode(',', $litpic_b64);
-        $ntime = time();
-        $savepath = $ddcfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
-        CreateDir($savepath);
-        $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
-        $fullUrl = $fullUrl.".png";
-        file_put_contents($cfg_basedir.$fullUrl, base64_decode($data[1]));
-        //加水印
-        WaterImg($cfg_basedir.$fullUrl, 'up');
-        $litpic = $fullUrl;
-    }
     //分析处理附加表数据
     $inadd_f = '';
     $inadd_v = '';
diff --git a/src/admin/templets/album_add.htm b/src/admin/templets/album_add.htm
index a9416da9..d3be2c06 100644
--- a/src/admin/templets/album_add.htm
+++ b/src/admin/templets/album_add.htm
@@ -7,6 +7,9 @@
   <link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
   <link rel="stylesheet" href="../static/web/css/admin.css">
   <link rel="stylesheet" href="css/albumupload.css">
+  <script>
+    const cfg_uplitpic_cut = '<?php echo $cfg_uplitpic_cut;?>';
+  </script>
   <script language="javascript" src="../static/web/js/jquery.min.js"></script>
   <script src="../static/web/js/bootstrap.bundle.min.js"></script>
   <script type="text/javascript" src="../static/web/js/webajax.js"></script>
@@ -59,7 +62,6 @@ table{border-collapse:separate}
     <input type="hidden" name="imagebody" value="">
     <input type="hidden" name="dopost" value="save">
     <input name="maxwidth" type="hidden" id="maxwidth" size="10" value="<?php echo $cfg_album_width; ?>">
-    <input type="hidden" id="litpic_b64" name="litpic_b64" value="">
     <input type="hidden" id="albums" name="albums" value="">
     <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" class="mt-3">
       <tr>
diff --git a/src/admin/templets/album_edit.htm b/src/admin/templets/album_edit.htm
index e0fc4756..6bc2acb9 100644
--- a/src/admin/templets/album_edit.htm
+++ b/src/admin/templets/album_edit.htm
@@ -7,6 +7,9 @@
 <link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
 <link rel="stylesheet" href="../static/web/css/admin.css">
 <link rel="stylesheet" href="css/albumupload.css">
+<script>
+  const cfg_uplitpic_cut = '<?php echo $cfg_uplitpic_cut;?>';
+</script>
 <script language="javascript" src="../static/web/js/jquery.min.js"></script>
 <script type="text/javascript" src="../static/web/js/webajax.js"></script>
 <link rel="stylesheet" href="../static/web/css/daterangepicker.css">
@@ -60,7 +63,6 @@ table{border-collapse:separate}
   <input type="hidden" name="imagebody" value="">
   <input type="hidden" name="dopost" value="save">
   <input type="hidden" id="albums" name="albums" value="">
-  <input type="hidden" id="litpic_b64" name="litpic_b64" value="">
   <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" class="mt-3">
     <tr>
       <td width="65%" height="30"><img src="../static/web/img/book1.gif">&nbsp;<a href="catalog_do.php?cid=<?php echo $arcRow['typeid']?>&dopost=listArchives">图集列表</a> &gt; 修改图集</td>
diff --git a/src/admin/templets/archives_add.htm b/src/admin/templets/archives_add.htm
index 9858a1c5..0ce1eb6d 100644
--- a/src/admin/templets/archives_add.htm
+++ b/src/admin/templets/archives_add.htm
@@ -6,6 +6,9 @@
   <link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
   <link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
   <link rel="stylesheet" href="../static/web/css/admin.css">
+  <script>
+    const cfg_uplitpic_cut = '<?php echo $cfg_uplitpic_cut;?>';
+  </script>
   <script language="javascript" src="../static/web/js/jquery.min.js"></script>
   <script language="javascript" src="../static/web/js/webajax.js"></script>
   <link rel="stylesheet" href="../static/web/css/daterangepicker.css">
@@ -71,7 +74,6 @@ table{border-collapse:separate}
     <input type="hidden" name="channelid" value="<?php echo $channelid?>">
     <input type="hidden" name="cid" value="<?php echo $cid?>">
     <input type="hidden" name="dopost" value="save">
-    <input type="hidden" id="litpic_b64" name="litpic_b64" value="">
     <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="needset" style="border:1px solid #dee2e6;background:#ffffff;">
       <tr>
         <td height="26" colspan="4" class="bline">
diff --git a/src/admin/templets/archives_edit.htm b/src/admin/templets/archives_edit.htm
index d7839706..14271ce6 100644
--- a/src/admin/templets/archives_edit.htm
+++ b/src/admin/templets/archives_edit.htm
@@ -6,6 +6,9 @@
   <link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
   <link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
   <link rel="stylesheet" href="../static/web/css/admin.css">
+  <script>
+    const cfg_uplitpic_cut = '<?php echo $cfg_uplitpic_cut;?>';
+  </script>
   <script src="../static/web/js/jquery.min.js"></script>
   <script language="javascript" src="../static/web/js/webajax.js"></script>
   <script src="../static/web/js/bootstrap.bundle.min.js"></script>
@@ -67,7 +70,6 @@ table{border-collapse:separate}
     <input type="hidden" name="channelid" value="<?php echo $channelid?>">
     <input type="hidden" name="id" value="<?php echo $aid?>">
     <input type="hidden" name="dopost" value="save">
-    <input type="hidden" id="litpic_b64" name="litpic_b64" value="">
     <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="needset" style="border:1px solid #dee2e6;background:#ffffff;">
       <tr>
         <td height="26" class="bline">
diff --git a/src/admin/templets/archives_sg_add.htm b/src/admin/templets/archives_sg_add.htm
index 47479eaa..7cb99433 100644
--- a/src/admin/templets/archives_sg_add.htm
+++ b/src/admin/templets/archives_sg_add.htm
@@ -6,6 +6,9 @@
 <link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
 <link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
 <link rel="stylesheet" href="../static/web/css/admin.css">
+<script>
+  const cfg_uplitpic_cut = '<?php echo $cfg_uplitpic_cut;?>';
+</script>
 <script language="javascript" src="../static/web/js/jquery.min.js"></script>
 <script src="../static/web/js/bootstrap.bundle.min.js"></script>
 <script language="javascript" src="../static/web/js/webajax.js"></script>
@@ -60,7 +63,6 @@ table{border-collapse:separate}
   <input type="hidden" name="channelid" value="<?php echo $channelid?>">
   <input type="hidden" name="cid" value="<?php echo $cid?>">
   <input type="hidden" name="dopost" value="save">
-  <input type="hidden" id="litpic_b64" name="litpic_b64" value="">
   <table width="98%"  border="0" align="center" cellpadding="2" cellspacing="2" id="needset" style="border:1px solid #dee2e6;background:#ffffff;">
     <tr>
       <td height="26" colspan="4" class="bline">
diff --git a/src/admin/templets/archives_sg_edit.htm b/src/admin/templets/archives_sg_edit.htm
index 85596481..8f95fc71 100644
--- a/src/admin/templets/archives_sg_edit.htm
+++ b/src/admin/templets/archives_sg_edit.htm
@@ -6,6 +6,9 @@
 <link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
 <link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
 <link rel="stylesheet" href="../static/web/css/admin.css">
+<script>
+  const cfg_uplitpic_cut = '<?php echo $cfg_uplitpic_cut;?>';
+</script>
 <script language="javascript" src="../static/web/js/jquery.min.js"></script>
 <script language="javascript" src="../static/web/js/webajax.js"></script>
 <script type="text/javascript" src="../static/web/js/moment.min.js"></script>
@@ -57,7 +60,6 @@ table{border-collapse:separate}
 <input type="hidden" name="id" value="<?php echo $aid; ?>">
 <input type="hidden" name="sortrank" value="<?php echo $addRow['senddate']; ?>">
 <input type="hidden" name="dopost" value="save">
-<input type="hidden" id="litpic_b64" name="litpic_b64" value="">
   <table width="98%"  border="0" align="center" cellpadding="2" cellspacing="2" id="needset" style="border:1px solid #dee2e6;background:#ffffff;">
     <tr>
       <td height="26" class="bline">
diff --git a/src/admin/templets/article_add.htm b/src/admin/templets/article_add.htm
index 5e54eb65..5f7c528e 100644
--- a/src/admin/templets/article_add.htm
+++ b/src/admin/templets/article_add.htm
@@ -9,6 +9,9 @@
 <link rel="stylesheet" href="../static/web/css/daterangepicker.css">
 <link rel="stylesheet" href="../static/web/css/jquery.fileupload.css">
 <link rel="stylesheet" href="../static/web/css/cropper.min.css">
+<script>
+  const cfg_uplitpic_cut = '<?php echo $cfg_uplitpic_cut;?>';
+</script>
 <script src="../static/web/js/jquery.min.js"></script>
 <script src="../static/web/js/webajax.js"></script>
 <script src="../static/web/js/moment.min.js"></script>
@@ -81,7 +84,6 @@ table{border-collapse:separate}
   <form name="form1" action="article_add.php" enctype="multipart/form-data" method="post" onSubmit="return checkSubmit()">
     <input type="hidden" name="channelid" value="<?php echo $channelid?>">
     <input type="hidden" name="dopost" value="save">
-    <input type="hidden" id="litpic_b64" name="litpic_b64" value="">
     <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="needset" style="border:1px solid #dee2e6;background:#ffffff">
       <tr>
         <td height="26" colspan="5" class="bline">
diff --git a/src/admin/templets/article_edit.htm b/src/admin/templets/article_edit.htm
index b771d4a9..7d3b5362 100644
--- a/src/admin/templets/article_edit.htm
+++ b/src/admin/templets/article_edit.htm
@@ -9,6 +9,9 @@
 <link rel="stylesheet" href="../static/web/css/daterangepicker.css">
 <link rel="stylesheet" href="../static/web/css/jquery.fileupload.css">
 <link rel="stylesheet" href="../static/web/css/cropper.min.css">
+<script>
+  const cfg_uplitpic_cut = '<?php echo $cfg_uplitpic_cut;?>';
+</script>
 <script src="../static/web/js/jquery.min.js"></script>
 <script src="../static/web/js/webajax.js"></script>
 <script src="../static/web/js/moment.min.js"></script>
@@ -72,7 +75,6 @@ table{border-collapse:separate}
     <input type="hidden" name="dopost" value="save">
     <input type="hidden" name="channelid" value="<?php echo $channelid?>">
     <input type="hidden" name="id" value="<?php echo $aid?>">
-    <input type="hidden" id="litpic_b64" name="litpic_b64" value="">
     <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="needset" style="border:1px solid #dee2e6;background:#ffffff">
       <tr>
         <td height="26" colspan="2" class="bline">
diff --git a/src/admin/templets/soft_add.htm b/src/admin/templets/soft_add.htm
index c06541ad..209d7c84 100644
--- a/src/admin/templets/soft_add.htm
+++ b/src/admin/templets/soft_add.htm
@@ -6,6 +6,9 @@
   <link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
   <link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
   <link rel="stylesheet" href="../static/web/css/admin.css">
+  <script>
+    const cfg_uplitpic_cut = '<?php echo $cfg_uplitpic_cut;?>';
+  </script>
   <script language="javascript" src="../static/web/js/jquery.min.js"></script>
   <script src="../static/web/js/bootstrap.bundle.min.js"></script>
   <script language="javascript" src="../static/web/js/webajax.js"></script>
@@ -55,7 +58,6 @@ table{border-collapse:separate}
     <input type="hidden" name="dopost" value="save">
     <input type="hidden" name="channelid" value="<?php echo $channelid?>">
     <input type="hidden" name="cid" value="<?php echo $cid; ?>">
-    <input type="hidden" id="litpic_b64" name="litpic_b64" value="">
     <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" class="mt-3">
       <tr>
         <td width="60%" height="30"><img src="../static/web/img/book1.gif">&nbsp;<a href="catalog_do.php?cid=<?php echo $cid?>&channelid=<?php echo $channelid?>&dopost=listArchives">软件列表</a> &gt; 发布软件</td>
diff --git a/src/admin/templets/soft_edit.htm b/src/admin/templets/soft_edit.htm
index 3919a2f5..1dbd9441 100644
--- a/src/admin/templets/soft_edit.htm
+++ b/src/admin/templets/soft_edit.htm
@@ -6,6 +6,9 @@
   <link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
   <link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
   <link rel="stylesheet" href="../static/web/css/admin.css">
+  <script>
+    const cfg_uplitpic_cut = '<?php echo $cfg_uplitpic_cut;?>';
+  </script>
   <script language="javascript" src="../static/web/js/jquery.min.js"></script>
   <script src="../static/web/js/bootstrap.bundle.min.js"></script>
   <script language="javascript" src="../static/web/js/webajax.js"></script>
@@ -49,7 +52,6 @@ table{border-collapse:separate}
     <input type="hidden" name="dopost" value="save">
     <input type="hidden" name="channelid" value="<?php echo $channelid?>">
     <input type="hidden" name="id" value="<?php echo $aid?>">
-    <input type="hidden" id="litpic_b64" name="litpic_b64" value="">
     <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" class="mt-3">
       <tr>
         <td width="85%" height="30"><img src="../static/web/img/book1.gif">&nbsp;<a href="catalog_do.php?cid=<?php echo $arcRow['typeid']?>&dopost=listArchives"></a><a href="catalog_do.php?cid=<?php echo $arcRow["typeid"]?>&dopost=listArchives">软件列表</a> &gt; 修改软件</td>
diff --git a/src/admin/templets/spec_add.htm b/src/admin/templets/spec_add.htm
index 29ebe605..f2a55b2d 100644
--- a/src/admin/templets/spec_add.htm
+++ b/src/admin/templets/spec_add.htm
@@ -6,6 +6,9 @@
   <link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
   <link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
   <link rel="stylesheet" href="../static/web/css/admin.css">
+  <script>
+    const cfg_uplitpic_cut = '<?php echo $cfg_uplitpic_cut;?>';
+  </script>
   <script language="javascript" src="../static/web/js/jquery.min.js"></script>
   <script language="javascript" src="../static/web/js/webajax.js"></script>
   <link rel="stylesheet" href="../static/web/css/jquery.fileupload.css">
@@ -68,7 +71,6 @@ table{border-collapse:separate}
     <input type="hidden" name="channelid" value="<?php echo $channelid?>">
     <input type="hidden" name="arcrank" value="0">
     <input type="hidden" name="source" value="本站">
-    <input type="hidden" id="litpic_b64" name="litpic_b64" value="">
     <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" class="mt-3">
       <tr>
         <td width="85%" height="30"><img src="../static/web/img/book1.gif">&nbsp;<a href="content_s_list.php">专题列表</a><a href="catalog_do.php?cid=<?php echo $cid?>&channelid=<?php echo $channelid?>&dopost=listArchives"></a> &gt; 发布专题</td>
diff --git a/src/admin/templets/spec_edit.htm b/src/admin/templets/spec_edit.htm
index e0851b16..7c8521ea 100644
--- a/src/admin/templets/spec_edit.htm
+++ b/src/admin/templets/spec_edit.htm
@@ -6,6 +6,9 @@
   <link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
   <link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
   <link rel="stylesheet" href="../static/web/css/admin.css">
+  <script>
+    const cfg_uplitpic_cut = '<?php echo $cfg_uplitpic_cut;?>';
+  </script>
   <script language="javascript" src="../static/web/js/jquery.min.js"></script>
   <script language="javascript" src="../static/web/js/webajax.js"></script>
   <link rel="stylesheet" href="../static/web/css/daterangepicker.css">
@@ -75,7 +78,6 @@ table{border-collapse:separate}
     <input type="hidden" name="arcrank" value="<?php echo $arcRow['arcrank']?>">
     <input type="hidden" name="source" value="本站">
     <input type="hidden" name="dopost" value="save">
-    <input type="hidden" id="litpic_b64" name="litpic_b64" value="">
     <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" class="mt-3">
       <tr>
         <td width="85%" height="30"><img src="../static/web/img/book1.gif">&nbsp;<a href="content_s_list.php">专题列表</a><a href="catalog_do.php?cid=<?php echo $cid?>&channelid=<?php echo $channelid?>&dopost=listArchives"></a> &gt; 修改专题</td>