日志时间

src/main/java/com/edgec/browserbackend/browser/dto/LoginHistoryDto.java

@@ -30,7 +30,7 @@ public class LoginHistoryDto {
         if (loginHistory.getLoginPlace() != null)
             this.loginPlace = loginHistory.getLoginPlace();
         if (loginHistory.getLoginTime() != 0)
-            this.loginTime = Instant.ofEpochMilli(loginHistory.getLoginTime()).atZone(ZoneOffset.UTC).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+            this.loginTime = Instant.ofEpochMilli(loginHistory.getLoginTime()).atZone(ZoneId.of("Asia/Shanghai")).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
     }
 
     public String getNickname() {

src/main/java/com/edgec/browserbackend/browser/service/Impl/ShopServiceImpl.java

@@ -269,21 +269,36 @@ public class ShopServiceImpl implements ShopService {
                 throw new ClientRequestException(AccountErrorCode.NOPERMISSION);
             }
         }
-        shops.stream().forEach(shop -> {
+        if (shops.size() == 1) {
             try {
-                userShopRepository.deleteByShopIdExceptOwner(shop.getShopId(), shop.getOwner());
+                userShopRepository.deleteByShopIdExceptOwner(shops.get(0).getShopId(), shops.get(0).getOwner());
                 for (Account account1 : accounts) {
-                    UserShop userShop1 = userShopRepository.findByUsernameAndShopId(account1.getName(), shop.getShopId());
+                    UserShop userShop1 = userShopRepository.findByUsernameAndShopId(account1.getName(), shops.get(0).getShopId());
                     if (userShop1 != null)
                         return;
-                    userShop1 = new UserShop(account1.getName(), shop.getShopId(), "-1");
+                    userShop1 = new UserShop(account1.getName(), shops.get(0).getShopId(), "-1");
                     userShopRepository.save(userShop1);
                 }
             } catch (Exception e) {
                 logger.error("fail to assign", e.getMessage());
                 throw  new ClientRequestException(BrowserErrorCode.UNKNOWN);
             }
-        });
+        } else {
+            shops.stream().forEach(shop -> {
+                try {
+                    for (Account account1 : accounts) {
+                        UserShop userShop1 = userShopRepository.findByUsernameAndShopId(account1.getName(), shop.getShopId());
+                        if (userShop1 != null)
+                            return;
+                        userShop1 = new UserShop(account1.getName(), shop.getShopId(), "-1");
+                        userShopRepository.save(userShop1);
+                    }
+                } catch (Exception e) {
+                    logger.error("fail to assign", e.getMessage());
+                    throw  new ClientRequestException(BrowserErrorCode.UNKNOWN);
+                }
+            });
+        }
     }
 
     @Override