diff --git a/.gitignore b/.gitignore
index 3b0378bd..aa30057a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ src/data/time.lock.inc
 src/m/index.html
 src/uploads/userup
 src/uploads/20*
+src/data/mysqli_error_trace.inc
diff --git a/src/data/mysqli_error_trace.inc b/src/data/mysqli_error_trace.inc
deleted file mode 100644
index cbd4da27..00000000
--- a/src/data/mysqli_error_trace.inc
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php  exit();
-/*
-Page: /index.php?upcache=1
-Error: Table 'dedecms.dede_plus_mda_setting' doesn't exist <br />Error sql: <font color='red'>SELECT * FROM `dede_plus_mda_setting` WHERE skey='email' LIMIT 0,1;</font>
-Time2020-05-10 14:11:03
-*/
-?>
-<?php  exit();
-/*
-Page: /index.php?upcache=1
-Error: Table 'dedecms.dede_plus_mda_setting' doesn't exist <br />Error sql: <font color='red'>SELECT * FROM `dede_plus_mda_setting` WHERE skey='channel_uuid' LIMIT 0,1;</font>
-Time2020-05-10 14:11:03
-*/
-?>
-<?php  exit();
-/*
-Page: /index.php?upcache=1
-Error: Table 'dedecms.dede_plus_mda_setting' doesn't exist <br />Error sql: <font color='red'>SELECT * FROM `dede_plus_mda_setting` WHERE skey='channel_secret' LIMIT 0,1;</font>
-Time2020-05-10 14:11:03
-*/
-?>
-<?php  exit();
-/*
-Page: /index.php?upcache=1
-Error: Table 'dedecms.dede_plus_mda_setting' doesn't exist <br />Error sql: <font color='red'>SELECT * FROM `dede_plus_mda_setting` WHERE skey='email' LIMIT 0,1;</font>
-Time2020-05-10 14:11:14
-*/
-?>
-<?php  exit();
-/*
-Page: /index.php?upcache=1
-Error: Table 'dedecms.dede_plus_mda_setting' doesn't exist <br />Error sql: <font color='red'>SELECT * FROM `dede_plus_mda_setting` WHERE skey='channel_uuid' LIMIT 0,1;</font>
-Time2020-05-10 14:11:14
-*/
-?>
-<?php  exit();
-/*
-Page: /index.php?upcache=1
-Error: Table 'dedecms.dede_plus_mda_setting' doesn't exist <br />Error sql: <font color='red'>SELECT * FROM `dede_plus_mda_setting` WHERE skey='channel_secret' LIMIT 0,1;</font>
-Time2020-05-10 14:11:14
-*/
-?>
-<?php  exit();
-/*
-Page: /dede/makehtml_all.php?action=make&step=3&uptype=time&mkvalue=1589040000
-Error: Table 'dedecms.dede_plus_mda_setting' doesn't exist <br />Error sql: <font color='red'>SELECT * FROM `dede_plus_mda_setting` WHERE skey='email' LIMIT 0,1;</font>
-Time2020-05-10 14:11:35
-*/
-?>
-<?php  exit();
-/*
-Page: /dede/makehtml_all.php?action=make&step=3&uptype=time&mkvalue=1589040000
-Error: Table 'dedecms.dede_plus_mda_setting' doesn't exist <br />Error sql: <font color='red'>SELECT * FROM `dede_plus_mda_setting` WHERE skey='channel_uuid' LIMIT 0,1;</font>
-Time2020-05-10 14:11:35
-*/
-?>
-<?php  exit();
-/*
-Page: /dede/makehtml_all.php?action=make&step=3&uptype=time&mkvalue=1589040000
-Error: Table 'dedecms.dede_plus_mda_setting' doesn't exist <br />Error sql: <font color='red'>SELECT * FROM `dede_plus_mda_setting` WHERE skey='channel_secret' LIMIT 0,1;</font>
-Time2020-05-10 14:11:35
-*/
-?>
-<?php  exit();
-/*
-Page: /index.php?upcache=1
-Error: Table 'dedecms.dede_plus_mda_setting' doesn't exist <br />Error sql: <font color='red'>SELECT * FROM `dede_plus_mda_setting` WHERE skey='email' LIMIT 0,1;</font>
-Time2020-05-10 14:11:40
-*/
-?>
-<?php  exit();
-/*
-Page: /index.php?upcache=1
-Error: Table 'dedecms.dede_plus_mda_setting' doesn't exist <br />Error sql: <font color='red'>SELECT * FROM `dede_plus_mda_setting` WHERE skey='channel_uuid' LIMIT 0,1;</font>
-Time2020-05-10 14:11:40
-*/
-?>
-<?php  exit();
-/*
-Page: /index.php?upcache=1
-Error: Table 'dedecms.dede_plus_mda_setting' doesn't exist <br />Error sql: <font color='red'>SELECT * FROM `dede_plus_mda_setting` WHERE skey='channel_secret' LIMIT 0,1;</font>
-Time2020-05-10 14:11:40
-*/
-?>
diff --git a/src/dede/article_template_rand.php b/src/dede/article_template_rand.php
index 5ff5babe..4968a7d5 100755
--- a/src/dede/article_template_rand.php
+++ b/src/dede/article_template_rand.php
@@ -86,7 +86,7 @@ make_hash();
 $msg = "
 <link href='images/base.css' rel='stylesheet' type='text/css' />
 <script language='javascript' src='js/main.js'></script>
