From e0827b6980e7f1b80fbf637fe445e084f35b2b45 Mon Sep 17 00:00:00 2001
From: jack ning <github@bytedesk.com>
Date: Mon, 24 Mar 2025 22:09:41 +0800
Subject: [PATCH] update modules/core: mod        6 files

---
 modules/core/pom.xml                            | 10 ++++++++++
 .../core/rbac/role/RoleRestService.java         | 17 ++++-------------
 modules/pom.xml                                 | 12 +-----------
 3 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index bc3f31fd11..317ef09317 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -121,6 +121,16 @@
 			<version>1.4</version>
 		</dependency>
 
+		<!-- 汉字转拼音 -->
+        <!-- https://github.com/houbb/pinyin -->
+        <!-- https://mvnrepository.com/artifact/com.github.houbb/pinyin -->
+        <dependency>
+            <groupId>com.github.houbb</groupId>
+            <artifactId>pinyin</artifactId>
+            <version>0.3.1</version>
+            <!-- <version>0.4.5</version> -->
+        </dependency>
+
 		<!-- TODO: Rate Limiter -->
 		<!-- https://bucket4j.com/8.14.0/toc.html -->
 		<!-- https://github.com/bucket4j/bucket4j -->
diff --git a/modules/core/src/main/java/com/bytedesk/core/rbac/role/RoleRestService.java b/modules/core/src/main/java/com/bytedesk/core/rbac/role/RoleRestService.java
index e545d43846..41486a6c41 100644
--- a/modules/core/src/main/java/com/bytedesk/core/rbac/role/RoleRestService.java
+++ b/modules/core/src/main/java/com/bytedesk/core/rbac/role/RoleRestService.java
@@ -2,7 +2,7 @@
  * @Author: jackning 270580156@qq.com
  * @Date: 2024-01-29 16:21:24
  * @LastEditors: jackning 270580156@qq.com
- * @LastEditTime: 2025-03-21 15:32:54
+ * @LastEditTime: 2025-03-24 21:58:57
  * @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.
@@ -95,14 +95,6 @@ public class RoleRestService extends BaseRestService<RoleEntity, RoleRequest, Ro
                 return roleRepository.existsByUid(uid);
         }
 
-        // public RoleResponse createOrUpdate(RoleRequest request) {
-        //         if (StringUtils.hasText(request.getUid()) && existsByUid(request.getUid())) {
-        //                 return addAuthorities(request);
-        //         } else {
-        //                 return create(request);
-        //         }
-        // }
-
         public RoleResponse create(RoleRequest request) {
                 // 判断uid是否已存在
                 if (StringUtils.hasText(request.getUid()) && existsByUid(request.getUid())) {
@@ -137,7 +129,7 @@ public class RoleRestService extends BaseRestService<RoleEntity, RoleRequest, Ro
                 if (savedEntity == null) {
                         throw new RuntimeException("role " + request.getName() + " create failed");
                 }
-                // 
+                //
                 return convertToResponse(savedEntity);
         }
 
@@ -174,10 +166,10 @@ public class RoleRestService extends BaseRestService<RoleEntity, RoleRequest, Ro
                 Optional<RoleEntity> roleOptional = findByUid(request.getUid());
                 if (roleOptional.isPresent()) {
                         RoleEntity role = roleOptional.get();
-                        if (request.getAuthorityUids()!= null) {
+                        if (request.getAuthorityUids() != null) {
                                 for (String authorityUid : request.getAuthorityUids()) {
                                         Optional<AuthorityEntity> authorityOptional = authorityService
-                                                       .findByUid(authorityUid);
+                                                        .findByUid(authorityUid);
                                         authorityOptional.ifPresent(role::addAuthority);
                                 }
                         }
@@ -192,7 +184,6 @@ public class RoleRestService extends BaseRestService<RoleEntity, RoleRequest, Ro
                 }
         }
 
-
         @Override
         public void deleteByUid(String uid) {
                 Optional<RoleEntity> roleOptional = findByUid(uid);
diff --git a/modules/pom.xml b/modules/pom.xml
index 240d796036..7de60e5677 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -324,17 +324,7 @@
             <scope>provided</scope>
         </dependency> -->
 
-        <!-- 汉字转拼音 -->
-        <!-- https://github.com/houbb/pinyin -->
-        <!-- https://mvnrepository.com/artifact/com.github.houbb/pinyin -->
-        <dependency>
-            <groupId>com.github.houbb</groupId>
-            <artifactId>pinyin</artifactId>
-            <version>0.3.1</version>
-            <!-- <version>0.4.5</version> -->
-            <scope>provided</scope>
-        </dependency>
-
+        
         <!-- apijson auto generate crud api -->
         <!-- http://apijson.cn/doc/zh/ -->
         <!-- https://jitpack.io/#Tencent/APIJSON/7.0.0 -->