bug修复

Author: danbai225

src/main/java/com/danbai/ys/controller/YsController.java

@@ -6,6 +6,7 @@
 import com.danbai.ys.service.impl.AdminServiceImpl;
 import com.danbai.ys.service.impl.CommImpl;
 import com.danbai.ys.service.impl.YsServiceImpl;
+import com.danbai.ys.utils.DateUtils;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -14,6 +15,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

src/main/java/com/danbai/ys/service/impl/UserServiceImpl.java

@@ -176,7 +176,7 @@ public Token createToken(String username) {
 
     @Override
     public boolean checkToken(Token token) {
-        if (token == null|token.getUsername()==null|token.getToken()==null|token.getUsername().length()<1|token.getToken().length()<1) {
+        if (token == null||token.getUsername()==null||token.getToken()==null||token.getUsername().length()<1|token.getToken().length()<1) {
             return false;
         }
         Token rtoken = (Token) redisTemplate.opsForValue().get(Token.TOKEN+token.getUsername());

src/main/java/com/danbai/ys/utils/EmailUtil.java

@@ -6,6 +6,8 @@
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 
+import javax.mail.internet.InternetAddress;
+import java.io.UnsupportedEncodingException;
 import java.util.Properties;
 
 /**
@@ -19,7 +21,7 @@ public class EmailUtil {
     private static final String PROTOCOL = "smtp";
     private static final int PORT = 465;
     private static final String FROM = "[email protected]";
-    private static final String PWD = "hjj225";
+    private static final String PWD = "**";
 
     private static JavaMailSenderImpl javaMailSender;
 
@@ -46,15 +48,18 @@ public class EmailUtil {
 
     @Async
     public void sendEmail(final String title, final String content, final String toMail) {
-
-        SimpleMailMessage mailMessage = new SimpleMailMessage();
-        mailMessage.setFrom(FROM);
-        mailMessage.setSubject(title);
-        mailMessage.setText(content);
-
-        String[] toAddress = toMail.split(",");
-        mailMessage.setTo(toAddress);
-        //发送邮件
-        javaMailSender.send(mailMessage);
+        try {
+            SimpleMailMessage mailMessage = new SimpleMailMessage();
+            String nick=javax.mail.internet.MimeUtility.encodeText("淡白影视");
+            mailMessage.setFrom(String.valueOf(new InternetAddress(nick+" <"+FROM+">")));
+            mailMessage.setSubject(title);
+            mailMessage.setText(content);
+            String[] toAddress = toMail.split(",");
+            mailMessage.setTo(toAddress);
+            //发送邮件
+            javaMailSender.send(mailMessage);
+        }catch(Exception e){
+            System.out.println(e);
+        }
     }
 }