From bd4634e240ff004b524afc8cfe1007f4ca52a3c6 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 11 Apr 2022 10:46:52 +0800
Subject: [PATCH] minio 连接地址修改
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index fd5438e..c7643ed 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -347,6 +347,9 @@
user.setHold("2");
}
}
+ if (user.getHold().equals("2")){
+ states = true;
+ }
//如果是离职
if (null != user.getStatus()) {
@@ -655,7 +658,7 @@
}
}
//填写你文件上传的地址以及相应信息
- String url = "http://223.82.109.183:2081";
+ String url = "http://61.131.136.25:2081";
String access = "zhbaadmin";
String secret = "zhbapassword";
String bucket = "zhba";
@@ -688,7 +691,7 @@
FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
//外围url
- String urls = "http://223.82.109.183:2081/zhba/" + newName;
+ String urls = "http://61.131.136.25:2081/zhba/" + newName;
//内网
String inUrl = FtpConfig.ip + "/zhba/" + newName;
//返回
@@ -887,7 +890,7 @@
@ApiOperationSupport(order = 12)
@ApiOperation(value = "导入用户", notes = "传入excel")
public R importSecurityTest(MultipartFile file, Integer isCovered, String deptId) {
- SecurityImporterTest securityImporter = new SecurityImporterTest(userService, false, deptId);
+ SecurityImporterTest securityImporter = new SecurityImporterTest(userService);
ExcelUtil.save(file, securityImporter, SecurityExcel.class);
return R.success("操作成功");
}
@@ -1235,6 +1238,8 @@
user.setHold("2");
user.setSecuritynumber(null);
}
+ }else {
+ state = true;
}
String url = "";
--
Gitblit v1.9.3