feat: spring cloud loadbalancer集成caffenine, 增加本地环境变量的配置，支持同机多环境的开发

MrSongWhoLovesLearning · Jan 23, 2022 · ff049e6 · ff049e6
1 parent ad869d6
commit ff049e6
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,6 +20,8 @@ temp/
 # idea
 .idea/
 *.iml
+*.iws
+*.ipr
 
 *velocity.log*
 
@@ -30,11 +32,6 @@ temp/
 .factorypath
 .springBeans
 
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.ipr
-
 ### NetBeans ###
 nbproject/private/
 build/
@@ -44,3 +41,6 @@ nbdist/
 
 *.log
 tmp/
+
+# 环境变量
+local.env
diff --git a/mate-core/mate-starter-cloud/src/main/resources/bootstrap.yml b/mate-core/mate-starter-cloud/src/main/resources/bootstrap.yml
@@ -7,21 +7,22 @@ spring:
   cloud:
     nacos:
       config:
-        namespace: @config.namespace@
-        server-addr: @config.server-addr@
-        group: @config.group@
+        namespace: ${NACOS.NAMESPACE:@config.namespace@}
+        server-addr: ${NACOS.URL:@config.server-addr@}
+        group: ${NACOS.GROUP:@config.group@}
         file-extension: yaml
         prefix: mate
-#        shared-configs:
-#          - @artifactId@-@spring.active@.${spring.cloud.nacos.config.file-extension}
-#            refresh-enabled: true
-#        shared-configs[0]:
-#          data-id: @artifactId@.yaml
-#          group: DEFAULT_GROUP
-#          refresh: true
+      #        shared-configs:
+      #          - @artifactId@-@spring.active@.${spring.cloud.nacos.config.file-extension}
+      #            refresh-enabled: true
+      #        shared-configs[0]:
+      #          data-id: @artifactId@.yaml
+      #          group: DEFAULT_GROUP
+      #          refresh: true
       discovery:
-        namespace: @config.namespace@
-        server-addr: @config.server-addr@
+        namespace: ${NACOS.NAMESPACE:@config.namespace@}
+        server-addr: ${NACOS.URL:@config.server-addr@}
+        group: ${NACOS.GROUP:@config.group@}
         watch:
           enabled: false
     sentinel:
@@ -33,7 +34,12 @@ spring:
       eager: true
       transport:
         #port: @sentinel.port@
-        dashboard: @sentinel.dashboard@
+        dashboard: ${SENTINEL.URL:@sentinel.dashboard@}
+    loadbalancer:
+      cache:
+        enabled: true
+        caffeine:
+          spec: initialCapacity=500,expireAfterWrite=5s
 feign:
   sentinel:
     enabled: true
diff --git a/mate-core/mate-starter-dependencies/pom.xml b/mate-core/mate-starter-dependencies/pom.xml
@@ -107,6 +107,7 @@
         <lombok.version>1.18.20</lombok.version>
         <hutool.version>5.7.19</hutool.version>
         <spring.security.version>2.5.5</spring.security.version>
+        <caffeine.version>3.0.5</caffeine.version>
     </properties>
 
     <dependencyManagement>
@@ -600,6 +601,11 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>com.github.ben-manes.caffeine</groupId>
+                <artifactId>caffeine</artifactId>
+                <version>${caffeine.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/mate-core/mate-starter-feign/pom.xml b/mate-core/mate-starter-feign/pom.xml
@@ -29,6 +29,10 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-loadbalancer</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-actuator</artifactId>