添加了redis支持

liujun · liujun · commit cf0d5606e782 · 2018-05-23T22:29:45.000+08:00
diff --git a/llmall-commodity/src/main/java/biz/llmall/commodity/config/RedisConfig.java b/llmall-commodity/src/main/java/biz/llmall/commodity/config/RedisConfig.java
@@ -0,0 +1,41 @@
+package biz.llmall.commodity.config;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.CachingConfigurerSupport;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cache.interceptor.KeyGenerator;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.cache.RedisCacheManager;
+import org.springframework.data.redis.core.RedisTemplate;
+
+import java.util.Arrays;
+
+@Configuration
+@EnableCaching
+public class RedisConfig extends CachingConfigurerSupport {
+    private RedisTemplate redisTemplate;
+
+    public RedisConfig(RedisTemplate redisTemplate) {
+        this.redisTemplate = redisTemplate;
+    }
+
+    @Bean
+    @Override
+    public KeyGenerator keyGenerator() {
+        return (target, method, params) -> {
+            StringBuilder stringBuilder = new StringBuilder();
+            stringBuilder.append(target.getClass().getName());
+            stringBuilder.append(method.getName());
+            Arrays.stream(params).forEach(param -> stringBuilder.append(param.toString()));
+            return stringBuilder.toString();
+        };
+    }
+
+    @Bean
+    @Override
+    public CacheManager cacheManager() {
+        RedisCacheManager redisCacheManager = new RedisCacheManager(redisTemplate);
+        redisCacheManager.setDefaultExpiration(24 * 3600);
+        return redisCacheManager;
+    }
+}
diff --git a/llmall-commodity/src/main/java/biz/llmall/commodity/controller/CarouselController.java b/llmall-commodity/src/main/java/biz/llmall/commodity/controller/CarouselController.java
@@ -4,6 +4,7 @@
 import biz.llmall.common.dto.response.EnumStatus;
 import biz.llmall.common.entity.carousel.Carousel;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -22,8 +23,18 @@ public APIResponse<List<Carousel>> findCarousels() {
         try {
             List<Carousel> carousels = carouselService.findCarousels(new Date());
             return APIResponse.success(carousels);
-        } catch (Exception cex) {
-            return APIResponse.error(EnumStatus.SERVICE_ERROR, cex.getMessage());
+        } catch (Exception ex) {
+            return APIResponse.error(EnumStatus.SERVICE_ERROR, ex.getMessage());
+        }
+    }
+
+    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
+    public APIResponse<Carousel> getCarouselById(@PathVariable("id") Long id) {
+        try {
+            Carousel carousel = carouselService.findCarouselById(id);
+            return APIResponse.success(carousel);
+        } catch (Exception ex) {
+            return APIResponse.error(EnumStatus.SERVICE_ERROR, ex.getMessage());
         }
     }
 }
diff --git a/llmall-commodity/src/main/java/biz/llmall/commodity/model/service/ICarouselService.java b/llmall-commodity/src/main/java/biz/llmall/commodity/model/service/ICarouselService.java
@@ -7,4 +7,5 @@
 
 public interface ICarouselService {
     List<Carousel> findCarousels(Date currentDatetime);
+    Carousel findCarouselById(Long id);
 }
