device_info不参与签名

src/api/fly.js

@@ -36,29 +36,30 @@ fly.config.headers["Content-Type"] =
 const filterNoToken = ["/login", "/refreshToken"];
 
 fly.interceptors.request.use(async config => {
+  if (config.headers) {
+    config.headers["X-Version"] = appInfo.versionName;
+    config.headers["X-Brand"] = qs.stringify(appDev);
+    config.headers["X-Package"] = packages;
+    config.headers["X-CodeVersion"] = '1.0.2';
+    config.headers["X-Provider"] = provider;
+    if (sendOrderId) config.headers["send-order-id"] = sendOrderId;
+  } else {
+    if (sendOrderId) {
+      config.headers = {  'X-Version': appInfo.versionName, 'X-Brand': qs.stringify(appDev), "X-Package": packages, 'send-order-id': sendOrderId };
+    } else {
+      config.headers = { 'X-Version': appInfo.versionName, 'X-Brand': qs.stringify(appDev), "X-Package": packages };
+    }
+  }
+  
   // 过滤一些不需要登录的路由
   if (filterNoToken.indexOf(config.url) === -1) {
     let regId = (await storage.get({ key: "regId" })).data;
     let push_id = (await storage.get({ key: "push_id" })).data;
     let token = await getToken();
-    if (config.headers) {
-      config.headers.Authorization = token;
-      config.headers["X-Version"] = appInfo.versionName;
-      config.headers["X-Brand"] = qs.stringify(appDev);
-      config.headers["X-Package"] = packages;
-      config.headers["X-regId"] = regId;
-      config.headers["X-CodeVersion"] = '1.0.1';
-      config.headers["X-pushId"] = push_id;
-      config.headers["X-Provider"] = provider;
-      if (sendOrderId) config.headers["send-order-id"] = sendOrderId;
-    }
-    else {
-      if (sendOrderId) {
-        config.headers = { Authorization: token, 'X-Version': appInfo.versionName, 'X-Brand': qs.stringify(appDev), "X-Package": packages, 'send-order-id': sendOrderId };
-      } else {
-        config.headers = { Authorization: token, 'X-Version': appInfo.versionName, 'X-Brand': qs.stringify(appDev), "X-Package": packages };
-      }
-    }
+    config.headers.Authorization = token;
+    config.headers["X-regId"] = regId;
+    config.headers["X-pushId"] = push_id;
+
     if (config.method === "POST") {
       if (qs.stringify(config.body)) {
         config.body = qs.stringify(config.body) + '&package=' + packages;
@@ -78,6 +79,8 @@ fly.interceptors.response.use(
   async res => {
     if (!res.data.code) {
       return Promise.resolve(res.data.data);
+    }if (res.data.code == 10029) {
+      return Promise.resolve(res.data.data ? res.data.data : {});
     } else if (res.data.code === 10023 || res.data.code === 10001) {
       // token失效
       await clearToken();
@@ -92,6 +95,7 @@ fly.interceptors.response.use(
       prompt.showToast({
         message: res.data.msg
       })
+      // it.errBackTo();
       return Promise.reject(res);
     }
   },

src/api/index.js

@@ -224,7 +224,48 @@ export const getFreeBook = sex => {
 export const getReadrecord = () => {
   return fly.get('readrecord')
 }
+
 //注销账户
 export const logOff = () => {
-  return fly.get(`/user/logOff`)
+  return fly.get(`user/logOff`)
+}
+
+//腾讯广告书籍替换
+export const noAdvBookInfo = (send_order_id) => {
+  return fly.get(`/txAdqNew/noAdvBookInfo`,{send_order_id:send_order_id})
+}
+
+//阅读返回书籍推荐
+export const recommendBooks = (bid) => {
+  return fly.get(`/books/recommend_books`,{bid:bid})
+}
+
+//推荐书籍点击次数
+export const clickRecommendBooks = (bid) => {
+  return fly.get(`/books/clickRecommendBooks`,{bid:bid})
+}
+
+//轮播图和弹窗点击统计
+export const clickBanner = (id) => {
+  return fly.get(`/books/clickRecommendBooks`,{bid:bid})
+}
+
+// 获取可用促销活动
+export const getPopp = () => {
+  return fly.get(`/books/clickRecommendBooks`,{bid:bid})
+}
+
+// 充值成功回调参数
+export const advertOrders = (order) => {
+  return fly.get(`/books/advertOrders`,{order_id:order})
+}
+
+// 获取轮播图弹窗参数 1为男频，2为女频，3为书架，4为弹窗,5为充值页返回广告
+export const getBannerData = (release_type) => {
+  return fly.get(`/books/recommendBanners`,{release_type:release_type})
+}
+
+// banner弹窗等广告点击统计
+export const checkAdvertisement = (type,id) => {
+  return fly.get(`/books/checkAdvertisement`,{type:type,ids:id})
 }

src/api/utils.js

@@ -57,8 +57,8 @@ export const login = async () => {
   }
   let word='abcdefg'
   let queryString = "";
-  if (send_order_id) queryString = `androidid=${androidid.userId || word }&device_info=${JSON.stringify(device_info) }&device_no=${androidid.userId || word}&package=${packages}&send_order_id=${send_order_id}&timestamp=${timestamp}&key=${signKey}`;
-  else queryString = `androidid=${androidid.userId || word}&device_info=${JSON.stringify(device_info) || word}&device_no=${androidid.userId || word}&package=${packages}&timestamp=${timestamp}&key=${signKey}`;
+  if (send_order_id) queryString = `androidid=${androidid.userId || word }&device_no=${androidid.userId || word}&package=${packages}&send_order_id=${send_order_id}&timestamp=${timestamp}&key=${signKey}`;
+  else queryString = `androidid=${androidid.userId || word}&device_no=${androidid.userId || word}&package=${packages}&timestamp=${timestamp}&key=${signKey}`;
   let data = qs.stringify({
     androidid: androidid.userId|| word,
     device_info: JSON.stringify(device_info)|| word,

src/manifest.json

@@ -1,9 +1,9 @@
 {
   "package": "com.beidao.kuaiying.yuele",
-  "name": "阅乐看书",
+  "name": "阅乐小说",
   "versionName": "1.0.1",
   "versionCode": 1,
-  "minPlatformVersion": 1070,
+  "minPlatformVersion": 1100,
   "icon": "/assets/imgs/logo.png",
   "features": [
     {