-<script language='javascript' src='../include/dedeajax2.js'></script>
+<script language='javascript' src='../static/js/dedeajax2.js'></script>
 <script language='javascript'>
 function DoRand(jobname)
 {
diff --git a/src/dede/templets/makehtml_homepage.htm b/src/dede/templets/makehtml_homepage.htm
index 2fe753b1..bce121bd 100755
--- a/src/dede/templets/makehtml_homepage.htm
+++ b/src/dede/templets/makehtml_homepage.htm
@@ -4,9 +4,9 @@
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
 <title>主页更新向导</title>
 <link href="css/base.css" rel="stylesheet" type="text/css">
-<link rel="stylesheet" type="text/css" media="all" href="../include/calendar/calendar-win2k-1.css" title="win2k-1" />
-<script type="text/javascript" src="../include/calendar/calendar.js"></script>
-<script type="text/javascript" src="../include/calendar/calendar-cn.js"></script>
+<link rel="stylesheet" type="text/css" media="all" href="../static/js/calendar/calendar-win2k-1.css" title="win2k-1" />
+<script type="text/javascript" src="../static/js/calendar/calendar.js"></script>
+<script type="text/javascript" src="../static/js/calendar/calendar-cn.js"></script>
 <script language="javascript">
 function SelectTemplets(fname)
 {
diff --git a/src/dede/templets/makeremote_all.htm b/src/dede/templets/makeremote_all.htm
index fcee5a72..301d9ed4 100755
--- a/src/dede/templets/makeremote_all.htm
+++ b/src/dede/templets/makeremote_all.htm
@@ -4,9 +4,9 @@
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
 <title>远程服务器同步</title>
 <link href="css/base.css" rel="stylesheet" type="text/css">
-<link rel="stylesheet" type="text/css" media="all" href="../include/calendar/calendar-win2k-1.css" title="win2k-1" />
-<script type="text/javascript" src="../include/calendar/calendar.js"></script>
-<script type="text/javascript" src="../include/calendar/calendar-cn.js"></script>
+<link rel="stylesheet" type="text/css" media="all" href="../static/js/calendar/calendar-win2k-1.css" title="win2k-1" />
+<script type="text/javascript" src="../static/js/calendar/calendar.js"></script>
+<script type="text/javascript" src="../static/js/calendar/calendar-cn.js"></script>
 <script language="javascript">
 function checkAll()
 {
diff --git a/src/dede/templets/module_main.htm b/src/dede/templets/module_main.htm
index f72a3068..8371bf1d 100755
--- a/src/dede/templets/module_main.htm
+++ b/src/dede/templets/module_main.htm
@@ -4,7 +4,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
 <title>模块打包</title>
 <link href="css/base.css" rel="stylesheet" type="text/css" />
-<script src="../include/dedeajax2.js" language="javascript" type="text/javascript"></script>
+<script src="../static/js/dedeajax2.js" language="javascript" type="text/javascript"></script>
 <script language="javascript" type="text/javascript">
 function getmodule(action,hash)
     {
diff --git a/src/dede/templets/story_edit.htm b/src/dede/templets/story_edit.htm
index d45d3752..b024f7ff 100755
--- a/src/dede/templets/story_edit.htm
+++ b/src/dede/templets/story_edit.htm
@@ -5,7 +5,7 @@
 <title>修改连载图书</title>
 <link href='css/base.css' rel='stylesheet' type='text/css'>
 <script language="javascript" src="js/main.js"></script>
-<script language="javascript" src="../include/js/dedeajax2.js"></script>
+<script language="javascript" src="../static/js/dedeajax2.js"></script>
 <script language="javascript" src="js/story.js"></script>
 <style type="text/css">
 <!--
diff --git a/src/dede/templets/sys_data_replace.htm b/src/dede/templets/sys_data_replace.htm
index c1d069c6..4dfa5563 100755
--- a/src/dede/templets/sys_data_replace.htm
+++ b/src/dede/templets/sys_data_replace.htm
@@ -115,7 +115,7 @@
                   	<input type="text" name="validate" class="alltxt" style="width:80px;text-transform: uppercase;" />
                   </td>
                   <td>
-                  	<img src='../include/vdimgck.php' />
+                  	<img src='../plus/vdimgck.php' />
                   </td>
                 </tr>
               </table>
diff --git a/src/templets/default/ajaxfeedback2.htm b/src/templets/default/ajaxfeedback2.htm
index bec67ef3..5350c8b9 100755
--- a/src/templets/default/ajaxfeedback2.htm
+++ b/src/templets/default/ajaxfeedback2.htm
@@ -25,10 +25,10 @@
           <div class="dcmp-content">
             <script type="text/javascript">
 					//<![CDATA[
-					window.CKEDITOR_BASEPATH='{dede:global.cfg_cmsurl/}/include/ckeditor/';
+					window.CKEDITOR_BASEPATH='{dede:global.cfg_cmsurl/}/static/js/ckeditor/';
 					//]]>
                     </script>
-            <script type="text/javascript" src="{dede:global.cfg_cmsurl/}/include/ckeditor/ckeditor.js?t=B8DJ5M3"></script>
+            <script type="text/javascript" src="{dede:global.cfg_cmsurl/}/static/js/ckeditor/ckeditor.js?t=B8DJ5M3"></script>
             {dede:php}
             GetEditor('msg','',100,'Feedback','print','false',true);
             {/dede:php} </div>
diff --git a/src/templets/plus/feedback_templet.htm b/src/templets/plus/feedback_templet.htm
index 7700cefc..34b9ae33 100755
--- a/src/templets/plus/feedback_templet.htm
+++ b/src/templets/plus/feedback_templet.htm
@@ -227,7 +227,7 @@ function ajaxQuotePost(fid)
             <div class="dcmp-content1">
             <script type="text/javascript">
 					//<![CDATA[
-					window.CKEDITOR_BASEPATH='{dede:global.cfg_cmsurl/}/include/ckeditor/';
+					window.CKEDITOR_BASEPATH='{dede:global.cfg_cmsurl/}/static/js/ckeditor/';
 					//]]>
                     </script>
             {dede:php}