sso

pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/controller/AuthController.java

@@ -59,13 +59,14 @@ public class AuthController {
 
     /**
      * 获取手机验证码或者邮箱验证邮件
-     * @param action 验证动作 CaptchaActionEnum
-     * @param type 验证类型 0邮箱 1手机
+     *
+     * @param action   验证动作 CaptchaActionEnum
+     * @param type     验证类型 0邮箱 1手机
      * @param receiver 接收者 （邮箱或者手机号）
      * @return Boolean
      */
     @GetMapping("/getVerifyCode")
-    public ResultMap<Boolean> getVerifyCode(@RequestParam String action,@RequestParam Integer type,@NotBlank(message = "接收者不能为空") @RequestParam String receiver) {
+    public ResultMap<Boolean> getVerifyCode(@RequestParam String action, @RequestParam Integer type, @NotBlank(message = "接收者不能为空") @RequestParam String receiver) {
         CaptchaActionEnum actionEnum = CaptchaActionEnum.getEnumByValue(action);
         if (actionEnum == null) {
             return new ResultMap<>(CommonConstant.ERROR, AuthConstant.EXCEPTION_MSG_CODE_ACTION_ERROR, false);
@@ -75,21 +76,22 @@ public class AuthController {
             return new ResultMap<>(CommonConstant.ERROR, AuthConstant.EXCEPTION_MSG_CODE_TYPE_ERROR, false);
         }
         if (authService.getVerifyCode(actionEnum, verifyTypeEnum, receiver)) {
-            return new ResultMap<>(CommonConstant.SUCCESS, VerifyTypeEnum.PHONE.code().equals(type) ?AuthConstant.SUCCESS_MSG_CODE_SEND:AuthConstant.SUCCESS_MSG_CODE_SEND_MAIL, true);
+            return new ResultMap<>(CommonConstant.SUCCESS, VerifyTypeEnum.PHONE.code().equals(type) ? AuthConstant.SUCCESS_MSG_CODE_SEND : AuthConstant.SUCCESS_MSG_CODE_SEND_MAIL, true);
         } else {
-            return new ResultMap<>(CommonConstant.ERROR, VerifyTypeEnum.PHONE.code().equals(type) ?AuthConstant.EXCEPTION_MSG_CODE_SEND_ERROR:AuthConstant.EXCEPTION_MAIL_CODE_SEND_ERROR, false);
+            return new ResultMap<>(CommonConstant.ERROR, VerifyTypeEnum.PHONE.code().equals(type) ? AuthConstant.EXCEPTION_MSG_CODE_SEND_ERROR : AuthConstant.EXCEPTION_MAIL_CODE_SEND_ERROR, false);
         }
     }
 
     /**
      * 检查用户是否存在(用于忘记密码)
-     * @param code 图片验证码
+     *
+     * @param code    图片验证码
      * @param account 账户
      * @return Boolean
      */
     @PostMapping("/checkExist")
-    public ResultMap<Boolean> checkExist(@NotBlank(message = "key不能为空") @RequestParam String key,@NotBlank(message = "验证码不能为空") @RequestParam String code,@RequestParam @NotBlank(message = "手机号/邮箱 不能为空")String account) {
-        return new ResultMap<>(CommonConstant.SUCCESS, CommonConstant.RESULT_SUCCESS,authService.checkExist(key,account,code));
+    public ResultMap<Boolean> checkExist(@NotBlank(message = "key不能为空") @RequestParam String key, @NotBlank(message = "验证码不能为空") @RequestParam String code, @RequestParam @NotBlank(message = "手机号/邮箱 不能为空") String account) {
+        return new ResultMap<>(CommonConstant.SUCCESS, CommonConstant.RESULT_SUCCESS, authService.checkExist(key, account, code));
     }
 
 

pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/controller/DirectoryController.java

@@ -18,7 +18,9 @@ import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.List;
 
-
+/**
+ * 目录模块
+ */
 @RestController
 @RequestMapping("/directory")
 public class DirectoryController {
@@ -90,9 +92,10 @@ public class DirectoryController {
     }
 
     /**
-     * 获取组列表
-     * @param clientId clientId
-     * @param tenantId tenantId
+     * 获取微软组列表
+     *
+     * @param clientId     clientId
+     * @param tenantId     tenantId
      * @param clientSecret clientSecret
      * @return List
      */
@@ -102,6 +105,12 @@ public class DirectoryController {
         return new ResultMap<>(CommonConstant.SUCCESS, CommonConstant.RESULT_SUCCESS, directoryList);
     }
 
+    /**
+     * 同步(点击同步按钮之后)
+     *
+     * @param scheduleSettingDTO 同步设置
+     * @return String
+     */
     @PostMapping("/syncSetting")
     public ResultMap<String> syncSetting(@RequestBody @Valid ScheduleSettingDTO scheduleSettingDTO) {
         scheduleSettingService.syncSetting(scheduleSettingDTO);

pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/controller/DomainController.java

@@ -1,7 +1,9 @@
 package cn.kdan.pdf.tech.core.controller;
 
 import cn.kdan.pdf.tech.core.model.Domain;
+import cn.kdan.pdf.tech.core.model.VppMember;
 import cn.kdan.pdf.tech.core.service.DomainService;
+import cn.kdan.pdf.tech.core.service.VppMemberService;
 import constant.CommonConstant;
 import org.springframework.web.bind.annotation.*;
 import pojo.ResultMap;
@@ -13,13 +15,17 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.List;
 
-
+/**
+ * 域名模块
+ */
 @RestController
 @RequestMapping("/domain")
 public class DomainController {
 
     @Resource
     private DomainService domainService;
+    @Resource
+    private VppMemberService memberService;
 
     /**
      * 获取DNS的txt文件
@@ -28,7 +34,8 @@ public class DomainController {
      */
     @GetMapping("/getDNSTxt")
     public ResultMap<String> getDNSTxt() {
-        String txt = "PDF-Tech-Editor" + "-domain-verification=" + CommonUtils.generateId();
+        VppMember member = memberService.getCurrentUser();
+        String txt = "PDF-Tech-Editor" + "-domain-verification=" + member.getCompanyId();
         return new ResultMap<>(CommonConstant.SUCCESS, CommonConstant.RESULT_SUCCESS, txt);
     }
 
@@ -40,7 +47,8 @@ public class DomainController {
     @GetMapping("/getHttpTxt")
     public void getHttpTxt(HttpServletResponse response) {
         String fileName = "PDF-Tech-Editor-domain-verification.txt";
-        String content = "PDF-Tech-Editor-domain-verification=" + CommonUtils.generateId();
+        VppMember member = memberService.getCurrentUser();
+        String content = "PDF-Tech-Editor-domain-verification=" + member.getCompanyId();
 
         response.setContentType("text/plain");
         response.setHeader("Content-Disposition", "attachment; filename=" + fileName);
@@ -106,15 +114,11 @@ public class DomainController {
      * 验证域名
      *
      * @param domainId    域名id
-     * @param verifyCode  验证码
-     * @param fileName    文件名
-     * @param fileContent 文件内容
      * @return string
      */
     @PostMapping("/verify")
-    public ResultMap<String> verify(@RequestParam String domainId, @RequestParam(required = false) String verifyCode,
-                                    @RequestParam(required = false) String fileName, @RequestParam(required = false) String fileContent) {
-        domainService.verify(domainId, verifyCode, fileName, fileContent);
+    public ResultMap<String> verify(@RequestParam String domainId) {
+        domainService.verify(domainId);
         return new ResultMap<>(CommonConstant.SUCCESS, CommonConstant.RESULT_SUCCESS);
     }
 

pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/controller/ProductController.java

@@ -4,7 +4,10 @@ import cn.kdan.pdf.tech.core.pojo.vo.ProductListVO;
 import cn.kdan.pdf.tech.core.pojo.vo.ProductSimpleVO;
 import cn.kdan.pdf.tech.core.service.ProductService;
 import constant.CommonConstant;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import pojo.ResultMap;
 
 import javax.annotation.Resource;
@@ -24,7 +27,7 @@ public class ProductController {
     /**
      * 获取团队下的产品
      *
-     * @param teamId      团队id
+     * @param teamId 团队id
      * @return List
      */
     @GetMapping("/listWithSimpleInfo")

pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/controller/VppDashboardController.java

@@ -2,7 +2,6 @@ package cn.kdan.pdf.tech.core.controller;
 
 import cn.kdan.pdf.tech.core.pojo.vo.*;
 import cn.kdan.pdf.tech.core.service.VppDashboardService;
-import cn.kdan.pdf.tech.core.service.VppDeviceService;
 import constant.CommonConstant;
 import org.springframework.web.bind.annotation.*;
 import pojo.ResultMap;
@@ -23,6 +22,7 @@ public class VppDashboardController {
     /**
      * 获取全局预览数据，不区分产品
      * 不区分账户权限
+     *
      * @return DashboardOverviewVO
      */
     @GetMapping("/getOverview")
@@ -33,6 +33,7 @@ public class VppDashboardController {
     /**
      * 获取全局预览数据，区分产品
      * 区分超管和团队管理员权限
+     *
      * @param codeList 产品编码
      * @return DashboardOverviewVO
      */
@@ -44,6 +45,7 @@ public class VppDashboardController {
     /**
      * 获取图表数据
      * 不区分账户权限
+     *
      * @param type 1today,2last 7 days,3last 30 days,4this month
      * @return DashboardChartStatisticVO
      */
@@ -55,6 +57,7 @@ public class VppDashboardController {
     /**
      * 获取团队数据
      * 不区分账户权限
+     *
      * @return DashboardTeamDataVO
      */
     @GetMapping("/getTeamData")
@@ -65,6 +68,7 @@ public class VppDashboardController {
     /**
      * 获取团队成员数据
      * 区分超管和团队管理员权限
+     *
      * @return DashboardTeamMemberVO
      */
     @GetMapping("/getTeamMemberData")

pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/controller/VppDeviceController.java

@@ -9,7 +9,6 @@ import cn.kdan.pdf.tech.core.service.VppCompanyService;
 import cn.kdan.pdf.tech.core.service.VppDeviceService;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.util.MapUtils;
-import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
 import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageInfo;
 import constant.CommonConstant;
@@ -38,14 +37,14 @@ public class VppDeviceController {
     /**
      * 分页查询用户管理的团队的设备
      *
-     * @param page 页数
-     * @param pageSize 页码
+     * @param page      页数
+     * @param pageSize  页码
      * @param productId 产品id
-     * @param status 状态
-     * @param teamId 团队id
+     * @param status    状态
+     * @param teamId    团队id
      * @return PageInfo
      */
-    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN,RoleEnum.SUPER_ADMIN})
+    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN, RoleEnum.SUPER_ADMIN})
     @GetMapping("/page")
     public ResultMap<PageInfo<VppDeviceVO>> page(@RequestParam(required = false, defaultValue = "1") Integer page,
                                                  @RequestParam(required = false, defaultValue = "10") Integer pageSize,
@@ -53,11 +52,11 @@ public class VppDeviceController {
                                                  @RequestParam(required = false) Integer status,
                                                  @RequestParam(required = false) String teamId,
                                                  @RequestParam(required = false) String queryString
-                                    ) {
-        return new ResultMap<>(CommonConstant.SUCCESS, CommonConstant.RESULT_SUCCESS,vppDeviceService.page(page,pageSize,productId,status,teamId,queryString));
+    ) {
+        return new ResultMap<>(CommonConstant.SUCCESS, CommonConstant.RESULT_SUCCESS, vppDeviceService.page(page, pageSize, productId, status, teamId, queryString));
     }
 
-    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN,RoleEnum.SUPER_ADMIN})
+    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN, RoleEnum.SUPER_ADMIN})
     @GetMapping("/download")
     public void downloadFailedUsingJson(HttpServletResponse response,
                                         @RequestParam(required = false) Integer productId,
@@ -70,7 +69,7 @@ public class VppDeviceController {
             response.setCharacterEncoding("utf-8");
             // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
             VppCompany company = vppCompanyService.getUserCompany();
-            String fileName = URLEncoder.encode(company.getName()+ " " + CommonUtils.getDateTime("yyyyMMdd") +" Device", "UTF-8").replaceAll("\\+", "%20");
+            String fileName = URLEncoder.encode(company.getName() + " " + CommonUtils.getDateTime("yyyyMMdd") + " Device", "UTF-8").replaceAll("\\+", "%20");
             response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
             // 这里需要设置不关闭流
             EasyExcel.write(response.getOutputStream(), VppDeviceVO.class)
@@ -78,7 +77,7 @@ public class VppDeviceController {
                     .sheet("模板")
                     .doWrite(() -> {
                         // 分页查询数据
-                        return vppDeviceService.listWithInfo( productId, status, teamId, queryString);
+                        return vppDeviceService.listWithInfo(productId, status, teamId, queryString);
                     });
         } catch (Exception e) {
             // 重置response
@@ -97,13 +96,13 @@ public class VppDeviceController {
      * 解绑序列码和设备
      *
      * @param deviceId 设备id
-     * @return    ResultMap
+     * @return ResultMap
      */
-    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN,RoleEnum.SUPER_ADMIN})
+    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN, RoleEnum.SUPER_ADMIN})
     @PostMapping("/cancel")
     public ResultMap<Boolean> cancel(@RequestParam String deviceId) {
         vppDeviceService.cancel(deviceId);
-        return new ResultMap<>(CommonConstant.SUCCESS, VppDeviceConstant.SUCCESS_MSG_Canceled,Boolean.TRUE);
+        return new ResultMap<>(CommonConstant.SUCCESS, VppDeviceConstant.SUCCESS_MSG_Canceled, Boolean.TRUE);
     }
 
 }

pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/controller/VppLicenseCodeController.java

@@ -10,7 +10,6 @@ import cn.kdan.pdf.tech.core.service.VppCompanyService;
 import cn.kdan.pdf.tech.core.service.VppLicenseCodeService;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.util.MapUtils;
-import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
 import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageInfo;
 import constant.CommonConstant;
@@ -50,7 +49,7 @@ public class VppLicenseCodeController {
      * @param queryString 邮箱用户名或者
      * @return PageInfo
      */
-    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN,RoleEnum.SUPER_ADMIN})
+    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN, RoleEnum.SUPER_ADMIN})
     @GetMapping("/page")
     public ResultMap<PageInfo<VppLicenseCodeVO>> page(@RequestParam(required = false, defaultValue = "1") Integer page,
                                                       @RequestParam(required = false, defaultValue = "10") Integer pageSize,
@@ -74,16 +73,16 @@ public class VppLicenseCodeController {
      */
     @GetMapping("/pageForReseller")
     public ResultMap<PageInfo<VppLicenseCodeVO>> pageForReseller(@RequestParam(required = false, defaultValue = "1") Integer page,
-                                                      @RequestParam(required = false, defaultValue = "10") Integer pageSize,
-                                                      @RequestParam(required = false) Integer productId,
-                                                      @RequestParam(required = false) Integer status,
-                                                      @RequestParam(required = false) String queryString
+                                                                 @RequestParam(required = false, defaultValue = "10") Integer pageSize,
+                                                                 @RequestParam(required = false) Integer productId,
+                                                                 @RequestParam(required = false) Integer status,
+                                                                 @RequestParam(required = false) String queryString
     ) {
         return new ResultMap<>(CommonConstant.SUCCESS, CommonConstant.RESULT_SUCCESS, vppLicenseCodeService.pageForReseller(page, pageSize, productId, status, queryString));
     }
 
 
-    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN,RoleEnum.SUPER_ADMIN})
+    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN, RoleEnum.SUPER_ADMIN})
     @GetMapping("/download")
     public void downloadFailedUsingJson(HttpServletResponse response,
                                         @RequestParam(required = false) Integer productId,
@@ -96,7 +95,7 @@ public class VppLicenseCodeController {
             response.setCharacterEncoding("utf-8");
             // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
             VppCompany company = vppCompanyService.getUserCompany();
-            String fileName = URLEncoder.encode(company.getName()+ " " +CommonUtils.getDateTime("yyyyMMdd") +" License", "UTF-8").replaceAll("\\+", "%20");
+            String fileName = URLEncoder.encode(company.getName() + " " + CommonUtils.getDateTime("yyyyMMdd") + " License", "UTF-8").replaceAll("\\+", "%20");
             response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
             // 这里需要设置不关闭流
             EasyExcel.write(response.getOutputStream(), VppLicenseCodeVO.class)
@@ -104,7 +103,7 @@ public class VppLicenseCodeController {
                     .sheet("模板")
                     .doWrite(() -> {
                         // 分页查询数据
-                        return vppLicenseCodeService.listWithInfo( productId, teamId, status, queryString);
+                        return vppLicenseCodeService.listWithInfo(productId, teamId, status, queryString);
                     });
         } catch (Exception e) {
             // 重置response
@@ -127,7 +126,7 @@ public class VppLicenseCodeController {
      * @param productIds 产品id集合
      * @return ResultMap
      */
-    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN,RoleEnum.SUPER_ADMIN})
+    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN, RoleEnum.SUPER_ADMIN})
     @PostMapping("/singleAssign")
     public ResultMap<Boolean> singleAssign(@RequestParam List<String> memberIds,
                                            @RequestParam String teamId,
@@ -140,26 +139,26 @@ public class VppLicenseCodeController {
     /**
      * 给团队中除了超级管理员外的所有用户授权指定产品的序列码
      *
-     * @param teamId 团队id
+     * @param teamId     团队id
      * @param productIds 产品id集合
      * @return ResultMap
      */
-    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN,RoleEnum.SUPER_ADMIN})
+    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN, RoleEnum.SUPER_ADMIN})
     @PostMapping("/teamAssign")
-    public ResultMap<Boolean> teamAssign( @RequestParam String teamId,
-                                          @RequestParam List<Integer> productIds) {
+    public ResultMap<Boolean> teamAssign(@RequestParam String teamId,
+                                         @RequestParam List<Integer> productIds) {
         vppLicenseCodeService.teamAssign(teamId, productIds);
         return new ResultMap<>(CommonConstant.SUCCESS, VppLicenseCodeConstant.SUCCESS_MSG_ASSIGN, Boolean.TRUE);
     }
 
-    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN,RoleEnum.SUPER_ADMIN})
+    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN, RoleEnum.SUPER_ADMIN})
     @PostMapping("/cancelLicenceAssign")
     public ResultMap<Boolean> cancelLicenceAssign(@RequestParam String licenceId) {
         vppLicenseCodeService.cancelLicenceAssign(licenceId);
         return new ResultMap<>(CommonConstant.SUCCESS, VppLicenseCodeConstant.CANCEL_ASSIGN, Boolean.TRUE);
     }
 
