From 3156e9c21817f2056b870832f0902ddc07f6d4f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=9D=E5=85=88=E7=91=9E?= <1490493387@qq.com>
Date: Thu, 4 Aug 2022 22:07:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=9E=E9=AA=8C=E5=AE=A4=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=90=AF=E5=8A=A8=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 youlai-common/common-redis/pom.xml            |  2 ++
 youlai-common/common-web/pom.xml              |  6 ++++++
 youlai-lab/pom.xml                            | 19 +++++--------------
 .../java/com/youlai/lab/LabApplication.java   |  2 +-
 .../src/main/resources/bootstrap-dev.yml      | 17 +----------------
 5 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/youlai-common/common-redis/pom.xml b/youlai-common/common-redis/pom.xml
index 21ce82752..8750b4352 100644
--- a/youlai-common/common-redis/pom.xml
+++ b/youlai-common/common-redis/pom.xml
@@ -21,6 +21,7 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-cache</artifactId>
@@ -46,5 +47,6 @@
             <artifactId>spring-boot-configuration-processor</artifactId>
             <optional>true</optional>
         </dependency>
+
     </dependencies>
 </project>
diff --git a/youlai-common/common-web/pom.xml b/youlai-common/common-web/pom.xml
index def1cfa13..32484cc4a 100644
--- a/youlai-common/common-web/pom.xml
+++ b/youlai-common/common-web/pom.xml
@@ -22,6 +22,12 @@
             <artifactId>common-log</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.youlai</groupId>
+            <artifactId>common-redis</artifactId>
+        </dependency>
+
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
diff --git a/youlai-lab/pom.xml b/youlai-lab/pom.xml
index 0b0fb9c93..6663d6389 100644
--- a/youlai-lab/pom.xml
+++ b/youlai-lab/pom.xml
@@ -61,15 +61,6 @@
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.youlai</groupId>
-            <artifactId>common-web</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.youlai</groupId>
-            <artifactId>common-core</artifactId>
-        </dependency>
         <!-- Api文档 -->
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
@@ -85,11 +76,6 @@
             <artifactId>spring-jdbc</artifactId>
         </dependency>
 
-        <!--        <dependency>-->
-        <!--            <groupId>org.springframework</groupId>-->
-        <!--            <artifactId>spring-aspects</artifactId>-->
-        <!--        </dependency>-->
-
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
@@ -129,6 +115,11 @@
             <artifactId>ums-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.youlai</groupId>
+            <artifactId>common-web</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.youlai</groupId>
             <artifactId>common-mybatis</artifactId>
diff --git a/youlai-lab/src/main/java/com/youlai/lab/LabApplication.java b/youlai-lab/src/main/java/com/youlai/lab/LabApplication.java
index 53e9cf0f8..7cb7e77f4 100644
--- a/youlai-lab/src/main/java/com/youlai/lab/LabApplication.java
+++ b/youlai-lab/src/main/java/com/youlai/lab/LabApplication.java
@@ -15,7 +15,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * @author <a href="mailto:2256222053@qq.com">zc</a>
  * @date 2021/11/29 0029 22:50
  */
-@SpringBootApplication(exclude = DataSourceAutoConfiguration.class)
+@SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients(basePackageClasses = {OrderFeignClient.class, SkuFeignClient.class, MemberFeignClient.class})
 public class LabApplication {
diff --git a/youlai-lab/src/main/resources/bootstrap-dev.yml b/youlai-lab/src/main/resources/bootstrap-dev.yml
index 143c48707..f4fd07a50 100644
--- a/youlai-lab/src/main/resources/bootstrap-dev.yml
+++ b/youlai-lab/src/main/resources/bootstrap-dev.yml
@@ -15,24 +15,9 @@ spring:
         server-addr: http://localhost:8848
       # 配置中心
       config:
-        server-addr: http://localhost:8848
+        server-addr: http://c.youlai.tech:8848
         file-extension: yaml
         # 公共配置
         shared-configs[0]:
           data-id: youlai-common.yaml
           refresh: true
-    sentinel:
-      enabled: true
-      eager: true # 取消控制台懒加载，项目启动即连接Sentinel
-      transport: # 提供客户端与服务端基础和监控API模块
-        dashboard: localhost:8858 # 控制台地址
-      datasource:
-        # 限流规则，flow为key，随便定义
-        flow:
-          nacos:
-            server-addr: ${spring.cloud.nacos.discovery.server-addr}
-            namespace: sentinel-namespace-id
-            dataId: ${spring.application.name}-flow-rules
-            groupId: SENTINEL_GROUP
-            data-type: json
-            rule-type: flow