商城等接口去除 areaCode

app/build.gradle

@@ -50,202 +50,15 @@ android {
     }
     productFlavors {
         sangzhuzi {
-            applicationId "com.tenlion.cultural.sangzhuzi"
+            applicationId "com.tenlion.cultural"
             dimension 'market'
-            resValue "string", "APP_CHANNEL", "sangzhuzi"
+            resValue "string", "APP_CHANNEL", "cultural"
-            manifestPlaceholders = [CHANNEL_VALUE: "sangzhuzi",
+            manifestPlaceholders = [CHANNEL_VALUE: "cultural",
                                     APP_LOGO     : "@drawable/app_logo",
-                                    CITY_ID      : "640676",
+                                    CITY_ID      : "640675",
-                                    CITY_CODE    : "540202000000",
+                                    CITY_CODE    : "540200000000",
-                                    BD_KEY       : "ipb1ae32sNDRMbwOOpApG6bVBji9K86R",
+                                    BD_KEY       : "sdX2qpmzj85dEUGLS74982Gt1fFBjvS7",
-                                    APP_NAME     : "桑珠孜区数字文化云"]
+                                    APP_NAME     : "日喀则市数字文化云"]
-        }
-        nanmulin {
-            applicationId "com.tenlion.cultural.nanmulin"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "nanmulin"
-            manifestPlaceholders = [CHANNEL_VALUE: "nanmulin",
-                                    APP_LOGO     : "@drawable/app_logo",
-                                    CITY_ID      : "640865",
-                                    CITY_CODE    : "540221000000",
-                                    BD_KEY       : "g0G2QLpGCAFV8QKxKo5irCZDwPlCPRTQ",
-                                    APP_NAME     : "南木林县数字文化云"]
-        }
-        jiangzi {
-            applicationId "com.tenlion.cultural.jiangzi"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "jiangzi"
-            manifestPlaceholders = [CHANNEL_VALUE: "jiangzi",
-                                    APP_LOGO     : "@drawable/app_logo",
-                                    CITY_ID      : "641029",
-                                    CITY_CODE    : "540222000000",
-                                    BD_KEY       : "ZkcqIoGvjy8EfIwaal796KSNEWFsmObL",
-                                    APP_NAME     : "江孜县数字文化云"]
-        }
-        dingri {
-            applicationId "com.tenlion.cultural.dingri"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "dingri"
-            manifestPlaceholders = [CHANNEL_VALUE: "dingri",
-                                    APP_LOGO     : "@drawable/app_logo",
-                                    CITY_ID      : "641204",
-                                    CITY_CODE    : "540223000000",
-                                    BD_KEY       : "ql1MLXVWxztmqN2cdxGpe7aYdcvNdRSd",
-                                    APP_NAME     : "定日县数字文化云"]
-        }
-        sajia {
-            applicationId "com.tenlion.cultural.sajia"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "sajia"
-            manifestPlaceholders = [CHANNEL_VALUE: "sajia",
-                                    APP_LOGO     : "@drawable/app_logo",
-                                    CITY_ID      : "641393",
-                                    CITY_CODE    : "540224000000",
-                                    BD_KEY       : "PoMpzyP5FGptOGR4dFByXd6euQ66IDI5",
-                                    APP_NAME     : "萨迦县数字文化云"]
-        }
-        lazi {
-            applicationId "com.tenlion.cultural.lazi"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "lazi"
-            manifestPlaceholders = [CHANNEL_VALUE: "lazi",
-                                    APP_LOGO     : "@drawable/app_logo",
-                                    CITY_ID      : "641512",
-                                    CITY_CODE    : "540225000000",
-                                    BD_KEY       : "LYw9cxjZ6eNLQ5vFIMvmcvafENtfIG8y",
-                                    APP_NAME     : "拉孜县数字文化云"]
-        }
-        angren {
-            applicationId "com.tenlion.cultural.angren"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "angren"
-            manifestPlaceholders = [CHANNEL_VALUE: "angren",
-                                    APP_LOGO     : "@drawable/app_logo",
-                                    CITY_ID      : "641622",
-                                    CITY_CODE    : "540226000000",
-                                    BD_KEY       : "YGTBM02Sgut6xqT9D5lrcfeYqBhE6Ncr",
-                                    APP_NAME     : "昂仁县数字文化云"]
-        }
-        xietongmen {
-            applicationId "com.tenlion.cultural.xietongmen"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "xietongmen"
-            manifestPlaceholders = [CHANNEL_VALUE: "xietongmen",
-                                    APP_LOGO     : "@drawable/app_logo",
-                                    CITY_ID      : "641825",
-                                    CITY_CODE    : "540227000000",
-                                    BD_KEY       : "3Y4ZNEGjTGt9iFSHpF1r1iNdnCBxmYIg",
-                                    APP_NAME     : "谢通门县数字文化云"]
-        }
-        bailang {
-            applicationId "com.tenlion.cultural.bailang"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "bailang"
-            manifestPlaceholders = [CHANNEL_VALUE: "bailang",
-                                    APP_LOGO     : "@drawable/app_logo",
-                                    CITY_ID      : "641940",
-                                    CITY_CODE    : "540228000000",
-                                    BD_KEY       : "DlnhdI1CmTqBZBCRFkGdnxrDaStkQsu5",
-                                    APP_NAME     : "白朗县数字文化云"]
-        }
-        renbu {
-            applicationId "com.tenlion.cultural.renbu"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "renbu"
-            manifestPlaceholders = [CHANNEL_VALUE: "renbu",
-                                    APP_LOGO     : "@drawable/app_logo",
-                                    CITY_ID      : "642063",
-                                    CITY_CODE    : "540229000000",
-                                    BD_KEY       : "UL2rUUtPhOq3xBBWpnDGiEuTNHLvtWuh",
-                                    APP_NAME     : "仁布县数字文化云"]
-        }
-        kangma {
-            applicationId "com.tenlion.cultural.kangma"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "kangma"
-            manifestPlaceholders = [CHANNEL_VALUE: "kangma",
-                                    APP_LOGO     : "@drawable/app_logo",
-                                    CITY_ID      : "642146",
-                                    CITY_CODE    : "540230000000",
-                                    BD_KEY       : "kQsUL41b09E3nhtNIo2ohEKalWwhDFeV",
-                                    APP_NAME     : "康马县数字文化云"]
-        }
-        dingjie {
-            applicationId "com.tenlion.cultural.dingjie"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "dingjie"
-            manifestPlaceholders = [CHANNEL_VALUE: "dingjie",
-                                    APP_LOGO     : "@drawable/app_logo",
-                                    CITY_ID      : "642203",
-                                    CITY_CODE    : "540231000000",
-                                    BD_KEY       : "4rGrPthpteXXbkyrQXYkbX34YQ31PpH5",
-                                    APP_NAME     : "定结县数字文化云"]
-        }
-        zhongba {
-            applicationId "com.tenlion.cultural.zhongba"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "zhongba"
-            manifestPlaceholders = [CHANNEL_VALUE: "zhongba",
-                                    APP_LOGO     : "@drawable/app_logo",
-                                    CITY_ID      : "642284",
-                                    CITY_CODE    : "540232000000",
-                                    BD_KEY       : "HpPUfcA5QdexPDpP7QOakTFGHGGtmSQo",
-                                    APP_NAME     : "仲巴县数字文化云"]
-        }
-        yadong {
-            applicationId "com.tenlion.cultural.yadong"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "yadong"
-            manifestPlaceholders = [CHANNEL_VALUE: "yadong",
-                                    APP_LOGO     : "@drawable/app_logo",
-                                    CITY_ID      : "642356",
-                                    CITY_CODE    : "540233000000",
-                                    BD_KEY       : "vICh5EdGtR5k2RdTaXYWoyDLBai2fVof",
-                                    APP_NAME     : "亚东县数字文化云"]
-        }
-        jilong {
-            applicationId "com.tenlion.cultural.jilong"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "jilong"
-            manifestPlaceholders = [CHANNEL_VALUE: "jilong",
-                                    APP_LOGO     : "@drawable/app_logo",
-                                    CITY_ID      : "642389",
-                                    CITY_CODE    : "540234000000",
-                                    BD_KEY       : "1uYUV884B8jzRnQG3FlZe5484mWWBkr4",
-                                    APP_NAME     : "吉隆县数字文化云"]
-        }
-        nielamu {
-            applicationId "com.tenlion.cultural.nielamu"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "nielamu"
-            manifestPlaceholders = [CHANNEL_VALUE: "nielamu",
-                                    APP_LOGO     : "@drawable/app_logo",
-                                    CITY_ID      : "642437",
-                                    CITY_CODE    : "540235000000",
-                                    BD_KEY       : "EZOGc1TFrNolwpiwDNWgaTIzCYQOKrk0",
-                                    APP_NAME     : "聂拉木县数字文化云"]
-        }
-        saga {
-            applicationId "com.tenlion.cultural.saga"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "saga"
-            manifestPlaceholders = [CHANNEL_VALUE: "saga",
-                                    APP_LOGO     : "@drawable/app_logo",
-                                    CITY_ID      : "642489",
-                                    CITY_CODE    : "540236000000",
-                                    BD_KEY       : "FzlGpMenDV34XFpGWIuiO4s6Tw2otlIK",
-                                    APP_NAME     : "萨嘎县数字文化云"]
-        }
-        gangba {
-            applicationId "com.tenlion.cultural.gangba"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "gangba"
-            manifestPlaceholders = [CHANNEL_VALUE: "gangba",
-                                    APP_LOGO     : "@drawable/app_logo",
-                                    CITY_ID      : "642536",
-                                    CITY_CODE    : "540237000000",
-                                    BD_KEY       : "PCSYjtiOsUEBCpK5SjZ2xsBN55jqfsIl",
-                                    APP_NAME     : "岗巴县数字文化云"]
         }
     }
 }

cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/conver/AreaInterceptor.java

@@ -1,6 +1,7 @@
 package com.sucstepsoft.cm_utils.core.retrofit_net.conver;
 
 import com.sucstepsoft.cm_utils.constant.PathConfig;
+import com.sucstepsoft.cm_utils.utils.LogUtils;
 import com.sucstepsoft.cm_utils.utils.UserInfoSPUtils;
 import com.sucstepsoft.cm_utils.utils.UserLgUtils;
 
@@ -37,6 +38,7 @@ public class AreaInterceptor implements Interceptor {
 //        String cityId = UserLgUtils.getCityId();
         //判断是否需要添加
         List<String> baseUrlName = originalRequest.headers("is_need_area");
+        LogUtils.e(baseUrlName);
         if (baseUrlName.size() <= 0) {
             //需要添加
             HttpUrl modifiedUrl = originalRequest.url().newBuilder()

moduleshop/src/main/java/com/tenlionsoft/moduleshop/net/ShopApi.java

@@ -26,13 +26,13 @@ import retrofit2.http.Query;
 
 public interface ShopApi {
     //获取商品分类
-    @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"})
+    @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"})
     @GET("app/category/listztreerelease")
     Observable<List<ShopSortListBean>> getShopCategoryList();
 
 
     //根据分类ID商品检索
-    @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"})
+    @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"})
     @GET("app/shopgoods/solrrelease")
     Observable<GoodsListBean> getGoodsList(@Query("page") String page,
                                            @Query("rows") String rows,
@@ -50,7 +50,7 @@ public interface ShopApi {
      * @param uE         商品评分
      * @return
      */
-    @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"})
+    @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"})
     @GET("app/shopgoods/solrrelease")
     Observable<GoodsListBean> getGoodsList(@Query("page") String page,
                                            @Query("rows") String rows,
@@ -63,14 +63,14 @@ public interface ShopApi {
     /**
      * 获取商品详情
      */
-    @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"})
+    @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"})
     @GET("app/shopgoods/getrelease/{goodsId}")
     Observable<ShopGoodsDetailBean> getGoodsDetailById(@Path("goodsId") String goodsId);
 
     /**
      * 获取商品规格
      */
-    @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"})
+    @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"})
     @GET("app/shopgoodsitem/listrelease/{goodsId}")
     Observable<List<GoodsStandardBean>> getStandardListByGoodsId(@Path("goodsId") String goodsId);
 
@@ -78,21 +78,21 @@ public interface ShopApi {
     /**
      * 提交订单
      */
-    @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"})
+    @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"})
     @POST("app/order/savebycart")
     Observable<OrderSuccessBean> doSaveOrder(@Body RequestBody goods, @Header("token") String token);
 
     /**
      * 新增收货地址
      */
-    @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"})
+    @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"})
     @POST("app/shopaddress/save")
     Observable<BaseSuccessBean> doSaveAddress(@Body RequestBody goods, @Header("token") String token);
 
     /**
      * 修改收货地址
      */
-    @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"})
+    @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"})
     @PUT("app/shopaddress/update/{shopAddressId}")
     Observable<BaseSuccessBean> doEditAddress(@Body RequestBody goods,
                                               @Path("shopAddressId") String addressId,
@@ -101,35 +101,35 @@ public interface ShopApi {
     /**
      * 设置默认收货地址
      */
-    @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"})
+    @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"})
     @PUT("app/shopaddress/updatedefault/{shopAddressId}")
     Observable<BaseSuccessBean> doSetDefaultAddress(@Path("shopAddressId") String id, @Header("token") String token);
 
     /**
      * 获取默认地址
      */
-    @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"})
+    @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"})
     @GET("app/shopaddress/getdefault")
     Observable<ShippingAddressBean> getDefaultAddress(@Header("token") String token);
 
     /**
      * 删除收货地址
      */
-    @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"})
+    @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"})
     @DELETE("app/shopaddress/remove/{ids}")
     Observable<BaseSuccessBean> doDelShippingAddress(@Path("ids") String id, @Header("token") String token);
 
     /**
      * 收货地址列表
      */
-    @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"})
+    @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"})
     @GET("app/shopaddress/list")
     Observable<List<ShippingAddressBean>> getShippingAddressList(@Header("token") String token);
 
     /**
      * 我的订单
      */
-    @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"})
+    @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"})
     @GET("app/order/listpage")
     Observable<OrderListBean> getMineShopOrderList(@Query("orderStatus") String status,
                                                    @Query("page") String page,
@@ -140,14 +140,14 @@ public interface ShopApi {
     /**
      * 删除订单
      */
-    @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"})
+    @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"})
     @DELETE("app/order/delete/{orderId}")
     Observable<BaseSuccessBean> doDelOrder(@Path("orderId") String id, @Header("token") String token);
 
     /**
      * 取消订单
      */
-    @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"})
+    @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"})
     @PUT("app/order/updatebuyersclose/{orderId}")
     Observable<BaseSuccessBean> doCancelOrder(@Path("orderId") String id,
                                               @Body RequestBody body,
@@ -156,7 +156,7 @@ public interface ShopApi {
     /**
      * 获取取消原因
      */
-    @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"})
+    @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"})
     @GET("app/data/listbyparentid/{id}")
     Observable<List<BaseDictionaryBean>> getCancelData(@Path("id") String id,
                                                        @Header("token") String token);