Browse Source

del jetcache

GITZYY 7 months ago
parent
commit
9b234c151b

+ 0 - 1
egress-gateway-service-adapter/src/main/java/com/hrsk/cloud/eg/adapter/controller/package-info.java

@@ -1 +0,0 @@
-package com.hrsk.cloud.eg.adapter.controller;

+ 0 - 1
egress-gateway-service-adapter/src/main/java/com/hrsk/cloud/eg/adapter/package-info.java

@@ -1 +0,0 @@
-package com.hrsk.cloud.eg.adapter;

+ 4 - 4
egress-gateway-service-domain/pom.xml

@@ -59,10 +59,10 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-pool2</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.apache.commons</groupId>-->
+<!--            <artifactId>commons-pool2</artifactId>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>com.alibaba.fastjson2</groupId>
             <artifactId>fastjson2</artifactId>

+ 0 - 1
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/package-info.java

@@ -1 +0,0 @@
-package com.hrsk.cloud.eg.domain.api;

+ 0 - 1
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/package-info.java

@@ -1 +0,0 @@
-package com.hrsk.cloud.eg.domain;

+ 0 - 8
egress-gateway-service-infrastructure/pom.xml

@@ -54,13 +54,5 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.alicp.jetcache</groupId>
-            <artifactId>jetcache-starter-redis</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>redis.clients</groupId>
-            <artifactId>jedis</artifactId>
-        </dependency>
     </dependencies>
 </project>

+ 14 - 11
pom.xml

@@ -27,8 +27,9 @@
         <mybatis-plus-generator.version>3.5.1</mybatis-plus-generator.version>
         <fast2json.version>2.0.7</fast2json.version>
         <guva.version>33.2.1-jre</guva.version>
-        <jetcache.version>2.7.0</jetcache.version>
+        <redis.version>3.2.6</redis.version>
         <jedis.version>4.2.2</jedis.version>
+        <jetcache.version>2.5.14</jetcache.version>
     </properties>
 
     <dependencies>
@@ -89,6 +90,12 @@
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
                 <version>${commons-lang3.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>redis.clients</groupId>
+                        <artifactId>jedis</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>commons-codec</groupId>
@@ -133,6 +140,12 @@
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-pool2</artifactId>
                 <version>${common-pools.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>redis.clients</groupId>
+                        <artifactId>jedis</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>com.alibaba.fastjson2</groupId>
@@ -144,16 +157,6 @@
                 <artifactId>guava</artifactId>
                 <version>${guva.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.alicp.jetcache</groupId>
-                <artifactId>jetcache-starter-redis</artifactId>
-                <version>${jetcache.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>redis.clients</groupId>
-                <artifactId>jedis</artifactId>
-                <version>${jedis.version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 

+ 12 - 0
start/src/main/resources/application-dev.yaml

@@ -25,6 +25,18 @@ spring:
       poolPreparedStatements: true
       maxOpenPreparedStatements: 20
       logSlowSql: true
+#  redis:
+#    port: 6379
+#    password:
+#    host: 192.168.1.169
+#    database: 0
+#    lettuce:
+#      pool:
+#        max-active: 8
+#        max-idle: 8
+#        min-idle: 5
+#    timeout: 3
+
 #jetcache:
 #  statIntervalMinutes: 15 # 指定统计间隔,以分钟为单位。0表示没有统计数据。
 #  areaInCacheName: true # jetcache-anno使用缓存名称作为远程缓存密钥前缀,在jetcache 2.4.3 和之前的版本中,它总是在缓存名称中添加区域名称,从2.4.4开始我们有这个配置项,为兼容原因,默认值为true。

+ 14 - 0
start/src/main/resources/application-pre.yaml

@@ -20,6 +20,20 @@ spring:
       poolPreparedStatements: true
       maxOpenPreparedStatements: 20
       logSlowSql: true
+#  redis:
+#    timeout: 3
+#    database: 8
+#    host: 47.96.139.31
+#    port: 6380
+#    lettuce:
+#      pool:
+#        min-idle: 50
+#        max-idle: 50
+#        max-active: 100
+#        max-wait: -1
+#    password: IICdQIBA#DANB%gkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAK8f%
+
+
 
 #jetcache:
 #  statIntervalMinutes: 15 # 指定统计间隔,以分钟为单位。0表示没有统计数据。

+ 2 - 2
start/src/main/resources/logback-spring.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
+    <property name="PROJECT_NAME" value="eg-server"/>
     <!-- 日志存放路径 -->
-    <property name="log.path" value="./logs" />
-    <property name="LOG_HOME"  value="./log/${PROJECT_NAME}"/>
+    <property name="LOG_HOME"  value="./log"/>
     <!-- 日志输出格式 -->
     <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
     <!-- 控制台输出 -->

+ 1 - 16
start/src/test/java/StartTest.java

@@ -1,15 +1,8 @@
 import com.hrsk.cloud.eg.Application;
-import com.hrsk.cloud.eg.constant.BusinessPrefixEnum;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * @author zhangyy
  * @version 1.0
@@ -18,16 +11,8 @@ import java.util.Map;
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = Application.class)
-@ComponentScan(basePackages={"com.hrsk.cloud.eg.infrastructure.utils"})
 public class StartTest {
 
-    @Resource
-    private RedisUtil redisUtil;
 
-    @Test
-    public void test(){
-        Map<String,String> map = new HashMap<>();
-        map.put("key","value");
-       redisUtil.set(BusinessPrefixEnum.CHECK_INTO_PREFIX.getCode()+"test",map,5000 );
-    }
+
 }