diff --git a/file-web/src/main/java/com/qiwenshare/file/config/QiwenFileConfig.java b/file-web/src/main/java/com/qiwenshare/file/config/QiwenFileConfig.java index 0653d02..0b6942e 100644 --- a/file-web/src/main/java/com/qiwenshare/file/config/QiwenFileConfig.java +++ b/file-web/src/main/java/com/qiwenshare/file/config/QiwenFileConfig.java @@ -8,6 +8,16 @@ import org.springframework.stereotype.Component; public class QiwenFileConfig { private boolean remoteLogin; + private boolean shareMode; + + public boolean isShareMode() { + return shareMode; + } + + public void setShareMode(boolean shareMode) { + this.shareMode = shareMode; + } + public boolean isRemoteLogin() { return remoteLogin; } diff --git a/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java b/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java index ca3e192..e2e8f01 100644 --- a/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java +++ b/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java @@ -36,11 +36,6 @@ public class FileController { @Autowired QiwenFileConfig qiwenFileConfig; - /** - * 是否开启共享文件模式 - */ - public static Boolean isShareFile = true; - public static long treeid = 0; /** @@ -123,7 +118,7 @@ public class FileController { @ResponseBody public RestResult> getFileList(FileBean fileBean, @RequestHeader("token") String token){ RestResult> restResult = new RestResult<>(); - if(isShareFile){ + if(qiwenFileConfig.isShareMode()){ fileBean.setUserId(2L); }else { //UserBean sessionUserBean = (UserBean) SecurityUtils.getSubject().getPrincipal(); @@ -365,7 +360,7 @@ public class FileController { result.setErrorMessage("未登录"); return result; } - if (isShareFile){ + if (qiwenFileConfig.isShareMode()){ if (sessionUserBean.getUserId() > 2){ result.setSuccess(false); result.setErrorMessage("没权限,请联系管理员!"); @@ -396,7 +391,7 @@ public class FileController { sessionUserBean = (UserBean) SecurityUtils.getSubject().getPrincipal(); } long userId = sessionUserBean.getUserId(); - if (isShareFile){ + if (qiwenFileConfig.isShareMode()){ userId = 2; } List file = fileService.selectFileByExtendName(getFileExtendsByType(fileBean.getFileType()), userId); @@ -424,7 +419,7 @@ public class FileController { } else { sessionUserBean = (UserBean) SecurityUtils.getSubject().getPrincipal(); } - if (isShareFile){ + if (qiwenFileConfig.isShareMode()){ fileBean.setUserId(2L); }else{ fileBean.setUserId(sessionUserBean.getUserId()); diff --git a/file-web/src/main/java/com/qiwenshare/file/controller/FiletransferController.java b/file-web/src/main/java/com/qiwenshare/file/controller/FiletransferController.java index 5385380..f1e6040 100644 --- a/file-web/src/main/java/com/qiwenshare/file/controller/FiletransferController.java +++ b/file-web/src/main/java/com/qiwenshare/file/controller/FiletransferController.java @@ -29,8 +29,6 @@ public class FiletransferController { @Resource IFiletransferService filetransferService; - @Resource - IFileService fileService; @Resource FileController fileController; @@ -148,7 +146,7 @@ public class FiletransferController { RestResult restResult = new RestResult(); UserBean sessionUserBean = (UserBean) SecurityUtils.getSubject().getPrincipal(); StorageBean storageBean = new StorageBean(); - if (FileController.isShareFile){ + if (qiwenFileConfig.isShareMode()){ storageBean.setUserId(2L); }else{ storageBean.setUserId(sessionUserBean.getUserId()); diff --git a/file-web/src/main/java/com/qiwenshare/file/controller/RouterController.java b/file-web/src/main/java/com/qiwenshare/file/controller/RouterController.java deleted file mode 100644 index 3d48a82..0000000 --- a/file-web/src/main/java/com/qiwenshare/file/controller/RouterController.java +++ /dev/null @@ -1,35 +0,0 @@ -//package com.mac.scp.controller; -// -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.ResponseBody; -//import org.springframework.web.bind.annotation.RestController; -//import org.springframework.web.servlet.ModelAndView; -// -///** -// * 用户控制类 -// * -// * @author ma116 -// */ -//@RestController -//public class RouterController { -// -// -// @RequestMapping("/file") -// @ResponseBody -// public ModelAndView file() { -// return new ModelAndView("/file.html"); -// } -// -// @RequestMapping("/login") -// @ResponseBody -// public ModelAndView login() { -// return new ModelAndView("/login"); -// } -// -// @RequestMapping("/register") -// @ResponseBody -// public ModelAndView register() { -// return new ModelAndView("/register"); -// } -// -//} diff --git a/file-web/src/main/java/com/qiwenshare/file/controller/UserController.java b/file-web/src/main/java/com/qiwenshare/file/controller/UserController.java index 54269de..48a52b3 100644 --- a/file-web/src/main/java/com/qiwenshare/file/controller/UserController.java +++ b/file-web/src/main/java/com/qiwenshare/file/controller/UserController.java @@ -33,8 +33,7 @@ import java.util.Map; public class UserController { @Resource IUserService userService; - @Resource - IFiletransferService filetransferService; + @Autowired IRemoteUserService remoteUserService; @Autowired diff --git a/file-web/src/main/resources/application.properties b/file-web/src/main/resources/application.properties index 79da0bb..9858bce 100644 --- a/file-web/src/main/resources/application.properties +++ b/file-web/src/main/resources/application.properties @@ -1,6 +1,6 @@ server.port=8080 -#eureka.client.register-with-eureka=false -#eureka.client.fetchRegistry=false +eureka.client.register-with-eureka=false +eureka.client.fetchRegistry=false #eureka.client.server.waitTimeInMsWhenSyncEmpty=0 eureka.instance.hostname=localhost eureka.client.serviceUrl.defaultZone=http://${eureka.instance.hostname}:8761/eureka/ @@ -46,3 +46,4 @@ mybatis-plus.configuration.map-underscore-to-camel-case=false mybatis-plus.global-config.banner=false qiwen-file.remote-login=false +qiwen-file.share-mode=false