From da54fd8dab6e0224b15adf384078cdc4a72af4de Mon Sep 17 00:00:00 2001 From: jack ning Date: Tue, 9 Sep 2025 12:57:32 +0800 Subject: [PATCH] update --- .../com/bytedesk/ai/robot/RobotTypeEnum.java | 3 +- .../core/config/WebSecurityConfig.java | 8 +- .../core/rbac/auth/AuthController.java | 149 ++------- .../core/rbac/auth/AuthLoginRetryHelper.java | 180 +++++++++++ .../bytedesk/core/rbac/auth/AuthService.java | 59 +++- .../rbac/user/UserDetailsServiceImpl.java | 13 + plugins/cms/.gitattributes | 2 + .../cms/.mvn/wrapper/maven-wrapper.properties | 19 ++ plugins/cms/mvnw | 259 +++++++++++++++ plugins/cms/mvnw.cmd | 149 +++++++++ plugins/cms/pom.xml | 35 +++ plugins/cms/readme.md | 4 + .../java/com/bytedesk/cms/CmsApplication.java | 13 + .../src/main/resources/application.properties | 1 + .../com/bytedesk/cms/CmsApplicationTests.java | 13 + plugins/crm/.gitattributes | 2 + .../crm/.mvn/wrapper/maven-wrapper.properties | 2 + plugins/crm/mvnw | 295 ++++++++++++++++++ plugins/crm/mvnw.cmd | 189 +++++++++++ plugins/crm/pom.xml | 35 +++ .../java/com/bytedesk/crm/CrmApplication.java | 13 + .../src/main/resources/application.properties | 1 + .../com/bytedesk/crm/CrmApplicationTests.java | 13 + 23 files changed, 1318 insertions(+), 139 deletions(-) create mode 100644 modules/core/src/main/java/com/bytedesk/core/rbac/auth/AuthLoginRetryHelper.java create mode 100644 plugins/cms/.gitattributes create mode 100644 plugins/cms/.mvn/wrapper/maven-wrapper.properties create mode 100755 plugins/cms/mvnw create mode 100644 plugins/cms/mvnw.cmd create mode 100644 plugins/cms/pom.xml create mode 100644 plugins/cms/readme.md create mode 100644 plugins/cms/src/main/java/com/bytedesk/cms/CmsApplication.java create mode 100644 plugins/cms/src/main/resources/application.properties create mode 100644 plugins/cms/src/test/java/com/bytedesk/cms/CmsApplicationTests.java create mode 100644 plugins/crm/.gitattributes create mode 100644 plugins/crm/.mvn/wrapper/maven-wrapper.properties create mode 100755 plugins/crm/mvnw create mode 100644 plugins/crm/mvnw.cmd create mode 100644 plugins/crm/pom.xml create mode 100644 plugins/crm/src/main/java/com/bytedesk/crm/CrmApplication.java create mode 100644 plugins/crm/src/main/resources/application.properties create mode 100644 plugins/crm/src/test/java/com/bytedesk/crm/CrmApplicationTests.java diff --git a/modules/ai/src/main/java/com/bytedesk/ai/robot/RobotTypeEnum.java b/modules/ai/src/main/java/com/bytedesk/ai/robot/RobotTypeEnum.java index 741b082edf..fdec0e56ab 100644 --- a/modules/ai/src/main/java/com/bytedesk/ai/robot/RobotTypeEnum.java +++ b/modules/ai/src/main/java/com/bytedesk/ai/robot/RobotTypeEnum.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-06-05 11:10:06 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-04-17 17:10:00 + * @LastEditTime: 2025-09-09 09:54:29 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -19,7 +19,6 @@ public enum RobotTypeEnum { LLM, // 问答机器人, 直接调用大模型 KB, // 知识库机器人, 跟某一个知识库对话 KBDOC, // 知识库机器人, 跟某一个文档对话 - // RAG, // 文档问答机器人, 检索问答: 通过isKbEnabled字段判断 ; // 根据整型值查找对应的枚举常量 diff --git a/modules/core/src/main/java/com/bytedesk/core/config/WebSecurityConfig.java b/modules/core/src/main/java/com/bytedesk/core/config/WebSecurityConfig.java index cbf7fe6647..fe5dc47916 100644 --- a/modules/core/src/main/java/com/bytedesk/core/config/WebSecurityConfig.java +++ b/modules/core/src/main/java/com/bytedesk/core/config/WebSecurityConfig.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-05-16 18:19:59 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-06-26 17:00:29 + * @LastEditTime: 2025-09-09 12:43:21 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -92,12 +92,6 @@ public class WebSecurityConfig { return http.build(); } - // 注释掉单独的 UserDetailsService bean，因为它已经在 DaoAuthenticationProvider 中使用 - // @Bean - // public UserDetailsService userDetailsService() { - // return new UserDetailsServiceImpl(); - // } - @Bean public AuthTokenFilter authTokenFilter() { return new AuthTokenFilter(); diff --git a/modules/core/src/main/java/com/bytedesk/core/rbac/auth/AuthController.java b/modules/core/src/main/java/com/bytedesk/core/rbac/auth/AuthController.java index a465514163..79c272b88a 100644 --- a/modules/core/src/main/java/com/bytedesk/core/rbac/auth/AuthController.java +++ b/modules/core/src/main/java/com/bytedesk/core/rbac/auth/AuthController.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-01-29 16:21:24 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-09-08 14:39:02 + * @LastEditTime: 2025-09-09 12:28:07 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -13,8 +13,6 @@ package com.bytedesk.core.rbac.auth; import org.springframework.http.ResponseEntity; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -41,9 +39,6 @@ import com.bytedesk.core.utils.JwtUtils; import com.bytedesk.core.rbac.token.TokenRestService; import org.springframework.util.StringUtils; -import com.bytedesk.core.redis.RedisLoginRetryService; -import com.bytedesk.core.config.properties.BytedeskProperties; - @Slf4j @RestController @RequestMapping("/auth/v1") @@ -60,13 +55,9 @@ public class AuthController { private final KaptchaRedisService kaptchaRestService; - private final AuthenticationManager authenticationManager; - private final TokenRestService tokenRestService; - private final RedisLoginRetryService redisLoginRetryService; - - private final BytedeskProperties bytedeskProperties; + private final AuthLoginRetryHelper loginRetryHelper; @PostMapping(value = "/register") public ResponseEntity register(@RequestBody UserRequest userRequest, HttpServletRequest request) { @@ -96,123 +87,47 @@ public class AuthController { return ResponseEntity.ok().body(JsonResult.error(I18Consts.I18N_AUTH_CAPTCHA_ERROR, -1, false)); } - // 检查用户是否被锁定 - if (redisLoginRetryService.isUserLocked(authRequest.getUsername())) { - long remainingTime = redisLoginRetryService.getLockRemainingTime(authRequest.getUsername()); - if (remainingTime > 0) { - long minutes = remainingTime / 60; - long seconds = remainingTime % 60; - String timeStr = minutes > 0 ? minutes + "分" + seconds + "秒" : seconds + "秒"; - return ResponseEntity.ok().body(JsonResult.error("账户已被锁定，请" + timeStr + "后重试", -1, false)); - } else { - // 锁定时间已过，解锁用户 - redisLoginRetryService.unlockUser(authRequest.getUsername()); - } - } - - // 获取配置的最大重试次数和锁定时间 - int maxRetryCount = 3; // 默认值 - int lockTimeMinutes = 10; // 默认值 - try { - if (bytedeskProperties != null && bytedeskProperties.getCustom() != null) { - if (bytedeskProperties.getCustom().getLoginMaxRetryCount() != null) { - maxRetryCount = bytedeskProperties.getCustom().getLoginMaxRetryCount(); - } - if (bytedeskProperties.getCustom().getLoginMaxRetryLockTime() != null) { - lockTimeMinutes = bytedeskProperties.getCustom().getLoginMaxRetryLockTime(); - } - } - } catch (Exception e) { - log.warn("Failed to get BytedeskProperties, using default values", e); - } + // 预登录检查 + loginRetryHelper.performPreLoginChecks(authRequest.getUsername()); - // 如果最大重试次数为0，表示不限制 - if (maxRetryCount > 0) { - int currentFailedCount = redisLoginRetryService.getLoginFailedCount(authRequest.getUsername()); - if (currentFailedCount >= maxRetryCount) { - // 达到最大重试次数，锁定用户 - if (lockTimeMinutes > 0) { - redisLoginRetryService.lockUser(authRequest.getUsername(), lockTimeMinutes * 60L); - return ResponseEntity.ok().body(JsonResult.error("密码错误次数过多，账户已被锁定" + lockTimeMinutes + "分钟", -1, false)); + Authentication authentication; + // 判断是否使用密码哈希登录 + if (StringUtils.hasText(authRequest.getPassword())) { + // 使用自定义明文密码授权逻辑 + log.debug("Using plain password authentication"); + authentication = authService.authenticateWithPlainPassword(authRequest); + if (authentication == null) { + return loginRetryHelper.handleLoginFailure(authRequest.getUsername(), "用户名或密码错误"); } - } - } - - Authentication authentication; - // 判断是否使用密码哈希登录 - if (StringUtils.hasText(authRequest.getPassword())) { - // 使用现有登录逻辑（明文密码） - log.debug("Using plain password authentication"); - try { - authentication = authenticationManager.authenticate( - new UsernamePasswordAuthenticationToken(authRequest.getUsername(), authRequest.getPassword())); - // 登录成功，重置失败次数 - redisLoginRetryService.resetLoginFailedCount(authRequest.getUsername()); - - } catch (Exception e) { - // 登录失败，增加失败次数 - if (maxRetryCount > 0) { - int newFailedCount = redisLoginRetryService.incrementLoginFailedCount(authRequest.getUsername(), 3600L); // 1小时过期 - int remainingAttempts = maxRetryCount - newFailedCount; - - if (remainingAttempts > 0) { - return ResponseEntity.ok().body(JsonResult.error("用户名或密码错误，还可尝试" + remainingAttempts + "次", -1, false)); - } else { - // 达到最大重试次数，锁定用户 - if (lockTimeMinutes > 0) { - redisLoginRetryService.lockUser(authRequest.getUsername(), lockTimeMinutes * 60L); - return ResponseEntity.ok().body(JsonResult.error("密码错误次数过多，账户已被锁定" + lockTimeMinutes + "分钟", -1, false)); - } else { - return ResponseEntity.ok().body(JsonResult.error("用户名或密码错误", -1, false)); - } - } - } else { - return ResponseEntity.ok().body(JsonResult.error("用户名或密码错误", -1, false)); - } - } - } else if (StringUtils.hasText(authRequest.getPasswordHash()) - && StringUtils.hasText(authRequest.getPasswordSalt())) { - // 使用密码哈希登录（AES解密） - log.debug("Using password hash authentication with AES decryption for user: {}", authRequest.getUsername()); - try { + } else if (StringUtils.hasText(authRequest.getPasswordHash()) + && StringUtils.hasText(authRequest.getPasswordSalt())) { + // 使用密码哈希登录（AES解密） + log.debug("Using password hash authentication with AES decryption for user: {}", authRequest.getUsername()); authentication = authService.authenticateWithPasswordHash(authRequest); if (authentication == null) { - // 登录失败，增加失败次数 - if (maxRetryCount > 0) { - int newFailedCount = redisLoginRetryService.incrementLoginFailedCount(authRequest.getUsername(), 3600L); // 1小时过期 - int remainingAttempts = maxRetryCount - newFailedCount; - - if (remainingAttempts > 0) { - return ResponseEntity.ok().body(JsonResult.error("用户名或密码错误，还可尝试" + remainingAttempts + "次", -1, false)); - } else { - // 达到最大重试次数，锁定用户 - if (lockTimeMinutes > 0) { - redisLoginRetryService.lockUser(authRequest.getUsername(), lockTimeMinutes * 60L); - return ResponseEntity.ok().body(JsonResult.error("密码错误次数过多，账户已被锁定" + lockTimeMinutes + "分钟", -1, false)); - } else { - return ResponseEntity.ok().body(JsonResult.error("用户名或密码错误", -1, false)); - } - } - } else { - return ResponseEntity.ok().body(JsonResult.error("用户名或密码错误", -1, false)); - } + return loginRetryHelper.handleLoginFailure(authRequest.getUsername(), "用户名或密码错误"); } - // 登录成功，重置失败次数 - redisLoginRetryService.resetLoginFailedCount(authRequest.getUsername()); - - } catch (Exception e) { - log.error("Password hash authentication failed for user: {}: {}", authRequest.getUsername(), e.getMessage()); + } else { + return ResponseEntity.ok().body(JsonResult.error("Password or password hash is required", -1, false)); + } + + // 登录成功，重置失败次数 + loginRetryHelper.resetLoginFailedCount(authRequest.getUsername()); + + // 格式化并返回成功响应 + AuthResponse authResponse = authService.formatResponse(authRequest, authentication); + return ResponseEntity.ok(JsonResult.success(authResponse)); + + } catch (Exception e) { + log.error("Authentication failed for user: {}: {}", authRequest.getUsername(), e.getMessage()); + if (StringUtils.hasText(authRequest.getPasswordHash())) { return ResponseEntity.ok().body(JsonResult.error("密码解密失败，请检查密码格式", -1, false)); } - } else { - return ResponseEntity.ok().body(JsonResult.error("Password or password hash is required", -1, false)); + return loginRetryHelper.handleLoginFailure(authRequest.getUsername(), "用户名或密码错误"); } - // - AuthResponse authResponse = authService.formatResponse(authRequest, authentication); - return ResponseEntity.ok(JsonResult.success(authResponse)); } @PostMapping("/send/mobile") diff --git a/modules/core/src/main/java/com/bytedesk/core/rbac/auth/AuthLoginRetryHelper.java b/modules/core/src/main/java/com/bytedesk/core/rbac/auth/AuthLoginRetryHelper.java new file mode 100644 index 0000000000..59e53bb371 --- /dev/null +++ b/modules/core/src/main/java/com/bytedesk/core/rbac/auth/AuthLoginRetryHelper.java @@ -0,0 +1,180 @@ +/* + * @Author: jackning 270580156@qq.com + * @Date: 2025-09-09 14:15:00 + * @LastEditors: jackning 270580156@qq.com + * @LastEditTime: 2025-09-09 12:56:11 + * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk + * Please be aware of the BSL license restrictions before installing Bytedesk IM – + * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. + * Business Source License 1.1: https://github.com/Bytedesk/bytedesk/blob/main/LICENSE + * contact: 270580156@qq.com + * Copyright (c) 2024 by bytedesk.com, All Rights Reserved. + */ +package com.bytedesk.core.rbac.auth; + +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Component; + +import com.bytedesk.core.config.properties.BytedeskProperties; +import com.bytedesk.core.redis.RedisLoginRetryService; +import com.bytedesk.core.utils.JsonResult; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +/** + * 登录重试辅助工具类 + * 封装登录失败处理、重试次数统计、用户锁定等逻辑 + */ +@Slf4j +@Component +@RequiredArgsConstructor +public class AuthLoginRetryHelper { + + private final RedisLoginRetryService redisLoginRetryService; + private final BytedeskProperties bytedeskProperties; + + /** + * 登录重试配置 + */ + public static class LoginRetryConfig { + public final int maxRetryCount; + public final int lockTimeMinutes; + + public LoginRetryConfig(int maxRetryCount, int lockTimeMinutes) { + this.maxRetryCount = maxRetryCount; + this.lockTimeMinutes = lockTimeMinutes; + } + } + + /** + * 获取登录重试配置 + */ + public LoginRetryConfig getLoginRetryConfig() { + int maxRetryCount = 3; // 默认值 + int lockTimeMinutes = 10; // 默认值 + + try { + if (bytedeskProperties != null && bytedeskProperties.getCustom() != null) { + if (bytedeskProperties.getCustom().getLoginMaxRetryCount() != null) { + maxRetryCount = bytedeskProperties.getCustom().getLoginMaxRetryCount(); + } + if (bytedeskProperties.getCustom().getLoginMaxRetryLockTime() != null) { + lockTimeMinutes = bytedeskProperties.getCustom().getLoginMaxRetryLockTime(); + } + } + } catch (Exception e) { + log.warn("Failed to get BytedeskProperties, using default values", e); + } + + return new LoginRetryConfig(maxRetryCount, lockTimeMinutes); + } + + /** + * 检查用户是否被锁定 + * @param username 用户名 + * @return 如果用户被锁定，返回错误响应；否则返回null + */ + public ResponseEntity checkUserLocked(String username) { + if (redisLoginRetryService.isUserLocked(username)) { + long remainingTime = redisLoginRetryService.getLockRemainingTime(username); + if (remainingTime > 0) { + long minutes = remainingTime / 60; + long seconds = remainingTime % 60; + String timeStr = minutes > 0 ? minutes + "分" + seconds + "秒" : seconds + "秒"; + return ResponseEntity.ok().body(JsonResult.error("账户已被锁定，请" + timeStr + "后重试", -1, false)); + } else { + // 锁定时间已过，解锁用户 + redisLoginRetryService.unlockUser(username); + } + } + return null; + } + + /** + * 检查是否已达到最大重试次数 + * @param username 用户名 + * @param config 重试配置 + * @return 如果已达到最大重试次数，返回错误响应；否则返回null + */ + public ResponseEntity checkMaxRetryReached(String username, LoginRetryConfig config) { + // 如果最大重试次数为0，表示不限制 + if (config.maxRetryCount > 0) { + int currentFailedCount = redisLoginRetryService.getLoginFailedCount(username); + if (currentFailedCount >= config.maxRetryCount) { + // 达到最大重试次数，锁定用户 + if (config.lockTimeMinutes > 0) { + redisLoginRetryService.lockUser(username, config.lockTimeMinutes * 60L); + return ResponseEntity.ok().body(JsonResult.error("密码错误次数过多，账户已被锁定" + config.lockTimeMinutes + "分钟", -1, false)); + } + } + } + return null; + } + + /** + * 处理登录失败，增加失败次数并返回相应错误信息 + * @param username 用户名 + * @param config 重试配置 + * @param errorMessage 自定义错误信息，可为null + * @return 错误响应 + */ + public ResponseEntity handleLoginFailure(String username, LoginRetryConfig config, String errorMessage) { + if (config.maxRetryCount > 0) { + int newFailedCount = redisLoginRetryService.incrementLoginFailedCount(username, 3600L); // 1小时过期 + int remainingAttempts = config.maxRetryCount - newFailedCount; + + if (remainingAttempts > 0) { + return ResponseEntity.ok().body(JsonResult.error("用户名或密码错误，还可尝试" + remainingAttempts + "次", -1, false)); + } else { + // 达到最大重试次数，锁定用户 + if (config.lockTimeMinutes > 0) { + redisLoginRetryService.lockUser(username, config.lockTimeMinutes * 60L); + return ResponseEntity.ok().body(JsonResult.error("密码错误次数过多，账户已被锁定" + config.lockTimeMinutes + "分钟", -1, false)); + } else { + return ResponseEntity.ok().body(JsonResult.error("用户名或密码错误", -1, false)); + } + } + } else { + return ResponseEntity.ok().body(JsonResult.error(errorMessage != null ? errorMessage : "用户名或密码错误", -1, false)); + } + } + + /** + * 处理登录失败（简化版本，自动获取配置） + * @param username 用户名 + * @param errorMessage 错误信息 + * @return 错误响应 + */ + public ResponseEntity handleLoginFailure(String username, String errorMessage) { + LoginRetryConfig config = getLoginRetryConfig(); + return handleLoginFailure(username, config, errorMessage); + } + + /** + * 登录成功后重置失败次数 + * @param username 用户名 + */ + public void resetLoginFailedCount(String username) { + redisLoginRetryService.resetLoginFailedCount(username); + log.debug("Reset login failed count for user: {}", username); + } + + /** + * 执行登录前的所有检查 + * @param username 用户名 + * @return 如果检查失败，返回错误响应；否则返回null + */ + public ResponseEntity performPreLoginChecks(String username) { + LoginRetryConfig config = getLoginRetryConfig(); + + // 检查用户是否被锁定 + ResponseEntity lockedResponse = checkUserLocked(username); + if (lockedResponse != null) { + return lockedResponse; + } + + // 检查是否已达到最大重试次数 + return checkMaxRetryReached(username, config); + } +} diff --git a/modules/core/src/main/java/com/bytedesk/core/rbac/auth/AuthService.java b/modules/core/src/main/java/com/bytedesk/core/rbac/auth/AuthService.java index 4765490ab4..3448edc6ad 100644 --- a/modules/core/src/main/java/com/bytedesk/core/rbac/auth/AuthService.java +++ b/modules/core/src/main/java/com/bytedesk/core/rbac/auth/AuthService.java @@ -36,6 +36,7 @@ import com.bytedesk.core.uid.UidUtils; import com.bytedesk.core.utils.ConvertUtils; import com.bytedesk.core.utils.JwtUtils; import com.bytedesk.core.utils.PasswordCryptoUtils; + import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -162,6 +163,49 @@ public class AuthService { .build(); } + /** + * 通用的密码验证逻辑 + */ + private Authentication authenticateWithPassword(UserDetailsImpl userDetails, String password, String username) { + try { + // 验证密码与数据库中存储的BCrypt密码 + String dbPassword = userDetails.getPassword(); // 数据库存储的BCrypt加密密码 + boolean isValid = passwordEncoder.matches(password, dbPassword); + + if (!isValid) { + log.warn("Password verification failed for user: {}", username); + return null; + } + + // 密码验证成功，构造认证对象 + log.info("Password authentication successful for user: {}", username); + return new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities()); + + } catch (Exception e) { + log.error("Password authentication error for user: {}: {}", username, e.getMessage()); + return null; + } + } + + /** + * 明文密码登录 - 直接验证明文密码 + * 参考 authenticateWithPasswordHash 逻辑，去掉AES解密过程 + */ + public Authentication authenticateWithPlainPassword(AuthRequest authRequest) { + // 1. 查询用户，传入平台信息 + UserDetailsImpl userDetails = (UserDetailsImpl) userDetailsService.loadUserByUsernameAndPlatform(authRequest.getUsername(), authRequest.getPlatform()); + if (userDetails == null) { + log.warn("User not found: {}", authRequest.getUsername()); + return null; + } + + // 2. 直接使用明文密码验证（无需AES解密） + String plainPassword = authRequest.getPassword(); + log.debug("Using plain password authentication for user: {}", authRequest.getUsername()); + + return authenticateWithPassword(userDetails, plainPassword, authRequest.getUsername()); + } + /** * 密码哈希登录 - 支持AES解密 * 前端使用AES加密密码，后端解密后验证 @@ -173,7 +217,7 @@ public class AuthService { log.warn("User not found: {}", authRequest.getUsername()); return null; } - // 实际情况：现在支持AES解密前端加密的密码 + try { // 2. 使用AES解密前端发送的加密密码 String decryptedPassword = PasswordCryptoUtils.decryptPassword( @@ -182,18 +226,7 @@ public class AuthService { ); log.debug("Password decrypted successfully for user: {}", authRequest.getUsername()); - // 3. 验证解密后的密码与数据库中存储的BCrypt密码 - String dbPassword = userDetails.getPassword(); // 数据库存储的BCrypt加密密码 - boolean isValid = passwordEncoder.matches(decryptedPassword, dbPassword); - // 密码验证失败 - if (!isValid) { - log.warn("Password verification failed for user: {}", authRequest.getUsername()); - return null; - } - - // 4. 密码验证成功，构造认证对象 - log.info("Password hash authentication successful for user: {}", authRequest.getUsername()); - return new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities()); + return authenticateWithPassword(userDetails, decryptedPassword, authRequest.getUsername()); } catch (Exception e) { log.error("Password hash authentication error for user: {}: {}", authRequest.getUsername(), e.getMessage()); diff --git a/modules/core/src/main/java/com/bytedesk/core/rbac/user/UserDetailsServiceImpl.java b/modules/core/src/main/java/com/bytedesk/core/rbac/user/UserDetailsServiceImpl.java index fc1e7ddf9c..fafe282e70 100644 --- a/modules/core/src/main/java/com/bytedesk/core/rbac/user/UserDetailsServiceImpl.java +++ b/modules/core/src/main/java/com/bytedesk/core/rbac/user/UserDetailsServiceImpl.java @@ -70,6 +70,19 @@ public class UserDetailsServiceImpl implements UserDetailsService { return UserDetailsImpl.build(userOptional.get()); } + public UserDetailsImpl loadUserByUsernameAndPlatform(String username, String platform) { + log.debug("loadUserByUsernameAndPlatform username: {}, platform: {}", username, platform); + // + Optional userOptional = findByUsernameAndPlatform(username, platform); + if (!userOptional.isPresent()) { + throw new UsernameNotFoundException("username " + username + " is not found"); + } + if (!userOptional.get().isEnabled()) { + throw new UserDisabledException("username " + username + " is not enabled"); + } + return UserDetailsImpl.build(userOptional.get()); + } + public UserDetails loadUserByUsernameAndPlatform(String subject) { String username = JSON.parseObject(subject, JwtSubject.class).getUsername(); String platform = JSON.parseObject(subject, JwtSubject.class).getPlatform(); diff --git a/plugins/cms/.gitattributes b/plugins/cms/.gitattributes new file mode 100644 index 0000000000..3b41682ac5 --- /dev/null +++ b/plugins/cms/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/plugins/cms/.mvn/wrapper/maven-wrapper.properties b/plugins/cms/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000000..12fbe1e907 --- /dev/null +++ b/plugins/cms/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip diff --git a/plugins/cms/mvnw b/plugins/cms/mvnw new file mode 100755 index 0000000000..19529ddf8c --- /dev/null +++ b/plugins/cms/mvnw @@ -0,0 +1,259 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.2 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/plugins/cms/mvnw.cmd b/plugins/cms/mvnw.cmd new file mode 100644 index 0000000000..249bdf3822 --- /dev/null +++ b/plugins/cms/mvnw.cmd @@ -0,0 +1,149 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.2 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/plugins/cms/pom.xml b/plugins/cms/pom.xml new file mode 100644 index 0000000000..493652118f --- /dev/null +++ b/plugins/cms/pom.xml @@ -0,0 +1,35 @@ + + + 4.0.0 + + + com.bytedesk + plugins + ${revision} + + + bytedesk-plugin-cms + ${revision} + + bytedesk-plugin-cms + https://ai.bytedesk.com + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/cms/readme.md b/plugins/cms/readme.md new file mode 100644 index 0000000000..f589041fca --- /dev/null +++ b/plugins/cms/readme.md @@ -0,0 +1,4 @@ +# cms 内容管理系统 + +- 统一门户网站搭建 +- 内容管理系统 diff --git a/plugins/cms/src/main/java/com/bytedesk/cms/CmsApplication.java b/plugins/cms/src/main/java/com/bytedesk/cms/CmsApplication.java new file mode 100644 index 0000000000..6fbd132de0 --- /dev/null +++ b/plugins/cms/src/main/java/com/bytedesk/cms/CmsApplication.java @@ -0,0 +1,13 @@ +package com.bytedesk.cms; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class CmsApplication { + + public static void main(String[] args) { + SpringApplication.run(CmsApplication.class, args); + } + +} diff --git a/plugins/cms/src/main/resources/application.properties b/plugins/cms/src/main/resources/application.properties new file mode 100644 index 0000000000..a0e22037c6 --- /dev/null +++ b/plugins/cms/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=cms diff --git a/plugins/cms/src/test/java/com/bytedesk/cms/CmsApplicationTests.java b/plugins/cms/src/test/java/com/bytedesk/cms/CmsApplicationTests.java new file mode 100644 index 0000000000..5594f295eb --- /dev/null +++ b/plugins/cms/src/test/java/com/bytedesk/cms/CmsApplicationTests.java @@ -0,0 +1,13 @@ +package com.bytedesk.cms; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class CmsApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/plugins/crm/.gitattributes b/plugins/crm/.gitattributes new file mode 100644 index 0000000000..3b41682ac5 --- /dev/null +++ b/plugins/crm/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/plugins/crm/.mvn/wrapper/maven-wrapper.properties b/plugins/crm/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000000..44f3cf2c18 --- /dev/null +++ b/plugins/crm/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip diff --git a/plugins/crm/mvnw b/plugins/crm/mvnw new file mode 100755 index 0000000000..e9cf8d3307 --- /dev/null +++ b/plugins/crm/mvnw @@ -0,0 +1,295 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.3 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" + +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi +fi + +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi + +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/plugins/crm/mvnw.cmd b/plugins/crm/mvnw.cmd new file mode 100644 index 0000000000..2e2dbe0396 --- /dev/null +++ b/plugins/crm/mvnw.cmd @@ -0,0 +1,189 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.3 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' + +$MAVEN_M2_PATH = "$HOME/.m2" +if ($env:MAVEN_USER_HOME) { + $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" +} + +if (-not (Test-Path -Path $MAVEN_M2_PATH)) { + New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null +} + +$MAVEN_WRAPPER_DISTS = $null +if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { + $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" +} else { + $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" +} + +$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +$actualDistributionDir = "" + +# First try the expected directory name (for regular distributions) +$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" +$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" +if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { + $actualDistributionDir = $distributionUrlNameMain +} + +# If not found, search for any directory with the Maven executable (for snapshots) +if (!$actualDistributionDir) { + Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { + $testPath = Join-Path $_.FullName "bin/$MVN_CMD" + if (Test-Path -Path $testPath -PathType Leaf) { + $actualDistributionDir = $_.Name + } + } +} + +if (!$actualDistributionDir) { + Write-Error "Could not find Maven distribution directory in extracted archive" +} + +Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/plugins/crm/pom.xml b/plugins/crm/pom.xml new file mode 100644 index 0000000000..01f2883970 --- /dev/null +++ b/plugins/crm/pom.xml @@ -0,0 +1,35 @@ + + + 4.0.0 + + + com.bytedesk + plugins + ${revision} + + + bytedesk-plugin-crm + ${revision} + + bytedesk-plugin-crm + https://ai.bytedesk.com + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/crm/src/main/java/com/bytedesk/crm/CrmApplication.java b/plugins/crm/src/main/java/com/bytedesk/crm/CrmApplication.java new file mode 100644 index 0000000000..82b661b009 --- /dev/null +++ b/plugins/crm/src/main/java/com/bytedesk/crm/CrmApplication.java @@ -0,0 +1,13 @@ +package com.bytedesk.crm; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class CrmApplication { + + public static void main(String[] args) { + SpringApplication.run(CrmApplication.class, args); + } + +} diff --git a/plugins/crm/src/main/resources/application.properties b/plugins/crm/src/main/resources/application.properties new file mode 100644 index 0000000000..68e05c9f2f --- /dev/null +++ b/plugins/crm/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=crm diff --git a/plugins/crm/src/test/java/com/bytedesk/crm/CrmApplicationTests.java b/plugins/crm/src/test/java/com/bytedesk/crm/CrmApplicationTests.java new file mode 100644 index 0000000000..a25d266a84 --- /dev/null +++ b/plugins/crm/src/test/java/com/bytedesk/crm/CrmApplicationTests.java @@ -0,0 +1,13 @@ +package com.bytedesk.crm; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class CrmApplicationTests { + + @Test + void contextLoads() { + } + +}