#

vincentlu

2025-02-14 e091115b8938731d7d23b2b694f76d2c9b2da10e

#

 rsf-admin/src/page/login/Register.jsx

@@ -69,6 +69,10 @@
                setIsCounting(true);
                setCountdown(60);
                localStorage.setItem('codeCountdown', 60);
            } else if (code === 10005 || code === 10006) {
                setError('email', {
                    message: msg
                })
            } else {
                notify(msg, { type: 'error', messageArgs: { _: msg } });
            }

 rsf-admin/src/page/settings/BaseSettings.jsx

@@ -71,6 +71,10 @@
                    username: data.username
                }
                localStorage.setItem("user", JSON.stringify(userToPersist));
            } else if (code === 10005 || code === 10006) {
                setError('email', {
                    message: msg
                })
            } else {
                notify(msg, { type: 'error', messageArgs: { _: msg } });
            }

 rsf-server/src/main/java/com/vincent/rsf/server/common/domain/BusinessRes.java

@@ -12,4 +12,8 @@

    public final static String USERNAME_FROZEN = "10004 - Account frozen";

    public final static String INVALID_EMAIL = "10005 - Invalid email address";

    public final static String EMAIL_EXIT = "10006 - Email address already exist";

}

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java

@@ -88,10 +88,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)) {
@@ -138,7 +138,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")
@@ -184,6 +184,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()));
        }

 rsf-server/src/main/resources/application.yml

@@ -2,6 +2,16 @@
  profiles:

    active: dev



config:

  system-name: @pom.artifactId@

  system-version: @pom.version@

  system-mode: ONLINE

  token-key: KUHSMcYQ4lePt3r6bckz0P13cBJyoonYqInThvQlUnbsFCIcCcZZAbWZ6UNFztYNYPhGdy6eyb8WdIz8FU2Cz396TyTJk3NI2rtXMHBOehRb4WWJ4MdYVVg2oWPyqRQ2

  super-username: root

  code-length: 6

  code-time: 300

  security-code: 951123



eureka:

  client:

    enabled: false

@@ -25,14 +35,4 @@


logging:

  file:

    path: logs/@pom.artifactId@



config:

  system-name: @pom.artifactId@

  system-version: @pom.version@

  system-mode: ONLINE

  token-key: KUHSMcYQ4lePt3r6bckz0P13cBJyoonYqInThvQlUnbsFCIcCcZZAbWZ6UNFztYNYPhGdy6eyb8WdIz8FU2Cz396TyTJk3NI2rtXMHBOehRb4WWJ4MdYVVg2oWPyqRQ2

  super-username: root

  code-length: 6

  code-time: 300

  security-code: 951123
    path: logs/@pom.artifactId@