Merge remote-tracking branch 'origin/dev_price' into dev_price

src/main/java/com/glxp/api/config/RedisConfig.java

@@ -15,6 +15,7 @@ import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.*;
 import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
+import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 
 import javax.annotation.Resource;
 
@@ -46,8 +47,7 @@ public class RedisConfig extends CachingConfigurerSupport {
      * retemplate相关配置
      * @param factory
      * @return
-     */
-    @Bean
+     */ @Bean
     public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {
 
         RedisTemplate<String, Object> template = new RedisTemplate<>();
@@ -57,7 +57,7 @@ public class RedisConfig extends CachingConfigurerSupport {
         //使用Jackson2JsonRedisSerializer来序列化和反序列化redis的value值（默认使用JDK的序列化方式）
         Jackson2JsonRedisSerializer jacksonSeial = new Jackson2JsonRedisSerializer(Object.class);
 
-        ObjectMapper om = new ObjectMapper();
+        ObjectMapper om = new JacksonConfig().jacksonObjectMapper(new Jackson2ObjectMapperBuilder());
         // 指定要序列化的域，field,get和set,以及修饰符范围，ANY是都有包括private和public
         om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
         // 指定序列化输入的类型，类必须是非final修饰的，final修饰的类，比如String,Integer等会跑出异常
@@ -76,6 +76,35 @@ public class RedisConfig extends CachingConfigurerSupport {
 
         return template;
     }
+//    @Bean
+//    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {
+//
+//        RedisTemplate<String, Object> template = new RedisTemplate<>();
+//        // 配置连接工厂
+//        template.setConnectionFactory(factory);
+//
+//        //使用Jackson2JsonRedisSerializer来序列化和反序列化redis的value值（默认使用JDK的序列化方式）
+//        Jackson2JsonRedisSerializer jacksonSeial = new Jackson2JsonRedisSerializer(Object.class);
+//
+//        ObjectMapper om = new ObjectMapper();
+//        // 指定要序列化的域，field,get和set,以及修饰符范围，ANY是都有包括private和public
+//        om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
+//        // 指定序列化输入的类型，类必须是非final修饰的，final修饰的类，比如String,Integer等会跑出异常
+//        om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
+//        jacksonSeial.setObjectMapper(om);
+//
+//        // 值采用json序列化
+//        template.setValueSerializer(jacksonSeial);
+//        //使用StringRedisSerializer来序列化和反序列化redis的key值
+//        template.setKeySerializer(new StringRedisSerializer());
+//
+//        // 设置hash key 和value序列化模式
+//        template.setHashKeySerializer(new StringRedisSerializer());
+//        template.setHashValueSerializer(jacksonSeial);
+//        template.afterPropertiesSet();
+//
+//        return template;
+//    }
 
     /**
      * 对hash类型的数据操作

src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemServiceImpl.java

@@ -2,6 +2,7 @@ package com.glxp.api.service.thrsys.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.auth.AuthLicenseDao;
 import com.glxp.api.dao.thrsys.ThrSystemDao;
 import com.glxp.api.entity.auth.AuthLicense;
@@ -53,7 +54,7 @@ public class ThrSystemServiceImpl extends ServiceImpl<ThrSystemDao,ThrSystemEnti
 
         if (filterBasicThirdSysRequest.getPage() != null) {
             int offset = (filterBasicThirdSysRequest.getPage() - 1) * filterBasicThirdSysRequest.getLimit();
-//            PageHelper.offsetPage(offset, filterBasicThirdSysRequest.getLimit());
+            PageHelper.offsetPage(offset, filterBasicThirdSysRequest.getLimit());
         }
         List<ThrSystemEntity> data = thrSystemDao.filterBasicThiSys(filterBasicThirdSysRequest);
         //查询本系统的授权码

src/main/java/com/glxp/api/util/page/ListPageRequest.java

@@ -14,16 +14,16 @@ public class ListPageRequest {
 
 
     @Min(message = "分页参数错误", value = 1)
-    private Integer page = 1;
+    private Integer page;
 
 
     @Min(value = 1, message = "分页参数不能小于1")
     @Max(value = 500, message = "分页参数不能大于500")
-    private Integer limit = 10;
+    private Integer limit;
     private String orderBy;
     private String sort;
 
     public Page getPageObj() {
-        return new Page(this.page, this.limit);
+        return new Page(this.page == null ? 1 : this.page, this.limit == null ? 10 : this.limit);
     }
 }