tanlie 2 nedēļas atpakaļ
vecāks
revīzija
99891749d3

+ 2 - 2
wishing-platform/platform-service/platform-service-admin/src/main/java/cn/qinys/platform/admin/controller/WishTreeController.java

@@ -31,8 +31,8 @@ public class WishTreeController {
     }
 
     @PostMapping("/create")
-    public Result<Long> createWishTree(@RequestBody @Valid WishingTreeCreateReq req) {
-        Long id = wishTreeService.createWishTree(req);
+    public Result<Integer> createWishTree(@RequestBody @Valid WishingTreeCreateReq req) {
+        Integer id = wishTreeService.createWishTree(req);
         return new Result<>("created", id);
     }
 

+ 1 - 1
wishing-platform/platform-service/platform-service-admin/src/main/java/cn/qinys/platform/admin/service/WishTreeService.java

@@ -16,7 +16,7 @@ public interface WishTreeService {
 	 * @param req create request
 	 * @return created record id
 	 */
-	Long createWishTree(WishingTreeCreateReq req);
+	Integer createWishTree(WishingTreeCreateReq req);
 
 	Page<WishingTreePageResp> getWishTreePage(WishingTreePageReq req);
 }

+ 1 - 1
wishing-platform/platform-service/platform-service-admin/src/main/java/cn/qinys/platform/admin/service/impl/WishTreeServiceImpl.java

@@ -35,7 +35,7 @@ public class WishTreeServiceImpl implements WishTreeService {
 
 
     @Override
-    public Long createWishTree(WishingTreeCreateReq req) {
+    public Integer createWishTree(WishingTreeCreateReq req) {
         WishingTree tree = BeanExUtils.convert(req, WishingTree.class);
         // insert returns number of rows; id is populated into entity if DB supports generated keys
         if (!StringUtils.hasText(tree.getAddress())) {

+ 7 - 5
wishing-platform/platform-service/platform-service-mobile/src/main/java/cn/qinys/platform/mobile/service/impl/LoginServiceImpl.java

@@ -15,13 +15,11 @@ import cn.qinys.platform.mobile.resp.UserWishSummaryResp;
 import cn.qinys.platform.mobile.service.LoginService;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
-import org.aspectj.apache.bcel.generic.RET;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.Map;
 import java.util.UUID;
-import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
@@ -88,9 +86,13 @@ public class LoginServiceImpl extends AbstractLoginService implements LoginServi
 
     @Override
     public void logout() {
-        LoginUserInfo currentUserInfo = CurrentUtils.getCurrentUserInfo();
-        this.kicKOut(currentUserInfo.getWxId());
-        log.info("user logout: {}", currentUserInfo);
+        try {
+            LoginUserInfo currentUserInfo = CurrentUtils.getCurrentUserInfo();
+            this.kicKOut(currentUserInfo.getWxId());
+            log.info("user logout: {}", currentUserInfo);
+        } catch (Exception e) {
+            log.error("user logout", e);
+        }
     }
 
     @Override