diff --git a/src/data/safe/inc_safe_config.php b/src/data/safe/inc_safe_config.php
deleted file mode 100755
index e66f347c..00000000
--- a/src/data/safe/inc_safe_config.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$safe_gdopen = '1,2,3,4,5,6,7';
-$safe_codetype = '3';
-$safe_gdtype = '1';
-$safe_gdstyle = '3';
-$safe_wwidth = '80';
-$safe_wheight = '36';
-$safe_codelen = '4';
-$safe_faq_reg = '0';
-$safe_faq_send = '0';
-$safe_faq_msg = '1';
-$safe_faqs = 'a:4:{i:1;a:2:{s:8:"question";s:37:"您最喜欢的网建程序是什么";s:6:"answer";s:7:"DedeBIZ";}i:2;a:2:{s:8:"question";s:6:"1+11=?";s:6:"answer";s:2:"12";}i:3;a:2:{s:8:"question";s:59:"中国哪项体育运动最让人听着伤心,看着揪心?";s:6:"answer";s:6:"足球";}i:4;a:2:{s:8:"question";s:29:"<img src="/static/web/img/favicon.ico">";s:6:"answer";s:24:"织梦内容管理系统";}}';
-?>
\ No newline at end of file
diff --git a/src/data/safe/index.html b/src/data/safe/index.html
deleted file mode 100755
index 87245193..00000000
--- a/src/data/safe/index.html
+++ /dev/null
@@ -1 +0,0 @@
-dir
\ No newline at end of file
diff --git a/src/data/safequestions.php b/src/data/safequestions.php
deleted file mode 100755
index 14211ba9..00000000
--- a/src/data/safequestions.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-//安全提示问题，这两句不要修改
-$safequestions = array();
-$safequestions[0] = '没安全提示问题';
-//下面的设置可以手工修改
-$safequestions[1] = '您最喜欢的格言什么';
-$safequestions[2] = '您家乡的名称是什么';
-$safequestions[3] = '您读的小学叫什么';
-$safequestions[4] = '您的父亲叫什么名字';
-$safequestions[5] = '您的母亲叫什么名字';
-$safequestions[6] = '您最喜欢的偶像是谁';
-$safequestions[7] = '您最喜欢的歌曲是什么';
-//以下不要修改
-function GetSafequestion($selid=0,$formname='safequestion')
-{
-	global $safequestions;
-	$safequestions_form = "<select class='form-control' name='$formname' id='$formname'>";
-	foreach($safequestions as $k=>$v)
-	{
-	 	if($k==$selid) $safequestions_form .= "<option value='$k' selected>$v</option>\r\n";
-	 	else $safequestions_form .= "<option value='$k'>$v</option>\r\n";
-	}
-	$safequestions_form .= "</select>\r\n";
-	return $safequestions_form;
-}
-?>
\ No newline at end of file
diff --git a/src/system/common.inc.php b/src/system/common.inc.php
index d7ed8f60..41c908c3 100755
--- a/src/system/common.inc.php
+++ b/src/system/common.inc.php
@@ -122,11 +122,6 @@ require_once(DEDEDATA.'/common.inc.php');
 if (!isset($cfg_dbtype)) {
     $cfg_dbtype = 'mysql';
 }
-//载入系统验证安全配置
-if (file_exists(DEDEDATA.'/safe/inc_safe_config.php')) {
-    require_once(DEDEDATA.'/safe/inc_safe_config.php');
-    if (!empty($safe_faqs)) $safefaqs = unserialize($safe_faqs);
-}
 //Session跨域设置
 if (!empty($cfg_domain_cookie)) {
     @session_set_cookie_params(0, '/', $cfg_domain_cookie);
@@ -227,6 +222,11 @@ if (!isset($cfg_NotPrintHead)) {
         header("Content-Type: text/html; charset={$cfg_soft_lang}");
     }
 }
+//安全提示
+$safe_gdopen = '1,2,3,4,5,6,7';
+$safe_codetype = '3';
+$safe_wwidth = '80';
+$safe_wheight = '36';
 //自动加载类库处理
 if (version_compare(PHP_VERSION, '7.2.0', '>=')) {
     require_once(DEDEINC.'/autoload7.inc.php');
@@ -268,6 +268,7 @@ $cfg_helper_autoload = array(
     'archive',    /* 文档小助手 */
     'upload',     /* 上传小助手 */
     'extend',     /* 扩展小助手 */
+    'code',       /* 代码小助手 */
 );
 //初始化小助手
 helper($cfg_helper_autoload);
\ No newline at end of file
diff --git a/src/user/config.php b/src/user/config.php
index c45aa62b..8eb9b242 100755
--- a/src/user/config.php
+++ b/src/user/config.php
@@ -215,4 +215,29 @@ function countArchives($channelid)
     } else {
         return FALSE;
     }
+}
+
+//安全提示问题，这两句不要修改
+$safequestions = array();
+$safequestions[0] = '没安全提示问题';
+//下面的设置可以手工修改
+$safequestions[1] = '您最喜欢的格言什么';
+$safequestions[2] = '您家乡的名称是什么';
+$safequestions[3] = '您读的小学叫什么';
+$safequestions[4] = '您的父亲叫什么名字';
+$safequestions[5] = '您的母亲叫什么名字';
+$safequestions[6] = '您最喜欢的偶像是谁';
+$safequestions[7] = '您最喜欢的歌曲是什么';
+//以下不要修改
+function GetSafequestion($selid=0,$formname='safequestion')
+{
+	global $safequestions;
+	$safequestions_form = "<select class='form-control' name='$formname' id='$formname'>";
+	foreach($safequestions as $k=>$v)
+	{
+	 	if($k==$selid) $safequestions_form .= "<option value='$k' selected>$v</option>\r\n";
+	 	else $safequestions_form .= "<option value='$k'>$v</option>\r\n";
+	}
+	$safequestions_form .= "</select>\r\n";
+	return $safequestions_form;
 }
\ No newline at end of file
diff --git a/src/user/templets/edit_baseinfo.htm b/src/user/templets/edit_baseinfo.htm
index da395aec..e0374c7f 100755
--- a/src/user/templets/edit_baseinfo.htm
+++ b/src/user/templets/edit_baseinfo.htm
@@ -86,7 +86,6 @@
 										<label class="col-sm-2 col-form-label">原安全问题</label>
 										<div class="col-sm-10">
 											<?php
-											require(DEDEDATA.'/safequestions.php');
 											echo GetSafequestion($row['safequestion'],'safequestion');
 											?>
 										</div>
diff --git a/src/user/templets/resetpassword3.htm b/src/user/templets/resetpassword3.htm
index 9290aada..fea0636d 100755
--- a/src/user/templets/resetpassword3.htm
+++ b/src/user/templets/resetpassword3.htm
@@ -23,7 +23,6 @@
 						<input type="hidden" name="userid" value="<?php echo $userid;?>">
 						<div class="form-group">
 							<?php
-							require(DEDEDATA.'/safequestions.php');
 							echo GetSafequestion(0,'safequestion');
 							?>
 						</div>