Ver Fonte

refactor: 调整包层级

linwenhua há 3 anos atrás
pai
commit
6068be7ac9

+ 3 - 3
smsb-customer-manager-adapter/src/main/java/com/inspur/customer/web/controller/keyclaok/KeycloakController.java

@@ -3,9 +3,9 @@ package com.inspur.customer.web.controller.keyclaok;
 import com.alibaba.cola.dto.Response;
 import com.alibaba.cola.dto.SingleResponse;
 import com.alibaba.fastjson.JSONObject;
-import com.inspur.customer.service.client.keycloak.KeycloakService;
-import com.inspur.customer.service.client.wechat.IWeChatService;
-import com.inspur.customer.service.dto.SubscribeDto;
+import com.inspur.customer.client.keycloak.KeycloakService;
+import com.inspur.customer.client.wechat.IWeChatService;
+import com.inspur.customer.object.wechat.SubscribeDto;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.dubbo.config.annotation.DubboReference;

+ 3 - 3
smsb-customer-manager-app/src/main/java/com/inspur/customer/service/keycloak/KeycloakServiceImpl.java

@@ -1,8 +1,8 @@
 package com.inspur.customer.service.keycloak;
 
-import com.inspur.customer.service.client.keycloak.KeycloakService;
-import com.inspur.customer.service.dto.KeycloakUserCO;
-import com.inspur.customer.service.dto.Pair;
+import com.inspur.customer.client.keycloak.KeycloakService;
+import com.inspur.customer.object.keycloak.KeycloakUserCO;
+import com.inspur.customer.object.wechat.Pair;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.keycloak.admin.client.Keycloak;

+ 2 - 2
smsb-customer-manager-app/src/main/java/com/inspur/customer/service/wechat/WeChatServiceImpl.java

@@ -1,7 +1,7 @@
 package com.inspur.customer.service.wechat;
 
-import com.inspur.customer.service.client.wechat.IWeChatService;
-import com.inspur.customer.service.constans.HttpUrlConstant;
+import com.inspur.customer.client.wechat.IWeChatService;
+import com.inspur.customer.context.HttpUrlConstant;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.http.HttpEntity;

+ 3 - 3
smsb-customer-manager-client/src/main/java/com/inspur/customer/service/client/keycloak/KeycloakService.java → smsb-customer-manager-client/src/main/java/com/inspur/customer/client/keycloak/KeycloakService.java

@@ -1,6 +1,6 @@
-package com.inspur.customer.service.client.keycloak;
-import com.inspur.customer.service.dto.KeycloakUserCO;
-import com.inspur.customer.service.dto.Pair;
+package com.inspur.customer.client.keycloak;
+import com.inspur.customer.object.keycloak.KeycloakUserCO;
+import com.inspur.customer.object.wechat.Pair;
 
 import java.util.List;
 import java.util.Map;

+ 1 - 1
smsb-customer-manager-client/src/main/java/com/inspur/customer/service/client/wechat/IWeChatService.java → smsb-customer-manager-client/src/main/java/com/inspur/customer/client/wechat/IWeChatService.java

@@ -1,4 +1,4 @@
-package com.inspur.customer.service.client.wechat;
+package com.inspur.customer.client.wechat;
 
 /**
  * 微信接口处理

+ 1 - 1
smsb-customer-manager-client/src/main/java/com/inspur/customer/service/constans/HttpUrlConstant.java → smsb-customer-manager-client/src/main/java/com/inspur/customer/context/HttpUrlConstant.java

@@ -1,4 +1,4 @@
-package com.inspur.customer.service.constans;
+package com.inspur.customer.context;
 
 /**
  * url统一管理

+ 22 - 1
smsb-customer-manager-client/src/main/java/com/inspur/customer/service/dto/KeycloakUserCO.java → smsb-customer-manager-client/src/main/java/com/inspur/customer/object/keycloak/KeycloakUserCO.java

@@ -1,9 +1,12 @@
-package com.inspur.customer.service.dto;
+package com.inspur.customer.object.keycloak;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.lang.Nullable;
 
 import java.io.Serializable;
+import java.util.BitSet;
 import java.util.List;
 
 /**
@@ -51,4 +54,22 @@ public class KeycloakUserCO implements Serializable {
             }
         }
     }
+
+    @JsonIgnore
+    public BitSet getInformFlag() {
+        BitSet bitSet = new BitSet(4);
+        if (StringUtils.isNotBlank(phone)) {
+            bitSet.set(0);
+        }
+        if (StringUtils.isNotBlank(email)) {
+            bitSet.set(1);
+        }
+        if (StringUtils.isNotBlank(wechat)) {
+            bitSet.set(2);
+        }
+        if (StringUtils.isNotBlank(wechatAppletOpenId)) {
+            bitSet.set(3);
+        }
+        return bitSet;
+    }
 }

+ 1 - 1
smsb-customer-manager-client/src/main/java/com/inspur/customer/service/dto/Pair.java → smsb-customer-manager-client/src/main/java/com/inspur/customer/object/wechat/Pair.java

@@ -1,4 +1,4 @@
-package com.inspur.customer.service.dto;
+package com.inspur.customer.object.wechat;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
smsb-customer-manager-client/src/main/java/com/inspur/customer/service/dto/SubscribeDto.java → smsb-customer-manager-client/src/main/java/com/inspur/customer/object/wechat/SubscribeDto.java

@@ -1,4 +1,4 @@
-package com.inspur.customer.service.dto;
+package com.inspur.customer.object.wechat;
 
 import lombok.Data;