Merge branch 'zx_online_0422' of http://git.dayaedu.com/yonge/cooleshow into develop-new

cooleshow-auth/auth-server/pom.xml

@@ -16,7 +16,25 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
-
+        <dependency>
+            <groupId>com.dayaedu.cbs.openfeign</groupId>
+            <artifactId>dayaedu-openfeign-client</artifactId>
+            <version>1.0.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.alibaba.cloud</groupId>
+                    <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework.cloud</groupId>
+                    <artifactId>spring-cloud-loadbalancer</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework.cloud</groupId>
+                    <artifactId>spring-cloud-starter-openfeign</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>com.microsvc.toolkit.config</groupId>
             <artifactId>microsvc-config-jwt</artifactId>

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ExceptionLogController.java → cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/ExceptionLogController.java

@@ -1,4 +1,4 @@
-package com.yonge.cooleshow.admin.controller;
+package com.yonge.cooleshow.auth.web.controller;
 
 import com.dayaedu.cbs.common.enums.EAppKey;
 import com.dayaedu.cbs.openfeign.client.SysExceptionLogFeignClientService;