diff --git a/.gitignore b/.gitignore
index 5643d51c..3549add5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,10 @@
.DS_Store
-src/data/tplcache/
+src/data/tplcache/*.inc
+src/data/tplcache/*.txt
src/data/sessions*
-src/data/cache/
+src/data/cache/*.inc
+src/data/cache/*.dat
+src/data/cache/*/
src/data/common.inc.php
src/data/config.cache.bak.php
src/data/config.cache.inc.php
@@ -14,7 +17,6 @@ src/uploads/allimg/*
src/.txt
src/data/enums/
src/index.html
-src/data/admin/
src/data/module/
src/uploads/*.php
src/data/time.lock.inc
diff --git a/dedebiz b/dedebiz
index 55ada914..bc7df73c 100755
--- a/dedebiz
+++ b/dedebiz
@@ -310,7 +310,7 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
$fp = fopen($workDir."/install/common.inc.php","r");
$configStr1 = fread($fp,filesize($workDir."/install/common.inc.php"));
fclose($fp);
- @chmod($workDir."/../data",0777);
+ @chmod($workDir."/data",0777);
$dbtype = "sqlite";
$dbhost = "";
$dbname = "DedeBIZ";
@@ -319,6 +319,8 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
$dbprefix = "dede_";
$dblang = "utf8";
+ mkdir($workDir.'/data/tplcache', 0777);
+
//common.inc.php
$configStr1 = str_replace("~dbtype~",$dbtype,$configStr1);
$configStr1 = str_replace("~dbhost~",$dbhost,$configStr1);
@@ -348,11 +350,11 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
$configStr2 = str_replace("~webname~",$webname,$configStr2);
$configStr2 = str_replace("~adminmail~",$adminmail,$configStr2);
- $fp = fopen($workDir.'/../data/config.cache.inc.php','w');
+ $fp = fopen($workDir.'/data/config.cache.inc.php','w');
fwrite($fp,$configStr2);
fclose($fp);
- $fp = fopen($workDir.'/../data/config.cache.bak.php','w');
+ $fp = fopen($workDir.'/data/config.cache.bak.php','w');
fwrite($fp,$configStr2);
fclose($fp);
@@ -462,6 +464,10 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
if (phpversion() < "5.4") {
die("DedeBIZ:command web server not support\n\n");
}
+
+ // 写入安装程序锁
+ file_put_contents($workDir.'/install/install_lock.txt', 'ok');
+
echo "Start Dev Server For DedeBIZ\n\r";
echo "Open http://localhost:8088\n\r";
passthru(PHP_BINARY . ' -S localhost:8088 -t' . escapeshellarg('./'));
diff --git a/src/admin/dialog/select_mimages.php b/src/admin/dialog/select_mimages.php
index 58a49351..b03b02ec 100644
--- a/src/admin/dialog/select_mimages.php
+++ b/src/admin/dialog/select_mimages.php
@@ -74,11 +74,19 @@ button+button{margin-left:10px}
el.setAttribute('data-num',i);
});
}
+ function isFileImage(file) {
+ return file && file['type'].split('/')[0] === 'image';
+ }
function addList(files){
var files_sum = files.length;
var vDom = document.createDocumentFragment();
for(let i=0;i
+
+
+
+
\ No newline at end of file
diff --git a/src/data/admin/quickmenu.txt b/src/data/admin/quickmenu.txt
new file mode 100644
index 00000000..ae9bcb91
--- /dev/null
+++ b/src/data/admin/quickmenu.txt
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/src/data/admin/source.txt b/src/data/admin/source.txt
new file mode 100644
index 00000000..03836d53
--- /dev/null
+++ b/src/data/admin/source.txt
@@ -0,0 +1,4 @@
+DedeBIZ
+今日头条
+微信公众号
+百家号
\ No newline at end of file
diff --git a/src/data/admin/ver.txt b/src/data/admin/ver.txt
new file mode 100644
index 00000000..9068a635
--- /dev/null
+++ b/src/data/admin/ver.txt
@@ -0,0 +1 @@
+20220305
\ No newline at end of file
diff --git a/src/data/admin/verifies.txt b/src/data/admin/verifies.txt
new file mode 100644
index 00000000..e2983bed
--- /dev/null
+++ b/src/data/admin/verifies.txt
@@ -0,0 +1 @@
+20201022
\ No newline at end of file
diff --git a/src/data/admin/writer.txt b/src/data/admin/writer.txt
new file mode 100644
index 00000000..99dc1179
--- /dev/null
+++ b/src/data/admin/writer.txt
@@ -0,0 +1 @@
+秩名,网络,消息
\ No newline at end of file
diff --git a/src/data/cache/index.html b/src/data/cache/index.html
new file mode 100644
index 00000000..0d2ecd7f
--- /dev/null
+++ b/src/data/cache/index.html
@@ -0,0 +1 @@
+dir
diff --git a/src/data/tplcache/index.html b/src/data/tplcache/index.html
new file mode 100644
index 00000000..87245193
--- /dev/null
+++ b/src/data/tplcache/index.html
@@ -0,0 +1 @@
+dir
\ No newline at end of file
diff --git a/src/system/database/dedesqlite.class.php b/src/system/database/dedesqlite.class.php
index 80a1d48e..cde6874a 100755
--- a/src/system/database/dedesqlite.class.php
+++ b/src/system/database/dedesqlite.class.php
@@ -129,14 +129,13 @@ class DedeSqlite
//为了防止采集等需要较长运行时间的程序超时,在运行这类程序时设置系统等待和交互时间
function SetLongLink()
{
- @mysqli_query("SET interactive_timeout=3600, wait_timeout=3600 ;", $this->linkID);
+ // @mysqli_query("SET interactive_timeout=3600, wait_timeout=3600 ;", $this->linkID);
}
//获得错误描述
function GetError()
{
- $str = mysqli_error($this->linkID);
- return $str;
+ return $this->linkID->lastErrorMsg();
}
//关闭数据库