Merge branch 'master' into hellohao-dev

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;
                 }

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;

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) {

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(),"");
     }
 }

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> images = imgService.selectimg(img);
@@ -491,7 +490,6 @@ public class AdminController {
         return msg;
     }
 
-    //工具函数
     private static String getChinaes(int v){
         String ch = "";
         switch(v){

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");

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;
     }
 

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");

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 {