Merge remote-tracking branch 'origin/master'

src/main/java/com/dlbridge/jadp/common/interceptor/LogInterceptor.java

@@ -33,7 +33,7 @@ public class LogInterceptor extends JService implements HandlerInterceptor {
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response,
                              Object handler) throws Exception {        //线程绑定变量（该数据只有当前请求的线程可见）
-        log.info("URI:" + request.getRequestURI() + ",\n param:" + RequestParamHelper.createLinkString(RequestParamHelper.getRequestParamMap(request)));
+//        log.info("URI:" + request.getRequestURI() + ",\n param:" + RequestParamHelper.createLinkString(RequestParamHelper.getRequestParamMap(request)));
         return true;
     }
 

src/main/java/com/dlbridge/jadp/common/interceptor/SecurityInterceptor.java

@@ -55,7 +55,7 @@ public class SecurityInterceptor extends JService implements HandlerInterceptor
         }
 
         Map<String, Object> queryParams = getQueryParams(request);
-       logger.info("请求URL:"+request.getRequestURI()+queryParams);
+//       logger.info("请求URL:"+request.getRequestURI()+queryParams);
         if (handler instanceof HandlerMethod) {
             HandlerMethod handlerMethod = (HandlerMethod) handler;
             Method method = handlerMethod.getMethod();
@@ -80,8 +80,7 @@ public class SecurityInterceptor extends JService implements HandlerInterceptor
                 String sign = request.getParameter("sign");
                 String cId = request.getParameter("cId");
                 String uId = request.getParameter("uId");
-                String str = "cId=" + cId + "&timestamp=" + timestamp + "&uId=" + uId;
-               log.info("请求路径：" + str + ",sign:" + DigestUtils.md5DigestAsHex(str.getBytes()) + ",psign:" + sign);
+//               log.info("请求路径：" + str + ",sign:" + DigestUtils.md5DigestAsHex(str.getBytes()) + ",psign:" + sign);
                 if (NumberUtils.toInt(uId, -1) == -1 || NumberUtils.toInt(uId, -1) == 0) {
                     log.info("无用户信息登录");
                     response.sendRedirect("http://timer.geexek.com");
@@ -91,6 +90,7 @@ public class SecurityInterceptor extends JService implements HandlerInterceptor
                     log.info("无权限！");
                     throw new RuntimeException("无权限");
                 }
+                String str = "cId=" + cId + "&timestamp=" + timestamp + "&uId=" + uId;
                 if (!DigestUtils.md5DigestAsHex(str.getBytes()).equals(sign)) {
                     log.info("签名不一致！");
                     throw new RuntimeException("签名不一致！");

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/PhotoController.java

@@ -31,7 +31,7 @@ public class PhotoController {
     @RequestMapping("index/{cmptId}")
     @PageView
     public ModelAndView index(@PathVariable("cmptId") Integer cmptId,
-                              @RequestParam("uId") Integer userId,
+                              @RequestParam(value = "uId",required = false, defaultValue = "-1") Integer userId,
                               ModelAndView mv) {
         Cmpt cmpt = cmptService.queryCmptBycmptId(cmptId);
         int nueuserId = cmptService.getCommonNeuUserId(userId);