观云台登陆调整：用gic后台一套账号

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/LoginController.java

@@ -2,8 +2,8 @@ package com.gic.cloud.web.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.ServiceResponse;
-import com.gic.cloud.dto.UserDTO;
-import com.gic.cloud.service.UserApiService;
+import com.gic.auth.dto.UserDTO;
+import com.gic.auth.service.UserApiService;
 import com.gic.cloud.web.constant.ErrorCode;
 import com.gic.cloud.web.vo.CloudDataServiceInfoVO;
 import com.gic.cloud.web.vo.EnterpriseVo;
@@ -63,7 +63,7 @@ public class LoginController {
         String smsSenceId = "GYT0001";
         String tsPhone = "18000000000";
         String code = "1234";
-        List<UserDTO> userDTOList = this.userApiService.listUserByPhone("+"+areaCode, phoneNumber).getResult();
+        List<UserDTO> userDTOList = this.userApiService.listUserByPhoneNumber(phoneNumber, "+" + areaCode).getResult();
         if(CollectionUtils.isNotEmpty(userDTOList)){
             List<Integer> enterpriseIdList = userDTOList.stream().map(userDTO -> userDTO.getEnterpriseId()).collect(Collectors.toList());
             List<EnterpriseDTO> enterpriseDTOList = this.enterpriseApiService.listEnterpriseByIds(enterpriseIdList).getResult();
@@ -123,11 +123,11 @@ public class LoginController {
 
     @RequestMapping("all-enterprise")
     public RestResponse allEnterprise(Integer userId){
-        UserDTO userDTO = this.userApiService.getUser(userId).getResult();
+        UserDTO userDTO = this.userApiService.getUserInfoById(userId).getResult();
         if(userDTO == null){
             return RestResponse.success();
         }
-        List<UserDTO> userDTOList = this.userApiService.listUserByPhone(userDTO.getNationCode(), userDTO.getPhone()).getResult();
+        List<UserDTO> userDTOList = this.userApiService.listUserByPhoneNumber(userDTO.getPhoneNumber(), userDTO.getPhoneAreaCode()).getResult();
         log.info("userDTOList:{}", JSON.toJSONString(userDTOList));
         if(CollectionUtils.isNotEmpty(userDTOList)){
             List<Integer> enterpriseIdList = userDTOList.stream().map(user -> user.getEnterpriseId()).collect(Collectors.toList());
@@ -140,7 +140,7 @@ public class LoginController {
                     if(CollectionUtils.isNotEmpty(userDTOList)){
                         userDTOList.stream().forEach(user -> {
                             if(user.getEnterpriseId().intValue() == enterpriseDTO.getEnterpriseId().intValue()){
-                                vo.setIsAdmin((user.getPhone().equals(enterpriseDTO.getPhoneNumber())) ? 1 : 0);
+                                vo.setIsAdmin((user.getPhoneNumber().equals(enterpriseDTO.getPhoneNumber())) ? 1 : 0);
                                 vo.setUserName(user.getUserName());
                                 vo.setUserId(user.getUserId());
                             }

gic-data-cloud-wxapp/src/main/resources/dubbo-gic-data-cloud-wxapp.xml

@@ -138,7 +138,7 @@
     <dubbo:reference interface="com.gic.member.config.api.service.OrderPointCalculationPartyApiService" id="orderPointCalculationPartyApiService" timeout="60000" />
 
     <dubbo:reference interface="com.gic.cloud.service.DataAuthApiService" id="dataAuthApiService" timeout="6000" retries="0"/>
-    <dubbo:reference interface="com.gic.cloud.service.UserApiService" id="userApiService" timeout="6000" retries="0"/>
+    <dubbo:reference interface="com.gic.auth.service.UserApiService" id="userApiService" timeout="6000" retries="0"/>
     <dubbo:reference interface="com.gic.marketing.process.api.service.sms.SmsSendApiService" id="smsSendApiService" timeout="6000" retries="0"/>
     <dubbo:reference interface="com.gic.store.service.StoreTagApiService" id="storeTagApiService" timeout="6000" retries="0"/>
     <dubbo:reference interface="com.gic.cloud.service.StoreAttentionApiService" id="storeAttentionApiService" timeout="6000" retries="0"/>