From a935fc71d8e52f2ba10e42cfdb9e75ef9cb32bd7 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 26 三月 2025 09:52:15 +0800
Subject: [PATCH] #修复 初始化时库区关系未绑定
---
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java
index b38af13..8551b63 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java
@@ -1,5 +1,6 @@
package com.vincent.rsf.server.system.controller;
+import com.vincent.rsf.common.enums.SystemModeType;
import com.vincent.rsf.common.utils.Utils;
import com.vincent.rsf.framework.common.BaseRes;
import com.vincent.rsf.framework.common.Cools;
@@ -62,7 +63,10 @@
@PostMapping("/login")
public R login(@RequestBody LoginParam param, HttpServletRequest request) {
String username = param.getUsername();
- User user = userService.getByUsername(username, null);
+ User user = userService.getByUsername(username
+ , configProperties.getSystemMode()
+ .equals(SystemModeType.OFFLINE) ? param.getTenantId() : null
+ );
if (user == null) {
return R.parse(BusinessRes.USERNAME_NOT_EXIST);
}
@@ -85,10 +89,10 @@
return R.parse(BaseRes.PARAM);
}
if (!emailService.isValid(email)) {
- return R.error("Please enter a valid email address.");
+ return R.parse(BusinessRes.INVALID_EMAIL);
}
if (null != userService.getByEmail(email, null)) {
- return R.error("Email Already Exist");
+ return R.parse(BusinessRes.EMAIL_EXIT);
}
Long expire = redisService.getExpire(EmailType.REGISTER_VERIFY.toString(), email);
if (expire > (configProperties.getCodeTime() - 60)) {
@@ -135,7 +139,7 @@
configProperties.getTokenExpireTime(), configProperties.getTokenKey());
userLoginService.saveAsync(user.getId(), accessToken, UserLogin.TYPE_LOGIN, tenantId, null, request);
Tenant tenant = tenantService.getById(user.getTenantId());
- return R.ok().add(new LoginResult(accessToken, user, tenant.getName()));
+ return R.ok("Sign Up Success").add(new LoginResult(accessToken, user, tenant.getName()));
}
@GetMapping("/system/info")
@@ -181,6 +185,15 @@
user.setEmailVerified(null);
user.setTenantId(null);
user.setStatus(null);
+ if (!Cools.isEmpty(user.getEmail())) {
+ if (!emailService.isValid(user.getEmail())) {
+ return R.parse(BusinessRes.INVALID_EMAIL);
+ }
+ User one = userService.getByEmail(user.getEmail(), null);
+ if (null != one && !one.getId().equals(user.getId())) {
+ return R.parse(BusinessRes.EMAIL_EXIT);
+ }
+ }
if (userService.updateById(user)) {
return R.ok("Save Success").add(userService.getById(user.getId()));
}
--
Gitblit v1.9.1