houweiyu преди 4 години
родител
ревизия
eb501944e8

+ 1 - 5
kankan-daikan-application/src/main/java/kankan/daikan/KankanDaikanApplication.java

@@ -10,8 +10,6 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-//import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 
@@ -19,14 +17,12 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
+
 /**
  * @author abnerhou
  * @date 2021/1/5 12:25
  * @desciption
  */
-//@EnableFeignClients
-//@NacosPropertySource(dataId = "abner-test", autoRefreshed = true)
-@EnableDiscoveryClient
 @SpringBootApplication(scanBasePackages = {"fdage.back.sdk.base.mybatis","fdage.back.sdk.core" , "kankan.daikan" , "fdage.back.sdk.base.swagger"})
 @MapperScan(basePackages = {"kankan.daikan.base.dao"})
 public class KankanDaikanApplication extends SpringBootServletInitializer {

+ 5 - 1
kankan-daikan-core/src/main/java/kankan/daikan/base/config/MyNacosLifecycle.java

@@ -1,3 +1,4 @@
+/*
 package kankan.daikan.base.config;
 
 import org.springframework.beans.BeansException;
@@ -8,11 +9,13 @@ import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
 
+*/
 /**
  * 2 * @Author: Abner
  * 3 * @Date: 2021/1/29 13:59
  * 4
- */
+ *//*
+
 @Configuration
 public class MyNacosLifecycle implements ApplicationContextAware {
 
@@ -34,3 +37,4 @@ public class MyNacosLifecycle implements ApplicationContextAware {
     }
 }
 
+*/

+ 0 - 1
kankan-daikan-core/src/main/java/kankan/daikan/core/controller/CommonController.java

@@ -105,7 +105,6 @@ public class CommonController extends BaseController{
     @ApiOperation(value = "上传视频")
     @PostMapping("/upLoadVideo")
     @ResponseBody
-    @RequiresPermissions("sys:oss:all")
     public Result uploadIntroduceVideo(@RequestParam("file") MultipartFile file) {
         if (null == file) {
             throw new CommonBaseException(ResultCodeEnum.D3001);

+ 0 - 32
pom.xml

@@ -135,38 +135,6 @@
             <version>3.4.0</version>
         </dependency>
 
-        <!-- nacos 注册中心依赖 -->
-          <dependency>
-              <groupId>org.springframework.cloud</groupId>
-              <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-              <exclusions>
-                  <exclusion>
-                      <groupId>com.google.guava</groupId>
-                      <artifactId>guava</artifactId>
-                  </exclusion>
-                  <exclusion>
-                      <groupId>commons-io</groupId>
-                      <artifactId>commons-io</artifactId>
-                  </exclusion>
-                  <exclusion>
-                      <groupId>org.springframework.boot</groupId>
-                      <artifactId>spring-boot-starter-tomcat</artifactId>
-                  </exclusion>
-              </exclusions>
-          </dependency>
-        <!-- nacos 配置中心依赖 -->
-         <dependency>
-              <groupId>com.alibaba.boot</groupId>
-              <artifactId>nacos-config-spring-boot-starter</artifactId>
-              <version>${nacos-config-spring-boot.version}</version>
-              <exclusions>
-                  <exclusion>
-                      <groupId>com.google.guava</groupId>
-                      <artifactId>guava</artifactId>
-                  </exclusion>
-              </exclusions>
-          </dependency>
-
     </dependencies>
 
     <build>