From 8089f7b3044c279b0ae722aa629713a9660248ea Mon Sep 17 00:00:00 2001 From: yizzuide Date: Thu, 13 Feb 2020 23:36:31 +0800 Subject: [PATCH] (*): SpEl support string operator. --- Milkomeda/milkomeda-spring-boot-starter.iml | 99 ++++++++-------- Milkomeda/pom.xml | 6 +- .../yizzuide/milkomeda/util/ReflectUtil.java | 4 +- MilkomedaDemo/MilkomedaDemo.iml | 110 +++++++++--------- MilkomedaDemo/pom.xml | 4 +- .../demo/light/service/OrderService.java | 6 +- .../src/main/resources/application.yml | 2 +- 7 files changed, 115 insertions(+), 116 deletions(-) diff --git a/Milkomeda/milkomeda-spring-boot-starter.iml b/Milkomeda/milkomeda-spring-boot-starter.iml index ce241eb4..1307eb51 100644 --- a/Milkomeda/milkomeda-spring-boot-starter.iml +++ b/Milkomeda/milkomeda-spring-boot-starter.iml @@ -66,91 +66,90 @@ - - - - - - - - - + + + + + + + + - + - - + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - + + + + + + + - + - + - - - + + + - + - - - + + + - + diff --git a/Milkomeda/pom.xml b/Milkomeda/pom.xml index c4bcd029..ca102867 100644 --- a/Milkomeda/pom.xml +++ b/Milkomeda/pom.xml @@ -11,7 +11,7 @@ 1.8 - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT 2.1.1 3.1 0.9.1 @@ -63,7 +63,7 @@ sonatype-oss-release - 2.5.1 + 2.5.2 @@ -181,7 +181,7 @@ org.springframework.boot spring-boot-dependencies - 2.2.2.RELEASE + 2.2.4.RELEASE pom import diff --git a/Milkomeda/src/main/java/com/github/yizzuide/milkomeda/util/ReflectUtil.java b/Milkomeda/src/main/java/com/github/yizzuide/milkomeda/util/ReflectUtil.java index c767e6be..fa1948fa 100644 --- a/Milkomeda/src/main/java/com/github/yizzuide/milkomeda/util/ReflectUtil.java +++ b/Milkomeda/src/main/java/com/github/yizzuide/milkomeda/util/ReflectUtil.java @@ -27,7 +27,7 @@ * * @author yizzuide * @since 0.2.0 - * @version 2.4.0 + * @version 2.5.2 * Create at 2019/04/11 19:55 */ @Slf4j @@ -112,7 +112,7 @@ public static String extractValue(JoinPoint joinPoint, String express) { } // 解析EL表达式 - if (express.startsWith("@") || express.startsWith("#") || express.startsWith("T(") || express.startsWith("args[")) { + if (express.startsWith("'") || express.startsWith("@") || express.startsWith("#") || express.startsWith("T(") || express.startsWith("args[")) { return ELContext.getValue(joinPoint, express); } return express; diff --git a/MilkomedaDemo/MilkomedaDemo.iml b/MilkomedaDemo/MilkomedaDemo.iml index d06d4890..7e904aea 100644 --- a/MilkomedaDemo/MilkomedaDemo.iml +++ b/MilkomedaDemo/MilkomedaDemo.iml @@ -25,41 +25,41 @@ - - - - + + + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - + + + + + + + + @@ -80,22 +80,22 @@ - - + + - - - + + + - - + + - + @@ -104,34 +104,34 @@ - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - + + - - - - - + + + + + diff --git a/MilkomedaDemo/pom.xml b/MilkomedaDemo/pom.xml index 64faca74..4c9ab538 100644 --- a/MilkomedaDemo/pom.xml +++ b/MilkomedaDemo/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.2.RELEASE + 2.2.4.RELEASE @@ -19,7 +19,7 @@ UTF-8 UTF-8 1.8 - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT 2.1.1 diff --git a/MilkomedaDemo/src/main/java/com/github/yizzuide/milkomeda/demo/light/service/OrderService.java b/MilkomedaDemo/src/main/java/com/github/yizzuide/milkomeda/demo/light/service/OrderService.java index 3e0c3a9c..3272783f 100644 --- a/MilkomedaDemo/src/main/java/com/github/yizzuide/milkomeda/demo/light/service/OrderService.java +++ b/MilkomedaDemo/src/main/java/com/github/yizzuide/milkomeda/demo/light/service/OrderService.java @@ -40,7 +40,7 @@ public List> findList() { * @param orderId 订单id */ // 参数采集方式生成缓存key - @LightCacheable(value = "order", keyPrefix = "order:", key = "#orderId", condition = "#orderId!=null", discardStrategy = LightDiscardStrategy.LazyExpire) + @LightCacheable(value = "order", key = "'order:' + #orderId", condition = "#orderId!=null", discardStrategy = LightDiscardStrategy.LazyExpire) // 静态方法生成缓存key // @LightCacheable(value = "order", key = "T(com.github.yizzuide.milkomeda.demo.light.pref.CacheKeys).ORDER.key", condition = "#orderId!=null", discardStrategy = LightDiscardStrategy.LazyExpire, expire = DEF_EXPIRE_SECONDS) public Order findById(String orderId) { @@ -48,12 +48,12 @@ public Order findById(String orderId) { return new Order(orderId, "小明", "1200", new Date()); } - @LightCacheEvict(value = "order", keyPrefix = "order:", key = "#orderId") + @LightCacheEvict(value = "order", key = "'order:' + #orderId") public void deleteById(String orderId) { log.info("删除订单：{}", orderId); } - @LightCachePut(value = "order", keyPrefix = "order:", key = "#orderId", condition = "#orderId!=null") + @LightCachePut(value = "order", key = "'order:' + #orderId", condition = "#orderId!=null") public Order updateById(String orderId) { return new Order(orderId, "小红", "2000", new Date()); } diff --git a/MilkomedaDemo/src/main/resources/application.yml b/MilkomedaDemo/src/main/resources/application.yml index 0cb5e4b0..469cb49f 100644 --- a/MilkomedaDemo/src/main/resources/application.yml +++ b/MilkomedaDemo/src/main/resources/application.yml @@ -9,7 +9,7 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://localhost:3306/milkomeda?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&useSSL=false&rewriteBatchedStatements=true&allowMultiQueries=true username: root - password: fuadmin + password: ${MYSQL_PWD} redis: host: 127.0.0.1