diff --git a/llmall-commodity/src/main/java/biz/llmall/commodity/model/service/impl/BrandService.java b/llmall-commodity/src/main/java/biz/llmall/commodity/model/service/impl/BrandService.java
@@ -3,6 +3,7 @@
 import biz.llmall.commodity.model.service.IBrandService;
 import biz.llmall.common.entity.commodity.Brand;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -13,11 +14,13 @@ public class BrandService implements IBrandService {
     private BrandMapper brandMapper;
 
     @Override
+    @Cacheable("findBrands")
     public List<Brand> findBrands() {
         return brandMapper.findBrands();
     }
 
     @Override
+    @Cacheable("findBrandById")
     public Brand findBrandById(Long id) {
         return brandMapper.selectBrandByPrimaryKey(id);
     }
diff --git a/llmall-commodity/src/main/java/biz/llmall/commodity/model/service/impl/CarouselService.java b/llmall-commodity/src/main/java/biz/llmall/commodity/model/service/impl/CarouselService.java
@@ -3,6 +3,7 @@
 import biz.llmall.commodity.model.service.ICarouselService;
 import biz.llmall.common.entity.carousel.Carousel;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
@@ -14,7 +15,14 @@ public class CarouselService implements ICarouselService {
     private CarouselMapper carouselMapper;
 
     @Override
+    @Cacheable("findCarousels")
     public List<Carousel> findCarousels(Date currentDatetime) {
         return carouselMapper.findCarousels(currentDatetime);
     }
+
+    @Override
+    @Cacheable("findCarouselById")
+    public Carousel findCarouselById(Long id) {
+        return carouselMapper.selectCarouselByPrimaryKey(id);
+    }
 }
diff --git a/llmall-commodity/src/main/java/biz/llmall/commodity/model/service/impl/CategoryService.java b/llmall-commodity/src/main/java/biz/llmall/commodity/model/service/impl/CategoryService.java
@@ -3,6 +3,7 @@
 import biz.llmall.commodity.model.service.ICategoryService;
 import biz.llmall.common.entity.commodity.Category;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -12,11 +13,13 @@ public class CategoryService implements ICategoryService {
     @Autowired private CategoryMapper categoryMapper;
 
     @Override
+    @Cacheable("getCategories")
     public List<Category> getCategories() {
         return categoryMapper.findCategories();
     }
 
     @Override
+    @Cacheable("findCategoryById")
     public Category findCategoryById(Long id) {
         return categoryMapper.selectCategoryByPrimaryKey(id);
     }
diff --git a/llmall-commodity/src/main/java/biz/llmall/commodity/model/service/impl/CommodityService.java b/llmall-commodity/src/main/java/biz/llmall/commodity/model/service/impl/CommodityService.java
@@ -3,6 +3,7 @@
 import biz.llmall.commodity.model.service.ICommodityService;
 import biz.llmall.common.entity.commodity.Commodity;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -13,11 +14,13 @@ public class CommodityService implements ICommodityService {
     private CommodityMapper commodityMapper;
 
     @Override
+    @Cacheable("findCommoditiesTopX")
     public List<Commodity> findCommoditiesTopX(int max) {
         return commodityMapper.findCommoditiesTopX(max);
     }
 
     @Override
+    @Cacheable("findCommodityByPrimaryId")
     public Commodity findCommodityByPrimaryId(Long id) {
         return commodityMapper.selectCommodityByPrimaryKey(id);
     }
diff --git a/llmall-commodity/src/main/resources/application.yml b/llmall-commodity/src/main/resources/application.yml
@@ -11,9 +11,13 @@ spring:
     auto: true
   devtools:
     livereload:
-      enabled: true
+      enabled: false
     restart:
       exclude: static/**
+      enabled: false
+    remote:
+      restart:
+        enabled: false
   http:
     encoding:
       charset: UTF-8
@@ -31,7 +35,6 @@ mybatis:
     cache-enabled: true
 
 logging:
-  path: /var/log/llmall
   config: classpath:logback-spring.xml
   
 #swagger config
@@ -63,4 +66,6 @@ spring:
     host: 127.0.0.1
     port: 6379
     password: ge*u0Oj9X
+    database: 0
+
 ---
diff --git a/llmall-commodity/src/main/resources/mappers/CarouselMapper.xml b/llmall-commodity/src/main/resources/mappers/CarouselMapper.xml
@@ -19,7 +19,7 @@
 	<sql id="Carousel_Base_Column_List">
 	    id, start_time, end_time, round_at_last, auto, `order`, create_time, update_time
 	</sql>
-	<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="CarouselBaseResultMap">
+	<select id="selectCarouselByPrimaryKey" parameterType="java.lang.Long" resultMap="CarouselBaseResultMap">
 		select
 		<include refid="Carousel_Base_Column_List"/>
 		from carousel
@@ -46,7 +46,7 @@
 		from carousel_image
 		where carousel_id = #{id,jdbcType=BIGINT}
 	</select>
-	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+	<delete id="deleteCarouselByPrimaryKey" parameterType="java.lang.Long">
 	    delete from carousel
 	    where id = #{id,jdbcType=BIGINT}
 	</delete>
@@ -58,7 +58,7 @@
 	      #{roundAtLast,jdbcType=BIT}, #{auto,jdbcType=BIT},#{order,jdbcType=BIT}, #{createTime,jdbcType=TIMESTAMP},
 	      #{updateTime,jdbcType=TIMESTAMP})
 	</insert>
-	<update id="updateByPrimaryKey" parameterType="biz.llmall.common.entity.carousel.Carousel">
+	<update id="updateCarouselByPrimaryKey" parameterType="biz.llmall.common.entity.carousel.Carousel">
     	update carousel
 	    set start_time = #{startTime,jdbcType=TIMESTAMP},
 	      end_time = #{endTime,jdbcType=TIMESTAMP},
diff --git a/llmall-commodity/src/main/resources/mappers/CategoryMapper.xml b/llmall-commodity/src/main/resources/mappers/CategoryMapper.xml
@@ -56,6 +56,6 @@
 	<select id="findCategories" resultMap="CategoryMainMap">
         select * from category t1
         where 1=1
-        and t1.parent_id = 0;
+        and t1.parent_id = 0
     </select>
 </mapper>
diff --git a/llmall-common/src/main/java/biz/llmall/common/redis/EnumRedisKey.java b/llmall-common/src/main/java/biz/llmall/common/redis/EnumRedisKey.java
@@ -0,0 +1,34 @@
+package biz.llmall.common.redis;
+
+/**
+ * @author: liu jun
+ * @date: 14:30 2017/11/22
+ * @ver: 1.0
+ * @desc:
+ */
+public enum EnumRedisKey {
+	REDIS_VALUE_TIMEOUT("1"),
+    REDIS_KEY_BRANDS("brands"),
+    ;
+
+	private String key;
+
+	EnumRedisKey(String key) {
+		this.key = key;
+	}
+
+	public String getKeyName(String name) {
+		EnumRedisKey[] keys = EnumRedisKey.values();
+		for (EnumRedisKey k : keys) {
+			if (k.equals(name)) {
+				return k.getKeyName(name);
+			}
+		}
+
+		return "";
+	}
+
+	public String getKey() {
+		return key;
+	}
+}
diff --git a/pom.xml b/pom.xml
@@ -95,11 +95,6 @@
                 <artifactId>spring-boot-starter-data-redis</artifactId>
                 <version>${spring-boot.version}</version>
             </dependency>
-            <dependency>
-                <groupId>redis.clients</groupId>
-                <artifactId>jedis</artifactId>
-                <version>${jedis.version}</version>
-            </dependency>
             <!--json-->
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>

Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,5 @@`
`7`	`7`
`8`	`8`	`public interface ICarouselService {`
`9`	`9`	`List<Carousel> findCarousels(Date currentDatetime);`
	`10`	`+ Carousel findCarouselById(Long id);`
`10`	`11`	`}`