From de1edfafcb3e4287ea28d1cd3096281e0f526a21 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 04 Dec 2023 19:40:44 +0800
Subject: [PATCH] 设置登录有效期
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 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 2656e12..d5a67bd 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -212,7 +212,9 @@
@ApiOperation(value = "列表", notes = "传入account和realName")
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<IPage<UserVO>> page(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
+ System.out.println("在线更新代码.... ");
IPage<UserVO> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
+ System.out.println("=================在线更新代码==================");
return R.data(pages);
}
@@ -688,8 +690,8 @@
in, in.available(), -1)
.headers(headers)
.build());
- InputStream inputStream = new ByteArrayInputStream(b);
- FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
+// InputStream inputStream = new ByteArrayInputStream(b);
+// FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
//外围url
String urls = FileConfig.url + "/zhba/" + newName;
@@ -1307,7 +1309,7 @@
"id,tenant_id,account,password,name,real_name,avatar,email,phone,sex," +
"role_id,dept_id,cardid,nativePlace,nation,fingerprint,education," +
"politicaloutlook,healstats,height,address,registered,rtime," +
- "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch,guncode,create_time,cell) " +
+ "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch,guncode,create_time,update_time,cell) " +
"values(" + "'" + user.getId() + "'" +
"," + "'" + user.getTenantId() + "'" +
"," + "'" + user.getAccount() + "'" +
@@ -1340,17 +1342,16 @@
"," + "'" + user.getDispatch() + "'" +
"," + "'" + user.getGuncode() + "'" +
"," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getCreateTime()) + "'" +
+ "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'" +
"," + "'" + user.getCell() + "'" + ");" +
- "insert into sys_experience(id,name,post,entryTime," +
- "cardId,companyname,securityId) " +
- "values(" + "'" + experience.getId() + "'" + "," +
- "'" + experience.getName() + "'" + "," +
- "'" + experience.getPost() + "'" + "," +
+ "insert into sys_experience(id,name,post,entryTime,cardId,companyname,securityId) " +
+ "values(" + "'" + experience.getId() + "'" +
+ "," + "'" + experience.getName() + "'" +
+ "," + "'" + experience.getPost() + "'" +
"," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getEntrytime()) + "'" +
"," + "'" + experience.getCardid() + "'" +
"," + "'" + experience.getCompanyname() + "'" +
- "," + "'" + experience.getSecurityid() + "'"
- + ")";
+ "," + "'" + experience.getSecurityid() + "'" + ")";
myAsyncService.dataSync(s);
}
--
Gitblit v1.9.3