diff --git a/backend/src/main/java/io/metersphere/api/controller/APITestController.java b/backend/src/main/java/io/metersphere/api/controller/APITestController.java index 6ac534febb..ad3940ac7a 100644 --- a/backend/src/main/java/io/metersphere/api/controller/APITestController.java +++ b/backend/src/main/java/io/metersphere/api/controller/APITestController.java @@ -12,7 +12,6 @@ import io.metersphere.commons.utils.PageUtils; import io.metersphere.commons.utils.Pager; import io.metersphere.commons.utils.SessionUtils; import io.metersphere.controller.request.QueryScheduleRequest; -import io.metersphere.dto.LicenseDTO; import io.metersphere.dto.ScheduleDao; import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresRoles; @@ -127,10 +126,4 @@ public class APITestController { public List listSchedule(@RequestBody QueryScheduleRequest request) { return apiTestService.listSchedule(request); } - - @GetMapping("/license/valid") - public LicenseDTO valid() { - return apiTestService.validateLicense(); - } - } diff --git a/backend/src/main/java/io/metersphere/api/service/APITestService.java b/backend/src/main/java/io/metersphere/api/service/APITestService.java index 83b33c5b37..44dd35677b 100644 --- a/backend/src/main/java/io/metersphere/api/service/APITestService.java +++ b/backend/src/main/java/io/metersphere/api/service/APITestService.java @@ -20,7 +20,6 @@ import io.metersphere.commons.constants.ScheduleType; import io.metersphere.commons.exception.MSException; import io.metersphere.commons.utils.*; import io.metersphere.controller.request.QueryScheduleRequest; -import io.metersphere.dto.LicenseDTO; import io.metersphere.dto.ScheduleDao; import io.metersphere.i18n.Translator; import io.metersphere.job.sechedule.ApiTestJob; @@ -437,13 +436,4 @@ public class APITestService { quotaService.checkAPITestQuota(); } } - - public LicenseDTO validateLicense() { - LicenseService licenseService = CommonBeanFactory.getBean(LicenseService.class); - if (licenseService != null) { - return licenseService.valid(); - } - return null; - } - } diff --git a/backend/src/main/java/io/metersphere/controller/LoginController.java b/backend/src/main/java/io/metersphere/controller/LoginController.java index 8452a51810..f1473d15fc 100644 --- a/backend/src/main/java/io/metersphere/controller/LoginController.java +++ b/backend/src/main/java/io/metersphere/controller/LoginController.java @@ -66,5 +66,4 @@ public class LoginController { public String getDefaultLanguage() { return userService.getDefaultLanguage(); } - } diff --git a/backend/src/main/java/io/metersphere/dto/LicenseDTO.java b/backend/src/main/java/io/metersphere/dto/LicenseDTO.java deleted file mode 100644 index 245f875979..0000000000 --- a/backend/src/main/java/io/metersphere/dto/LicenseDTO.java +++ /dev/null @@ -1,14 +0,0 @@ -package io.metersphere.dto; - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class LicenseDTO implements Serializable { - - private String status; - - private LicenseInfoDTO license; - -} \ No newline at end of file diff --git a/backend/src/main/java/io/metersphere/dto/LicenseInfoDTO.java b/backend/src/main/java/io/metersphere/dto/LicenseInfoDTO.java deleted file mode 100644 index 682ebe564e..0000000000 --- a/backend/src/main/java/io/metersphere/dto/LicenseInfoDTO.java +++ /dev/null @@ -1,21 +0,0 @@ -package io.metersphere.dto; - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class LicenseInfoDTO implements Serializable { - // 客户名称 - private String corporation; - // 授权截止时间 - private String expired; - //产品名称 - private String product; - //产品版本 - private String edition; - //icense版本 - private String licenseVersion; - //授权数量 - private int licenseCount; -} diff --git a/backend/src/main/java/io/metersphere/service/LicenseService.java b/backend/src/main/java/io/metersphere/service/LicenseService.java deleted file mode 100644 index 25e46b3d18..0000000000 --- a/backend/src/main/java/io/metersphere/service/LicenseService.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.metersphere.service; - -import io.metersphere.dto.LicenseDTO; - -public interface LicenseService { - - public LicenseDTO valid(); - - public LicenseDTO addValidLicense(String reqLicenseCode); -} diff --git a/backend/src/main/java/io/metersphere/service/UserService.java b/backend/src/main/java/io/metersphere/service/UserService.java index ef8e264e57..fe2b0b8dfc 100644 --- a/backend/src/main/java/io/metersphere/service/UserService.java +++ b/backend/src/main/java/io/metersphere/service/UserService.java @@ -34,6 +34,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; + import java.util.*; import java.util.stream.Collectors; diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack index 321c869938..cf6b065263 160000 --- a/backend/src/main/java/io/metersphere/xpack +++ b/backend/src/main/java/io/metersphere/xpack @@ -1 +1 @@ -Subproject commit 321c869938357e8c2253e5bd86c963828664ae23 +Subproject commit cf6b06526324326a563d933e07118fac014a63b4 diff --git a/frontend/src/business/App.vue b/frontend/src/business/App.vue index 266b73605e..c226861e51 100644 --- a/frontend/src/business/App.vue +++ b/frontend/src/business/App.vue @@ -1,15 +1,11 @@