refactor(XPack): License接口都放到XPack内
This commit is contained in:
parent
22020e48d0
commit
569b01f589
|
@ -67,10 +67,4 @@ public class LoginController {
|
||||||
public String getDefaultLanguage() {
|
public String getDefaultLanguage() {
|
||||||
return userService.getDefaultLanguage();
|
return userService.getDefaultLanguage();
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/api/license/valid")
|
|
||||||
public LicenseDTO valid() {
|
|
||||||
return userService.validateLicense();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,10 +0,0 @@
|
||||||
package io.metersphere.service;
|
|
||||||
|
|
||||||
import io.metersphere.dto.LicenseDTO;
|
|
||||||
|
|
||||||
public interface LicenseService {
|
|
||||||
|
|
||||||
public LicenseDTO valid();
|
|
||||||
|
|
||||||
public LicenseDTO addValidLicense(String reqLicenseCode);
|
|
||||||
}
|
|
|
@ -36,6 +36,7 @@ import org.springframework.transaction.annotation.Transactional;
|
||||||
import org.springframework.util.CollectionUtils;
|
import org.springframework.util.CollectionUtils;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
@ -591,12 +592,4 @@ public class UserService {
|
||||||
public List<User> searchUser(String condition) {
|
public List<User> searchUser(String condition) {
|
||||||
return extUserMapper.searchUser(condition);
|
return extUserMapper.searchUser(condition);
|
||||||
}
|
}
|
||||||
|
|
||||||
public LicenseDTO validateLicense() {
|
|
||||||
LicenseService licenseService = CommonBeanFactory.getBean(LicenseService.class);
|
|
||||||
if (licenseService != null) {
|
|
||||||
return licenseService.valid();
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit ca1b956888a85d9cb7c8b7b8b8692e658e4a63f8
|
Subproject commit e51e5704f9d7fbfb030a8a7d67d0094a9f36c23d
|
|
@ -1 +1 @@
|
||||||
Subproject commit 6dfc8fe7d5d43dbc80b45942bdcc90999f5c0e99
|
Subproject commit 2c5f7e15858f51e836cffa911f8ab7511b3cc0d5
|
Loading…
Reference in New Issue