Merge branch 'dev' of xiongzhu/raex_back into master

src/main/java/com/izouma/nineth/repo/netease/NeteaseMessageRepo.java

@@ -1,6 +1,8 @@
 package com.izouma.nineth.repo.netease;
 
 import com.izouma.nineth.domain.netease.NeteaseMessage;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
@@ -16,8 +18,7 @@ public interface NeteaseMessageRepo extends JpaRepository<NeteaseMessage, Long>,
     @Transactional
     void softDelete(Long id);
 
-    @Query(value = "select * from netease_message n where n.to_id = ?1 and n.ope = ?2 order by n.created_at desc limit 100", nativeQuery = true)
-    List<NeteaseMessage> findAllByToIdAndOpe(String toId, Integer ope);
+    Page<NeteaseMessage> findAllByToIdAndOpeOrderByCreatedAtDesc(String toId, Integer ope, Pageable pageable);
 
     Long countAllByToIdAndOpeAndCreatedAtAfter(String toId, Integer ope, LocalDateTime createdAt);
 

src/main/java/com/izouma/nineth/service/netease/TeamService.java

@@ -205,7 +205,7 @@ public class TeamService {
         JSONObject jsonObject = JSON.parseObject(result);
         Integer code = jsonObject.getInteger("code");
         if (code != 200) {
-            throw new BusinessException("注册出错，请核查后重新注册");
+            throw new BusinessException("群成员已满，无法加入");
         }
         List<String> members = new ArrayList<>(team.getMembers());
         members.add(id);

src/main/java/com/izouma/nineth/web/netease/NeteaseMessageController.java

@@ -13,6 +13,7 @@ import com.izouma.nineth.utils.excel.ExcelUtils;
 import lombok.AllArgsConstructor;
 import org.apache.commons.validator.Msg;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
@@ -51,8 +52,8 @@ public class NeteaseMessageController extends BaseController {
     }
 
     @PostMapping("/record")
-    public List<NeteaseMessage> record(String toId, Integer ope) {
-        return neteaseMessageRepo.findAllByToIdAndOpe(toId, ope);
+    public Page<NeteaseMessage> record(String toId, Integer ope, Pageable pageable) {
+        return neteaseMessageRepo.findAllByToIdAndOpeOrderByCreatedAtDesc(toId, ope, pageable);
     }
 
     @PostMapping("/del/{id}")