From ed2448a15ec51507828de292ae032ecec24b31c3 Mon Sep 17 00:00:00 2001
From: taoser <changlin_zhao@qq.com>
Date: Mon, 11 Oct 2021 18:02:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E6=9C=8D=E5=8A=A1bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                              | 4 ++--
 app/admin/view/set/system/website.html | 2 ++
 app/install/data/taoler.sql            | 5 +++--
 config/taoler.php                      | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 59bd79d..ce72294 100644
--- a/README.md
+++ b/README.md
@@ -7,8 +7,8 @@
  * 后台：http://adm.aieok.com:888
  * 账号：test
  * 密码：test123
- * 版本：TaoLer 1.8.2
- * 日期：2021.8.5
+ * 版本：TaoLer 1.8.18
+ * 日期：2021.10.11
 
 #### 项目地址
 
diff --git a/app/admin/view/set/system/website.html b/app/admin/view/set/system/website.html
index 61758e9..b780b2f 100644
--- a/app/admin/view/set/system/website.html
+++ b/app/admin/view/set/system/website.html
@@ -170,6 +170,7 @@
 					  </div>
 					</div>
 					{//邮箱发送测试}
+					{if $mailserver.active !== 1}
 					<div class="layui-form" wid100 >
 					  <div class="layui-form-item">
 						<label class="layui-form-label">测试邮箱</label>
@@ -188,6 +189,7 @@
 						<button class="layui-btn" lay-submit lay-filter="active_system_email">确认激活</button>
 					  </div>
 					</div>
+					{/if}
                 </div>
 				<div class="layui-tab-item">
 					<div class="layui-form" wid100 lay-filter="config">
diff --git a/app/install/data/taoler.sql b/app/install/data/taoler.sql
index 73ec302..b8384ef 100644
--- a/app/install/data/taoler.sql
+++ b/app/install/data/taoler.sql
@@ -376,9 +376,10 @@ CREATE TABLE `tao_mail_server` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `mail` varchar(50) NOT NULL COMMENT '邮箱设置',
   `host` varchar(50) NOT NULL COMMENT '邮箱服务地址',
-  `port` tinyint(2) NOT NULL COMMENT '邮箱端口',
+  `port` smallint(3) NOT NULL COMMENT '邮箱端口',
   `nickname` varchar(20) NOT NULL DEFAULT '' COMMENT '昵称',
   `password` varchar(16) NOT NULL COMMENT '邮箱密码',
+  `active` tinyint(1) NOT NULL DEFAULT '0' COMMENT '邮箱服务1激活0未激活',
   `create_time` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间',
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
@@ -386,7 +387,7 @@ CREATE TABLE `tao_mail_server` (
 -- ----------------------------
 -- Records of tao_mail_server
 -- ----------------------------
-INSERT INTO `tao_mail_server` VALUES ('1', 'xxxx@aliyun.com', 'smtp.aliyun.com', '25', 'user', '123456', '0');
+INSERT INTO `tao_mail_server` VALUES ('1', 'xxxx@aliyun.com', 'smtp.aliyun.com', '25', 'user', '123456', '0', '0');
 
 -- ----------------------------
 -- Table structure for tao_message
diff --git a/config/taoler.php b/config/taoler.php
index 0b08acd..2d8139d 100644
--- a/config/taoler.php
+++ b/config/taoler.php
@@ -7,7 +7,7 @@ return [
 	//应用名,此项不可更改
 	'appname'	=> 'TaoLer',
     //版本配置
-    'version'   => '1.8.3',
+    'version'   => '1.8.18',
 	//加盐
 	'salt'		=> 'taoler',
 	//数据库备份目录