Merge remote-tracking branch 'origin/developer' into developer

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

@@ -29,8 +29,7 @@ import org.springframework.context.annotation.ImportResource;
         "classpath*:dubbo-setting.xml",
         "classpath*:dubbo-gic-data-cloud-wxapp.xml",
         "classpath*:spring-interceptor.xml",
-        "classpath*:redis-init.xml",
-        "classpath:web-common-spring.xml"
+        "classpath*:redis-init.xml"
 })
 public class Main {
 

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/auth/DataAuthUtils.java

+package com.gic.cloud.web.auth;
+
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.cloud.dto.DataAuthDTO;
+import com.gic.cloud.service.DataAuthApiService;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class DataAuthUtils {
+    private static final Logger log = LogManager.getLogger(DataAuthUtils.class);
+
+    @Autowired
+    private DataAuthApiService dataAuthApiService;
+
+    public void getUserAuth(Integer userId, Integer enterpriseId){
+        ServiceResponse<DataAuthDTO> response = this.dataAuthApiService.ggetDataAuthByUserId(enterpriseId, userId);
+        if(response.isSuccess()){
+            DataAuthDTO dataAuthDTO = response.getResult();
+        }
+    }
+}

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

@@ -32,7 +32,7 @@ public class LoginController {
     @RequestMapping("send-code")
     public RestResponse sendCode(String phoneNumber, String areaCode){
         String smsSenceId = "GYT0001";
-        List<UserDTO> userDTOList = this.userApiService.listUserByPhone("86", phoneNumber).getResult();
+        List<UserDTO> userDTOList = this.userApiService.listUserByPhone("+"+areaCode, phoneNumber).getResult();
         if(CollectionUtils.isNotEmpty(userDTOList)){
             Integer enterpriseId = userDTOList.get(0).getEnterpriseId();
             String code = CreateRandomUtils.getStringRandom(4);

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

+package com.gic.cloud.web.controller;
+
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class StoreAttentionController {
+}

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

+package com.gic.cloud.web.controller;
+
+import com.gic.commons.webapi.reponse.RestResponse;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class StoreWidgetController {
+
+    @RequestMapping("store-widget-index")
+    public RestResponse storeWidgetIndex(Integer userId, Integer enterpriseId){
+        return null;
+    }
+
+
+}

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

@@ -73,7 +73,6 @@
     <dubbo:reference interface="com.gic.wechat.business.api.service.fwh.WeixinBaseFunService" id="weixinBaseFunService" timeout="6000" />
     <dubbo:reference interface="com.gic.wechat.business.api.service.wxa.WeixinWxaFunService" id="weixinWxaFunService" timeout="6000" />
     <!--用户-->
-    <dubbo:reference interface="com.gic.auth.service.UserApiService" id="userApiService" timeout="6000" />
     <dubbo:reference interface="com.gic.marketing.api.service.sms.SmsOuterApiService" id="smsOuterApiService" timeout="6000" />
     <!--短信-->
     <!--首页配置-->
@@ -138,5 +137,7 @@
     <dubbo:reference interface="com.gic.goods.pump.api.service.WeiMobGoodsService" id="weiMobGoodsService" timeout="60000" />
     <dubbo:reference interface="com.gic.member.config.api.service.OrderPointCalculationPartyApiService" id="orderPointCalculationPartyApiService" timeout="60000" />
 
-    <dubbo:reference interface="com.gic.open.api.service.EnterpriseLicenseApiService" id="enterpriseLicenseApiService" timeout="6000" retries="0"/>
+    <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.marketing.process.api.service.sms.SmsSendApiService" id="smsSendApiService" timeout="6000" retries="0"/>
 </beans>