xyvcard-wechat-auth 0.0.1 → 0.0.2

package/dist/utils/request.js

@@ -1 +1,86 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./config.js"),t=require("./db.js"),r=require("./auth.js");let o=!1,s=null;const a=(t,r)=>new Promise((o,s)=>{var a;wx.request({url:e.config.baseUrl+t.url,method:t.method,data:t.data,header:r,responseType:null!=(a=t.responseType)?a:"text",success(e){200===e.statusCode?o({code:e.statusCode,message:e.errMsg,data:e.data}):401===e.statusCode?wx.clearStorage():o({code:e.statusCode,message:e.errMsg,data:e.data})},fail(e){s(e)}})});exports.clearEmpty=function e(t){for(const r in t)"object"==typeof t[r]&&e(t[r]),"object"==typeof t[r]&&0===Object.keys(t[r]).length&&delete t[r],""===t[r]&&delete t[r];return t},exports.request=(...e)=>{return n=null,c=[...e],u=function*(e={},n=""){t.db.isTokenExpire()&&(o?yield s:(o=!0,s||(s=new Promise((e,t)=>{r.auth.refreshToken().then(()=>e(!0)).catch(e=>{wx.clearStorage(),t(e)})})),yield s,o=!1));try{let r={"content-type":"application/json",Authorization:t.db.getBearerToken(),"Grpc-Metadata-Tenant":n};return yield a(e,r)}catch(c){return Promise.reject(c)}},new Promise((e,t)=>{var r=e=>{try{s(u.next(e))}catch(r){t(r)}},o=e=>{try{s(u.throw(e))}catch(r){t(r)}},s=t=>t.done?e(t.value):Promise.resolve(t.value).then(r,o);s((u=u.apply(n,c)).next())});var n,c,u},exports.sendRequest=a,"object"==typeof exports&&"undefined"!=typeof module&&Object.keys(module.exports).forEach(function(e){exports[e]=module.exports[e]});
+import { config } from "./config.js";
+import { db } from "./db.js";
+import { auth } from "./auth.js";
+let isRefreshing = false;
+let refreshPromise = null;
+const request = async (options = {}, tenant = "") => {
+  if (db.isTokenExpire()) {
+    if (!isRefreshing) {
+      isRefreshing = true;
+      if (!refreshPromise) {
+        refreshPromise = new Promise((resolve, reject) => {
+          auth.refreshToken().then(() => resolve(true)).catch((err) => {
+            wx.clearStorage();
+            reject(err);
+          });
+        });
+      }
+      await refreshPromise;
+      isRefreshing = false;
+    } else {
+      await refreshPromise;
+    }
+  }
+  try {
+    let header = {
+      "content-type": "application/json",
+      "Authorization": db.getBearerToken(),
+      "Grpc-Metadata-Tenant": tenant
+    };
+    const response = await sendRequest(options, header);
+    return response;
+  } catch (error) {
+    return Promise.reject(error);
+  }
+};
+const sendRequest = (options, header) => {
+  return new Promise((resolve, reject) => {
+    wx.request({
+      url: config.baseUrl + options.url,
+      method: options.method,
+      data: options.data,
+      header,
+      responseType: options.responseType ? "text" : options.responseType,
+      success(response) {
+        if (response.statusCode === 200) {
+          resolve({
+            code: response.statusCode,
+            message: response.errMsg,
+            data: response.data
+          });
+        } else if (response.statusCode === 401) {
+          console.log("token过期....");
+          wx.clearStorage();
+        } else {
+          resolve({
+            code: response.statusCode,
+            message: response.errMsg,
+            data: response.data
+          });
+        }
+      },
+      fail(error) {
+        reject(error);
+      }
+    });
+  });
+};
+function clearEmpty(params) {
+  for (const key in params) {
+    if (typeof params[key] === "object") {
+      clearEmpty(params[key]);
+    }
+    if (typeof params[key] === "object" && Object.keys(params[key]).length === 0) {
+      delete params[key];
+    }
+    if (params[key] === "") {
+      delete params[key];
+    }
+  }
+  return params;
+}
+export {
+  clearEmpty,
+  request,
+  sendRequest
+};

