diff --git a/README.md b/README.md
index 2788356b1b9c823b034324ea9ac79d55d2caea20..e7b75f003824421ca30496f19669cf8c4e28126b 100644
--- a/README.md
+++ b/README.md
@@ -11,22 +11,23 @@ ElasticSearch、Spring Security、Quatz、Caffeine
 
 ### 项目除了基本的登录注册，核心功能还包含
 
-发帖、评论、私信；
-redis实现点赞、关注；
-kafka进行信息队列通知；
-elasticsearch全局搜索；
-Spring Security权限设置、Quatz进行统计、调度；
-actuator实现监控；
+基本功能 发帖、评论、私信；
+Redis实现点赞、关注等数据；
+Kafka进行信息队列通知；
+Elasticsearch分布式搜索帖子用户；
+Websocket实现线上网页实时聊天
+Spring Security权限设置；
+Quartz进行统计、调度；
+Actuator实现简单的监控；
 
-上传图片功能采用阿里云存储。
+上传图片功能采用阿里云oss存储。
 
 #### 安装教程
 
-1.不建议直接提取代码使用，里面除了spring自带整合的功能，其余像redis 等全部在我自己虚拟机上安装，可以照着配置自己安装在运行。
+1.不建议直接提取代码使用，里面除了spring自带整合的功能，其余像redis kafka等在我虚拟机上部署安装（需要熟悉Linux操作配置），可以照着application-dev.properties配置自己安装在运行。
 
 2.代码主要负责大家学习理解使用。
 
-
 #### 使用说明
 
 
