From f05f389e028ce10cc7a4c5bd4411132b2fbd9ac7 Mon Sep 17 00:00:00 2001 From: Hellohao <923453645@qq.com> Date: Sat, 10 Aug 2019 16:26:59 +0800 Subject: [PATCH] =?UTF-8?q?2019-08-10=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/picturebed.sql | 16 ++-- .../hellohao/controller/AdminController.java | 23 ++++-- .../controller/AdminRootController.java | 10 +++ .../hellohao/controller/ClientController.java | 1 - .../hellohao/controller/UserController.java | 5 +- src/main/java/cn/hellohao/dao/UserMapper.java | 3 +- .../java/cn/hellohao/service/UserService.java | 3 +- .../service/impl/UserServiceImpl.java | 9 ++- .../java/cn/hellohao/utils/SendEmail.java | 3 +- src/main/resources/application.properties | 2 +- src/main/resources/mapper/UserMapper.xml | 23 +++++- .../static/layui/layui/css/layui.css | 4 +- src/main/resources/templates/admin/about.html | 2 +- .../resources/templates/admin/setuser.html | 61 +++++++++------ src/main/resources/templates/admin/user.html | 76 ++++++++++++++++--- src/main/resources/templates/index.html | 26 ++----- 16 files changed, 190 insertions(+), 77 deletions(-) diff --git a/sql/picturebed.sql b/sql/picturebed.sql index 8e46211..37ef31a 100644 --- a/sql/picturebed.sql +++ b/sql/picturebed.sql @@ -11,7 +11,7 @@ Target Server Version : 50720 File Encoding : 65001 - Date: 07/08/2019 23:21:26 + Date: 10/08/2019 16:24:06 */ SET NAMES utf8mb4; @@ -42,7 +42,7 @@ CREATE TABLE `config` ( -- ---------------------------- -- Records of config -- ---------------------------- -INSERT INTO `config` VALUES (1, 7, 1, 'Hellohao', '网站由JAVA语言编写应用SpringBoot框架开发，前端全部组件由BootStrap/Layui框架编写。由作者个人更新维护，后期会加入更全面的功能供大家使用，如有BUG请与我反馈。', 'https://hellohao.nos-eastchina1.126.net/%E7%BD%91%E7%AB%99%E7%B4%A0%E6%9D%90/logo2.png', 'Hellohao 切勿上传违反中华人民共和国互联网法律条约资源', '
  • 作者博客
  • 高清壁纸
  • json格式化
    • ', '也许...|这将是最好用的图床', 'console.log(\'百度统计JS代码\');', 'http://tc.hellohao.cn', 'https://hellohao.oss-cn-beijing.aliyuncs.com/Hellohao/eb83a0714030248.jpg', 'https://hellohao.oss-cn-beijing.aliyuncs.com/Hellohao/086650714030248.jpg', NULL); +INSERT INTO `config` VALUES (1, 3, 1, 'Hellohao', '网站由JAVA语言编写应用SpringBoot框架开发，前端全部组件由BootStrap/Layui框架编写。由作者个人更新维护，后期会加入更全面的功能供大家使用，如有BUG请与我反馈。', 'https://hellohao.nos-eastchina1.126.net/%E7%BD%91%E7%AB%99%E7%B4%A0%E6%9D%90/logo2.png', 'Hellohao 切勿上传违反中华人民共和国互联网法律条约资源', '
  • 作者博客
  • 高清壁纸
  • json格式化
    • ', '也许...|这将是最好用的图床', 'console.log(\'百度统计JS代码\');', 'http://tc.hellohao.cn', 'https://hellohao.oss-cn-beijing.aliyuncs.com/Hellohao/eb83a0714030248.jpg', 'https://hellohao.oss-cn-beijing.aliyuncs.com/Hellohao/086650714030248.jpg', NULL); -- ---------------------------- -- Table structure for emailconfig @@ -78,7 +78,13 @@ CREATE TABLE `imgdata` ( `abnormal` int(2) NULL DEFAULT NULL COMMENT '异常', `source` int(2) NULL DEFAULT NULL COMMENT '存储源', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; + +-- ---------------------------- +-- Records of imgdata +-- ---------------------------- +INSERT INTO `imgdata` VALUES (1, 'admin/09bf60810015053.png', 'http://img.wwery.com/admin/09bf60810015053.png', 1, '2019-08-10', 71, NULL, 3); +INSERT INTO `imgdata` VALUES (2, 'admin/d5b2c0810025302.png', 'http://img.wwery.com/admin/d5b2c0810025302.png', 1, '2019-08-10', 120, NULL, 3); -- ---------------------------- -- Table structure for imgreview @@ -119,7 +125,7 @@ CREATE TABLE `keys` ( -- ---------------------------- INSERT INTO `keys` VALUES (1, '', '', '', '', '', 1); INSERT INTO `keys` VALUES (2, '11111111', '222222222222', '444444444444', '555555555', 'http://1.1.1', 2); -INSERT INTO `keys` VALUES (3, '123', '123', '0', '123', '123', 3); +INSERT INTO `keys` VALUES (3, '', '', '0', '', '', 3); INSERT INTO `keys` VALUES (4, '123', '123', '4', '412', 'https://0.0', 4); INSERT INTO `keys` VALUES (5, '0', '0', '0', '0', '0', 5); INSERT INTO `keys` VALUES (6, '', '', '', '', '', 6); @@ -173,7 +179,7 @@ CREATE TABLE `user` ( `uid` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户唯一标识', `isok` int(2) NOT NULL, PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Records of user diff --git a/src/main/java/cn/hellohao/controller/AdminController.java b/src/main/java/cn/hellohao/controller/AdminController.java index f459a48..33102c1 100644 --- a/src/main/java/cn/hellohao/controller/AdminController.java +++ b/src/main/java/cn/hellohao/controller/AdminController.java @@ -169,7 +169,7 @@ public class AdminController { PageHelper.startPage(pageNum, pageSize); List users = null; if (u.getLevel() > 1) { //根据用户等级查询管理员查询所有的信息 - users = userService.getuserlist();// 这是我们的sql + users = userService.getuserlist(u);// 这是我们的sql // 使用pageInfo包装查询 PageInfo rolePageInfo = new PageInfo<>(users);// return new PageResultBean<>(rolePageInfo.getTotal(), rolePageInfo.getList()); @@ -183,14 +183,16 @@ public class AdminController { @RequestMapping(value = "/selectusertable2") @ResponseBody public Map selectByFy12(HttpSession session, @RequestParam(required = false, defaultValue = "1") int page, - @RequestParam(required = false) int limit) { + @RequestParam(required = false) int limit,String username) { User u = (User) session.getAttribute("user"); // 使用Pagehelper传入当前页数和页面显示条数会自动为我们的select语句加上limit查询 // 从他的下一条sql开始分页 PageHelper.startPage(page, limit); List users = null; if (u.getLevel() > 1) { //根据用户等级查询管理员查询所有的信息 - users = userService.getuserlist();// 这是我们的sql + User user = new User(); + user.setUsername(username); + users = userService.getuserlist(user);// 这是我们的sql // 使用pageInfo包装查询 PageInfo rolePageInfo = new PageInfo<>(users);// Map map = new HashMap(); @@ -311,8 +313,7 @@ public class AdminController { public String tosetuser(HttpSession session, Model model, HttpServletRequest request) { User u = (User) session.getAttribute("user"); //key信息 - model.addAttribute("username", u.getUsername()); - model.addAttribute("level", u.getLevel()); + model.addAttribute("user", u); return "admin/setuser"; } @@ -322,9 +323,17 @@ public class AdminController { public String change(HttpSession session, User user) { //Integer count = userService.checkUsername(user.getUsername());//查询用户名是否重复 User u = (User) session.getAttribute("user"); - user.setEmail(u.getEmail()); + //user.setEmail(u.getEmail()); + user.setUid(u.getUid()); JSONArray jsonArray = new JSONArray(); - Integer ret = userService.change(user); + Integer ret =0; + if(u.getLevel()==1){ + user.setUsername(null); + user.setEmail(null); + ret = userService.change(user); + }else{ + ret = userService.change(user); + } jsonArray.add(ret); if (u.getEmail() != null && u.getPassword() != null) { session.removeAttribute("user"); diff --git a/src/main/java/cn/hellohao/controller/AdminRootController.java b/src/main/java/cn/hellohao/controller/AdminRootController.java index 7e997f9..87af2d8 100644 --- a/src/main/java/cn/hellohao/controller/AdminRootController.java +++ b/src/main/java/cn/hellohao/controller/AdminRootController.java @@ -183,6 +183,16 @@ public class AdminRootController { return ret; } + //修改用户激活状态 + @PostMapping("/setisok") + @ResponseBody + public String setisok(HttpSession session, User user) { + Integer ret = userService.setisok(user); + JSONArray jsonArray = new JSONArray(); + jsonArray.add(ret); + return jsonArray.toString(); + } + //关于系统 @RequestMapping("/about") public String about(HttpSession session,Model model ) { diff --git a/src/main/java/cn/hellohao/controller/ClientController.java b/src/main/java/cn/hellohao/controller/ClientController.java index bae29e4..21ee4de 100644 --- a/src/main/java/cn/hellohao/controller/ClientController.java +++ b/src/main/java/cn/hellohao/controller/ClientController.java @@ -223,5 +223,4 @@ public class ClientController { } - } diff --git a/src/main/java/cn/hellohao/controller/UserController.java b/src/main/java/cn/hellohao/controller/UserController.java index 4f3d2e9..8bc2259 100644 --- a/src/main/java/cn/hellohao/controller/UserController.java +++ b/src/main/java/cn/hellohao/controller/UserController.java @@ -88,7 +88,6 @@ public class UserController { @ResponseBody public String login( HttpSession httpSession, String email, String password) { JSONArray jsonArray = new JSONArray(); - Integer ret = userService.login(email, password); if (ret > 0) { User user = userService.getUsers(email); @@ -97,8 +96,10 @@ public class UserController { httpSession.setAttribute("email", user.getEmail()); httpSession.setAttribute("pass", user.getPassword()); jsonArray.add(1); - } else { + } else if(ret==-1){ jsonArray.add(-1); + }else { + jsonArray.add(-2); } } else { jsonArray.add(0); diff --git a/src/main/java/cn/hellohao/dao/UserMapper.java b/src/main/java/cn/hellohao/dao/UserMapper.java index 2779e03..7b88c89 100644 --- a/src/main/java/cn/hellohao/dao/UserMapper.java +++ b/src/main/java/cn/hellohao/dao/UserMapper.java @@ -30,7 +30,7 @@ public interface UserMapper { Integer getUserTotal(); - List getuserlist(); + List getuserlist(User user); //刪除用戶 Integer deleuser(@Param("id") Integer id); @@ -43,5 +43,6 @@ public interface UserMapper { Integer uiduser(@Param("uid") String uid); User getUsersMail(@Param("uid") String uid); + Integer setisok (User user); } diff --git a/src/main/java/cn/hellohao/service/UserService.java b/src/main/java/cn/hellohao/service/UserService.java index 54419cc..6e27a78 100644 --- a/src/main/java/cn/hellohao/service/UserService.java +++ b/src/main/java/cn/hellohao/service/UserService.java @@ -26,7 +26,7 @@ public interface UserService { Integer getUserTotal(); - List getuserlist(); + List getuserlist(User user); Integer deleuser(Integer id); @@ -38,4 +38,5 @@ public interface UserService { Integer uiduser(String uid); User getUsersMail(String uid); + Integer setisok (User user); } diff --git a/src/main/java/cn/hellohao/service/impl/UserServiceImpl.java b/src/main/java/cn/hellohao/service/impl/UserServiceImpl.java index 7ba858e..d3655d4 100644 --- a/src/main/java/cn/hellohao/service/impl/UserServiceImpl.java +++ b/src/main/java/cn/hellohao/service/impl/UserServiceImpl.java @@ -74,8 +74,8 @@ public class UserServiceImpl implements UserService { } @Override - public List getuserlist() { - return userMapper.getuserlist(); + public List getuserlist(User user) { + return userMapper.getuserlist(user); } @Override @@ -87,4 +87,9 @@ public class UserServiceImpl implements UserService { public User getUsersMail(String uid) { return userMapper.getUsersMail(uid); } + + @Override + public Integer setisok(User user) { + return userMapper.setisok(user); + } } diff --git a/src/main/java/cn/hellohao/utils/SendEmail.java b/src/main/java/cn/hellohao/utils/SendEmail.java index 435909a..968d7b2 100644 --- a/src/main/java/cn/hellohao/utils/SendEmail.java +++ b/src/main/java/cn/hellohao/utils/SendEmail.java @@ -17,7 +17,8 @@ public class SendEmail { p.setProperty("mail.smtp.port", emailConfig.getPort()); p.setProperty("mail.smtp.socketFactory.port", emailConfig.getPort()); p.setProperty("mail.smtp.auth", "true"); - p.setProperty("mail.smtp.socketFactory.class", "SSL_FACTORY"); + p.setProperty("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory"); + //p.setProperty("mail.smtp.socketFactory.class", "SSL_FACTORY"); Session session = Session.getInstance(p, new Authenticator() { // 设置认证账户信息 diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index d0a85cc..055f64e 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -24,7 +24,7 @@ multipart.maxFileSize=10240KB multipart.maxRequestSize=10240KB spring.thymeleaf.mode = LEGACYHTML5 spring.http.multipart.location=/data/upload_tmp -systemupdate=2019-08-07 +systemupdate=2019-08-10 diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml index c2f32a0..987563f 100644 --- a/src/main/resources/mapper/UserMapper.xml +++ b/src/main/resources/mapper/UserMapper.xml @@ -69,8 +69,17 @@ - UPDATE `user` set `password`=#{password} where email=#{email} + UPDATE `user` set + + `email` = #{email}, + + + `username` = #{username}, + + `password` = #{password} + where uid=#{uid} + @@ -85,6 +94,13 @@ * FROM user + + where + CONCAT( + username, + email + ) LIKE '%${username}%' + order by birthder desc @@ -93,4 +109,9 @@ DELETE FROM user WHERE id=#{id} + + + UPDATE `user` set `isok`=#{isok} where id=#{id} + + \ No newline at end of file diff --git a/src/main/resources/static/layui/layui/css/layui.css b/src/main/resources/static/layui/layui/css/layui.css index 7f28b8b..54538ae 100644 --- a/src/main/resources/static/layui/layui/css/layui.css +++ b/src/main/resources/static/layui/layui/css/layui.css @@ -2427,12 +2427,12 @@ hr { .layui-form-checked span, .layui-form-checked:hover span { - background-color: #ff0000 + background-color: #009688 } .layui-form-checked i, .layui-form-checked:hover i { - color: #ff0000 + color: #009688 } .layui-form-item .layui-form-checkbox { diff --git a/src/main/resources/templates/admin/about.html b/src/main/resources/templates/admin/about.html index 77d19c0..4233d20 100644 --- a/src/main/resources/templates/admin/about.html +++ b/src/main/resources/templates/admin/about.html @@ -27,7 +27,7 @@

    开发者交流群：32452345342

    -

     当前系统版本：2019-08-01    检查更新

    +

     当前系统版本：2019-08-10    检查更新

     支持一下作者吧：


    diff --git a/src/main/resources/templates/admin/setuser.html b/src/main/resources/templates/admin/setuser.html index 1a53799..c4bd4e4 100644 --- a/src/main/resources/templates/admin/setuser.html +++ b/src/main/resources/templates/admin/setuser.html @@ -10,17 +10,26 @@

    密码修改

    +
    +
    + +
    + + +
    +
    + th:value="${user.getUsername()}"/>
    @@ -47,7 +56,7 @@
    \ No newline at end of file diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 8d8c939..e687ca8 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -99,6 +99,8 @@
  • 注册 
    • + + @@ -543,8 +545,10 @@ Technology constantly updated, we will always move forward on the road ahead. } else { dd(); if (data == -1) { - toastr.error('账号未进行邮箱验证，请先验证邮箱。'); - } else { + toastr.error('您的账号是未激活状态，无法登陆。'); + } else if(data==-2){ + toastr.error('您的账号已被冻结。'); + }else { toastr.error('登录失败，请重试。'); } setTimeout(function () { @@ -727,24 +731,6 @@ Technology constantly updated, we will always move forward on the road ahead. $("#fen").html(min); $("#miao").html(sec); } - function xiazai(){ - swal({ - title: "即将下载客户端", - text: "客户端目前支持支Windows系统，Mac后期可能会推出。", - icon: "success", - buttons: true, - buttons: ["取消", "下载"], - dangerMode: false, - }) - .then((value) => { - if (value) { - window.open("https://hellohao.nos-eastchina1.126.net/TbedClient/Hellohao.7z"); - } else { - - } - }); - - } //回车登录 function keyLogin(){ if (event.keyCode==13) //回车键的键值为13