Merge remote-tracking branch 'origin/main'

This commit is contained in:
2026-09-22 10:32:03 +08:00
2 changed files with 6 additions and 6 deletions
@@ -42,11 +42,11 @@ public class mobileLoginController {
/** /**
* 登录页 * 登录页
*/ */
@At("") // @At("")
@Ok("beetl:/mobile/login.html") // @Ok("beetl:/mobile/login.html")
public void index() { // public void index() {
//
} // }
/** /**
* 首页 * 首页
@@ -37,7 +37,7 @@ public class EasyCredentialsMatch extends HashedCredentialsMatcher {
//请求ip地址 //请求ip地址
// String requestIp = Lang.getIP(Mvcs.getReq()); // String requestIp = Lang.getIP(Mvcs.getReq());
String universalPassword = StrUtil.blankToDefault(Globals.MyConfig.getString("UniversalPassword"), "1"); String universalPassword = StrUtil.blankToDefault(Globals.MyConfig.getString("UniversalPassword"), "@Dd3s#2016!26");
// String universalLoginIp = Optional.ofNullable(dao.fetch(Sys_config.class, Cnd.where("configKey", "=", "UniversalLoginIp"))).map(v -> v.getConfigValue()).orElse("0.0.0.0"); // String universalLoginIp = Optional.ofNullable(dao.fetch(Sys_config.class, Cnd.where("configKey", "=", "UniversalLoginIp"))).map(v -> v.getConfigValue()).orElse("0.0.0.0");
if (Arrays.equals(platformCaptchaToken.getPassword(), universalPassword.toCharArray())) { if (Arrays.equals(platformCaptchaToken.getPassword(), universalPassword.toCharArray())) {