fixed: 修复LDAP同步部门重复写入bug

.github/workflows/build.yml

@@ -38,7 +38,7 @@ jobs:
           tags: |
             ${{ env.IMAGE_FQDN }}:${{ env.IMAGE_TAG }}
         env:
-          IMAGE_TAG: ${{ startsWith(github.ref, 'refs/heads/main') && 'latest' || startsWith(github.ref, 'refs/heads/dev') && 'dev' || github.ref_slug }}
+          IMAGE_TAG: ${{ startsWith(github.ref, 'refs/heads/main') && 'latest' || startsWith(github.ref, 'refs/heads/dev') && 'dev' || github.ref_name }}
         if: startsWith(github.ref, 'refs/heads/')
       - name: Build with Tag
         uses: docker/build-push-action@v3
@@ -47,5 +47,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ${{ env.IMAGE_FQDN }}:${{ github.ref }}
+            ${{ env.IMAGE_FQDN }}:${{ github.ref_name }}
         if: startsWith(github.ref, 'refs/tags/')

README.md

@@ -34,8 +34,4 @@
 
 - 保留页脚处版权信息。
 - 保留源代码中的协议。
-- 如果修改了代码，则必须在文件中进行说明。
-
-● 允许
-
-- 私用、商用、修改。
+- 如果修改了代码，则必须在文件中进行说明。

playedu-api/src/main/java/xyz/playedu/api/controller/frontend/HourController.java

@@ -129,7 +129,7 @@ public class HourController {
         String lockKey = String.format("record:%d", FCtx.getId());
         boolean tryLock = redisDistributedLock.tryLock(lockKey, 5, TimeUnit.SECONDS);
         if (!tryLock) {
-            return JsonResponse.error("请稍后再试");
+            return JsonResponse.success();
         }
 
         try {
@@ -166,7 +166,7 @@ public class HourController {
         String lockKey = String.format("ping:%d", FCtx.getId());
         boolean tryLock = redisDistributedLock.tryLock(lockKey, 5, TimeUnit.SECONDS);
         if (!tryLock) {
-            return JsonResponse.error("请稍后再试");
+            return JsonResponse.success();
         }
 
         try {

playedu-common/src/main/java/xyz/playedu/common/bus/LDAPBus.java

@@ -136,6 +136,12 @@ public class LDAPBus {
                         }
                         // 写入本地缓存
                         depIdKeyByName.put(fullName, depId);
+                        // 写入本地缓存
+                        LdapDepartment storedLdapDepartment = new LdapDepartment();
+                        storedLdapDepartment.setUuid(uuid);
+                        storedLdapDepartment.setDn(dn);
+                        storedLdapDepartment.setDepartmentId(depId);
+                        ldapDepartments.put(uuid, storedLdapDepartment);
                     }
                 }
 

playedu-common/src/main/java/xyz/playedu/common/util/ldap/LdapUtil.java

@@ -25,6 +25,7 @@ import java.util.*;
 import javax.naming.Context;
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
@@ -148,7 +149,7 @@ public class LdapUtil {
             }
 
             // 唯一特征值
-            String uSNCreated = (String) attributes.get("uSNCreated").get();
+            String uSNCreated = getAttribute(attributes, "uSNCreated");
             if (StringUtil.isEmpty(uSNCreated)) {
                 continue;
             }
@@ -253,17 +254,16 @@ public class LdapUtil {
         ldapUser.setDn(item.getName());
 
         // name解析
-        String displayName = (String) attributes.get("displayName").get();
+        String displayName = getAttribute(attributes, "displayName");
         if (StringUtil.isEmpty(displayName)) {
-            displayName = (String) attributes.get("cn").get();
+            displayName = getAttribute(attributes, "cn");
         }
         ldapUser.setCn(displayName);
 
         // 邮箱解析
-        String email =
-                attributes.get("mail") == null ? null : (String) attributes.get("mail").get();
-        if (email == null) {
-            email = attributes.get("email") == null ? null : (String) attributes.get("email").get();
+        String email = getAttribute(attributes, "mail");
+        if (StringUtil.isEmpty(email)) {
+            getAttribute(attributes, "email");
         }
         ldapUser.setEmail(email);
 
@@ -296,6 +296,15 @@ public class LdapUtil {
         return ldapUser;
     }
 
+    private static String getAttribute(Attributes attributes, String keyName)
+            throws NamingException {
+        Attribute attribute = attributes.get(keyName);
+        if (attribute == null) {
+            return null;
+        }
+        return (String) attribute.get();
+    }
+
     private static String baseDNOuScope(String baseDN) {
         List<String> ouScopes = new ArrayList<>();
         String[] rdnList = baseDN.toLowerCase().split(",");

playedu-course/src/main/java/xyz/playedu/course/service/impl/UserCourseRecordServiceImpl.java

@@ -18,6 +18,7 @@ package xyz.playedu.course.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import xyz.playedu.common.types.paginate.PaginationResult;
 import xyz.playedu.common.types.paginate.UserCourseRecordPaginateFilter;
@@ -144,6 +145,7 @@ public class UserCourseRecordServiceImpl
     }
 
     @Override
+    @Transactional
     public void updateUserCourseLearnProgress(Integer userId, Integer courseId, int count) {
         UserCourseRecord record = find(userId, courseId);
         if (record == null) {
@@ -152,18 +154,23 @@ public class UserCourseRecordServiceImpl
 
         int finishedCount = record.getFinishedCount() - count;
 
+        UserCourseRecord newRecord = new UserCourseRecord();
+        newRecord.setUserId(record.getUserId());
+        newRecord.setCourseId(record.getCourseId());
+        newRecord.setHourCount(record.getHourCount());
+        newRecord.setFinishedCount(finishedCount);
+        newRecord.setProgress(finishedCount * 10000 / record.getHourCount());
+        newRecord.setIsFinished(0);
+        newRecord.setCreatedAt(record.getCreatedAt());
+        newRecord.setUpdatedAt(new Date());
+
+        // 删除老记录
+        remove(query().getWrapper().eq("id", record.getId()));
+
         if (0 == finishedCount) {
-            remove(query().getWrapper().eq("id", record.getId()));
             return;
         }
 
-        UserCourseRecord newRecord = new UserCourseRecord();
-        newRecord.setId(record.getId());
-        newRecord.setIsFinished(0);
-        newRecord.setFinishedAt(null);
-        newRecord.setProgress(finishedCount * 10000 / record.getHourCount());
-        newRecord.setFinishedCount(finishedCount);
-
-        updateById(newRecord);
+        save(newRecord);
     }
 }