-    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN,RoleEnum.SUPER_ADMIN})
+    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN, RoleEnum.SUPER_ADMIN})
     @PostMapping("/cancelLicenceAssignBatch")
     public ResultMap<String> cancelLicenceAssignBatch(@RequestParam("file") MultipartFile file) {
         return new ResultMap<>(CommonConstant.SUCCESS, VppLicenseCodeConstant.CANCEL_ASSIGN, vppLicenseCodeService.cancelLicenceAssignBatch(file));
@@ -167,10 +166,11 @@ public class VppLicenseCodeController {
 
     /**
      * 检查公司有没有剩余序列码
+     *
      * @param companyId
      * @return
      */
-    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN,RoleEnum.SUPER_ADMIN})
+    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN, RoleEnum.SUPER_ADMIN})
     @GetMapping("/checkCompanyLicense")
     public ResultMap<Boolean> checkCompanyLicense(@RequestParam("companyId") String companyId) {
         List<LicenseCodes> list = vppLicenseCodeService.getByCompanyIdRemoveExpired(companyId);
@@ -180,6 +180,7 @@ public class VppLicenseCodeController {
 
     /**
      * 检查公司有没有剩余序列码
+     *
      * @param licenseCodeId 序列码id
      * @return 禁用
      */

pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/controller/VppMemberController.java

@@ -14,20 +14,16 @@ import cn.kdan.pdf.tech.core.pojo.vo.SSOMemberLicenseVO;
 import cn.kdan.pdf.tech.core.pojo.vo.VppMemberVO;
 import cn.kdan.pdf.tech.core.service.VppLicenseCodeService;
 import cn.kdan.pdf.tech.core.service.VppMemberService;
-import com.azure.core.implementation.util.ObjectsUtil;
 import constant.CommonConstant;
 import enums.ValidStatusEnum;
 import exception.BackendRuntimeException;
 import org.springframework.beans.BeanUtils;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import pojo.ResultMap;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import java.util.List;
-import java.util.Objects;
 
 /**
  * @author tangxiangan
@@ -54,6 +50,7 @@ public class VppMemberController {
 
     /**
      * 试用超管注册
+     *
      * @param param 用户注册入参
      * @return 用户注册出参
      */
@@ -87,12 +84,13 @@ public class VppMemberController {
 
     /**
      * 添加管理员时判断用户是否存在
+     *
      * @param account 邮箱
      * @return Boolean
      */
     @PostMapping("/checkExist")
     public ResultMap<Boolean> checkExist(@RequestParam String account) {
-        return new ResultMap<>(CommonConstant.SUCCESS, CommonConstant.RESULT_SUCCESS,vppMemberService.checkExist(account));
+        return new ResultMap<>(CommonConstant.SUCCESS, CommonConstant.RESULT_SUCCESS, vppMemberService.checkExist(account));
     }
 
     /**
@@ -110,22 +108,28 @@ public class VppMemberController {
         return new ResultMap<>(CommonConstant.SUCCESS, CommonConstant.RESULT_SUCCESS, vppMemberVO);
     }
 
+    /**
+     * 检查单点登录用户（app端使用）
+     * @param email 邮箱
+     * @param productCode 产品code
+     * @return SSOMemberLicenseVO
+     */
     @GetMapping("/checkSSOMember")
-    public ResultMap<SSOMemberLicenseVO> checkSSOMember(@RequestParam("email") String email,@RequestParam("productCode") String productCode) {
+    public ResultMap<SSOMemberLicenseVO> checkSSOMember(@RequestParam("email") String email, @RequestParam("productCode") String productCode) {
         VppMember member = vppMemberService.getByAccountSSO(email);
         if (ObjectUtils.isEmpty(member)) {
             throw new BackendRuntimeException(SSOConstant.EXCEPTION_MSG_MEMBER_NOT_EXIST);
         }
-        if(member.getValidFlag().equals(ValidStatusEnum.REVOKED.value())){
+        if (member.getValidFlag().equals(ValidStatusEnum.REVOKED.value())) {
             throw new BackendRuntimeException(SSOConstant.EXCEPTION_MSG_MEMBER_REVOKED);
         }
-        LicenseCodes codes = licenseCodeService.getByMemberId(member.getId(),productCode);
-        if(!ObjectUtils.isEmpty(codes)){
+        LicenseCodes codes = licenseCodeService.getByMemberId(member.getId(), productCode);
+        if (!ObjectUtils.isEmpty(codes)) {
             throw new BackendRuntimeException(SSOConstant.EXCEPTION_MSG_MEMBER_HAS_ASSIGNED);
         }
         SSOMemberLicenseVO ssoMemberLicenseVO = new SSOMemberLicenseVO();
-        BeanUtils.copyProperties(member,ssoMemberLicenseVO);
-        BeanUtils.copyProperties(codes,ssoMemberLicenseVO);
+        BeanUtils.copyProperties(member, ssoMemberLicenseVO);
+        BeanUtils.copyProperties(codes, ssoMemberLicenseVO);
 
         return new ResultMap<>(CommonConstant.SUCCESS, VppLicenseCodeConstant.SUCCESS_MSG_ASSIGN, ssoMemberLicenseVO);
     }

pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/controller/VppOrderDetailController.java

@@ -7,7 +7,10 @@ import cn.kdan.pdf.tech.core.pojo.vo.SubscriptionVO;
 import cn.kdan.pdf.tech.core.service.SubscriptionService;
 import com.github.pagehelper.PageInfo;
 import constant.CommonConstant;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import pojo.ResultMap;
 
 import javax.annotation.Resource;
@@ -27,15 +30,15 @@ public class VppOrderDetailController {
      *
      * @param page     页码
      * @param pageSize 最大条数
-     * @param code code
+     * @param code     code
      * @return ResultMap
      */
-    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN,RoleEnum.SUPER_ADMIN})
+    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN, RoleEnum.SUPER_ADMIN})
     @GetMapping("/pageByCompany")
     public ResultMap<PageInfo<SubscriptionVO>> pageByCompany(@RequestParam(required = false, defaultValue = "1") Integer page,
                                                              @RequestParam(required = false, defaultValue = "10") Integer pageSize,
                                                              @RequestParam(required = false) String code) {
-        return new ResultMap<>(CommonConstant.SUCCESS, CommonConstant.RESULT_SUCCESS, subscriptionService.pageByCompany(page,pageSize,code));
+        return new ResultMap<>(CommonConstant.SUCCESS, CommonConstant.RESULT_SUCCESS, subscriptionService.pageByCompany(page, pageSize, code));
     }
 
     /**
@@ -43,14 +46,14 @@ public class VppOrderDetailController {
      *
      * @param page     页码
      * @param pageSize 最大条数
-     * @param code code
+     * @param code     code
      * @return ResultMap
      */
     @GetMapping("/pageForReseller")
     public ResultMap<PageInfo<SubscriptionResellerVO>> pageForReseller(@RequestParam(required = false, defaultValue = "1") Integer page,
                                                                        @RequestParam(required = false, defaultValue = "10") Integer pageSize,
                                                                        @RequestParam(required = false) String code) {
-        return new ResultMap<>(CommonConstant.SUCCESS, CommonConstant.RESULT_SUCCESS, subscriptionService.pageForReseller(page,pageSize,code));
+        return new ResultMap<>(CommonConstant.SUCCESS, CommonConstant.RESULT_SUCCESS, subscriptionService.pageForReseller(page, pageSize, code));
     }
 
 }

pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/controller/VppRTeamMemberRoleController.java

@@ -8,7 +8,6 @@ import cn.kdan.pdf.tech.core.pojo.vo.*;
 import cn.kdan.pdf.tech.core.service.DirectoryService;
 import cn.kdan.pdf.tech.core.service.VppCompanyService;
 import cn.kdan.pdf.tech.core.service.VppRTeamMemberRoleService;
-import cn.kdan.pdf.tech.core.service.VppTeamService;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.util.MapUtils;
 import com.alibaba.excel.util.StringUtils;
@@ -16,7 +15,6 @@ import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageInfo;
 import constant.CommonConstant;
 import enums.ValidStatusEnum;
-import org.bouncycastle.util.Strings;
 import org.springframework.web.bind.annotation.*;
 import pojo.ResultMap;
 import utils.CommonUtils;
@@ -46,14 +44,14 @@ public class VppRTeamMemberRoleController {
     /**
      * 超管分页获取所在公司团队的管理员信息
      *
-     * @param page     页码
-     * @param pageSize 最大条数
-     * @param teamId 团队id
-     * @param role 角色 0超管 1团队管理员
+     * @param page        页码
+     * @param pageSize    最大条数
+     * @param teamId      团队id
+     * @param role        角色 0超管 1团队管理员
      * @param queryString 名字或者邮箱
      * @return ResultMap
      */
-    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN,RoleEnum.SUPER_ADMIN})
+    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN, RoleEnum.SUPER_ADMIN})
     @GetMapping("/pageForAdmin")
     public ResultMap<PageInfo<VppTeamAdminVO>> pageForAdmin(@RequestParam(required = false, defaultValue = "1") Integer page,
                                                             @RequestParam(required = false, defaultValue = "10") Integer pageSize,
@@ -74,13 +72,22 @@ public class VppRTeamMemberRoleController {
         return new ResultMap<>(CommonConstant.SUCCESS, CommonConstant.RESULT_SUCCESS, vppRTeamMemberRoleService.pageForMember(page, pageSize, teamId, status, productCode, queryString, null));
     }
 
+    /**
+     * 目录用户查询
+     * @param page 页码
+     * @param pageSize 每页最大数量
+     * @param directoryId 目录id
+     * @param status 0是删除用户 1是有效访问用户 3是吊销用户
+     * @param queryString 用户名或者邮箱
+     * @return PageInfo<VppTeamMemberVO>
+     */
     @GetMapping("/pageForSSOMember")
     public ResultMap<PageInfo<VppTeamMemberVO>> pageForSSOMember(@RequestParam(required = false, defaultValue = "1") Integer page,
                                                                  @RequestParam(required = false, defaultValue = "10") Integer pageSize,
                                                                  @RequestParam(required = false) String directoryId,
                                                                  @RequestParam(required = false) String status,
                                                                  @RequestParam(required = false) String queryString) {
-        if (StringUtils.isEmpty(directoryId)){
+        if (StringUtils.isEmpty(directoryId)) {
             String teamId = directoryService.getById(directoryId).getTeamId();
             return new ResultMap<>(CommonConstant.SUCCESS, CommonConstant.RESULT_SUCCESS, vppRTeamMemberRoleService.pageForMember(page, pageSize, teamId, status, null, queryString, SyncUserEnum.SSO.value()));
         }
@@ -89,7 +96,7 @@ public class VppRTeamMemberRoleController {
 
 
     @GetMapping("/download")
-    public void downloadFailedUsingJson(HttpServletResponse response,
+    public void download(HttpServletResponse response,
                                         @RequestParam(required = false) String productCode,
                                         @RequestParam(required = false) String teamId,
                                         @RequestParam(required = false) String status,
@@ -100,7 +107,7 @@ public class VppRTeamMemberRoleController {
             response.setCharacterEncoding("utf-8");
             // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
             VppCompany company = vppCompanyService.getUserCompany();
-            String fileName = URLEncoder.encode(company.getName()+ " " + CommonUtils.getDateTime("yyyyMMdd") +" Member", "UTF-8").replaceAll("\\+", "%20");
+            String fileName = URLEncoder.encode(company.getName() + " " + CommonUtils.getDateTime("yyyyMMdd") + " Member", "UTF-8").replaceAll("\\+", "%20");
             response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
             // 这里需要设置不关闭流
             EasyExcel.write(response.getOutputStream(), VppTeamMemberVO.class)
@@ -122,6 +129,12 @@ public class VppRTeamMemberRoleController {
         }
     }
 
+    /**
+     * 导出sso用户
+     * @param directoryId 目录id
+     * @param status 用户状态
+     * @param queryString 用户名或者邮箱
+     */
     @GetMapping("/downloadSSOMember")
     public void downloadSSOMember(HttpServletResponse response,
                                   @RequestParam(required = false) String directoryId,
@@ -133,24 +146,24 @@ public class VppRTeamMemberRoleController {
             response.setCharacterEncoding("utf-8");
             // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
             VppCompany company = vppCompanyService.getUserCompany();
-            String fileName = URLEncoder.encode(company.getName()+ " " + CommonUtils.getDateTime("yyyyMMdd") +" Member Directory", "UTF-8").replaceAll("\\+", "%20");
+            String fileName = URLEncoder.encode(company.getName() + " " + CommonUtils.getDateTime("yyyyMMdd") + " Member Directory", "UTF-8").replaceAll("\\+", "%20");
             response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
             // 这里需要设置不关闭流
             EasyExcel.write(response.getOutputStream(), SSOMemberVO.class)
                     .autoCloseStream(Boolean.FALSE)
                     .sheet("模板")
                     .doWrite(() -> {
-                        List<VppTeamMemberVO> list ;
-                        if (StringUtils.isEmpty(directoryId)){
+                        List<VppTeamMemberVO> list;
+                        if (StringUtils.isEmpty(directoryId)) {
                             String teamId = directoryService.getById(directoryId).getTeamId();
                             list = vppRTeamMemberRoleService.listForMember(teamId, status, null, queryString, SyncUserEnum.SSO.value());
 
-                        }else {
+                        } else {
                             list = vppRTeamMemberRoleService.listForMember(null, status, null, queryString, SyncUserEnum.SSO.value());
                         }
                         List<SSOMemberVO> ssoMemberVOList = new ArrayList<>();
                         list.forEach(item -> {
-                            if (!StringUtils.isEmpty(item.getEmail())){
+                            if (!StringUtils.isEmpty(item.getEmail())) {
                                 SSOMemberVO ssoMemberVO = new SSOMemberVO();
                                 ssoMemberVO.setEmail(item.getEmail());
                                 ssoMemberVO.setFullName(item.getFullName());
@@ -173,16 +186,20 @@ public class VppRTeamMemberRoleController {
         }
     }
 
+    /**
+     * 下载删除的SSO成员
+     * @param queryString 邮箱或者用户名
+     */
     @GetMapping("/downloadUnValidSSOMember")
     public void downloadUnVaildSSOMember(HttpServletResponse response,
-                                  @RequestParam(required = false) String queryString) throws IOException {
+                                         @RequestParam(required = false) String queryString) throws IOException {
         // 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman
         try {
             response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
             response.setCharacterEncoding("utf-8");
             // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
             VppCompany company = vppCompanyService.getUserCompany();
-            String fileName = URLEncoder.encode(company.getName()+ " " + CommonUtils.getDateTime("yyyyMMdd") +" Member Deleted", "UTF-8").replaceAll("\\+", "%20");
+            String fileName = URLEncoder.encode(company.getName() + " " + CommonUtils.getDateTime("yyyyMMdd") + " Member Deleted", "UTF-8").replaceAll("\\+", "%20");
             response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
             // 这里需要设置不关闭流
             EasyExcel.write(response.getOutputStream(), SSODeletedMemberVO.class)
@@ -192,7 +209,7 @@ public class VppRTeamMemberRoleController {
                         List<VppTeamMemberVO> list = vppRTeamMemberRoleService.listForMember(null, ValidStatusEnum.INVALID.value(), null, queryString, SyncUserEnum.SSO.value());
                         List<SSODeletedMemberVO> ssoMemberVOList = new ArrayList<>();
                         list.forEach(item -> {
-                            if (!StringUtils.isEmpty(item.getEmail())){
+                            if (!StringUtils.isEmpty(item.getEmail())) {
                                 SSODeletedMemberVO vo = new SSODeletedMemberVO();
                                 vo.setEmail(item.getEmail());
                                 vo.setFullName(item.getFullName());
@@ -219,7 +236,7 @@ public class VppRTeamMemberRoleController {
      * @param teamId 团队id
      * @return List
      */
-    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN,RoleEnum.SUPER_ADMIN})
+    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN, RoleEnum.SUPER_ADMIN})
     @GetMapping("/listByTeamId")
     public ResultMap<List<VppTeamAdminVO>> listByTeamId(@RequestParam String teamId) {
         return new ResultMap<>(CommonConstant.SUCCESS, CommonConstant.RESULT_SUCCESS, vppRTeamMemberRoleService.listByTeamId(teamId));
@@ -227,9 +244,10 @@ public class VppRTeamMemberRoleController {
 
     /**
      * 获取当前登录用户的公司所有用户，除超管
+     *
      * @return List
      */
-    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN,RoleEnum.SUPER_ADMIN})
+    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN, RoleEnum.SUPER_ADMIN})
     @GetMapping("/getComponyMenber")
     public ResultMap<List<VppTeamMenberVO>> getComponyMenber() {
         return new ResultMap<>(CommonConstant.SUCCESS, CommonConstant.RESULT_SUCCESS, vppCompanyService.getComponyMenber());
@@ -237,6 +255,7 @@ public class VppRTeamMemberRoleController {
 
     /**
      * 修改团队成员时查询用户所在团队id
+     *
      * @param memberId
      * @return
      */
@@ -253,44 +272,48 @@ public class VppRTeamMemberRoleController {
 
     /**
      * 删除ms用户
+     *
      * @param memberId 用户id
      * @return Boolean
      */
     @PostMapping("/removeSSOMember")
-    public ResultMap<Boolean> removeSSOMember(@RequestParam String memberId){
+    public ResultMap<Boolean> removeSSOMember(@RequestParam String memberId) {
         vppRTeamMemberRoleService.removeSSOMembers(memberId);
         return new ResultMap<>(CommonConstant.SUCCESS, CommonConstant.RESULT_SUCCESS, Boolean.TRUE);
     }
 
     /**
      * 还原ms用户
+     *
      * @param memberId 用户id
      * @return Boolean
      */
     @PostMapping("/reductionSSOMember")
-    public ResultMap<Boolean> reductionSSOMember(@RequestParam String memberId){
+    public ResultMap<Boolean> reductionSSOMember(@RequestParam String memberId) {
         vppRTeamMemberRoleService.reductionSSOMember(memberId);
         return new ResultMap<>(CommonConstant.SUCCESS, CommonConstant.RESULT_SUCCESS, Boolean.TRUE);
     }
 
     /**
      * 吊销ms用户
+     *
      * @param memberId 用户id
      * @return Boolean
      */
     @PostMapping("/revokeSSOMember")
-    public ResultMap<Boolean> revokeSSOMember(@RequestParam String memberId){
+    public ResultMap<Boolean> revokeSSOMember(@RequestParam String memberId) {
         vppRTeamMemberRoleService.revokeSSOMember(memberId);
         return new ResultMap<>(CommonConstant.SUCCESS, CommonConstant.RESULT_SUCCESS, Boolean.TRUE);
     }
 
     /**
      * 取消吊销用户
+     *
      * @param memberId 用户id
      * @return Boolean
      */
     @PostMapping("/accessSSOMember")
-    public ResultMap<Boolean>  accessSSOMember(@RequestParam String memberId){
+    public ResultMap<Boolean> accessSSOMember(@RequestParam String memberId) {
         vppRTeamMemberRoleService.accessSSOMember(memberId);
         return new ResultMap<>(CommonConstant.SUCCESS, CommonConstant.RESULT_SUCCESS, Boolean.TRUE);
     }

pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/controller/VppSetController.java

@@ -3,7 +3,10 @@ package cn.kdan.pdf.tech.core.controller;
 import cn.kdan.pdf.tech.core.pojo.dto.SetGeneralDTO;
 import cn.kdan.pdf.tech.core.service.VppSetService;
 import constant.CommonConstant;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import pojo.ResultMap;
 
 import javax.annotation.Resource;
@@ -21,6 +24,7 @@ public class VppSetController {
 
     /**
      * 设置用户信息
+     *
      * @return
      */
     @PutMapping("/setGeneral")

pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/controller/VppTeamController.java

@@ -40,7 +40,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("/vppTeam")
 @Validated
-public class  VppTeamController {
+public class VppTeamController {
 
     @Resource
     private VppTeamService vppTeamService;
@@ -50,11 +50,12 @@ public class  VppTeamController {
 
     /**
      * 团队管理列表
-     * @param teamId 团队id
+     *
+     * @param teamId  团队id
      * @param keyword 模糊查询关键字（团队描述、团队管理员）
      * @return 团队数据
      */
-    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN,RoleEnum.SUPER_ADMIN})
+    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN, RoleEnum.SUPER_ADMIN})
     @GetMapping("/getManageTeamList")
     public ResultMap<PageInfo<VppTeamVO>> getManageTeamList(
             @RequestParam(required = false, defaultValue = "1") Integer page,
@@ -66,10 +67,11 @@ public class  VppTeamController {
 
     /**
      * 团队管理列表导出
-     * @param teamId 团队id
+     *
+     * @param teamId  团队id
      * @param keyword 模糊查询关键字
      */
-    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN,RoleEnum.SUPER_ADMIN})
+    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN, RoleEnum.SUPER_ADMIN})
     @GetMapping("/exportManageTeamList")
     public void exportManageTeamList(@RequestParam(required = false) String teamId, @RequestParam(required = false) String keyword, HttpServletResponse response) throws IOException {
         try {
@@ -101,10 +103,11 @@ public class  VppTeamController {
 
     /**
      * 创建团队
+     *
      * @param dto
      * @return
      */
-    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN,RoleEnum.SUPER_ADMIN})
+    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN, RoleEnum.SUPER_ADMIN})
     @PostMapping("/createTeam")
     public ResultMap<Boolean> createTeam(@RequestBody CreateTeamDTO dto) {
         vppTeamService.createTeam(dto);
@@ -113,10 +116,11 @@ public class  VppTeamController {
 
     /**
      * 编辑团队
+     *
      * @param dto
      * @return
      */
-    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN,RoleEnum.SUPER_ADMIN})
+    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN, RoleEnum.SUPER_ADMIN})
     @PutMapping("/editTeam")
     public ResultMap<Boolean> editTeam(@RequestBody EditTeamDTO dto) {
         vppTeamService.editTeam(dto);
@@ -125,10 +129,11 @@ public class  VppTeamController {
 
     /**
      * 编辑团队时获取团队信息
+     *
      * @param teamId 团队id
      * @return
      */
-    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN,RoleEnum.SUPER_ADMIN})
+    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN, RoleEnum.SUPER_ADMIN})
     @GetMapping("/getTeamProductInfo")
     public ResultMap<TeamInfoVO> getTeamProductInfo(@RequestParam String teamId) {
         return new ResultMap<>(CommonConstant.SUCCESS, CommonConstant.RESULT_SUCCESS, vppTeamService.getTeamProductInfo(teamId));
@@ -136,10 +141,11 @@ public class  VppTeamController {
 
     /**
      * 删除团队
+     *
      * @param teamId 团队id
      * @return
      */
-    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN,RoleEnum.SUPER_ADMIN})
+    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN, RoleEnum.SUPER_ADMIN})
     @DeleteMapping("/deleteTeam")
     public ResultMap<Boolean> deleteTeam(@RequestParam String teamId) {
         vppTeamService.deleteTeam(teamId);
@@ -153,42 +159,42 @@ public class  VppTeamController {
      * @param account 用户邮箱
      * @return Boolean
      */
-    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN,RoleEnum.SUPER_ADMIN})
+    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN, RoleEnum.SUPER_ADMIN})
     @PostMapping("/sendEmailForAddTeamAdmin")
-    public ResultMap<Boolean> sendEmailForAddTeamAdmin(@RequestParam @Size(min = 1,message = "teamIds cannot be blank") List<String> teamIds,
+    public ResultMap<Boolean> sendEmailForAddTeamAdmin(@RequestParam @Size(min = 1, message = "teamIds cannot be blank") List<String> teamIds,
                                                        @RequestParam @NotBlank(message = "account cannot be blank") String account) {
-        vppTeamService.sendEmailForAddTeamAdmin(teamIds,account);
-        return new ResultMap<>(CommonConstant.SUCCESS, VppTeamConstant.SUCCESS_MSG_SEND_ADD_ADMIN_EMAIL,Boolean.TRUE);
+        vppTeamService.sendEmailForAddTeamAdmin(teamIds, account);
+        return new ResultMap<>(CommonConstant.SUCCESS, VppTeamConstant.SUCCESS_MSG_SEND_ADD_ADMIN_EMAIL, Boolean.TRUE);
     }
 
     /**
      * 管理员管理中修改管理员管理的团队
      *
      * @param memberId 用户id
-     * @param teamIds 团队id
+     * @param teamIds  团队id
      * @return boolean
      */
-    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN,RoleEnum.SUPER_ADMIN})
+    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN, RoleEnum.SUPER_ADMIN})
     @PostMapping("/editTeamAdmin")
-    public ResultMap<Boolean> editTeamAdmin( @RequestParam String memberId,@RequestParam List<String> teamIds) {
-        vppTeamService.editTeamAdmin(memberId,teamIds);
-        return new ResultMap<>(CommonConstant.SUCCESS, VppTeamConstant.SUCCESS_MSG_CHANGE_TEAM_MEMBER,Boolean.TRUE);
+    public ResultMap<Boolean> editTeamAdmin(@RequestParam String memberId, @RequestParam List<String> teamIds) {
+        vppTeamService.editTeamAdmin(memberId, teamIds);
+        return new ResultMap<>(CommonConstant.SUCCESS, VppTeamConstant.SUCCESS_MSG_CHANGE_TEAM_MEMBER, Boolean.TRUE);
     }
 
     /**
      * 用户点击邀请邮件之后调用 将用户加入团队
      *
      * @param memberId 用户id
-     * @param teamIds 团队id
-     * @param action 动作
-     * @param code 验证码（邀请链接附带）
+     * @param teamIds  团队id
+     * @param action   动作
+     * @param code     验证码（邀请链接附带）
      * @return boolean
      */
     @PostMapping("/enterTeam")
-    public ResultMap<Boolean> enterTeam( @RequestParam String memberId,@RequestParam List<String> teamIds,
-                                             @RequestParam String action, @RequestParam String code) {
-        vppTeamService.enterTeam(memberId,teamIds,action,code);
-        return new ResultMap<>(CommonConstant.SUCCESS, VppTeamConstant.SUCCESS_MSG_SEND_ADD_ADMIN_EMAIL,Boolean.TRUE);
+    public ResultMap<Boolean> enterTeam(@RequestParam String memberId, @RequestParam List<String> teamIds,
+                                        @RequestParam String action, @RequestParam String code) {
+        vppTeamService.enterTeam(memberId, teamIds, action, code);
+        return new ResultMap<>(CommonConstant.SUCCESS, VppTeamConstant.SUCCESS_MSG_SEND_ADD_ADMIN_EMAIL, Boolean.TRUE);
     }
 
     /**
@@ -197,7 +203,7 @@ public class  VppTeamController {
      * @param memberId 用户id
      * @return VppTeamListVO
      */
-    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN,RoleEnum.SUPER_ADMIN})
+    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN, RoleEnum.SUPER_ADMIN})
     @GetMapping("/listForAdminEdit")
     public ResultMap<VppTeamListVO> listForAdminEdit(@RequestParam @NotBlank(message = "memberId cannot be blank") String memberId) {
         return new ResultMap<>(CommonConstant.SUCCESS, CommonConstant.RESULT_SUCCESS, vppTeamService.listForAdminEdit(memberId));
@@ -208,7 +214,7 @@ public class  VppTeamController {
      *
      * @return VppTeamListVO
      */
-    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN,RoleEnum.SUPER_ADMIN})
+    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN, RoleEnum.SUPER_ADMIN})
     @GetMapping("/listWithAdmin")
     public ResultMap<List<VppTeam>> listWithAdmin() {
         return new ResultMap<>(CommonConstant.SUCCESS, CommonConstant.RESULT_SUCCESS, vppTeamService.listWithAdmin());
@@ -216,9 +222,10 @@ public class  VppTeamController {
 
     /**
      * 添加团队成员
+     *
      * @return ResultMap
      */
-    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN,RoleEnum.SUPER_ADMIN})
+    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN, RoleEnum.SUPER_ADMIN})
     @PostMapping("/addTeamMember")
     public ResultMap<Boolean> addTeamMember(@Valid @RequestBody AddTeamMemberDTO dto) {
         vppRTeamMemberRoleService.addTeamMember(dto);
@@ -227,10 +234,11 @@ public class  VppTeamController {
 
     /**
      * 导入批量添加团队成员
+     *
      * @param file 文件
      * @return
      */
-    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN,RoleEnum.SUPER_ADMIN})
+    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN, RoleEnum.SUPER_ADMIN})
     @PostMapping("/addTeamMemberBatch")
     public ResultMap<String> addTeamMemberBatch(@RequestParam("file") MultipartFile file) {
         return new ResultMap<>(CommonConstant.SUCCESS, VppTeamConstant.SUCCESS_MSG_SEND_ADD_ADMIN_EMAIL, vppRTeamMemberRoleService.addTeamMemberBatch(file));
@@ -239,16 +247,17 @@ public class  VppTeamController {
 
     /**
      * 用户确认加入团队
+     *
      * @param memberEmail 用户邮件
-     * @param memberName 用户名
-     * @param teamId 团队id
-     * @param action 动作
-     * @param code 验证码
+     * @param memberName  用户名
+     * @param teamId      团队id
+     * @param action      动作
+     * @param code        验证码
      * @return
      */
     @PostMapping("/confirmTeamMember")
     public ResultMap<String> confirmTeamMember(@RequestParam String memberEmail, @RequestParam String memberName, @RequestParam String teamId,
-                                                @RequestParam String action, @RequestParam String code) {
+                                               @RequestParam String action, @RequestParam String code) {
         return new ResultMap<>(CommonConstant.SUCCESS, VppTeamConstant.SUCCESS_MSG_SEND_ADD_ADMIN_EMAIL,
                 vppRTeamMemberRoleService.confirmTeamMember(memberEmail, memberName, teamId, action, code));
     }
@@ -257,14 +266,14 @@ public class  VppTeamController {
      * 编辑团队成员
      *
      * @param memberId 用户id
-     * @param teamId 团队id
-     * @param name 用户名
+     * @param teamId   团队id
+     * @param name     用户名
      * @return ResultMap
      */
-    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN,RoleEnum.SUPER_ADMIN})
+    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN, RoleEnum.SUPER_ADMIN})
     @PostMapping("/editTeamMember")
