浏览代码

google.guava包版本升级

叶君翔 3 年之前
父节点
当前提交
f844fb4396

+ 0 - 3
lb-gateway/pom.xml

@@ -26,14 +26,12 @@
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-            <version>2021.1</version>
         </dependency>
 
         <!-- SpringCloud Alibaba Nacos Config -->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-            <version>2021.1</version>
         </dependency>
 
         <!--&lt;!&ndash; SpringCloud Alibaba Sentinel &ndash;&gt;-->
@@ -52,7 +50,6 @@
         <dependency>
             <groupId>com.alibaba.csp</groupId>
             <artifactId>sentinel-datasource-nacos</artifactId>
-            <version>1.8.0</version>
         </dependency>
 
 

+ 2 - 2
lb-gateway/src/main/resources/application.yml

@@ -5,10 +5,10 @@ spring:
     nacos:
         discovery:
         # 服务注册地址
-          server-addr: 192.168.1.200:8848
+          server-addr: 153.37.175.42:8848
         config:
          # 配置中心地址
-          server-addr: 192.168.1.200:8848
+          server-addr: 153.37.175.42:8848
           file-extension: yml         # 配置文件格式
           # 共享配置
           shared-configs:

+ 12 - 1
lb-third/lb-third-common/pom.xml

@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>19.0</version>
+            <version>28.2-jre</version>
         </dependency>
         <!-- fastjson -->
         <dependency>
@@ -128,5 +128,16 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
+
+        <!-- SpringCloud Alibaba Nacos -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
     </dependencies>
 </project>

+ 2 - 0
lb-third/lb-third-waimai/src/main/java/com/ydd/WaiMaiApplication.java

@@ -5,6 +5,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
 /**
  * 启动程序
@@ -12,6 +13,7 @@ import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfi
  * @author
  */
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class,DruidDataSourceAutoConfigure.class,SecurityAutoConfiguration.class })
+@EnableDiscoveryClient
 public class WaiMaiApplication
 {
     public static void main(String[] args)

+ 1 - 1
lb-third/lb-third-waimai/src/main/java/com/ydd/third/controller/PrintController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
  * @author 叶君翔
  * @date 2021/11/10 12:00
  */
-@RequestMapping(value = "/waimai/print")
+@RequestMapping(value = "/print")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 public class PrintController {
 

+ 16 - 34
lb-third/lb-third-waimai/src/main/resources/application.yml

@@ -1,27 +1,10 @@
-# 项目相关配置
-project:
-  # 名称
-  name: liebao
-  # 版本
-  version: 1.0
-  # 版权年份
-  copyrightYear: 2021
-  # 实例演示开关
-  demoEnabled: true
-  # 文件路径,使用jvm系统变量,兼容windows和linux
-  profile: ${user.dir}/upload/uploadPath
-  # 获取ip地址开关
-  addressEnabled: false
-  # 验证码类型 math 数组计算 char 字符验证
-  captchaType: math
-
 # 开发环境配置
 server:
   # 服务器的HTTP端口,默认为8080
   port: 8085
   servlet:
     # 应用的访问路径
-    context-path: /delivery
+    context-path: /waimai
   # undertow 配置
   undertow:
     # HTTP post内容的最大大小。当值为-1时,默认值为大小是无限的
@@ -52,21 +35,20 @@ logging:
 
 # Spring配置
 spring:
-  # 资源信息
-  messages:
-    # 国际化资源文件路径
-    basename: i18n/messages
   profiles:
     active: @profiles.active@
-  # 文件上传
-  servlet:
-    multipart:
-      # 单个文件大小
-      max-file-size: 50MB
-      # 设置总上传的文件大小
-      max-request-size: 100MB
-  # 服务模块
-  devtools:
-    restart:
-      # 热部署开关
-      enabled: true
+  # 微服务-服务注册
+  application:
+    name: lb-waimai
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 153.37.175.42:8848
+      config:
+        # 配置中心地址
+        server-addr: 153.37.175.42:8848
+        file-extension: yml         # 配置文件格式
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}