Merge remote-tracking branch 'origin/div' into div

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

 fanli/src/main/java/com/yeshi/fanli/util/email/MailSenderUtil.java

@@ -99,7 +99,7 @@
         String content) {

      try {

         String url = String.format(

               "http://111.230.142.62:8089/BuWan/email/sendEmail?fromAccount=%s&fromPwd=%s&toAccount=%s&title=%s&content=%s",

               "http://193.112.34.40:9001/BuWan/email/sendEmail?fromAccount=%s&fromPwd=%s&toAccount=%s&title=%s&content=%s",

               URLEncoder.encode(fromEmail, "UTF-8"), URLEncoder.encode(fromEmailPwd, "UTF-8"),

               URLEncoder.encode(toEmail, "UTF-8"), URLEncoder.encode(title, "UTF-8"),

               URLEncoder.encode(content, "UTF-8"));