diff --git a/src/main/java/com/test/community/controller/LoginController.java b/src/main/java/com/test/community/controller/LoginController.java
index 61e057ca1e318e9b6071cd24cb108f2f79beb822..85d01d52e4a4425601d08a677034918d0b28fdba 100644
--- a/src/main/java/com/test/community/controller/LoginController.java
+++ b/src/main/java/com/test/community/controller/LoginController.java
@@ -89,7 +89,7 @@ public class LoginController implements CommunityConstant {
     public String register(Model model, User user){
         Map<String,Object> map = userService.register(user);
         if(map==null || map.isEmpty()){
-            elasticSearchService.saveUser(user);
+//            elasticSearchService.saveUser(user);
             model.addAttribute("msg","注册成功，激活邮件已经到你的邮箱，请尽快去邮箱激活");
             model.addAttribute("target","/index");
             return "site/operate-result";
diff --git a/src/main/java/com/test/community/service/impl/UserServiceImpl.java b/src/main/java/com/test/community/service/impl/UserServiceImpl.java
index 4a11c111b975619e4012442995b2ce01450c7fca..75467abc457138429b8e07cb4ab6c6821438ab75 100644
--- a/src/main/java/com/test/community/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/test/community/service/impl/UserServiceImpl.java
@@ -109,7 +109,7 @@ public class UserServiceImpl implements UserService, CommunityConstant {
             //http://localhost:8080/community/activation/100/code
             String url = domain+contextPath+"/activation/"+user.getId()+"/"+user.getActivationCode();
             context.setVariable("url",url);
-            String content = templateEngine.process("/mail/activation",context);
+            String content = templateEngine.process("mail/activation",context);
             mailClient.sendMail(user.getEmail(),"激活账号",content);
         } catch (Exception e) {
             log.error("发送邮件失败",e);
diff --git a/src/main/java/com/test/community/util/MailClient.java b/src/main/java/com/test/community/util/MailClient.java
index 1c03cc024327d506794b788a1300923b891035b8..878d3f0efda0e1504ca70e8b8af556d1d85ed8d3 100644
--- a/src/main/java/com/test/community/util/MailClient.java
+++ b/src/main/java/com/test/community/util/MailClient.java
@@ -4,7 +4,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.mail.javamail.JavaMailSenderImpl;
+import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.stereotype.Component;
 
@@ -20,35 +20,25 @@ import java.util.Properties;
 public class MailClient {
     private static final Logger logger = LoggerFactory.getLogger(MailClient.class);
 
-//    @Autowired
-//    private JavaMailSenderImpl mailSender;
+    @Autowired
+    private JavaMailSender mailSender;
 
     @Value("${spring.mail.username}")
-    private String sender;//发件人
-    @Value("${spring.mail.password}")
-    private String password;
+    private String sender;
+
 
     public void sendMail(String recipient,
             String subject,String content){
         try {
-            Properties properties = new Properties();
-            properties.setProperty("mail.protocol","smtp");
-            properties.setProperty("mail.smtp.host","smtp.qq.com");
-            properties.setProperty("mail.smtp.auth","true");
-            Session session = Session.getDefaultInstance(properties);
-            MimeMessage message = new MimeMessage(session);
-//            MimeMessageHelper messageHelper = new MimeMessageHelper(message);
-//            messageHelper.setFrom(sender);
-//            messageHelper.setTo(recipient);
-//            messageHelper.setSubject(subject);
-//            messageHelper.setText(content,true);
-            message.setFrom(sender);
-            message.setRecipients(Message.RecipientType.TO, InternetAddress.parse(recipient));
-            message.setSubject(subject);
-            message.setContent(content,"text/html;charset=utf-8");
-            Transport transport = session.getTransport("smtp");
-            transport.connect(sender,password);
-            transport.sendMessage(message, message.getAllRecipients());
+            MimeMessage message = mailSender.createMimeMessage();
+            MimeMessageHelper messageHelper = new MimeMessageHelper(message);
+
+            messageHelper.setFrom(sender);
+            messageHelper.setTo(recipient);
+            messageHelper.setSubject(subject);
+            messageHelper.setText(content,true);
+
+            mailSender.send(messageHelper.getMimeMessage());
         } catch (MessagingException e) {
             logger.error("发送邮件失败"+e.getMessage());
         }
diff --git a/src/main/resources/application-produce.properties b/src/main/resources/application-produce.properties
index 6c90b6e739347b7809670131d01573ae966246ed..05824cb9c257799c27f6c46ca454eb9fb4d97adb 100644
--- a/src/main/resources/application-produce.properties
+++ b/src/main/resources/application-produce.properties
@@ -34,7 +34,8 @@ spring.mail.password=ulieztgbksnohgfa
 spring.mail.protocol=smtps
 spring.mail.properties.mail.smtp.ssl.enable=true
 spring.mail.properties.mail.smtp.socketFactory.port=465
-#spring.mail.properties.mail.smtp.auth=true
+spring.mail.properties.mail.smtp.auth=true
+spring.mail.properties.mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
 
 # community
 community.path.domain=http://47.99.157.147
@@ -46,7 +47,7 @@ spring.redis.host=localhost
 spring.redis.port=6379
 
 # KafkaProperties ??????? server.properties ???????
-spring.kafka.bootstrap-servers=localhost:9092
+spring.kafka.bootstrap-servers=47.99.157.147:9092
 # ?????Id
 spring.kafka.consumer.group-id=test-consumer-group
 spring.kafka.consumer.enable-auto-commit=true
diff --git a/src/main/resources/templates/site/operate-result.html b/src/main/resources/templates/site/operate-result.html
index 2806281a1ec4e21d384eeb7148c7b1220d440490..3c869935d8bb90c85457627d84a58c7cb9cd733d 100644
--- a/src/main/resources/templates/site/operate-result.html
+++ b/src/main/resources/templates/site/operate-result.html
@@ -65,7 +65,7 @@
 					<p class="lead" th:text="${msg}">您的账号已经激活成功,可以正常使用了!</p>
 					<hr class="my-4">
 					<p>
-						系统会在 <span id="seconds" class="text-danger">8</span> 秒后自动跳转,
+						系统会在 <span id="seconds" class="text-danger">60</span> 秒后自动跳转,
 						您也可以点此 <a id="target" th:href="@{${target}}" class="text-primary">链接</a>, 手动跳转!
 					</p>
 				</div>