From b38776ba05c20b12868b1e446e88f0539ab5df74 Mon Sep 17 00:00:00 2001 From: Hellohao <923453645@qq.com> Date: Tue, 18 Jun 2019 00:46:39 +0800 Subject: [PATCH] =?UTF-8?q?6-17=E6=9B=B4=E6=96=B0=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=8F=88=E6=8B=8D=E4=BA=91=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/hellohao/controller/UserController.java | 1 - src/main/java/cn/hellohao/utils/SendEmail.java | 3 ++- src/main/resources/application.properties | 6 +++--- src/main/resources/static/webuploade/js/upload.js | 3 ++- src/main/resources/templates/admin/index.html | 10 +++++----- src/main/resources/templates/index_upload.html | 3 +-- src/main/resources/templates/isok.html | 1 + 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/main/java/cn/hellohao/controller/UserController.java b/src/main/java/cn/hellohao/controller/UserController.java index 38aaf06..3fc6354 100644 --- a/src/main/java/cn/hellohao/controller/UserController.java +++ b/src/main/java/cn/hellohao/controller/UserController.java @@ -118,7 +118,6 @@ public class UserController { session.invalidate(); jsonObject.put("exit", 1); } - return jsonObject.toString(); } diff --git a/src/main/java/cn/hellohao/utils/SendEmail.java b/src/main/java/cn/hellohao/utils/SendEmail.java index f0775cb..435909a 100644 --- a/src/main/java/cn/hellohao/utils/SendEmail.java +++ b/src/main/java/cn/hellohao/utils/SendEmail.java @@ -35,6 +35,7 @@ public class SendEmail { public static Integer sendEmail(MimeMessage message, String username, String Url, String email, EmailConfig emailConfig, Config config) { String webname=config.getWebname(); String domain = config.getDomain(); + String texts = "

你正在注册【"+webname+"】，点击下方链接进行激活：


"+domain+"/user/activation.do?activation=" + Url + "&username=" + username + ""; String body = "\n" + "\n" + " \n" + @@ -75,7 +76,7 @@ public class SendEmail { message.setRecipients(Message.RecipientType.TO, email); // 内容(这个内容还不能乱写,有可能会被SMTP拒绝掉;多试几次吧) message.setSubject(emailConfig.getEmailname()+"账号激活");//标题 - message.setContent(body, "text/html;charset=UTF-8");//内容 + message.setContent(texts, "text/html;charset=UTF-8");//内容 message.setSentDate(new Date()); message.saveChanges(); System.out.println("准备发送"); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 999cd75..b399301 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,9 +1,9 @@ #ݿ˺picturebed -spring.datasource.username=root +spring.datasource.username=picturebed #ݿ -spring.datasource.password=root +spring.datasource.password=Aa923453645 #ݿӵַ -spring.datasource.url=jdbc:mysql://localhost:3306/picturebed?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8 +spring.datasource.url=jdbc:mysql://hellohao.cn:3306/picturebed?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8 #˿ server.port=8088 diff --git a/src/main/resources/static/webuploade/js/upload.js b/src/main/resources/static/webuploade/js/upload.js index 5d87cde..b109ba9 100644 --- a/src/main/resources/static/webuploade/js/upload.js +++ b/src/main/resources/static/webuploade/js/upload.js @@ -155,7 +155,8 @@ server: '/upimg', method:'POST', // runtimeOrder: 'flash', - + compress: false,//不启用压缩 + resize: false,//尺寸不改变 accept: { title: 'Images', //extensions: 'gif,jpg,jpeg,bmp,png', diff --git a/src/main/resources/templates/admin/index.html b/src/main/resources/templates/admin/index.html index 54031ee..28672b2 100644 --- a/src/main/resources/templates/admin/index.html +++ b/src/main/resources/templates/admin/index.html @@ -84,7 +84,7 @@
- + 用户管理
@@ -92,7 +92,7 @@
- + 对象存储
@@ -100,21 +100,21 @@
- + 图片鉴黄
- + 邮箱配置
- + 站点配置
diff --git a/src/main/resources/templates/index_upload.html b/src/main/resources/templates/index_upload.html index 460905b..62b734c 100644 --- a/src/main/resources/templates/index_upload.html +++ b/src/main/resources/templates/index_upload.html @@ -256,12 +256,11 @@ url: "/islogin", dataType: "json", success: function (data) { - console.log(data) if(data.lgoinret==1){ var username = data.username; var isvip = data.level; var h = '
  • ' + times() + username + ' 
    • '; - var h1 = '
  • 控制面板 
    • '; + var h1 = '
  • 控制面板 
    • '; var h2 = '
  • 退出
    • '; $("#usersrc").html(h + h1 + h2); } diff --git a/src/main/resources/templates/isok.html b/src/main/resources/templates/isok.html index 947478d..f8ecd17 100644 --- a/src/main/resources/templates/isok.html +++ b/src/main/resources/templates/isok.html @@ -4,6 +4,7 @@ +