From 7d4dcb04053007c21d26e42ce5676d93c87c30e5 Mon Sep 17 00:00:00 2001 From: hellohao <47170291+Hello-hao@users.noreply.github.com> Date: Wed, 7 Aug 2019 23:40:14 +0800 Subject: [PATCH 1/8] Update README.md --- README.md | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 95c2aa8..f5332db 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,8 @@ ![图床后台管理1.png](https://i.loli.net/2019/06/27/5d13abbbd94d288839.png) +![图床后台管理.png](http://cdn.wwery.com/Hellohao/15b3c0807113840.png) + ![图床后台管理.png](http://cdn.wwery.com/Hellohao/361ea0731102001.png) ![图床后台管理3.png](https://i.loli.net/2019/06/27/5d13abbbbd76136816.png) @@ -42,10 +44,13 @@ **2019-07-31** -> 添加支持FTP服务对接 -> 优化上传页面样式细节 -> 修复url上传后后台地址显示为空 - + - 优化系统内部架构，大大减少500服务器内部错误 + - 添加站点API接口功能 及 开关配置 + - 添加图片列表缩略图/URL显示功能 + - 添加图片链接生成二维码功能 + - 修改查看原图的相册插件 + - 优化多个页面细节样式 + **数据库增加了一个字段，需要导入新的SQL(已使用用户自行备份数据)** ## 运行环境 * JDK 1.8 From 6e49b3b82ba5bc0e1e49586aa632bb8a952c5aad Mon Sep 17 00:00:00 2001 From: hellohao <47170291+Hello-hao@users.noreply.github.com> Date: Thu, 8 Aug 2019 00:01:38 +0800 Subject: [PATCH 2/8] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index f5332db..a8c13ce 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,10 @@ ![图床后台管理.png](http://cdn.wwery.com/Hellohao/15b3c0807113840.png) +![图床后台管理.png](http://cdn.wwery.com/Hellohao/1a70a0807115019.png) + +![图床后台管理.png](http://cdn.wwery.com/Hellohao/6bfad0807115019.png) + ![图床后台管理.png](http://cdn.wwery.com/Hellohao/361ea0731102001.png) ![图床后台管理3.png](https://i.loli.net/2019/06/27/5d13abbbbd76136816.png) From ecbdf37ff0d4b89d9c5e3324f7be7cff9f44a786 Mon Sep 17 00:00:00 2001 From: hellohao <47170291+Hello-hao@users.noreply.github.com> Date: Thu, 8 Aug 2019 00:08:13 +0800 Subject: [PATCH 3/8] Update README.md --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index a8c13ce..499492f 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,16 @@ > 用户注册邮箱验证，以及后台配置邮箱服务器。 > 以及图片鉴黄配置等操作。 +## 主要功能支持： + - 支持 图片拖拽、截图软件直接(Ctrl+V)和图片URL地址上传。 + - 对接本地、网易、阿里、又拍、七牛、腾讯、FTP等各大对象存储平台。 + - 支持链接生成二维码。 + - 支持开启/关闭API接口。 + - URL列表、缩略图。查看原图等功能。 + - 图片鉴黄配置（开启后，每天固定时间进行非法图片监测） + - 游客、用户的上传管理 + - 邮箱注册激活。 + - 站点样式设置和上传规则配置等。 主站地址: [http://tc.hellohao.cn/](http://tc.hellohao.cn/) 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 4/8] =?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 From b9c5f52a4b4bea7bf7117a3ea77ae69ecdcfbd05 Mon Sep 17 00:00:00 2001 From: Hellohao <923453645@qq.com> Date: Thu, 15 Aug 2019 17:08:16 +0800 Subject: [PATCH 5/8] =?UTF-8?q?2019-08-15=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/picturebed.sql | 58 ++++++++----- .../controller/AdminRootController.java | 21 ++++- .../controller/UpdateImgController.java | 1 - .../java/cn/hellohao/dao/SysConfigMapper.java | 15 ++++ src/main/java/cn/hellohao/pojo/Config.java | 8 +- src/main/java/cn/hellohao/pojo/SysConfig.java | 35 ++++++++ .../cn/hellohao/service/SysConfigService.java | 16 ++++ .../service/impl/SysConfigServiceImpl.java | 27 +++++++ src/main/resources/application.properties | 2 +- src/main/resources/mapper/SysConfigMapper.xml | 20 +++++ src/main/resources/templates/admin/about.html | 5 +- src/main/resources/templates/admin/index.html | 5 +- .../resources/templates/admin/webconfig.html | 81 +++++++++++++++++-- src/main/resources/templates/index.html | 12 ++- 14 files changed, 263 insertions(+), 43 deletions(-) create mode 100644 src/main/java/cn/hellohao/dao/SysConfigMapper.java create mode 100644 src/main/java/cn/hellohao/pojo/SysConfig.java create mode 100644 src/main/java/cn/hellohao/service/SysConfigService.java create mode 100644 src/main/java/cn/hellohao/service/impl/SysConfigServiceImpl.java create mode 100644 src/main/resources/mapper/SysConfigMapper.xml diff --git a/sql/picturebed.sql b/sql/picturebed.sql index 37ef31a..d67ba61 100644 --- a/sql/picturebed.sql +++ b/sql/picturebed.sql @@ -1,17 +1,17 @@ /* Navicat Premium Data Transfer - Source Server : localhost + Source Server : 129.28.173.126 Source Server Type : MySQL - Source Server Version : 50720 - Source Host : localhost:3306 + Source Server Version : 50562 + Source Host : 129.28.173.126:3306 Source Schema : picturebed Target Server Type : MySQL - Target Server Version : 50720 + Target Server Version : 50562 File Encoding : 65001 - Date: 10/08/2019 16:24:06 + Date: 15/08/2019 16:49:51 */ SET NAMES utf8mb4; @@ -35,14 +35,14 @@ CREATE TABLE `config` ( `domain` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点域名', `background1` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '首页背景图', `background2` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '上传页面背景图', - `sett` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `sett` int(2) NOT NULL, PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Records of config -- ---------------------------- -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); +INSERT INTO `config` VALUES (1, 1, 1, 'Hellohao', '本站是Hellohao图床测试站，账号/密码：admin，为了更多人测试，切勿修改账号密码，恶意使用永久拉黑IP,并公布于众。', '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://129.28.173.126:8088', 'https://hellohao.oss-cn-beijing.aliyuncs.com/Hellohao/eb83a0714030248.jpg', 'https://hellohao.oss-cn-beijing.aliyuncs.com/Hellohao/086650714030248.jpg', 1); -- ---------------------------- -- Table structure for emailconfig @@ -78,13 +78,7 @@ 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 = 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); +) ENGINE = InnoDB AUTO_INCREMENT = 89 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Table structure for imgreview @@ -103,7 +97,7 @@ CREATE TABLE `imgreview` ( -- ---------------------------- -- Records of imgreview -- ---------------------------- -INSERT INTO `imgreview` VALUES (1, NULL, NULL, NULL, 0, 0); +INSERT INTO `imgreview` VALUES (1, '1111111111111111', '11111111111111111', '111111111111111', 0, 0); -- ---------------------------- -- Table structure for keys @@ -123,13 +117,13 @@ CREATE TABLE `keys` ( -- ---------------------------- -- Records of 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, '', '', '0', '', '', 3); -INSERT INTO `keys` VALUES (4, '123', '123', '4', '412', 'https://0.0', 4); +INSERT INTO `keys` VALUES (1, '547046ec6495457783f040df098a8ce3', '255b334a4d174e95a3d9e5938f1966ab', 'https://nos-eastchina1.126.net', 'hellohao', 'https://hellohao.nos-eastchina1.126.net', 1); +INSERT INTO `keys` VALUES (2, '', '', '', '', '', 2); +INSERT INTO `keys` VALUES (3, '', '', '', '', '', 3); +INSERT INTO `keys` VALUES (4, '', '', '', '', '', 4); INSERT INTO `keys` VALUES (5, '0', '0', '0', '0', '0', 5); INSERT INTO `keys` VALUES (6, '', '', '', '', '', 6); -INSERT INTO `keys` VALUES (7, '234', '234124', '234124', '', '234142', 7); +INSERT INTO `keys` VALUES (7, '', '', '', '', '', 7); INSERT INTO `keys` VALUES (8, '', '', '', '', '', 8); INSERT INTO `keys` VALUES (9, '', '', '', '', '', 9); INSERT INTO `keys` VALUES (10, '0', '', '0', '0', '0', 10); @@ -143,6 +137,26 @@ CREATE TABLE `notice` ( `text` varchar(10000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +-- ---------------------------- +-- Records of notice +-- ---------------------------- +INSERT INTO `notice` VALUES (1, '2019-07-25'); + +-- ---------------------------- +-- Table structure for sysconfig +-- ---------------------------- +DROP TABLE IF EXISTS `sysconfig`; +CREATE TABLE `sysconfig` ( + `id` int(2) NOT NULL AUTO_INCREMENT, + `register` int(2) NOT NULL COMMENT '是否可以注册', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; + +-- ---------------------------- +-- Records of sysconfig +-- ---------------------------- +INSERT INTO `sysconfig` VALUES (1, 1); + -- ---------------------------- -- Table structure for uploadconfig -- ---------------------------- @@ -163,7 +177,7 @@ CREATE TABLE `uploadconfig` ( -- ---------------------------- -- Records of uploadconfig -- ---------------------------- -INSERT INTO `uploadconfig` VALUES (1, 3, 5, 1, 5, 'gif,jpg,jpeg,bmp,png', 1, 1, 0); +INSERT INTO `uploadconfig` VALUES (1, 2, 5, 1, 5, 'gif,jpg,jpeg,bmp,png', 2, 0, 1); -- ---------------------------- -- Table structure for user @@ -179,7 +193,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 = 3 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Records of user diff --git a/src/main/java/cn/hellohao/controller/AdminRootController.java b/src/main/java/cn/hellohao/controller/AdminRootController.java index 87af2d8..9b684f9 100644 --- a/src/main/java/cn/hellohao/controller/AdminRootController.java +++ b/src/main/java/cn/hellohao/controller/AdminRootController.java @@ -6,6 +6,7 @@ import cn.hellohao.utils.StringUtils; import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSONArray; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.PostMapping; @@ -31,7 +32,10 @@ public class AdminRootController { private UploadConfigService uploadConfigService; @Autowired private NoticeService noticeService; - + @Autowired + private SysConfigService sysConfigService; + @Value("${systemupdate}") + private String systemupdate; //返回对象存储界面 @RequestMapping(value = "/touser") public String touser() { @@ -151,8 +155,10 @@ public class AdminRootController { public String towebconfig(Model model) { Config config = configService.getSourceype(); UploadConfig updateConfig = uploadConfigService.getUpdateConfig(); + SysConfig sysConfig = sysConfigService.getstate(); model.addAttribute("config",config); model.addAttribute("updateConfig",updateConfig); + model.addAttribute("sysconfig",sysConfig); return "admin/webconfig"; } //修改站点配置 @@ -160,7 +166,7 @@ public class AdminRootController { @ResponseBody public Integer updateconfig(String webname,String explain, String logos, String footed, String links, String notice,String baidu, - String domain,String background1,String background2 ) { + String domain,String background1,String background2,Integer sett ) { Config config = new Config(); config.setWebname(webname); config.setExplain(explain); @@ -172,6 +178,7 @@ public class AdminRootController { config.setDomain(domain); config.setBackground1(background1); config.setBackground2(background2); + config.setSett(sett); Integer ret = configService.setSourceype(config); return ret; } @@ -192,6 +199,15 @@ public class AdminRootController { jsonArray.add(ret); return jsonArray.toString(); } + //修改注册开关 + @PostMapping("/setstate") + @ResponseBody + public Integer setstate(HttpSession session, SysConfig sysConfig) { + Integer ret =-1; + ret = sysConfigService.setstate(sysConfig); + return ret; + } + //关于系统 @RequestMapping("/about") @@ -199,6 +215,7 @@ public class AdminRootController { //Integer ret = uploadConfigService.setUpdateConfig(updateConfig); User u = (User) session.getAttribute("user"); model.addAttribute("level",u.getLevel()); + model.addAttribute("systemupdate",systemupdate); return "admin/about"; } //检查更新 diff --git a/src/main/java/cn/hellohao/controller/UpdateImgController.java b/src/main/java/cn/hellohao/controller/UpdateImgController.java index 3412e2b..13604cb 100644 --- a/src/main/java/cn/hellohao/controller/UpdateImgController.java +++ b/src/main/java/cn/hellohao/controller/UpdateImgController.java @@ -126,7 +126,6 @@ public class UpdateImgController { @ResponseBody public String upimg( HttpSession session , @RequestParam(value = "file", required = false) MultipartFile[] file) throws Exception { - Config config = configService.getSourceype();//查询当前系统使用的存储源类型。 UploadConfig uploadConfig = uploadConfigService.getUpdateConfig(); User u = (User) session.getAttribute("user"); diff --git a/src/main/java/cn/hellohao/dao/SysConfigMapper.java b/src/main/java/cn/hellohao/dao/SysConfigMapper.java new file mode 100644 index 0000000..eb57199 --- /dev/null +++ b/src/main/java/cn/hellohao/dao/SysConfigMapper.java @@ -0,0 +1,15 @@ +package cn.hellohao.dao; + +import cn.hellohao.pojo.SysConfig; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author Tiansh + * @version 1.0 + * @date 2019/8/15 13:33 + */ +@Mapper +public interface SysConfigMapper { + SysConfig getstate(); + Integer setstate(SysConfig sysConfig); +} diff --git a/src/main/java/cn/hellohao/pojo/Config.java b/src/main/java/cn/hellohao/pojo/Config.java index 182a777..4533014 100644 --- a/src/main/java/cn/hellohao/pojo/Config.java +++ b/src/main/java/cn/hellohao/pojo/Config.java @@ -14,13 +14,13 @@ public class Config { private String domain; private String background1; private String background2; - private String sett; + private Integer sett; public Config() { } - public Config(Integer id, Integer sourcekey, Integer emails, String webname, String explain, String logos, String footed, String links, String notice, String baidu, String domain, String background1, String background2, String sett) { + public Config(Integer id, Integer sourcekey, Integer emails, String webname, String explain, String logos, String footed, String links, String notice, String baidu, String domain, String background1, String background2, Integer sett) { this.id = id; this.sourcekey = sourcekey; this.emails = emails; @@ -141,11 +141,11 @@ public class Config { this.background2 = background2; } - public String getSett() { + public Integer getSett() { return sett; } - public void setSett(String sett) { + public void setSett(Integer sett) { this.sett = sett; } } diff --git a/src/main/java/cn/hellohao/pojo/SysConfig.java b/src/main/java/cn/hellohao/pojo/SysConfig.java new file mode 100644 index 0000000..4f63747 --- /dev/null +++ b/src/main/java/cn/hellohao/pojo/SysConfig.java @@ -0,0 +1,35 @@ +package cn.hellohao.pojo; + +/** + * @author Hellohao + * @version 1.0 + * @date 2019/8/15 13:27 + */ +public class SysConfig { + private Integer id; + private String register; + + public SysConfig() { + } + + public SysConfig(Integer id, String register) { + this.id = id; + this.register = register; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getRegister() { + return register; + } + + public void setRegister(String register) { + this.register = register; + } +} diff --git a/src/main/java/cn/hellohao/service/SysConfigService.java b/src/main/java/cn/hellohao/service/SysConfigService.java new file mode 100644 index 0000000..a47d7c1 --- /dev/null +++ b/src/main/java/cn/hellohao/service/SysConfigService.java @@ -0,0 +1,16 @@ +package cn.hellohao.service; + +import cn.hellohao.dao.SysConfigMapper; +import cn.hellohao.pojo.SysConfig; +import org.springframework.stereotype.Service; + +/** + * @author Hellohao + * @version 1.0 + * @date 2019/8/15 13:46 + */ +@Service +public interface SysConfigService { + SysConfig getstate(); + Integer setstate(SysConfig sysConfig); +} diff --git a/src/main/java/cn/hellohao/service/impl/SysConfigServiceImpl.java b/src/main/java/cn/hellohao/service/impl/SysConfigServiceImpl.java new file mode 100644 index 0000000..ab11f05 --- /dev/null +++ b/src/main/java/cn/hellohao/service/impl/SysConfigServiceImpl.java @@ -0,0 +1,27 @@ +package cn.hellohao.service.impl; + +import cn.hellohao.dao.SysConfigMapper; +import cn.hellohao.pojo.SysConfig; +import cn.hellohao.service.SysConfigService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @author Hellohao + * @version 1.0 + * @date 2019/8/15 13:48 + */ +@Service +public class SysConfigServiceImpl implements SysConfigService { + @Autowired + private SysConfigMapper sysConfigMapper; + @Override + public SysConfig getstate() { + return sysConfigMapper.getstate(); + } + + @Override + public Integer setstate(SysConfig sysConfig) { + return sysConfigMapper.setstate(sysConfig); + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 055f64e..c67d80f 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-10 +systemupdate=2019-08-15 diff --git a/src/main/resources/mapper/SysConfigMapper.xml b/src/main/resources/mapper/SysConfigMapper.xml new file mode 100644 index 0000000..c5abccd --- /dev/null +++ b/src/main/resources/mapper/SysConfigMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + UPDATE sysconfig + + + `register` = #{register} + + + where id=1 + + + + \ No newline at end of file diff --git a/src/main/resources/templates/admin/about.html b/src/main/resources/templates/admin/about.html index 4233d20..4e9513e 100644 --- a/src/main/resources/templates/admin/about.html +++ b/src/main/resources/templates/admin/about.html @@ -27,7 +27,7 @@

    开发者交流群：32452345342

    -

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

    +

         检查更新

     支持一下作者吧：


    @@ -46,7 +46,8 @@ }) }); - function sysupdate(v) { + function sysupdate() { + var v = $('#dates').text(); $.ajax({ type: "POST", url: "/admin/root/sysupdate", diff --git a/src/main/resources/templates/admin/index.html b/src/main/resources/templates/admin/index.html index e46398b..0c81af1 100644 --- a/src/main/resources/templates/admin/index.html +++ b/src/main/resources/templates/admin/index.html @@ -15,6 +15,9 @@ .layui-logo{ font-family: 'Old English Text MT', 'EngraversOldEnglishBT-Bold', 'Lato', "PingFang SC", "Microsoft YaHei", sans-serif; } + #titles{ + font-size: 1.2em; + } @@ -24,7 +27,7 @@
      diff --git a/src/main/resources/templates/admin/webconfig.html b/src/main/resources/templates/admin/webconfig.html index 22c8ea9..25aba21 100644 --- a/src/main/resources/templates/admin/webconfig.html +++ b/src/main/resources/templates/admin/webconfig.html @@ -15,11 +15,11 @@
    • 首页设置
    • 百度统计
    • 上传配置
      • +
    • 站点配置
    -
    @@ -105,8 +105,18 @@ - +
    + +
    + +
    + + +
    精简首页：页面加载完直接打开上传页面，没有展示页 +
    + +
    保存
    @@ -191,8 +201,8 @@
    - - + +
    @@ -200,6 +210,20 @@ 保存
    + +
    +
    +
    + +
    + +
    +
    +
    +

    更多功能陆续开放...

    +
    +
    @@ -209,6 +233,7 @@ \ No newline at end of file diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index e687ca8..734d23a 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -116,7 +116,7 @@
    -
    +
    @@ -183,7 +183,7 @@ Technology constantly updated, we will always move forward on the road ahead.
    Collect from 网站建设
    -
    +