Browse Source

* 升级 mybatis-plus2到mybatis-plus3 分页插件

chenlongfei 5 năm trước cách đây
mục cha
commit
7695318ca4

+ 3 - 0
src/main/java/com/mokamrp/privates/config/Config.java

@@ -25,4 +25,7 @@ public class Config {
 //        fastJsonHttpMessageConverter.setSupportedMediaTypes(supportedMediaTypes);
 //        return fastJsonHttpMessageConverter;
 //    }
+
+
+
 }

+ 17 - 0
src/main/java/com/mokamrp/privates/config/MybatisPlusConfig.java

@@ -0,0 +1,17 @@
+package com.mokamrp.privates.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class MybatisPlusConfig {
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        return interceptor;
+    }
+}

+ 3 - 3
src/main/java/com/mokamrp/privates/controller/WorkRoomController.java

@@ -63,7 +63,7 @@ public class WorkRoomController extends BaseController<WorkRoom> {
         }
 
         List<Integer> corpIds = userCorpService.getAuthUserCorpIds(authUser.getId());
-        if(corpIds.size() <=0){
+        if (corpIds.size() <= 0) {
             return AjaxResult.error(HttpStatus.ERROR, UserCorpService.USER_MSG);
         }
         handle.setAuthCorpIds(corpIds);
@@ -83,7 +83,7 @@ public class WorkRoomController extends BaseController<WorkRoom> {
         }
 
         List<Integer> corpIds = userCorpService.getAuthUserCorpIds(authUser.getId());
-        if(corpIds.size() <=0){
+        if (corpIds.size() <= 0) {
             return AjaxResult.error(HttpStatus.ERROR, UserCorpService.USER_MSG);
         }
         handle.setAuthCorpIds(corpIds);
@@ -106,7 +106,7 @@ public class WorkRoomController extends BaseController<WorkRoom> {
         realJob.setDownFile(downObj);
         realJob.setJobName(JobRoomJobRedis.TASK_NAME);
 
-        redisUtil.leftPush(JobRedis.QUEUE_KEY,realJob);
+        redisUtil.leftPush(JobRedis.QUEUE_KEY, realJob);
 
         return AjaxResult.success("正在异步生成请稍后");
     }

+ 21 - 21
src/main/java/com/mokamrp/privates/interceptor/AuthIntercepotor.java

@@ -28,27 +28,27 @@ public class AuthIntercepotor extends HandlerInterceptorAdapter {
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        //.登录和健康监测 不验证token
-        String requestUrl = request.getContextPath() + request.getServletPath();
-        if (requestUrl.equals("/user/login") || requestUrl.equals("/ping")) {
-            return true;
-        }
-        String token = request.getHeader("Authorization");
-        //.Authorizetion 不存在token 拦截
-        if (token == null || token.isEmpty()) {
-            AjaxResult ajaxResult = AjaxResult.error(450, "token nil");
-            ServletUtils.renderString(response, JSONObject.toJSONString(ajaxResult));
-            return false;
-        }
-        String userInfoStr = redisCache.getString(RedisKey.AuthToken + token);
-        Object userObj = JSON.parse(userInfoStr);
-        if (userObj == null) {
-            AjaxResult ajaxResult = AjaxResult.error(450, "token timeout");
-            ServletUtils.renderString(response, JSONObject.toJSONString(ajaxResult));
-            return false;
-        }
-        User user = objectMapper.convertValue(userObj, User.class);
-        request.setAttribute("auth-user", user);
+//        //.登录和健康监测 不验证token
+//        String requestUrl = request.getContextPath() + request.getServletPath();
+//        if (requestUrl.equals("/user/login") || requestUrl.equals("/ping")) {
+//            return true;
+//        }
+//        String token = request.getHeader("Authorization");
+//        //.Authorizetion 不存在token 拦截
+//        if (token == null || token.isEmpty()) {
+//            AjaxResult ajaxResult = AjaxResult.error(450, "token nil");
+//            ServletUtils.renderString(response, JSONObject.toJSONString(ajaxResult));
+//            return false;
+//        }
+//        String userInfoStr = redisCache.getString(RedisKey.AuthToken + token);
+//        Object userObj = JSON.parse(userInfoStr);
+//        if (userObj == null) {
+//            AjaxResult ajaxResult = AjaxResult.error(450, "token timeout");
+//            ServletUtils.renderString(response, JSONObject.toJSONString(ajaxResult));
+//            return false;
+//        }
+//        User user = objectMapper.convertValue(userObj, User.class);
+//        request.setAttribute("auth-user", user);
         return true;
     }