删除corpId

coolstore-partner-model/src/main/java/com/cool/store/dto/buser/UserEventDTO.java

@@ -11,8 +11,6 @@ import lombok.Data;
 @Data
 public class UserEventDTO {
 
-    private String corpId;
-
     private String eventType;
 
     private String userId;

coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/AuthCorpInfoDTO.java

@@ -17,9 +17,6 @@ public class AuthCorpInfoDTO {
     @JSONField(name = "corp_name")
     private String corpName;
 
-    @JSONField(name = "corpid")
-    private String corpId;
-
     private String industry;
 
     @JSONField(name = "auth_channel")

coolstore-partner-model/src/main/java/com/cool/store/dto/login/RefreshUser.java

@@ -1,26 +0,0 @@
-package com.cool.store.dto.login;
-
-/**
- * @author zhangchenbiao
- * @FileName: RefreshUser
- * @Description:
- * @date 2023-05-23 14:29
- */
-public class RefreshUser {
-
-    /**
-     * 用户Id
-     */
-    private String userId;
-
-    /**
-     * 钉钉业务id
-     */
-    private String corpId;
-
-    /**
-     * 企业id
-     */
-    private String eid;
-
-}

coolstore-partner-model/src/main/java/com/cool/store/dto/login/UserIdInfoDTO.java

@@ -17,12 +17,9 @@ public class UserIdInfoDTO {
 
     private String userId;
 
-    private String corpId;
+    public UserIdInfoDTO(String openId, String unionId, String userId) {
-
-    public UserIdInfoDTO(String openId, String unionId, String userId, String corpId) {
         this.openId = openId;
         this.unionId = unionId;
         this.userId = userId;
-        this.corpId = corpId;
     }
 }

coolstore-partner-service/src/main/java/com/cool/store/context/LoginUserInfo.java

@@ -10,8 +10,6 @@ public class LoginUserInfo {
 
     private String name;
 
-    private String corpId;
-
     private String mobile;
 
     private String accessToken;

coolstore-partner-service/src/main/java/com/cool/store/service/impl/LoginServiceImpl.java

@@ -5,7 +5,6 @@ import com.cool.store.constants.CommonConstants;
 import com.cool.store.context.LoginUserInfo;
 import com.cool.store.context.DataSourceContext;
 import com.cool.store.dao.*;
-import com.cool.store.dto.login.RefreshUser;
 import com.cool.store.entity.EnterpriseUserDO;
 import com.cool.store.entity.SysRoleDO;
 import com.cool.store.enums.ErrorCodeEnum;
@@ -17,12 +16,10 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.crypto.RandomNumberGenerator;
 import org.apache.shiro.crypto.SecureRandomNumberGenerator;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.text.MessageFormat;
-import java.util.Objects;
 
 /**
  * @author zhangchenbiao
@@ -41,12 +38,10 @@ public class LoginServiceImpl implements LoginService {
     private RedisUtilPool redisUtilPool;
     @Resource
     private EnterpriseUserRoleDAO enterpriseUserRoleDAO;
-    @Value("${corp.id:null}")
-    private String corpId;
 
     @Override
     public Object feiShuLogin(String userId, Boolean needRefreshToken, String avatar) {
-        log.info("isvLogin, corpId={}, userId={}", userId);
+        log.info("isvLogin,  userId={}", userId);
         DataSourceContext.clearDataSourceType();
         if (StringUtils.isEmpty(userId)) {
             throw new ServiceException(ErrorCodeEnum.USER_NOT_EXIST);
@@ -73,7 +68,6 @@ public class LoginServiceImpl implements LoginService {
         currentUser.setIsAdmin(enterpriseUser.getIsAdmin());
         currentUser.setMobile(enterpriseUser.getMobile());
         currentUser.setSysRole(sysRole);
-        currentUser.setCorpId(corpId);
         currentUser.setAvatar(enterpriseUser.getAvatar());
         //生成令牌
         RandomNumberGenerator randomNumberGenerator = new SecureRandomNumberGenerator();

coolstore-partner-webb/src/main/java/com/cool/store/config/swagger/Swagger2Config.java

@@ -52,7 +52,7 @@ public class Swagger2Config {
                 .groupName(groupName)
                 .select()
                 .apis(this.scanBasePackage(packages))
-                //.paths(PathSelectors.regex(".*/menu/.*|.*/role.*"))
+                .paths(PathSelectors.regex(".*/getPartnerIntentInfo|.*/queryPartnerClerkInfoList|.*/queryPartnerBaseInfo"))
                 .build()
                 .globalOperationParameters(pars);
     }

coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java

@@ -180,7 +180,7 @@ public class TestController {
     @GetMapping("/user/getFreeBusyList")
     public ResultDTO<List<UserCalendarsEventDTO>> getFreeBusyList(@RequestParam("userId") String userId, @RequestParam("startTime") long startTime,
                                                                @RequestParam("endTime") long endTime) throws ApiException {
-        log.info("getUserCalendarsEvents : corpId:{}, appType:{}, userId:{}, startTime:{}, endTime:{}", userId, startTime, endTime);
+        log.info("getUserCalendarsEvents , appType:{}, userId:{}, startTime:{}, endTime:{}", userId, startTime, endTime);
         return ResultDTO.successResult(isvHttpRequest.getFreeBusyList(userId, startTime, endTime));
     }
 
@@ -205,7 +205,7 @@ public class TestController {
     @GetMapping("/user/getUserCalendarsEvents")
     public ResultDTO<List<UserCalendarsEventDTO>> getUserCalendarsEvents(@RequestParam("userId") String userId, @RequestParam("startTime") long startTime,
                                                                   @RequestParam("endTime") long endTime) throws ApiException {
-        log.info("getUserCalendarsEvents : corpId:{}, appType:{}, userId:{}, startTime:{}, endTime:{}", userId, startTime, endTime);
+        log.info("getUserCalendarsEvents : appType:{}, userId:{}, startTime:{}, endTime:{}", userId, startTime, endTime);
         return ResultDTO.successResult(isvHttpRequest.getUserCalendarsEvents(userId, startTime, endTime));
     }