package/dist/utils/util.d.ts

@@ -1 +1,10 @@
+/**
+ * 格式化日期时间字符串，格式化后的日期时间字符串2024-05-16
+ * @param dateTimeString 转换前的字符串2024-05-16T00:00:00.000Z
+ * @param format 转换格式
+ */
+export declare const formatDateTime: (dateTimeString: string, format?: any) => string;
 export declare const formatTime: (date: Date) => string;
+export declare function splitOrganTenant(organ: any): any;
+export declare function splitVcardTenant(vcard: any): any;
+export declare function splitVcardTenantReturn(vcardId: string, vcardTenant: string): string;

package/dist/utils/util.js

@@ -1 +1,88 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=e=>{const t=e.toString();return t[1]?t:"0"+t};exports.formatTime=t=>{const o=t.getFullYear(),r=t.getMonth()+1,n=t.getDate(),s=t.getHours(),u=t.getMinutes(),p=t.getSeconds();return[o,r,n].map(e).join("/")+" "+[s,u,p].map(e).join(":")},"object"==typeof exports&&"undefined"!=typeof module&&Object.keys(module.exports).forEach(function(e){exports[e]=module.exports[e]});
+const formatDateTime = (dateTimeString, format) => {
+  var date = new Date(dateTimeString);
+  var year = date.getFullYear();
+  var month = ("0" + (date.getMonth() + 1)).slice(-2);
+  var day = ("0" + date.getDate()).slice(-2);
+  var hours = ("0" + date.getHours()).slice(-2);
+  var minutes = ("0" + date.getMinutes()).slice(-2);
+  var seconds = ("0" + date.getSeconds()).slice(-2);
+  if (format === "YYYY-MM-DD HH:mm:ss") {
+    return year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds;
+  }
+  if (format === "YYYY-MM-DD HH:mm") {
+    return year + "-" + month + "-" + day + " " + hours + ":" + minutes;
+  }
+  if (format === "YYYY-MM-DD") {
+    return year + "-" + month + "-" + day;
+  }
+  if (format === "YYYY-MM") {
+    return year + "-" + month;
+  }
+  if (format === "YYYY年MM月DD日") {
+    return year + "年" + month + "月" + day + "日";
+  }
+  if (format === "YYYY年MM月DD日 HH:mm") {
+    return year + "年" + month + "月" + day + "日 " + hours + ":" + minutes;
+  }
+  if (format === "YYYY年MM月DD日 HH:mm:ss") {
+    return year + "年" + month + "月" + day + "日 " + hours + ":" + minutes + ":" + seconds;
+  }
+  if (format === "YYYY年MM月DD日 HH时mm分") {
+    return year + "年" + month + "月" + day + "日 " + hours + "时" + minutes + "分";
+  }
+  if (format === "MM.DD") {
+    return month + "." + day;
+  }
+  if (format === "MM/DD") {
+    return month + "/" + day;
+  }
+  if (format === "MM月DD日") {
+    return month + "月" + day + "日";
+  }
+  if (format === "MM月DD日 HH:mm") {
+    return month + "月" + day + "日 " + hours + ":" + minutes;
+  }
+  return "";
+};
+const formatTime = (date) => {
+  const year = date.getFullYear();
+  const month = date.getMonth() + 1;
+  const day = date.getDate();
+  const hour = date.getHours();
+  const minute = date.getMinutes();
+  const second = date.getSeconds();
+  return [year, month, day].map(formatNumber).join("/") + " " + [hour, minute, second].map(formatNumber).join(":");
+};
+const formatNumber = (n) => {
+  const s = n.toString();
+  return s[1] ? s : "0" + s;
+};
+function splitOrganTenant(organ) {
+  let tenant = organ.organTenant;
+  if (organ.orgId) {
+    tenant = organ.organTenant.split("@")[1];
+  }
+  return tenant;
+}
+function splitVcardTenant(vcard) {
+  let tenant = vcard.organTenant;
+  if (vcard.orgId) {
+    tenant = vcard.organTenant.split("@")[1];
+  }
+  return tenant;
+}
+function splitVcardTenantReturn(vcardId, vcardTenant) {
+  const isOrganVcard = (vcardTenant == null ? void 0 : vcardTenant.indexOf("@e")) > -1 ? true : false;
+  console.log("是否是组织名片", isOrganVcard);
+  if (isOrganVcard) {
+    vcardTenant = vcardId.split("@")[1] ? vcardId.split("@")[1] : vcardTenant;
+  }
+  return vcardTenant;
+}
+export {
+  formatDateTime,
+  formatTime,
+  splitOrganTenant,
+  splitVcardTenant,
+  splitVcardTenantReturn
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xyvcard-wechat-auth",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -9,10 +9,11 @@
   "author": "",
   "license": "",
   "dependencies": {
-    "miniprogram-api-typings": "^4.0.7"
+    "miniprogram-api-typings": "^4.1.0",
+    "@vant/weapp": "^1.11.7"
   },
   "devDependencies": {
-    "xyvcard-mini-wechat": "^0.0.3",
+    "xyvcard-wechat-build": "^0.0.2",
     "typescript": "^5.8.3"
   },
   "scripts": {

package/dist/app.js

@@ -1 +0,0 @@
-"use strict";App({globalData:{},onLaunch(){(wx.getStorageSync("logs")||[]).unshift(Date.now()),wx.login({success:e=>{}})}}),"object"==typeof exports&&"undefined"!=typeof module&&Object.keys(module.exports).forEach(function(e){exports[e]=module.exports[e]});

package/dist/app.json

@@ -1,24 +0,0 @@
-{
-  "pages": [
-    "pages/index/index"
-  ],
-  "window": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "",
-    "navigationBarBackgroundColor": "#fff"
-  },
-  "style": "v2",
-  "rendererOptions": {
-    "skyline": {
-      "defaultDisplayBlock": true,
-      "defaultContentBox": true,
-      "tagNameStyleIsolation": "legacy",
-      "disableABTest": true,
-      "sdkVersionBegin": "3.0.0",
-      "sdkVersionEnd": "15.255.255"
-    }
-  },
-  "componentFramework": "glass-easel",
-  "sitemapLocation": "sitemap.json",
-  "lazyCodeLoading": "requiredComponents"
-}

package/dist/pages/index/index.js

@@ -1 +0,0 @@
-"use strict";Page({data:{},onLoad(){},onReady(){},onShow(){},onHide(){},onUnload(){},onPullDownRefresh(){},onReachBottom(){},onShareAppMessage(){}}),"object"==typeof exports&&"undefined"!=typeof module&&Object.keys(module.exports).forEach(function(o){exports[o]=module.exports[o]});

package/dist/pages/index/index.json

@@ -1,7 +0,0 @@
-{
-  "usingComponents": {
-    "footer-btn": "/components/common/btn/footer-btn/index",
-    "footer-double-btn": "/components/common/btn/footer-double-btn/index",
-    "choose-avatar": "/components/common/choose-avatar/index"
-  }
-}

package/dist/pages/index/index.wxml

@@ -1,4 +0,0 @@
-<view style="width: 100%;">
-<footer-btn text="保存" btnBgColor="#2563EB" fontColor="#fff"></footer-btn>
-</view>
-<choose-avatar></choose-avatar>

package/dist/sitemap.json

@@ -1,7 +0,0 @@
-{
-  "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
-  "rules": [{
-  "action": "allow",
-  "page": "*"
-  }]
-}