修改接口bug

src/main/java/com/edgec/browserbackend/browser/controller/GroupController.java

@@ -27,7 +27,7 @@ public class GroupController {
         ResultDto resultDto = new ResultDto();
         try {
             GroupDto groupDto1 = new GroupDto();
-            groupDto1.setId(groupService.addGroup(principal.getName(), groupDto.getGroupName()));
+            groupDto1.setId(groupService.addGroup(principal.getName(), groupDto.getName()));
             resultDto.setData(groupDto1);
             resultDto.setStatus(0);
         }catch (ClientRequestException e) {

src/main/java/com/edgec/browserbackend/browser/domain/Group.java

@@ -10,7 +10,7 @@ import java.util.List;
 public class Group {
     @Id
     private String id;
-    private String groupName;
+    private String name;
     private String owner;
     private String details;
 
@@ -21,8 +21,8 @@ public class Group {
             this.setOwner(group.getOwner());
         if (StringUtils.isNotBlank(group.getDetails()))
             this.setDetails(group.getDetails());
-        if (StringUtils.isNotBlank(group.getGroupName()))
-            this.setGroupName(group.getGroupName());
+        if (StringUtils.isNotBlank(group.getName()))
+            this.setName(group.getName());
     }
 
     public String getId() {
@@ -41,12 +41,12 @@ public class Group {
         this.owner = owner;
     }
 
-    public String getGroupName() {
-        return groupName;
+    public String getName() {
+        return name;
     }
 
-    public void setGroupName(String groupName) {
-        this.groupName = groupName;
+    public void setName(String name) {
+        this.name = name;
     }
 
     public String getDetails() {

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

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class GroupDto {
     private String id;
-    private String groupName;
+    private String name;
     private String details;
 
     public GroupDto(){
@@ -15,7 +15,7 @@ public class GroupDto {
 
     public GroupDto(String id, String groupName, String details){
         this.id = id;
-        this.groupName = groupName;
+        this.name = groupName;
         this.details = details;
     }
 
@@ -35,11 +35,11 @@ public class GroupDto {
         this.id = id;
     }
 
-    public String getGroupName() {
-        return groupName;
+    public String getName() {
+        return name;
     }
 
-    public void setGroupName(String groupName) {
-        this.groupName = groupName;
+    public void setName(String name) {
+        this.name = name;
     }
 }

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

@@ -3,9 +3,11 @@ package com.edgec.browserbackend.browser.dto;
 import com.edgec.browserbackend.browser.domain.IpResource;
 import com.edgec.browserbackend.browser.domain.Shop;
 import com.edgec.browserbackend.browser.domain.TransferStatus;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 import java.util.List;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ShopDto {
 
     private String id;

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

@@ -35,7 +35,7 @@ public class GroupServiceImpl implements GroupService {
             throw new ClientRequestException(BrowserErrorCode.INFORMATIONNOTCOMPELETE);
         Group group = new Group();
         group.setOwner(username);
-        group.setGroupName(groupName);
+        group.setName(groupName);
         String id;
         try {
             Group group1 = groupRepository.save(group);
@@ -86,7 +86,7 @@ public class GroupServiceImpl implements GroupService {
         List<GroupDto> groupDtos = new ArrayList<>();
         try {
             groups.stream().forEach(x -> {
-                groupDtos.add(new GroupDto(x.getId(), x.getGroupName(), x.getDetails()));
+                groupDtos.add(new GroupDto(x.getId(), x.getName(), x.getDetails()));
             });
         } catch (Exception e){
             logger.error("fail to delete group", e.getMessage());

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

 package com.edgec.browserbackend.browser.service.Impl;
 
 import com.edgec.browserbackend.account.domain.Account;
+import com.edgec.browserbackend.account.domain.User;
 import com.edgec.browserbackend.account.exception.AccountErrorCode;
 import com.edgec.browserbackend.account.repository.AccountRepository;
 import com.edgec.browserbackend.browser.ErrorCode.BrowserErrorCode;
@@ -58,9 +59,12 @@ public class ShopServiceImpl implements ShopService {
         if (account.getPermission() < 4) {
             throw new ClientRequestException(AccountErrorCode.NOPERMISSION);
         }
-        userShopRepository.findByUsernameAndShopId(username, shop.getId());
-        if (shop.getFirstGroupId() != null) {
-            transferShop(username, shop.getId(), shop.getFirstGroupId());
+        UserShop us = userShopRepository.findByUsernameAndShopId(username, shop.getId());
+        if (shop.getFirstGroupId() != null && us == null) {
+            UserShop userShop = new UserShop();
+            userShop.setShopId(shop.getId());
+            userShop.setGroupId(shop.getFirstGroupId());
+            userShopRepository.save(userShop);
         }
         try {
             shop.setOwner(username);
@@ -200,7 +204,7 @@ public class ShopServiceImpl implements ShopService {
         }
         UserShop userShop = userShopRepository.findByUsernameAndShopId(username, shopId);
         Group group = groupRepository.findById(groupId).orElse(null);
-        if (account.getPermission() < 4 || userShop == null || !group.getOwner().equals(username)) {
+        if (account.getPermission() < 4 || (userShop == null) || !group.getOwner().equals(username)) {
             throw new ClientRequestException(AccountErrorCode.NOPERMISSION);
         }
         Shop shop = shopRepository.findById(shopId).orElse(null);

src/main/resources/logback-spring.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" debug="false">
 
-    <property name="application.name" value="registry" />
+    <property name="application.name" value="browserBackend" />
 
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
@@ -10,10 +10,10 @@
     </appender>
 
     <appender name="info_file" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_ROOT}/${application.name}/info.log</file>
+        <file>${LOG_ROOT}/info.log</file>
         <append>true</append>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_ROOT}/${application.name}/%d{yyyy-MM-dd}/info/info-%i.zip</fileNamePattern>
+            <fileNamePattern>${LOG_ROOT}/%d{yyyy-MM-dd}/info/info-%i.zip</fileNamePattern>
             <maxFileSize>50MB</maxFileSize>
             <maxHistory>7</maxHistory>
             <totalSizeCap>2GB</totalSizeCap>
@@ -29,10 +29,10 @@
     </appender>
 
     <appender name="warn_file" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_ROOT}/${application.name}/warn.log</file>
+        <file>${LOG_ROOT}/warn.log</file>
         <append>true</append>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_ROOT}/${application.name}/%d{yyyy-MM-dd}/warn/warn-%i.zip</fileNamePattern>
+            <fileNamePattern>${LOG_ROOT}/%d{yyyy-MM-dd}/warn/warn-%i.zip</fileNamePattern>
             <maxFileSize>50MB</maxFileSize>
             <maxHistory>15</maxHistory>
             <totalSizeCap>2GB</totalSizeCap>
@@ -48,10 +48,10 @@
     </appender>
 
     <appender name="error_file" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_ROOT}/${application.name}/error.log</file>
+        <file>${LOG_ROOT}/error.log</file>
         <append>true</append>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_ROOT}/${application.name}/%d{yyyy-MM-dd}/error/error-%i.zip</fileNamePattern>
+            <fileNamePattern>${LOG_ROOT}/%d{yyyy-MM-dd}/error/error-%i.zip</fileNamePattern>
             <maxFileSize>50MB</maxFileSize>
             <maxHistory>15</maxHistory>
             <totalSizeCap>2GB</totalSizeCap>