diff --git a/sql/tbed.sql b/sql/tbed.sql index fe940d9..8251cea 100644 --- a/sql/tbed.sql +++ b/sql/tbed.sql @@ -1,17 +1,17 @@ /* Navicat Premium Data Transfer - Source Server : localhost + Source Server : locMysql Source Server Type : MySQL - Source Server Version : 50720 + Source Server Version : 80028 Source Host : localhost:3306 Source Schema : tbed Target Server Type : MySQL - Target Server Version : 50720 + Target Server Version : 80028 File Encoding : 65001 - Date: 29/10/2021 14:42:28 + Date: 12/07/2022 22:23:39 */ SET NAMES utf8mb4; @@ -26,23 +26,42 @@ CREATE TABLE `album` ( `albumtitle` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `createdate` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `password` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, - `userid` int(10) NULL DEFAULT NULL + `userid` int(0) NULL DEFAULT NULL ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Records of album -- ---------------------------- +-- ---------------------------- +-- Table structure for appclient +-- ---------------------------- +DROP TABLE IF EXISTS `appclient`; +CREATE TABLE `appclient` ( + `id` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, + `isuse` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, + `winpackurl` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `macpackurl` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `appname` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `applogo` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `appupdate` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of appclient +-- ---------------------------- +INSERT INTO `appclient` VALUES ('app', 'on', '', '', 'Hellohao图像托管', 'https://hellohao.nos-eastchina1.126.net/TbedClient/app.png', 'off'); + -- ---------------------------- -- Table structure for code -- ---------------------------- DROP TABLE IF EXISTS `code`; CREATE TABLE `code` ( - `id` int(255) NOT NULL AUTO_INCREMENT, + `id` int(0) NOT NULL AUTO_INCREMENT, `value` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `code` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 10 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Records of code @@ -53,9 +72,9 @@ CREATE TABLE `code` ( -- ---------------------------- DROP TABLE IF EXISTS `config`; CREATE TABLE `config` ( - `id` int(4) NOT NULL AUTO_INCREMENT, - `sourcekey` int(4) NULL DEFAULT NULL, - `emails` int(4) NULL DEFAULT NULL COMMENT '邮箱配置', + `id` int(0) NOT NULL AUTO_INCREMENT, + `sourcekey` int(0) NULL DEFAULT NULL, + `emails` int(0) NULL DEFAULT NULL COMMENT '邮箱配置', `webname` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '网站名', `explain` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `video` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, @@ -66,11 +85,11 @@ CREATE TABLE `config` ( `domain` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `background1` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `background2` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, - `sett` int(2) NOT NULL COMMENT '首页样式', + `sett` int(0) NOT NULL COMMENT '首页样式', `webms` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `webkeywords` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `webfavicons` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, - `theme` int(4) NULL DEFAULT 1 COMMENT '主题', + `theme` int(0) NULL DEFAULT 1 COMMENT '主题', `websubtitle` mediumtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL, `logo` mediumtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL, `aboutinfo` mediumtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL, @@ -87,13 +106,13 @@ INSERT INTO `config` VALUES (1, 7, 1, 'Hellohao图床', 'Hellohao图像托管, -- ---------------------------- DROP TABLE IF EXISTS `emailconfig`; CREATE TABLE `emailconfig` ( - `id` int(2) NOT NULL AUTO_INCREMENT, + `id` int(0) NOT NULL AUTO_INCREMENT, `emails` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '邮箱', `emailkey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '授权码', `emailurl` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '服务器', `port` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '端口', `emailname` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户名', - `using` int(4) NULL DEFAULT NULL COMMENT '1为可用,其他为不使用', + `using` int(0) NULL DEFAULT NULL COMMENT '1为可用,其他为不使用', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; @@ -107,13 +126,13 @@ INSERT INTO `emailconfig` VALUES (1, '', '', '', '465', 'Hellohao图床', 0); -- ---------------------------- DROP TABLE IF EXISTS `group`; CREATE TABLE `group` ( - `id` int(255) NOT NULL AUTO_INCREMENT, + `id` int(0) NOT NULL AUTO_INCREMENT, `groupname` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '组名称', - `keyid` int(255) NULL DEFAULT NULL, - `usertype` int(4) NULL DEFAULT NULL, - `compress` int(4) NULL DEFAULT NULL, + `keyid` int(0) NULL DEFAULT NULL, + `usertype` int(0) NULL DEFAULT NULL, + `compress` int(0) NULL DEFAULT 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 = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Records of group @@ -140,15 +159,15 @@ INSERT INTO `imgandalbum` VALUES ('http://img.wwery.com/ccx51/5GBv93Ks.jpg', 'TO -- ---------------------------- DROP TABLE IF EXISTS `imgdata`; CREATE TABLE `imgdata` ( - `id` int(255) NOT NULL AUTO_INCREMENT COMMENT '主键', + `id` int(0) NOT NULL AUTO_INCREMENT COMMENT '主键', `imgname` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '图片名', `imgurl` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '图片链接', - `userid` int(10) NULL DEFAULT NULL COMMENT '用户名', + `userid` int(0) NULL DEFAULT NULL COMMENT '用户名', `updatetime` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '上传时间', `sizes` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `abnormal` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, - `source` int(2) NULL DEFAULT NULL COMMENT '存储源', - `imgtype` int(2) NULL DEFAULT NULL, + `source` int(0) NULL DEFAULT NULL COMMENT '存储源', + `imgtype` int(0) NULL DEFAULT NULL, `explains` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `md5key` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `imguid` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, @@ -157,7 +176,7 @@ CREATE TABLE `imgdata` ( `violation` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE, INDEX `index_md5key_url`(`md5key`(255), `imgurl`(255)) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compressed; +) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compressed; -- ---------------------------- -- Records of imgdata @@ -168,12 +187,12 @@ CREATE TABLE `imgdata` ( -- ---------------------------- DROP TABLE IF EXISTS `imgreview`; CREATE TABLE `imgreview` ( - `id` int(4) NOT NULL AUTO_INCREMENT, + `id` int(0) NOT NULL AUTO_INCREMENT, `app_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `api_key` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `secret_key` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, - `Using` int(4) NULL DEFAULT NULL, - `count` int(255) NULL DEFAULT NULL COMMENT '拦截数量', + `Using` int(0) NULL DEFAULT NULL, + `count` int(0) NULL DEFAULT NULL COMMENT '拦截数量', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; @@ -187,7 +206,7 @@ INSERT INTO `imgreview` VALUES (1, '', '', '', 0, 0); -- ---------------------------- DROP TABLE IF EXISTS `imgtemp`; CREATE TABLE `imgtemp` ( - `id` int(255) NOT NULL AUTO_INCREMENT, + `id` int(0) NOT NULL AUTO_INCREMENT, `imguid` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `deltime` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE @@ -202,13 +221,13 @@ CREATE TABLE `imgtemp` ( -- ---------------------------- DROP TABLE IF EXISTS `keys`; CREATE TABLE `keys` ( - `id` int(11) NOT NULL AUTO_INCREMENT, + `id` int(0) NOT NULL AUTO_INCREMENT, `AccessKey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `AccessSecret` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `Endpoint` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `Bucketname` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `RequestAddress` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, - `storageType` int(11) NULL DEFAULT NULL, + `storageType` int(0) NULL DEFAULT NULL, `keyname` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '未定义策略名称' COMMENT '策略名称', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 14 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; @@ -230,8 +249,8 @@ INSERT INTO `keys` VALUES (13, '', '', '', '0', '', 7, 'ftp'); -- ---------------------------- DROP TABLE IF EXISTS `sysconfig`; CREATE TABLE `sysconfig` ( - `id` int(2) NOT NULL AUTO_INCREMENT, - `register` int(2) NOT NULL COMMENT '是否可以注册', + `id` int(0) NOT NULL AUTO_INCREMENT, + `register` int(0) NOT NULL COMMENT '是否可以注册', `checkduplicate` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; @@ -246,19 +265,19 @@ INSERT INTO `sysconfig` VALUES (1, 1, '0'); -- ---------------------------- DROP TABLE IF EXISTS `uploadconfig`; CREATE TABLE `uploadconfig` ( - `id` int(2) NOT NULL AUTO_INCREMENT, + `id` int(0) NOT NULL AUTO_INCREMENT, `filesizetourists` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `filesizeuser` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, - `imgcounttourists` int(10) NULL DEFAULT NULL COMMENT '游客文件总数量, 超出则不允许加入队列', - `imgcountuser` int(10) NULL DEFAULT NULL COMMENT '用户文件总数量, 超出则不允许加入队列', + `imgcounttourists` int(0) NULL DEFAULT NULL COMMENT '游客文件总数量, 超出则不允许加入队列', + `imgcountuser` int(0) NULL DEFAULT NULL COMMENT '用户文件总数量, 超出则不允许加入队列', `suffix` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '支持后缀', - `urltype` int(2) NULL DEFAULT NULL COMMENT 'url类型', - `isupdate` int(2) NULL DEFAULT NULL COMMENT '禁止游客上传', - `api` int(2) NOT NULL COMMENT '开启api', + `urltype` int(0) NULL DEFAULT NULL COMMENT 'url类型', + `isupdate` int(0) NULL DEFAULT NULL COMMENT '禁止游客上传', + `api` int(0) NOT NULL COMMENT '开启api', `visitormemory` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `usermemory` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `blacklist` varchar(4000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, - `userclose` int(4) NULL DEFAULT 0 COMMENT '用户上传开关', + `userclose` int(0) NULL DEFAULT 0 COMMENT '用户上传开关', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; @@ -272,34 +291,35 @@ INSERT INTO `uploadconfig` VALUES (1, '10485760', '20971520', 5, 10, 'gif,jpg,jp -- ---------------------------- DROP TABLE IF EXISTS `user`; CREATE TABLE `user` ( - `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '主键', + `id` int(0) NOT NULL AUTO_INCREMENT COMMENT '主键', `username` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '用户名', `password` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '密码', `email` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `birthder` date NULL DEFAULT NULL COMMENT '注册时间', - `level` int(10) NULL DEFAULT NULL COMMENT '等级', + `level` int(0) NULL DEFAULT NULL COMMENT '等级', `uid` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户唯一标识', - `isok` int(2) NOT NULL, + `isok` int(0) NOT NULL, `memory` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, - `groupid` int(255) NULL DEFAULT NULL, + `groupid` int(0) NULL DEFAULT NULL, + `token` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Records of user -- ---------------------------- -INSERT INTO `user` VALUES (1, 'admin', 'YWRtaW4=', 'admin', '2019-01-10', 2, 'e95c0571bfe04ec680c249fb15cc22e9', 1, '2147483648', 1); +INSERT INTO `user` VALUES (1, 'admin', 'YWRtaW4=', 'admin', '2019-01-10', 2, '6c58804b45794d52ad76770ae3a5cbff', 1, '2147483648', 1, ''); -- ---------------------------- -- Table structure for usergroup -- ---------------------------- DROP TABLE IF EXISTS `usergroup`; CREATE TABLE `usergroup` ( - `id` int(255) NOT NULL AUTO_INCREMENT, - `userid` int(255) NULL DEFAULT NULL, - `groupid` int(255) NULL DEFAULT NULL, + `id` int(0) NOT NULL AUTO_INCREMENT, + `userid` int(0) NULL DEFAULT NULL, + `groupid` int(0) NULL DEFAULT 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 = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Records of usergroup diff --git a/src/main/java/cn/hellohao/auth/filter/SubjectFilter.java b/src/main/java/cn/hellohao/auth/filter/SubjectFilter.java index 2480366..34c95b9 100644 --- a/src/main/java/cn/hellohao/auth/filter/SubjectFilter.java +++ b/src/main/java/cn/hellohao/auth/filter/SubjectFilter.java @@ -25,7 +25,6 @@ public class SubjectFilter extends BasicHttpAuthenticationFilter { public static String WEBHOST = null; private String CODE ="000"; - protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) { UserServiceImpl userService = SpringContextHolder.getBean(UserServiceImpl.class); HttpServletRequest httpServletRequest = (HttpServletRequest) request; @@ -73,15 +72,12 @@ public class SubjectFilter extends BasicHttpAuthenticationFilter { Subject subject = SecurityUtils.getSubject(); UsernamePasswordToken tokenOBJ = new UsernamePasswordToken(userData.getEmail(),userData.getPassword()); tokenOBJ.setRememberMe(true); - //执行登录方法,如果没有异常,说明登录成功 subject.login(tokenOBJ); SecurityUtils.getSubject().getSession().setTimeout(3600000); User loginUser = (User) SecurityUtils.getSubject().getPrincipal(); } } } - -// String token = httpServletRequest.getHeader("Authorization"); JSONObject jsonObject = JWTUtil.checkToken(token); if(!jsonObject.getBoolean("check")){ if(!serviceName.contains("admin") || serviceName.contains("admin/client")){ @@ -100,7 +96,6 @@ public class SubjectFilter extends BasicHttpAuthenticationFilter { subject.login(tokenOBJ); SecurityUtils.getSubject().getSession().setTimeout(3600000);//一小时 } catch (Exception e) { -// System.err.println("拦截器,登录失败,false"); this.CODE = "403"; return false; } diff --git a/src/main/java/cn/hellohao/auth/filter/xss/XssFilter.java b/src/main/java/cn/hellohao/auth/filter/xss/XssFilter.java index 8a06a40..00998c5 100644 --- a/src/main/java/cn/hellohao/auth/filter/xss/XssFilter.java +++ b/src/main/java/cn/hellohao/auth/filter/xss/XssFilter.java @@ -24,7 +24,6 @@ public class XssFilter implements Filter { //由于我的@WebFilter注解配置的是urlPatterns="/*"(过滤所有请求),所以这里对不需要过滤的静态资源url,作忽略处理(大家可以依照具体需求配置) String[] exclusionsUrls = {".js",".gif",".jpg",".png",".bmp",".css",".ico"};//,"/","/index","/admin/root/" for (String str : exclusionsUrls) { - //System.out.println(path.contains(str)); if (path.contains(str)) { filterChain.doFilter(servletRequest,servletResponse); return; diff --git a/src/main/java/cn/hellohao/auth/filter/xss/XssHttpServletRequestWrapper.java b/src/main/java/cn/hellohao/auth/filter/xss/XssHttpServletRequestWrapper.java index 799f98d..b339aad 100644 --- a/src/main/java/cn/hellohao/auth/filter/xss/XssHttpServletRequestWrapper.java +++ b/src/main/java/cn/hellohao/auth/filter/xss/XssHttpServletRequestWrapper.java @@ -89,8 +89,6 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper { String line = ""; StringBuilder body = new StringBuilder(); int counter = 0; - - // 读取POST提交的数据内容 BufferedReader reader = new BufferedReader(new InputStreamReader(stream, Charset.forName("UTF-8"))); try { while ((line = reader.readLine()) != null) { diff --git a/src/main/java/cn/hellohao/auth/shiro/UserRealm.java b/src/main/java/cn/hellohao/auth/shiro/UserRealm.java index 5bfb3e4..9fd5480 100644 --- a/src/main/java/cn/hellohao/auth/shiro/UserRealm.java +++ b/src/main/java/cn/hellohao/auth/shiro/UserRealm.java @@ -51,7 +51,6 @@ public class UserRealm extends AuthorizingRealm { if(u==null){ return null; } - //密码认证(防止泄露,不需要我们做) return new SimpleAuthenticationInfo(u,u.getPassword(),""); } } diff --git a/src/main/java/cn/hellohao/controller/AdminController.java b/src/main/java/cn/hellohao/controller/AdminController.java index 4cfc5a6..4806c36 100644 --- a/src/main/java/cn/hellohao/controller/AdminController.java +++ b/src/main/java/cn/hellohao/controller/AdminController.java @@ -324,7 +324,6 @@ public class AdminController { img.setSelecttype(selecttype); } }else{ - //普通用户 img.setUserid(user.getId()); } List images = imgService.selectimg(img); @@ -491,7 +490,6 @@ public class AdminController { return msg; } - //工具函数 private static String getChinaes(int v){ String ch = ""; switch(v){ diff --git a/src/main/java/cn/hellohao/controller/AlbumController.java b/src/main/java/cn/hellohao/controller/AlbumController.java index 3b3b000..427da9c 100644 --- a/src/main/java/cn/hellohao/controller/AlbumController.java +++ b/src/main/java/cn/hellohao/controller/AlbumController.java @@ -97,8 +97,7 @@ public class AlbumController { } - //后台列表要修改时的查询表单 - @PostMapping("/admin/getAlbumListForKey") + @PostMapping("/admin/getAlbumListForKey") @ResponseBody public Msg getAlbumListForKey(@RequestParam(value = "data", defaultValue = "") String data){ Msg msg = new Msg(); @@ -214,8 +213,6 @@ public class AlbumController { String password = jsonObject.getString("password"); JSONArray jsonArray = JSONArray.parseArray(jsonObject.getString("albumlist")); if(null!=password){ -// String regex = "^[a-z0-9A-Z\u4e00-\u9fa5]+$"; -// return str.matches(regex); password = password.replace(" ", ""); if(password.replace(" ", "").equals("") || password.length()<3){ msg.setCode("110403"); diff --git a/src/main/java/cn/hellohao/controller/ExceptionHandling.java b/src/main/java/cn/hellohao/controller/ExceptionHandling.java index eec709f..3b5dc15 100644 --- a/src/main/java/cn/hellohao/controller/ExceptionHandling.java +++ b/src/main/java/cn/hellohao/controller/ExceptionHandling.java @@ -24,7 +24,6 @@ public class ExceptionHandling { ModelAndView modelAndView = new ModelAndView("index"); Print.Normal("异常拦截成功:"+ ssie.getMessage()); modelAndView.addObject("error",ssie.getMessage()); - //返回错误信息,并显示给用户 return modelAndView; } diff --git a/src/main/java/cn/hellohao/controller/IndexController.java b/src/main/java/cn/hellohao/controller/IndexController.java index 87a4d16..be56f2a 100644 --- a/src/main/java/cn/hellohao/controller/IndexController.java +++ b/src/main/java/cn/hellohao/controller/IndexController.java @@ -282,12 +282,9 @@ public class IndexController { msg.setInfo("图像已不存在,删除成功"); return msg; } - //判断是不是自己的图片 因为这里的删除功能只能是首页上传后才会调用的接口 能删除的图片只能是自己的 Subject subject = SecurityUtils.getSubject(); User user = (User) subject.getPrincipal(); if(null!=user){ - //由于integer类型的==比较方式适用于-128~127之间,所以超过这个范围就会不对 -// if(user.getId()!=image.getUserid()){ if(!user.getId().equals(image.getUserid())){ msg.setInfo("删除失败,该图片不允许你执行操作"); msg.setCode("100403"); diff --git a/src/main/java/cn/hellohao/controller/UserController.java b/src/main/java/cn/hellohao/controller/UserController.java index 6856f0f..9f2cedd 100644 --- a/src/main/java/cn/hellohao/controller/UserController.java +++ b/src/main/java/cn/hellohao/controller/UserController.java @@ -124,12 +124,12 @@ public class UserController { userService.register(user); }else{ msg.setCode("110408"); - msg.setInfo("验证码不正确");//失效也要处理。 + msg.setInfo("验证码不正确"); } return msg; } - @PostMapping("/login")//new + @PostMapping("/login") @ResponseBody public Msg login(HttpServletRequest request,HttpSession httpSession,@RequestParam(value = "data", defaultValue = "") String data) { Msg msg = new Msg(); @@ -176,7 +176,6 @@ public class UserController { msg.setData(jsonObject); return msg; } catch (UnknownAccountException e) { - //此异常说明用户名不存在 msg.setCode("4000"); msg.setInfo("登录邮箱不存在"); System.err.println("邮箱不存在"); @@ -225,7 +224,7 @@ public class UserController { } } - @PostMapping(value = "/logout")//new + @PostMapping(value = "/logout") @ResponseBody public Msg exit(Model model, HttpServletRequest request, HttpServletResponse response, HttpSession session) { Msg msg = new Msg(); @@ -236,7 +235,7 @@ public class UserController { return msg; } - @PostMapping("/retrievePass") //new + @PostMapping("/retrievePass") @ResponseBody public Msg retrievePass(HttpServletRequest request,HttpSession httpSession, @RequestParam(value = "data", defaultValue = "") String data) { Msg msg = new Msg(); @@ -296,7 +295,7 @@ public class UserController { return msg; } - @RequestMapping(value = "/retrieve", method = RequestMethod.GET) //new + @RequestMapping(value = "/retrieve", method = RequestMethod.GET) public String retrieve(Model model, String activation,String cip) { Integer ret = 0; try {