-    public ResultMap<Boolean> editTeamMember(@RequestParam String memberId,@RequestParam String teamId,@RequestParam String name) {
-        vppRTeamMemberRoleService.editTeamMember(memberId,teamId,name);
+    public ResultMap<Boolean> editTeamMember(@RequestParam String memberId, @RequestParam String teamId, @RequestParam String name) {
+        vppRTeamMemberRoleService.editTeamMember(memberId, teamId, name);
         return new ResultMap<>(CommonConstant.SUCCESS, VppTeamConstant.SUCCESS_MSG_CHANGE_TEAM_MEMBER, Boolean.TRUE);
     }
 
@@ -274,7 +283,7 @@ public class  VppTeamController {
      * @param memberId 用户id
      * @return ResultMap
      */
-    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN,RoleEnum.SUPER_ADMIN})
+    @PreCheckRole(roles = {RoleEnum.TEAM_ADMIN, RoleEnum.SUPER_ADMIN})
     @PostMapping("/deleteMember")
     public ResultMap<Boolean> deleteMember(@RequestParam String memberId) {
         vppRTeamMemberRoleService.deleteMember(memberId);

pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/pojo/dto/ScheduleSettingDTO.java

@@ -15,5 +15,8 @@ public class ScheduleSettingDTO {
      * 同步类型
      */
     private String type;
+    /**
+     * 目录id
+     */
     private String directoryId;
 }

pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/service/DomainService.java

@@ -44,11 +44,8 @@ public interface DomainService {
      * 验证域名
      *
      * @param domainId    域名id
-     * @param verifyCode 验证码
-     * @param fileName 文件名
-     * @param fileContent 文件内容
      */
-    void verify(String domainId, String verifyCode, String fileName, String fileContent);
+    void verify(String domainId);
     /**
      * 绑定域名
      *

pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/service/impl/DirectoryServiceImpl.java

@@ -29,6 +29,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 import utils.CommonUtils;
 
 import javax.annotation.Resource;
@@ -86,7 +87,7 @@ public class DirectoryServiceImpl implements DirectoryService {
 
     @Override
     public Directory create(DirectoryCreateDTO directoryVO) {
-        checkExist(directoryVO.getName());
+        checkExist(directoryVO.getName(),null);
         Directory directory = new Directory();
         //获取当前登录用户公司id
         VppMember member = vppMemberService.getCurrentUser();
@@ -107,7 +108,7 @@ public class DirectoryServiceImpl implements DirectoryService {
 
     @Override
     public void update(DirectoryUpdateDTO directoryUpdateDTO) {
-        checkExist(directoryUpdateDTO.getName());
+        checkExist(directoryUpdateDTO.getName(), directoryUpdateDTO.getDirectoryId());
         Directory directory = new Directory();
         directory.setDirectoryId(directoryUpdateDTO.getDirectoryId());
         directory.setName(directoryUpdateDTO.getName());
@@ -140,9 +141,12 @@ public class DirectoryServiceImpl implements DirectoryService {
         example.createCriteria().andCompanyIdEqualTo(companyId).andValidFlagEqualTo(ValidStatusEnum.VALID.value());
         return directoryMapper.selectByExample(example);
     }
-    private void checkExist(String name) {
+    private void checkExist(String name,String directoryId) {
         DirectoryExample example = new DirectoryExample();
-        example.createCriteria().andNameEqualTo(name).andValidFlagEqualTo(ValidStatusEnum.VALID.value());
+        DirectoryExample.Criteria criteria = example.createCriteria().andNameEqualTo(name).andValidFlagEqualTo(ValidStatusEnum.VALID.value());
+        if(!StringUtils.isEmpty(directoryId)){
+            criteria.andDirectoryIdNotEqualTo(directoryId);
+        }
         List<Directory> list = directoryMapper.selectByExample(example);
         if (!CollectionUtils.isEmpty(list)) {
             throw new BackendRuntimeException(SSOConstant.DIRECTORY_EXIST);

pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/service/impl/DomainServiceImpl.java

@@ -77,7 +77,7 @@ public class DomainServiceImpl implements DomainService {
         domains.setVerifyType(verifyType);
         domains.setCompanyId(vppMemberService.getCurrentUser().getCompanyId());
         domains.setStatus("0");
-        domains.setUsed(DomainUsedEnum.USED.code());
+        domains.setUsed(DomainUsedEnum.AVAILABLE.code());
         domains.setValidFlag(ValidStatusEnum.VALID.value());
         domains.setVerified(DomainVerifiedEnum.UNVERIFIED.code());
         domains.setCreateTime(new Date());
@@ -86,13 +86,14 @@ public class DomainServiceImpl implements DomainService {
     }
 
     @Override
-    public void verify(String domainId, String verifyCode, String fileName, String fileContent) {
+    public void verify(String domainId) {
         Domain domain = getById(domainId);
         //DNS处理方式
         if (DomainVerifyTypeEnum.DNS.code().equals(domain.getVerifyType())) {
-            checkDns(domain.getDomain(), verifyCode);
+            String txt = "PDF-Tech-Editor" + "-domain-verification=" + domain.getCompanyId();
+            checkDns(domain.getDomain(), txt);
         }else{
-            checkHttp(domain.getDomain(), fileName, fileContent);
+            checkHttp(domain.getDomain(), "PDF-Tech-Editor-domain-verification.txt", "PDF-Tech-Editor-domain-verification=" + domain.getCompanyId());
         }
         domain.setVerified(DomainVerifiedEnum.VERIFIED.code());
         domainMapper.updateByPrimaryKey(domain);
@@ -138,11 +139,11 @@ public class DomainServiceImpl implements DomainService {
                 for (Record record : records) {
                     if (record instanceof TXTRecord) {
                         TXTRecord txtRecord = (TXTRecord) record;
-                        if (txtRecord.rdataToString().equals(verifyCode)) {
+                        String txtValue = txtRecord.rdataToString().replace("\"", ""); // 去掉引号
+                        if (txtValue.equals(verifyCode)) {
                             found = true;
                             break;
                         }
-                        System.out.println("TXT Record: " + txtRecord.rdataToString());
                     }
                 }
             } else {