适配qmth-boot:1.0.4最新修改；增加导出license中的code字段

src/main/java/com/qmth/ops/api/controller/admin/DeployController.java

@@ -2,7 +2,6 @@ package com.qmth.ops.api.controller.admin;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.boot.core.exception.ParameterException;
 import com.qmth.boot.tools.device.DeviceInfo;
@@ -53,7 +52,7 @@ public class DeployController {
     private OrgService orgService;
 
     @RequestMapping("/modes")
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Object getModes() {
         return Arrays.stream(DeployMode.values()).map(item -> new CodeNameVO(item.getCode(), item.getName())).toArray();
     }

src/main/java/com/qmth/ops/api/controller/admin/EnvController.java

@@ -1,7 +1,6 @@
 package com.qmth.ops.api.controller.admin;
 
 import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.ops.api.constants.OpsApiConstants;
 import com.qmth.ops.api.security.AdminSession;
 import com.qmth.ops.api.security.Permission;
@@ -10,7 +9,6 @@ import com.qmth.ops.api.vo.EnvVO;
 import com.qmth.ops.biz.domain.AppEnv;
 import com.qmth.ops.biz.domain.Env;
 import com.qmth.ops.biz.domain.EnvType;
-import com.qmth.ops.biz.service.AppService;
 import com.qmth.ops.biz.service.EnvService;
 import org.springframework.web.bind.annotation.*;
 
@@ -26,11 +24,8 @@ public class EnvController {
     @Resource
     private EnvService envService;
 
-    @Resource
-    private AppService appService;
-
     @RequestMapping("/types")
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Object types() {
         return Arrays.stream(EnvType.values()).map(item -> new CodeNameVO(item.getCode(), item.getName())).toArray();
     }

src/main/java/com/qmth/ops/api/controller/admin/ModuleController.java

@@ -1,7 +1,6 @@
 package com.qmth.ops.api.controller.admin;
 
 import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.ops.api.constants.OpsApiConstants;
 import com.qmth.ops.api.security.AdminSession;
 import com.qmth.ops.api.security.Permission;
@@ -27,7 +26,7 @@ public class ModuleController {
     private ModuleService moduleService;
 
     @RequestMapping("/types")
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Object types() {
         return Arrays.stream(ModuleType.values()).map(ModuleTypeVO::new).toArray();
     }

src/main/java/com/qmth/ops/api/controller/admin/OrgController.java

@@ -2,7 +2,6 @@ package com.qmth.ops.api.controller.admin;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.core.solar.enums.OrgType;
 import com.qmth.ops.api.constants.OpsApiConstants;
 import com.qmth.ops.api.security.AdminSession;
@@ -31,7 +30,7 @@ public class OrgController {
     private FileService fileService;
 
     @RequestMapping("/types")
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Object getTypes() {
         return Arrays.stream(OrgType.values()).map(OrgTypeVO::new).toArray();
     }

src/main/java/com/qmth/ops/api/controller/admin/PropertyController.java

@@ -1,7 +1,6 @@
 package com.qmth.ops.api.controller.admin;
 
 import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.ops.api.binder.FileFormatBinder;
 import com.qmth.ops.api.constants.OpsApiConstants;
 import com.qmth.ops.api.security.AdminSession;
@@ -47,13 +46,13 @@ public class PropertyController {
     }
 
     @RequestMapping("/groups")
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public List<PropertyGroup> listGroups() {
         return propertyGroupService.getPropertyGroupList();
     }
 
     @RequestMapping("/modes")
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Object listModes() {
         return Arrays.stream(PropertyMode.values()).map(model -> new CodeNameVO(model.getCode(), model.getName()))
                 .toArray();

src/main/java/com/qmth/ops/api/controller/admin/UserController.java

@@ -2,7 +2,6 @@ package com.qmth.ops.api.controller.admin;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.core.exception.ParameterException;
 import com.qmth.ops.api.constants.OpsApiConstants;
 import com.qmth.ops.api.dto.LoginResult;
@@ -41,7 +40,7 @@ public class UserController {
     private FileService fileService;
 
     @PostMapping("/login")
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public LoginResult login(@Validated(UserForm.LoginGroup.class) UserForm form) {
         User user = userService.findByLoginName(form.getLoginName());
         if (user == null) {
@@ -58,7 +57,7 @@ public class UserController {
     }
 
     @RequestMapping("/roles")
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Object getRoles() {
         return Arrays.stream(Role.values()).map(role -> new CodeNameVO(role.getCode(), role.getName())).toArray();
     }

src/main/java/com/qmth/ops/api/controller/export/NginxConfigExportController.java

@@ -1,7 +1,6 @@
 package com.qmth.ops.api.controller.export;
 
 import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.core.exception.NotFoundException;
 import com.qmth.boot.core.exception.ParameterException;
 import com.qmth.boot.core.exception.UnauthorizedException;
@@ -20,7 +19,7 @@ import java.io.IOException;
 
 @RestController
 @RequestMapping(OpsApiConstants.EXPORT_URI_PREFIX + "/nginx")
-@Aac(auth = BOOL.FALSE)
+@Aac(auth = false)
 public class NginxConfigExportController {
 
     @Resource

src/main/java/com/qmth/ops/api/controller/export/PropertyExportController.java

@@ -1,7 +1,6 @@
 package com.qmth.ops.api.controller.export;
 
 import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.core.exception.ParameterException;
 import com.qmth.boot.core.exception.UnauthorizedException;
 import com.qmth.ops.api.binder.FileFormatBinder;
@@ -21,7 +20,7 @@ import java.util.List;
 
 @RestController
 @RequestMapping(OpsApiConstants.EXPORT_URI_PREFIX + "/property")
-@Aac(auth = BOOL.FALSE)
+@Aac(auth = false)
 public class PropertyExportController {
 
     @Resource

src/main/java/com/qmth/ops/api/controller/open/OpenAppDeployController.java

@@ -1,7 +1,6 @@
 package com.qmth.ops.api.controller.open;
 
 import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.core.solar.model.AppInfo;
 import com.qmth.boot.tools.signature.SignatureType;
 import com.qmth.ops.api.constants.OpsApiConstants;
@@ -17,7 +16,7 @@ import javax.annotation.Resource;
 
 @RestController
 @RequestMapping(OpsApiConstants.OPEN_URI_PREFIX)
-@Aac(auth = BOOL.TRUE, signType = SignatureType.SECRET)
+@Aac(auth = true, signType = SignatureType.SECRET)
 public class OpenAppDeployController {
 
     @Resource

src/main/java/com/qmth/ops/api/controller/open/OpenOrgController.java

@@ -1,7 +1,6 @@
 package com.qmth.ops.api.controller.open;
 
 import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.core.solar.enums.OrgType;
 import com.qmth.boot.core.solar.model.OrgInfo;
 import com.qmth.boot.tools.signature.SignatureType;
@@ -24,7 +23,7 @@ import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping(OpsApiConstants.OPEN_URI_PREFIX + "/org")
-@Aac(auth = BOOL.TRUE, signType = SignatureType.SECRET)
+@Aac(auth = true, signType = SignatureType.SECRET)
 public class OpenOrgController {
 
     @Resource
@@ -37,7 +36,7 @@ public class OpenOrgController {
             .map(type -> new CodeNameVO(type.toString(), type.getName())).toArray();
 
     @RequestMapping("/types")
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Object[] types() {
         return orgTypes;
     }

src/main/java/com/qmth/ops/api/controller/open/OpenWxappController.java

@@ -1,7 +1,6 @@
 package com.qmth.ops.api.controller.open;
 
 import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.core.solar.model.WxappAccessToken;
 import com.qmth.boot.core.solar.model.WxappSession;
 import com.qmth.boot.tools.signature.SignatureType;
@@ -16,7 +15,7 @@ import javax.annotation.Resource;
 
 @RestController
 @RequestMapping(OpsApiConstants.OPEN_URI_PREFIX + "/wxapp")
-@Aac(auth = BOOL.TRUE, signType = SignatureType.SECRET)
+@Aac(auth = true, signType = SignatureType.SECRET)
 public class OpenWxappController {
 
     @Resource

src/main/java/com/qmth/ops/api/controller/sms/SmsController.java

@@ -1,7 +1,6 @@
 package com.qmth.ops.api.controller.sms;
 
 import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.core.sms.api.SmsApiClient;
 import com.qmth.boot.core.sms.model.SmsConstants;
 import com.qmth.boot.core.sms.model.SmsSendRequest;
@@ -15,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 
 @RestController
-@Aac(auth = BOOL.TRUE, signType = SignatureType.SECRET)
+@Aac(auth = true, signType = SignatureType.SECRET)
 public class SmsController {
 
     @Resource

src/main/java/com/qmth/ops/biz/service/LicenseService.java

@@ -50,11 +50,10 @@ public class LicenseService {
         //build deploy info
         AppLicense license = new AppLicense();
         license.setId(deploy.getId());
+        license.setCode(app.getCode());
         license.setName(deploy.getName());
         license.setControl(deploy.getControl());
         license.setOrgs(new ArrayList<>());
-        //TODO
-        //后续需要补充app.code填充
         //build org info list
         OrgQuery query = new OrgQuery();
         query.setDeployId(deploy.getId());