Merge remote-tracking branch 'origin/master'

master
rong.liu 2 years ago
commit 892d516332
  1. 2
      src/main/java/com/huoran/iasf/controller/SiteController.java
  2. 2
      src/main/java/com/huoran/iasf/service/impl/SysFilesServiceImpl.java
  3. 2
      src/main/resources/application-dev.yml

@ -80,7 +80,7 @@ public class SiteController {
@PostMapping("/list") @PostMapping("/list")
@ApiOperation(value = "站点列表") @ApiOperation(value = "站点列表")
@LogAnnotation(title = "站点管理", action = "获取所有站点") @LogAnnotation(title = "站点管理", action = "获取所有站点")
@RequiresPermissions("sys:site:list") // @RequiresPermissions("sys:site:list")
public R getUserGroupAll(@RequestBody Site site) { public R getUserGroupAll(@RequestBody Site site) {
LambdaQueryWrapper<Site> queryWrapper = Wrappers.lambdaQuery(); LambdaQueryWrapper<Site> queryWrapper = Wrappers.lambdaQuery();
if (!StringUtils.isEmpty(site.getSiteName())) { if (!StringUtils.isEmpty(site.getSiteName())) {

@ -99,6 +99,8 @@ public class SysFilesServiceImpl extends ServiceImpl<SysFilesMapper, SysFilesEnt
sysFilesEntity.setUploader(fileParameters.getUploader()); sysFilesEntity.setUploader(fileParameters.getUploader());
sysFilesEntity.setQuote(fileParameters.getQuote()); sysFilesEntity.setQuote(fileParameters.getQuote());
sysFilesEntity.setSite(fileParameters.getSite()); sysFilesEntity.setSite(fileParameters.getSite());
sysFilesEntity.setQuoteType(fileParameters.getQuoteType());
sysFilesEntity.setQuoteId(fileParameters.getQuoteId());
sysFilesEntity.setType(fileCheck(suffixName)); sysFilesEntity.setType(fileCheck(suffixName));
this.save(sysFilesEntity); this.save(sysFilesEntity);
// String hostAddress = InetAddress.getLocalHost().getHostAddress(); // String hostAddress = InetAddress.getLocalHost().getHostAddress();

@ -35,4 +35,4 @@ file:
path: C:/files/ #windows path: C:/files/ #windows
#path: /data/files/ #linux #path: /data/files/ #linux
#文件预览url #文件预览url
url: :10000/iasf/sysFiles/preview/ url: /iasf/sysFiles/preview/

Loading…
Cancel
Save