From f9bb4660962400375065d1b32cb1359f262d7039 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=B2=E4=B9=88=E4=BA=86?= <zhongchunyang@rocan.com.cn>
Date: Wed, 13 Sep 2023 16:40:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |   3 +
 common/api/user.js                            |  25 +++--
 manifest.json                                 |   2 +-
 pages/device/APF/comp/basic.vue               | 103 +++++++++++-------
 pages/device/APF/comp/power.vue               |  91 +++++++++-------
 pages/device/APF/comp/xieBo.vue               |  18 +--
 pages/device/APF/detail.vue                   |  62 ++++++-----
 uniCloud-aliyun/cloudfunctions/push/index.js  |  20 ++++
 .../cloudfunctions/push/package.json          |   7 ++
 .../common/uni-config-center/index.js         |   1 -
 .../common/uni-config-center/package.json     |   9 --
 .../common/uni-id-common/index.js             |   1 -
 .../common/uni-id-common/package.json         |  16 ---
 13 files changed, 204 insertions(+), 154 deletions(-)
 create mode 100644 uniCloud-aliyun/cloudfunctions/push/index.js
 create mode 100644 uniCloud-aliyun/cloudfunctions/push/package.json
 delete mode 100644 uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/index.js
 delete mode 100644 uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/package.json
 delete mode 100644 uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/index.js
 delete mode 100644 uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/package.json

diff --git a/App.vue b/App.vue
index 521672e..ad4ba44 100644
--- a/App.vue
+++ b/App.vue
@@ -4,6 +4,9 @@ import {getImageUrl} from '@/common/api/basic'
 
 export default {
     onLaunch: function () {
+        // uni.onPushMessage((res) => {
+        //     console.log("收到推送消息：",res) //监听推送消息
+        // })
         console.log(window)
         // this.connect()
         console.log('App Launch')
diff --git a/common/api/user.js b/common/api/user.js
index 98cdd4b..d896dfd 100644
--- a/common/api/user.js
+++ b/common/api/user.js
@@ -141,7 +141,7 @@ export function apiRebindPhone(params) {
 }
 
 // 角色升级
-export function roleUpdate({ userId, referralCode }) {
+export function roleUpdate({userId, referralCode}) {
     return request({
         url: '/user-boot/appRole/roleUpdate',
         method: 'post',
@@ -207,15 +207,18 @@ export function apiUpdateUser(params) {
 // 更新用户推送标识
 
 export function apiUpdatePush(params) {
-    uni.getPushClientId((res) => {
-        let push_clientid = res.cid
-        request({
-            url: '/user-boot/appUser/updateDevCode',
-            data: {
-                devCode: push_clientid,
-                userId: uni.getStorageSync('userInfo').userIndex,
-            },
-            method: 'POST',
-        })
+    uni.getPushClientId({
+        success: (res) => {
+            let push_clientid = res.cid
+            console.log(push_clientid, 'push_clientid')
+            request({
+                url: '/user-boot/appUser/updateDevCode',
+                data: {
+                    devCode: push_clientid,
+                    userId: uni.getStorageSync('userInfo').userIndex,
+                },
+                method: 'POST',
+            })
+        }
     })
 }
diff --git a/manifest.json b/manifest.json
index b3576aa..4573388 100644
--- a/manifest.json
+++ b/manifest.json
@@ -70,7 +70,7 @@
                 "push" : {
                     "unipush" : {
                         "version" : "2",
-                        "offline" : false
+                        "offline" : true
                     }
                 },
                 "share" : {}
diff --git a/pages/device/APF/comp/basic.vue b/pages/device/APF/comp/basic.vue
index 138888b..2ce9fe4 100644
--- a/pages/device/APF/comp/basic.vue
+++ b/pages/device/APF/comp/basic.vue
@@ -6,10 +6,10 @@
                 <view class="item item-title">名称</view>
                 <view class="item item-title">有效值(A)</view>
                 <view class="item item-title">THDI(%)</view>
-                <template v-for="(item, index) in renderData.电网侧">
+                <template v-for="(item, index) in renderData.电网电流">
                     <view class="item">{{ item.phase }}</view>
-                    <view class="item">{{ item['Pq_RmsI(A)'] || '-' }}</view>
-                    <view class="item">{{ item['Pq_ThdI(%)'] || '-'}}</view>
+                    <view class="item">{{ item['Apf_RmsI_Sys(A)'] || '-' }}</view>
+                    <view class="item">{{ item['Apf_ThdA_Sys(%)'] || '-' }}</view>
                 </template>
             </view>
         </view>
@@ -20,11 +20,11 @@
                 <view class="item item-title">电压(V)</view>
                 <view class="item item-title">频率(Hz)</view>
                 <view class="item item-title">THDU(%)</view>
-                <template v-for="(item, index) in renderData.电网侧">
+                <template v-for="(item, index) in renderData.电网电压">
                     <view class="item">{{ item.phase }}</view>
-                    <view class="item">{{ item['Pq_RmsLU(V)'] || '-' }}</view>
-                    <view class="item">{{ item['Pq_Freq(Hz)'] || '-' }}</view>
-                    <view class="item">{{ item['Pq_ThdU(%)'] || '-' }}</view>
+                    <view class="item">{{ item['Apf_PhV_Sys(V)'] || '-' }}</view>
+                    <view class="item">{{ item['Apf_Freq(Hz)'] || '-' }}</view>
+                    <view class="item">{{ item['Apf_ThdU(%)'] || '-' }}</view>
                 </template>
             </view>
         </view>
@@ -34,10 +34,10 @@
                 <view class="item item-title">名称</view>
                 <view class="item item-title">有效值(A)</view>
                 <view class="item item-title">THDI(%)</view>
-                <template v-for="(item, index) in renderData.负载侧">
+                <template v-for="(item, index) in renderData.负载电流">
                     <view class="item">{{ item.phase }}</view>
-                    <view class="item">{{ item['Pq_RmsI(A)'] || '-' }}</view>
-                    <view class="item">{{ item['Pq_ThdI(%)'] || '-' }}</view>
+                    <view class="item">{{ item['Apf_RmsI_Load(A)'] || '-' }}</view>
+                    <view class="item">{{ item['Apf_ThdA_Load(%)'] || '-' }}</view>
                 </template>
             </view>
         </view>
@@ -47,10 +47,10 @@
                 <view class="item item-title">名称</view>
                 <view class="item item-title">有效值(A)</view>
                 <view class="item item-title">负载率(%)</view>
-                <template v-for="(item, index) in renderData.输出侧">
+                <template v-for="(item, index) in renderData.补偿电流">
                     <view class="item">{{ item.phase }}</view>
-                    <view class="item">{{ item['Apf_RmsI_Sys(A)'] || '-' }}</view>
-                    <view class="item"></view>
+                    <view class="item">{{ item['Apf_RmsI_TolOut(A)'] || '-' }}</view>
+                    <view class="item">-</view>
                 </template>
             </view>
         </view>
@@ -61,9 +61,11 @@ export default {
     data() {
         return {
             renderData: {
-                电网侧: {},
-                负载侧: {},
-                输出侧: {},
+                电网电流: [],
+                电网电压: [],
+                负载电流: [],
+                补偿电流: [],
+                未知:[]
             },
         }
     },
@@ -78,36 +80,55 @@ export default {
     watch: {
         basicData: {
             handler: function (newVal, oldVal) {
-                let arr = [
-                    {
-                        name: '电网侧',
-                        linePostion: 'cb23b9ede3b652cd6da194fd7b318124',
-                    },
-                    {
-                        name: '负载侧',
-                        linePostion: '32624d4bb3a86f2b9a01bab272e50125',
-                    },
-                    {
-                        name: '输出侧',
-                        linePostion: '26eae70fb5ff1c090d2dc7c3a0743948',
-                    },
-                ]
-                this.basicData.forEach((item) => {
+
+                newVal.forEach(item => {
                     if (item.phase === 'avg') {
                         return
                     }
-                    let index = arr.findIndex((item2) => {
-                        return item2.linePostion === item.position
+                    let key = ''
+                    switch (item.statisticalName) {
+                        case 'Apf_RmsI_Sys(A)':
+                            key = '电网电流'
+                            break
+                        case 'Apf_ThdA_Sys(%)':
+                            key = '电网电流'
+                            break
+                        case 'Apf_PhV_Sys(V)':
+                            key = '电网电压'
+                            break
+                        case 'Apf_Freq(Hz)':
+                            key = '电网电压'
+                            break
+                        case 'Apf_RmsI_Load(A)':
+                            key = '负载电流'
+                            break
+                        case 'Apf_ThdA_Load(%)':
+                            key = '负载电流'
+                            break
+                        case 'Apf_RmsI_TolOut(A)':
+                            key = '补偿电流'
+                            break
+                        case 'Apf_PhV_Sys(V)':
+                            key = '补偿电流'
+                            break
+                        case 'Apf_PhV_Sys(V)':
+                            key = '补偿电流'
+                            break
+                        default:
+                            key = '未知'
+                            break
+                    }
+
+                    let index = this.renderData[key].findIndex((item2) => {
+                        return item2.phase === item.phase
                     })
                     if (index > -1) {
-                        if (this.renderData[arr[index]['name']][item.phase]) {
-                            this.renderData[arr[index]['name']][item.phase][item.statisticalName] = item.statisticalData || '-'
-                        } else {
-                            this.renderData[arr[index]['name']][item.phase] = {
-                                phase: item.phase,
-                                [item.statisticalName]: item.statisticalData || '-',
-                            }
-                        }
+                        this.renderData[key][index][item.statisticalName] = item.statisticalData || '-'
+                    } else {
+                        this.renderData[key].push({
+                            phase: item.phase,
+                            [item.statisticalName]: item.statisticalData || '-',
+                        })
                     }
                 })
                 console.log(this.renderData)
diff --git a/pages/device/APF/comp/power.vue b/pages/device/APF/comp/power.vue
index 933ea12..fd46d2a 100644
--- a/pages/device/APF/comp/power.vue
+++ b/pages/device/APF/comp/power.vue
@@ -10,10 +10,10 @@
                 <view class="item item-title">功率因数</view>
                 <template v-for="(item, index) in renderData.电网侧">
                     <view class="item">{{ item.phase }}</view>
-                    <view class="item">{{ item['Pq_P(W)'] || '-' }}</view>
-                    <view class="item">{{ item['Pq_Q(var)'] || '-' }}</view>
-                    <view class="item">{{ item['Pq_S(VA)'] || '-' }}</view>
-                    <view class="item">{{ item['Pq_PF(null)'] || '-' }}</view>
+                    <view class="item">{{ item['Apf_P_Sys(W)'] || '-' }}</view>
+                    <view class="item">{{ item['Apf_Q_Sys(Var)'] || '-' }}</view>
+                    <view class="item">{{ item['Apf_S_Sys(VA)'] || '-' }}</view>
+                    <view class="item">{{ item['Apf_PF_Sys(null)'] || '-' }}</view>
                 </template>
             </view>
         </view>
@@ -25,12 +25,12 @@
                 <view class="item item-title">无功功率(kVar)</view>
                 <view class="item item-title">视在功率(kVA)</view>
                 <view class="item item-title">功率因数</view>
-                <template v-for="(item, index) in renderData.电网侧">
+                <template v-for="(item, index) in renderData.负载侧">
                     <view class="item">{{ item.phase }}</view>
-                    <view class="item">{{ item['Pq_P(W)'] || '-' }}</view>
-                    <view class="item">{{ item['Pq_Q(var)'] || '-' }}</view>
-                    <view class="item">{{ item['Pq_S(VA)'] || '-' }}</view>
-                    <view class="item">{{ item['Pq_PF(null)'] || '-' }}</view>
+                    <view class="item">{{ item['Apf_P_Load(W)'] || '-' }}</view>
+                    <view class="item">{{ item['Apf_Q_Load(Var)'] || '-' }}</view>
+                    <view class="item">{{ item['Apf_S_Load(VA)'] || '-' }}</view>
+                    <view class="item">{{ item['Apf_PF_Load(null)'] || '-' }}</view>
                 </template>
             </view>
         </view>
@@ -41,9 +41,9 @@ export default {
     data() {
         return {
             renderData: {
-                电网侧: {},
-                负载侧: {},
-                输出侧: {},
+                电网侧: [],
+                负载侧: [],
+                未知: [],
             },
         }
     },
@@ -58,36 +58,52 @@ export default {
     watch: {
         basicData: {
             handler: function (newVal, oldVal) {
-                let arr = [
-                    {
-                        name: '电网侧',
-                        linePostion: 'cb23b9ede3b652cd6da194fd7b318124',
-                    },
-                    {
-                        name: '负载侧',
-                        linePostion: '32624d4bb3a86f2b9a01bab272e50125',
-                    },
-                    {
-                        name: '输出侧',
-                        linePostion: '26eae70fb5ff1c090d2dc7c3a0743948',
-                    },
-                ]
-                this.basicData.forEach((item) => {
+
+                newVal.forEach(item => {
                     if (item.phase === 'avg') {
                         return
                     }
-                    let index = arr.findIndex((item2) => {
-                        return item2.linePostion === item.position
+                    let key = ''
+                    switch (item.statisticalName) {
+                        case 'Apf_P_Sys(W)':
+                            key = '电网侧'
+                            break
+                        case 'Apf_Q_Sys(Var)':
+                            key = '电网侧'
+                            break
+                        case 'Apf_S_Sys(VA)':
+                            key = '电网侧'
+                            break
+                        case 'Apf_PF_Sys(null)':
+                            key = '电网侧'
+                            break
+                        case 'Apf_P_Load(W)':
+                            key = '负载侧'
+                            break
+                        case 'Apf_Q_Load(Var)':
+                            key = '负载侧'
+                            break
+                        case 'Apf_S_Load(VA)':
+                            key = '负载侧'
+                            break
+                        case 'Apf_PF_Load(null)':
+                            key = '负载侧'
+                            break
+                        default:
+                            key = '未知'
+                            break
+                    }
+
+                    let index = this.renderData[key].findIndex((item2) => {
+                        return item2.phase === item.phase
                     })
                     if (index > -1) {
-                        if (this.renderData[arr[index]['name']][item.phase]) {
-                            this.renderData[arr[index]['name']][item.phase][item.statisticalName] = item.statisticalData || '-'
-                        } else {
-                            this.renderData[arr[index]['name']][item.phase] = {
-                                phase: item.phase,
-                                [item.statisticalName]: item.statisticalData || '-',
-                            }
-                        }
+                        this.renderData[key][index][item.statisticalName] = item.statisticalData || '-'
+                    } else {
+                        this.renderData[key].push({
+                            phase: item.phase,
+                            [item.statisticalName]: item.statisticalData || '-',
+                        })
                     }
                 })
                 console.log(this.renderData)
@@ -95,6 +111,7 @@ export default {
             deep: true,
             immediate: true,
         },
+
     },
     methods: {},
 }
diff --git a/pages/device/APF/comp/xieBo.vue b/pages/device/APF/comp/xieBo.vue
index de3c49d..1426134 100644
--- a/pages/device/APF/comp/xieBo.vue
+++ b/pages/device/APF/comp/xieBo.vue
@@ -69,23 +69,24 @@ export default {
     watch: {
         basicData: {
             handler: function (newVal, oldVal) {
+                console.log(this.basicData)
                 let basicData = JSON.parse(JSON.stringify(this.basicData))
                 let arr = [
                     {
                         name: '电网侧',
-                        linePostion: 'cb23b9ede3b652cd6da194fd7b318124',
+                        key: 'Apf_HarmI_Sys',
                     },
                     {
                         name: '负载侧',
-                        linePostion: '32624d4bb3a86f2b9a01bab272e50125',
+                        key: 'Apf_HarmI_Load',
                     },
                 ]
                 basicData.forEach((item) => {
-                    if (item.statisticalName.indexOf('Pq_HarmI_') === -1) {
+                    if (item.statisticalName.indexOf('HarmI') === -1) {
                         return
                     }
                     let index = arr.findIndex((item2) => {
-                        return item2.linePostion === item.position
+                        return item.statisticalName.indexOf(item2.key) > -1
                     })
                     if (index > -1) {
                         if (this.renderData[arr[index]['name']][item.phase]) {
@@ -93,7 +94,6 @@ export default {
                                 item.statisticalData || 0
                         } else {
                             this.renderData[arr[index]['name']][item.phase] = {
-                                phase: item.phase,
                                 [item.statisticalName]: item.statisticalData || 0,
                             }
                         }
@@ -110,10 +110,11 @@ export default {
                 let obj = JSON.parse(
                     JSON.stringify(this.renderData['电网侧'][Object.keys(this.renderData['电网侧'])[0]]),
                 )
-                delete obj['phase']
                 console.log(
                     Object.keys(obj).map((item) => {
-                        return item.match(/Pq_HarmI_(\d+)/)[1]
+                        // Apf_HarmI_Sys_36(A) 匹配36
+                        return item.match(/\d+/)[0]
+
                     }),
                 )
                 console.log(
@@ -128,7 +129,8 @@ export default {
                 )
                 this.chartData = {
                     categories: Object.keys(obj).map((item) => {
-                        return Number(item.match(/Pq_HarmI_(\d+)/)[1])
+                        // Apf_HarmI_Sys_36(A) 匹配36
+                        return Number(item.match(/\d+/)[0])
                     }),
                     series: [
                         {
diff --git a/pages/device/APF/detail.vue b/pages/device/APF/detail.vue
index 915a38c..347aef9 100644
--- a/pages/device/APF/detail.vue
+++ b/pages/device/APF/detail.vue
@@ -156,32 +156,7 @@ export default {
             dictData: [],
             isPrimaryUser: 0,
             userInfo: {},
-            topolodyData: [
-                {
-                    label: '电网侧',
-                    linePostion: 'cb23b9ede3b652cd6da194fd7b318124',
-                    lat: '',
-                    lng: '',
-                    showKey: ['Pq_ThdU(%)', 'Pq_ThdI(%)'], //要展示的指标key
-                    value: [],// 展示的指标值
-                },
-                {
-                    label: '负载侧',
-                    linePostion: '32624d4bb3a86f2b9a01bab272e50125',
-                    lat: '',
-                    lng: '',
-                    showKey: ['Pq_ThdU(%)', 'Pq_ThdI(%)'], //要展示的指标key
-                    value: [],
-                },
-                {
-                    label: '输出侧',
-                    linePostion: '26eae70fb5ff1c090d2dc7c3a0743948',
-                    lat: '',
-                    lng: '',
-                    showKey: ['Apf_ThdA_Load(%)', 'Apf_ThdA_Sys(%)'], //要展示的指标key
-                    value: [],
-                },
-            ],
+            topolodyData: [],
             basicData: [],
             IOData: [],
         }
@@ -268,7 +243,7 @@ export default {
                 this.deviceInfo = res.data
                 this.downloadImg()
                 uni.setNavigationBarTitle({title: this.deviceInfo.devName || '设备详情'})
-                this.topolodyData.filter((item) => {
+                this.topolodyData = this.topolodyData.filter((item) => {
                     let index = this.deviceInfo.appsLineTopologyDiagramPO.findIndex((element) => {
                         element.label = element.name
                         item.label = element.name
@@ -283,6 +258,7 @@ export default {
                         return false
                     }
                 })
+                console.log(this.topolodyData)
                 if (this.client) {
                     this.loading = false
                 } else {
@@ -379,18 +355,19 @@ export default {
                 })
         },
         handlerData(data) {
+            this.basicData = data
             this.topolodyData.forEach((element) => {
                 let arr = []
                 element.showKey.forEach((key) => {
                     data.forEach((item) => {
-                        if (item.statisticalName === key && item.phase === 'avg' && element.linePostion === item.position) {
+                        if (item.statisticalName === key && item.phase === 'avg' ) {
                             arr.push(key + ':' + item.statisticalData)
                         }
                     })
                 })
                 element.value = arr
             })
-            this.basicData = data
+            console.log(this.topolodyData)
             this.$forceUpdate()
         },
     },
@@ -434,6 +411,32 @@ export default {
                 text: '用户',
             })
         }
+        this.topolodyData = this.$util.getDictData('Line_Position').map(item => {
+            switch (item.name) {
+                case '电网侧':
+                    item.showKey = ['Apf_ThdA_Sys(%)']
+                    break
+                case '负载侧':
+                    item.showKey = ['Apf_ThdA_Load(%)']
+                    break
+                case '输出侧':
+                    item.showKey = ['Apf_RmsI_TolOut(A)']
+                    break
+                case 'PCC公共点':
+                    item.showKey = []
+                    break
+                default:
+                    break
+            }
+            return {
+                label: item.name,
+                linePostion: item.id,
+                lat: '',
+                lng: '',
+                showKey: item.showKey, //要展示的指标key
+                value: [],
+            }
+        })
         this.init()
     },
 }
@@ -455,6 +458,7 @@ export default {
         position: relative;
         width: 375px;
         margin: 0 auto;
+        overflow: hidden;
 
         image {
             image-rendering: -moz-crisp-edges;
diff --git a/uniCloud-aliyun/cloudfunctions/push/index.js b/uniCloud-aliyun/cloudfunctions/push/index.js
new file mode 100644
index 0000000..025205d
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/push/index.js
@@ -0,0 +1,20 @@
+'use strict';
+const uniPush = uniCloud.getPushManager({appId: "__UNI__88BC25B"})
+exports.main = async (event, context) => {
+    //event为客户端上传的参数
+    console.log('event : ', event)
+    let body = JSON.parse(event.body)
+    let res = await uniPush.sendMessage({
+        "push_clientid": body.push_clientid,	//填写上一步在uni-app客户端获取到的客户端推送标识push_clientid
+        "title": body.title,
+        "content": body.content,
+        "payload": body.payload,
+        "force_notification": true,
+        "settings": {
+            "strategy": {
+                "default": 4
+            }
+        }
+    })
+    return res
+};
diff --git a/uniCloud-aliyun/cloudfunctions/push/package.json b/uniCloud-aliyun/cloudfunctions/push/package.json
new file mode 100644
index 0000000..a60c163
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/push/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "push",
+  "dependencies": {},
+  "extensions": {
+    "uni-cloud-push": {}
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/index.js b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/index.js
deleted file mode 100644
index 00ba62f..0000000
--- a/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/index.js
+++ /dev/null
@@ -1 +0,0 @@
-"use strict";var t=require("fs"),r=require("path");function e(t){return t&&"object"==typeof t&&"default"in t?t:{default:t}}var n=e(t),o=e(r),i="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};var u=function(t){var r={exports:{}};return t(r,r.exports),r.exports}((function(t,r){var e="__lodash_hash_undefined__",n=9007199254740991,o="[object Arguments]",u="[object Function]",c="[object Object]",a=/^\[object .+?Constructor\]$/,f=/^(?:0|[1-9]\d*)$/,s={};s["[object Float32Array]"]=s["[object Float64Array]"]=s["[object Int8Array]"]=s["[object Int16Array]"]=s["[object Int32Array]"]=s["[object Uint8Array]"]=s["[object Uint8ClampedArray]"]=s["[object Uint16Array]"]=s["[object Uint32Array]"]=!0,s[o]=s["[object Array]"]=s["[object ArrayBuffer]"]=s["[object Boolean]"]=s["[object DataView]"]=s["[object Date]"]=s["[object Error]"]=s[u]=s["[object Map]"]=s["[object Number]"]=s[c]=s["[object RegExp]"]=s["[object Set]"]=s["[object String]"]=s["[object WeakMap]"]=!1;var l="object"==typeof i&&i&&i.Object===Object&&i,h="object"==typeof self&&self&&self.Object===Object&&self,p=l||h||Function("return this")(),_=r&&!r.nodeType&&r,v=_&&t&&!t.nodeType&&t,d=v&&v.exports===_,y=d&&l.process,g=function(){try{var t=v&&v.require&&v.require("util").types;return t||y&&y.binding&&y.binding("util")}catch(t){}}(),b=g&&g.isTypedArray;function j(t,r,e){switch(e.length){case 0:return t.call(r);case 1:return t.call(r,e[0]);case 2:return t.call(r,e[0],e[1]);case 3:return t.call(r,e[0],e[1],e[2])}return t.apply(r,e)}var w,O,m,A=Array.prototype,z=Function.prototype,M=Object.prototype,x=p["__core-js_shared__"],C=z.toString,F=M.hasOwnProperty,U=(w=/[^.]+$/.exec(x&&x.keys&&x.keys.IE_PROTO||""))?"Symbol(src)_1."+w:"",S=M.toString,I=C.call(Object),P=RegExp("^"+C.call(F).replace(/[\\^$.*+?()[\]{}|]/g,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),T=d?p.Buffer:void 0,q=p.Symbol,E=p.Uint8Array,$=T?T.allocUnsafe:void 0,D=(O=Object.getPrototypeOf,m=Object,function(t){return O(m(t))}),k=Object.create,B=M.propertyIsEnumerable,N=A.splice,L=q?q.toStringTag:void 0,R=function(){try{var t=vt(Object,"defineProperty");return t({},"",{}),t}catch(t){}}(),G=T?T.isBuffer:void 0,V=Math.max,W=Date.now,H=vt(p,"Map"),J=vt(Object,"create"),K=function(){function t(){}return function(r){if(!xt(r))return{};if(k)return k(r);t.prototype=r;var e=new t;return t.prototype=void 0,e}}();function Q(t){var r=-1,e=null==t?0:t.length;for(this.clear();++r<e;){var n=t[r];this.set(n[0],n[1])}}function X(t){var r=-1,e=null==t?0:t.length;for(this.clear();++r<e;){var n=t[r];this.set(n[0],n[1])}}function Y(t){var r=-1,e=null==t?0:t.length;for(this.clear();++r<e;){var n=t[r];this.set(n[0],n[1])}}function Z(t){var r=this.__data__=new X(t);this.size=r.size}function tt(t,r){var e=Ot(t),n=!e&&wt(t),o=!e&&!n&&At(t),i=!e&&!n&&!o&&Ft(t),u=e||n||o||i,c=u?function(t,r){for(var e=-1,n=Array(t);++e<t;)n[e]=r(e);return n}(t.length,String):[],a=c.length;for(var f in t)!r&&!F.call(t,f)||u&&("length"==f||o&&("offset"==f||"parent"==f)||i&&("buffer"==f||"byteLength"==f||"byteOffset"==f)||dt(f,a))||c.push(f);return c}function rt(t,r,e){(void 0!==e&&!jt(t[r],e)||void 0===e&&!(r in t))&&ot(t,r,e)}function et(t,r,e){var n=t[r];F.call(t,r)&&jt(n,e)&&(void 0!==e||r in t)||ot(t,r,e)}function nt(t,r){for(var e=t.length;e--;)if(jt(t[e][0],r))return e;return-1}function ot(t,r,e){"__proto__"==r&&R?R(t,r,{configurable:!0,enumerable:!0,value:e,writable:!0}):t[r]=e}Q.prototype.clear=function(){this.__data__=J?J(null):{},this.size=0},Q.prototype.delete=function(t){var r=this.has(t)&&delete this.__data__[t];return this.size-=r?1:0,r},Q.prototype.get=function(t){var r=this.__data__;if(J){var n=r[t];return n===e?void 0:n}return F.call(r,t)?r[t]:void 0},Q.prototype.has=function(t){var r=this.__data__;return J?void 0!==r[t]:F.call(r,t)},Q.prototype.set=function(t,r){var n=this.__data__;return this.size+=this.has(t)?0:1,n[t]=J&&void 0===r?e:r,this},X.prototype.clear=function(){this.__data__=[],this.size=0},X.prototype.delete=function(t){var r=this.__data__,e=nt(r,t);return!(e<0)&&(e==r.length-1?r.pop():N.call(r,e,1),--this.size,!0)},X.prototype.get=function(t){var r=this.__data__,e=nt(r,t);return e<0?void 0:r[e][1]},X.prototype.has=function(t){return nt(this.__data__,t)>-1},X.prototype.set=function(t,r){var e=this.__data__,n=nt(e,t);return n<0?(++this.size,e.push([t,r])):e[n][1]=r,this},Y.prototype.clear=function(){this.size=0,this.__data__={hash:new Q,map:new(H||X),string:new Q}},Y.prototype.delete=function(t){var r=_t(this,t).delete(t);return this.size-=r?1:0,r},Y.prototype.get=function(t){return _t(this,t).get(t)},Y.prototype.has=function(t){return _t(this,t).has(t)},Y.prototype.set=function(t,r){var e=_t(this,t),n=e.size;return e.set(t,r),this.size+=e.size==n?0:1,this},Z.prototype.clear=function(){this.__data__=new X,this.size=0},Z.prototype.delete=function(t){var r=this.__data__,e=r.delete(t);return this.size=r.size,e},Z.prototype.get=function(t){return this.__data__.get(t)},Z.prototype.has=function(t){return this.__data__.has(t)},Z.prototype.set=function(t,r){var e=this.__data__;if(e instanceof X){var n=e.__data__;if(!H||n.length<199)return n.push([t,r]),this.size=++e.size,this;e=this.__data__=new Y(n)}return e.set(t,r),this.size=e.size,this};var it,ut=function(t,r,e){for(var n=-1,o=Object(t),i=e(t),u=i.length;u--;){var c=i[it?u:++n];if(!1===r(o[c],c,o))break}return t};function ct(t){return null==t?void 0===t?"[object Undefined]":"[object Null]":L&&L in Object(t)?function(t){var r=F.call(t,L),e=t[L];try{t[L]=void 0;var n=!0}catch(t){}var o=S.call(t);n&&(r?t[L]=e:delete t[L]);return o}(t):function(t){return S.call(t)}(t)}function at(t){return Ct(t)&&ct(t)==o}function ft(t){return!(!xt(t)||function(t){return!!U&&U in t}(t))&&(zt(t)?P:a).test(function(t){if(null!=t){try{return C.call(t)}catch(t){}try{return t+""}catch(t){}}return""}(t))}function st(t){if(!xt(t))return function(t){var r=[];if(null!=t)for(var e in Object(t))r.push(e);return r}(t);var r=yt(t),e=[];for(var n in t)("constructor"!=n||!r&&F.call(t,n))&&e.push(n);return e}function lt(t,r,e,n,o){t!==r&&ut(r,(function(i,u){if(o||(o=new Z),xt(i))!function(t,r,e,n,o,i,u){var a=gt(t,e),f=gt(r,e),s=u.get(f);if(s)return void rt(t,e,s);var l=i?i(a,f,e+"",t,r,u):void 0,h=void 0===l;if(h){var p=Ot(f),_=!p&&At(f),v=!p&&!_&&Ft(f);l=f,p||_||v?Ot(a)?l=a:Ct(j=a)&&mt(j)?l=function(t,r){var e=-1,n=t.length;r||(r=Array(n));for(;++e<n;)r[e]=t[e];return r}(a):_?(h=!1,l=function(t,r){if(r)return t.slice();var e=t.length,n=$?$(e):new t.constructor(e);return t.copy(n),n}(f,!0)):v?(h=!1,d=f,y=!0?(g=d.buffer,b=new g.constructor(g.byteLength),new E(b).set(new E(g)),b):d.buffer,l=new d.constructor(y,d.byteOffset,d.length)):l=[]:function(t){if(!Ct(t)||ct(t)!=c)return!1;var r=D(t);if(null===r)return!0;var e=F.call(r,"constructor")&&r.constructor;return"function"==typeof e&&e instanceof e&&C.call(e)==I}(f)||wt(f)?(l=a,wt(a)?l=function(t){return function(t,r,e,n){var o=!e;e||(e={});var i=-1,u=r.length;for(;++i<u;){var c=r[i],a=n?n(e[c],t[c],c,e,t):void 0;void 0===a&&(a=t[c]),o?ot(e,c,a):et(e,c,a)}return e}(t,Ut(t))}(a):xt(a)&&!zt(a)||(l=function(t){return"function"!=typeof t.constructor||yt(t)?{}:K(D(t))}(f))):h=!1}var d,y,g,b;var j;h&&(u.set(f,l),o(l,f,n,i,u),u.delete(f));rt(t,e,l)}(t,r,u,e,lt,n,o);else{var a=n?n(gt(t,u),i,u+"",t,r,o):void 0;void 0===a&&(a=i),rt(t,u,a)}}),Ut)}function ht(t,r){return bt(function(t,r,e){return r=V(void 0===r?t.length-1:r,0),function(){for(var n=arguments,o=-1,i=V(n.length-r,0),u=Array(i);++o<i;)u[o]=n[r+o];o=-1;for(var c=Array(r+1);++o<r;)c[o]=n[o];return c[r]=e(u),j(t,this,c)}}(t,r,Pt),t+"")}var pt=R?function(t,r){return R(t,"toString",{configurable:!0,enumerable:!1,value:(e=r,function(){return e}),writable:!0});var e}:Pt;function _t(t,r){var e,n,o=t.__data__;return("string"==(n=typeof(e=r))||"number"==n||"symbol"==n||"boolean"==n?"__proto__"!==e:null===e)?o["string"==typeof r?"string":"hash"]:o.map}function vt(t,r){var e=function(t,r){return null==t?void 0:t[r]}(t,r);return ft(e)?e:void 0}function dt(t,r){var e=typeof t;return!!(r=null==r?n:r)&&("number"==e||"symbol"!=e&&f.test(t))&&t>-1&&t%1==0&&t<r}function yt(t){var r=t&&t.constructor;return t===("function"==typeof r&&r.prototype||M)}function gt(t,r){if(("constructor"!==r||"function"!=typeof t[r])&&"__proto__"!=r)return t[r]}var bt=function(t){var r=0,e=0;return function(){var n=W(),o=16-(n-e);if(e=n,o>0){if(++r>=800)return arguments[0]}else r=0;return t.apply(void 0,arguments)}}(pt);function jt(t,r){return t===r||t!=t&&r!=r}var wt=at(function(){return arguments}())?at:function(t){return Ct(t)&&F.call(t,"callee")&&!B.call(t,"callee")},Ot=Array.isArray;function mt(t){return null!=t&&Mt(t.length)&&!zt(t)}var At=G||function(){return!1};function zt(t){if(!xt(t))return!1;var r=ct(t);return r==u||"[object GeneratorFunction]"==r||"[object AsyncFunction]"==r||"[object Proxy]"==r}function Mt(t){return"number"==typeof t&&t>-1&&t%1==0&&t<=n}function xt(t){var r=typeof t;return null!=t&&("object"==r||"function"==r)}function Ct(t){return null!=t&&"object"==typeof t}var Ft=b?function(t){return function(r){return t(r)}}(b):function(t){return Ct(t)&&Mt(t.length)&&!!s[ct(t)]};function Ut(t){return mt(t)?tt(t,!0):st(t)}var St,It=(St=function(t,r,e){lt(t,r,e)},ht((function(t,r){var e=-1,n=r.length,o=n>1?r[n-1]:void 0,i=n>2?r[2]:void 0;for(o=St.length>3&&"function"==typeof o?(n--,o):void 0,i&&function(t,r,e){if(!xt(e))return!1;var n=typeof r;return!!("number"==n?mt(e)&&dt(r,e.length):"string"==n&&r in e)&&jt(e[r],t)}(r[0],r[1],i)&&(o=n<3?void 0:o,n=1),t=Object(t);++e<n;){var u=r[e];u&&St(t,u,e,o)}return t})));function Pt(t){return t}t.exports=It}));const c=Object.prototype.hasOwnProperty,a=(t,r)=>c.call(t,r);class f{constructor({pluginId:t,defaultConfig:r={},customMerge:e,root:n}){this.pluginId=t,this.defaultConfig=r,this.pluginConfigPath=o.default.resolve(n||__dirname,t),this.customMerge=e,this._config=void 0}resolve(t){return o.default.resolve(this.pluginConfigPath,t)}hasFile(t){return n.default.existsSync(this.resolve(t))}requireFile(t){try{return require(this.resolve(t))}catch(t){if("MODULE_NOT_FOUND"===t.code)return;throw t}}_getUserConfig(){return this.requireFile("config.json")}config(t,r){if(!this._config){const t=this._getUserConfig();this._config=Array.isArray(t)?t:(this.customMerge||u)(this.defaultConfig,t)}let e=this._config;return t?function(t,r,e){if("number"==typeof r)return t[r];if("symbol"==typeof r)return a(t,r)?t[r]:e;const n="string"!=typeof(o=r)?o:o.split(".").reduce(((t,r)=>(r.split(/\[([^}]+)\]/g).forEach((r=>r&&t.push(r))),t)),[]);var o;let i=t;for(let t=0;t<n.length;t++){const r=n[t];if(!a(i,r))return e;i=i[r]}return i}(e,t,r):e}}const s=new class{constructor(){this._configMap=new Map}plugin({pluginId:t,defaultConfig:r,customMerge:e,root:n=__dirname,cache:o=!0}){if(this._configMap.has(t)&&o)return this._configMap.get(t);const i=new f({pluginId:t,defaultConfig:r,customMerge:e,root:n});return o&&this._configMap.set(t,i),i}};var l=s.plugin.bind(s);module.exports=l;
diff --git a/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/package.json b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/package.json
deleted file mode 100644
index 35d1d3a..0000000
--- a/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/package.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "uni-config-center",
-  "version": "0.0.3",
-  "description": "配置中心",
-  "main": "index.js",
-  "keywords": [],
-  "author": "DCloud",
-  "license": "Apache-2.0"
-}
\ No newline at end of file
diff --git a/uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/index.js b/uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/index.js
deleted file mode 100644
index fe4a308..0000000
--- a/uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/index.js
+++ /dev/null
@@ -1 +0,0 @@
-"use strict";var e,t=(e=require("crypto"))&&"object"==typeof e&&"default"in e?e.default:e;const n={TOKEN_EXPIRED:"uni-id-token-expired",CHECK_TOKEN_FAILED:"uni-id-check-token-failed",PARAM_REQUIRED:"uni-id-param-required",ACCOUNT_EXISTS:"uni-id-account-exists",ACCOUNT_NOT_EXISTS:"uni-id-account-not-exists",ACCOUNT_CONFLICT:"uni-id-account-conflict",ACCOUNT_BANNED:"uni-id-account-banned",ACCOUNT_AUDITING:"uni-id-account-auditing",ACCOUNT_AUDIT_FAILED:"uni-id-account-audit-failed",ACCOUNT_CLOSED:"uni-id-account-closed"};function i(e){return!!e&&("object"==typeof e||"function"==typeof e)&&"function"==typeof e.then}function r(e){if(!e)return;const t=e.match(/^(\d+).(\d+).(\d+)/);return t?t.slice(1,4).map(e=>parseInt(e)):void 0}function o(e,t){const n=r(e),i=r(t);return n?i?function(e,t){const n=Math.max(e.length,t.length);for(let i=0;i<n;i++){const n=e[i],r=t[i];if(n>r)return 1;if(n<r)return-1}return 0}(n,i):1:i?-1:0}const s={"uni-id-token-expired":30203,"uni-id-check-token-failed":30202};function c(e){const{errCode:t,errMsgValue:n}=e;e.errMsg=this._t(t,n),t in s&&(e.code=s[t]),delete e.errMsgValue}function a(e){return"object"===(i=e,Object.prototype.toString.call(i).slice(8,-1).toLowerCase())&&e.errCode&&(t=e.errCode,Object.values(n).includes(t))&&!!e.errCode;var t,i}let u={"zh-Hans":{"uni-id-token-expired":"登录状态失效，token已过期","uni-id-check-token-failed":"token校验未通过","uni-id-param-required":"缺少参数: {param}","uni-id-account-exists":"此账号已注册","uni-id-account-not-exists":"此账号未注册","uni-id-account-conflict":"用户账号冲突","uni-id-account-banned":"从账号已封禁","uni-id-account-auditing":"此账号正在审核中","uni-id-account-audit-failed":"此账号审核失败","uni-id-account-closed":"此账号已注销"},en:{"uni-id-token-expired":"The login status is invalid, token has expired","uni-id-check-token-failed":"Check token failed","uni-id-param-required":"Parameter required: {param}","uni-id-account-exists":"Account exists","uni-id-account-not-exists":"Account does not exists","uni-id-account-conflict":"User account conflict","uni-id-account-banned":"Account has been banned","uni-id-account-auditing":"Account audit in progress","uni-id-account-audit-failed":"Account audit failed","uni-id-account-closed":"Account has been closed"}};try{const e=require.resolve("uni-config-center/uni-id/lang/index.js");u=function(e,t){const n=Object.keys(e);n.push(...Object.keys(t));const i={};for(let r=0;r<n.length;r++){const o=n[r];i[o]=Object.assign({},e[o],t[o])}return i}(u,require(e))}catch(e){}var d=u;function l(e){return e.replace(/=/g,"").replace(/\+/g,"-").replace(/\//g,"_")}function h(e){return JSON.parse((t=function(e){var t=4-(e=e.toString()).length%4;if(4!==t)for(var n=0;n<t;++n)e+="=";return e.replace(/-/g,"+").replace(/_/g,"/")}(e),Buffer.from(t,"base64").toString("utf-8")));var t}function f(e){return l((t=JSON.stringify(e),Buffer.from(t,"utf-8").toString("base64")));var t}function p(e,n){return l(t.createHmac("sha256",n).update(e).digest("base64"))}const k=function(e,t){if("string"!=typeof e)throw new Error("Invalid token");const n=e.split(".");if(3!==n.length)throw new Error("Invalid token");const[i,r,o]=n;if(p(i+"."+r,t)!==o)throw new Error("Invalid token");const s=h(i);if("HS256"!==s.alg||"JWT"!==s.typ)throw new Error("Invalid token");const c=h(r);if(1e3*c.exp<Date.now()){const e=new Error("Token expired");throw e.name="TokenExpiredError",e}return c},g=function(e,t,n={}){const{expiresIn:i}=n;if(!i)throw new Error("expiresIn is required");const r=parseInt(Date.now()/1e3),o={...e,iat:r,exp:r+n.expiresIn},s=f({alg:"HS256",typ:"JWT"})+"."+f(o);return s+"."+p(s,t)},I=uniCloud.database(),_=I.command,C=I.collection("uni-id-users"),m=I.collection("uni-id-roles");class T{constructor({uniId:e}={}){this.uid=null,this.userRecord=null,this.userPermission=null,this.oldToken=null,this.oldTokenPayload=null,this.uniId=e,this.config=this.uniId._getConfig(),this.clientInfo=this.uniId._clientInfo,this.checkConfig()}checkConfig(){const{tokenExpiresIn:e,tokenExpiresThreshold:t}=this.config;if(t>e)throw new Error("Config error, tokenExpiresThreshold should be less than tokenExpiresIn")}get customToken(){return this.uniId.interceptorMap.get("customToken")}isTokenInDb(e){return o(e,"1.0.10")>=0}async getUserRecord(){if(this.userRecord)return this.userRecord;const e=await C.doc(this.uid).get();if(this.userRecord=e.data[0],!this.userRecord)throw{errCode:n.ACCOUNT_NOT_EXISTS};switch(this.userRecord.status){case void 0:case 0:break;case 1:throw{errCode:n.ACCOUNT_BANNED};case 2:throw{errCode:n.ACCOUNT_AUDITING};case 3:throw{errCode:n.ACCOUNT_AUDIT_FAILED};case 4:throw{errCode:n.ACCOUNT_CLOSED}}if(this.oldTokenPayload){if(this.isTokenInDb(this.oldTokenPayload.uniIdVersion)){if(-1===(this.userRecord.token||[]).indexOf(this.oldToken))throw{errCode:n.CHECK_TOKEN_FAILED}}if(this.userRecord.valid_token_date&&this.userRecord.valid_token_date>1e3*this.oldTokenPayload.iat)throw{errCode:n.TOKEN_EXPIRED}}return this.userRecord}async updateUserRecord(e){await C.doc(this.uid).update(e)}async getUserPermission(){if(this.userPermission)return this.userPermission;const e=(await this.getUserRecord()).role||[];if(0===e.length)return this.userPermission={role:[],permission:[]},this.userPermission;if(e.includes("admin"))return this.userPermission={role:e,permission:[]},this.userPermission;const t=await m.where({role_id:_.in(e)}).get(),n=(i=t.data.reduce((e,t)=>(t.permission&&e.push(...t.permission),e),[]),Array.from(new Set(i)));var i;return this.userPermission={role:e,permission:n},this.userPermission}async _createToken({uid:e,role:t,permission:i}={}){if(!t||!i){const e=await this.getUserPermission();t=e.role,i=e.permission}let r={uid:e,role:t,permission:i};if(this.uniId.interceptorMap.has("customToken")){const n=this.uniId.interceptorMap.get("customToken");if("function"!=typeof n)throw new Error("Invalid custom token file");r=await n({uid:e,role:t,permission:i})}const o=Date.now(),{tokenSecret:s,tokenExpiresIn:c}=this.config,a=g({...r,uniIdVersion:"1.0.14"},s,{expiresIn:c}),u=await this.getUserRecord(),d=(u.token||[]).filter(e=>{try{const t=this._checkToken(e);if(u.valid_token_date&&u.valid_token_date>1e3*t.iat)return!1}catch(e){if(e.errCode===n.TOKEN_EXPIRED)return!1}return!0});return d.push(a),await this.updateUserRecord({last_login_ip:this.clientInfo.clientIP,last_login_date:o,token:d}),{token:a,tokenExpired:o+1e3*c}}async createToken({uid:e,role:t,permission:i}={}){if(!e)throw{errCode:n.PARAM_REQUIRED,errMsgValue:{param:"uid"}};this.uid=e;const{token:r,tokenExpired:o}=await this._createToken({uid:e,role:t,permission:i});return{errCode:0,token:r,tokenExpired:o}}async refreshToken({token:e}={}){if(!e)throw{errCode:n.PARAM_REQUIRED,errMsgValue:{param:"token"}};this.oldToken=e;const t=this._checkToken(e);this.uid=t.uid,this.oldTokenPayload=t;const{uid:i}=t,{role:r,permission:o}=await this.getUserPermission(),{token:s,tokenExpired:c}=await this._createToken({uid:i,role:r,permission:o});return{errCode:0,token:s,tokenExpired:c}}_checkToken(e){const{tokenSecret:t}=this.config;let i;try{i=k(e,t)}catch(e){if("TokenExpiredError"===e.name)throw{errCode:n.TOKEN_EXPIRED};throw{errCode:n.CHECK_TOKEN_FAILED}}return i}async checkToken(e,{autoRefresh:t=!0}={}){if(!e)throw{errCode:n.PARAM_REQUIRED,errMsgValue:{param:"token"}};this.oldToken=e;const i=this._checkToken(e);this.uid=i.uid,this.oldTokenPayload=i;const{tokenExpiresThreshold:r}=this.config,{uid:o,role:s,permission:c}=i,a={role:s,permission:c};if(!s&&!c){const{role:e,permission:t}=await this.getUserPermission();a.role=e,a.permission=t}if(!r||!t){const e={code:0,errCode:0,...i,...a};return delete e.uniIdVersion,e}const u=Date.now();let d={};1e3*i.exp-u<1e3*r&&(d=await this._createToken({uid:o}));const l={code:0,errCode:0,...i,...a,...d};return delete l.uniIdVersion,l}}var E=Object.freeze({__proto__:null,checkToken:async function(e,{autoRefresh:t=!0}={}){return new T({uniId:this}).checkToken(e,{autoRefresh:t})},createToken:async function({uid:e,role:t,permission:n}={}){return new T({uniId:this}).createToken({uid:e,role:t,permission:n})},refreshToken:async function({token:e}={}){return new T({uniId:this}).refreshToken({token:e})}});const w=require("uni-config-center")({pluginId:"uni-id"});class A{constructor({context:e,clientInfo:t,config:n}={}){this._clientInfo=e?function(e){return{appId:e.APPID,platform:e.PLATFORM,locale:e.LOCALE,clientIP:e.CLIENTIP,deviceId:e.DEVICEID}}(e):t,this.config=n||this._getOriginConfig(),this.interceptorMap=new Map,w.hasFile("custom-token.js")&&this.setInterceptor("customToken",require(w.resolve("custom-token.js"))),this._i18n=uniCloud.initI18n({locale:this._clientInfo.locale,fallbackLocale:"zh-Hans",messages:d})}setInterceptor(e,t){this.interceptorMap.set(e,t)}_t(...e){return this._i18n.t(...e)}_parseOriginConfig(e){return Array.isArray(e)?e:e[0]?Object.values(e):e}_getOriginConfig(){if(w.hasFile("config.json")){let e;try{e=w.config()}catch(e){throw new Error("Invalid uni-id config file\n"+e.message)}return this._parseOriginConfig(e)}try{return this._parseOriginConfig(require("uni-id/config.json"))}catch(e){throw new Error("Invalid uni-id config file")}}_getAppConfig(){const e=this._getOriginConfig();return Array.isArray(e)?e.find(e=>e.dcloudAppid===this._clientInfo.appId)||e.find(e=>e.isDefaultConfig):e}_getPlatformConfig(){const e=this._getAppConfig();if(!e)throw new Error(`Config for current app (${this._clientInfo.appId}) was not found, please check your config file or client appId`);let t;switch("app-plus"===this._clientInfo.platform&&(this._clientInfo.platform="app"),"h5"===this._clientInfo.platform&&(this._clientInfo.platform="web"),this._clientInfo.platform){case"web":t="h5";break;case"app":t="app-plus"}const n=[{tokenExpiresIn:7200,tokenExpiresThreshold:1200,passwordErrorLimit:6,passwordErrorRetryTime:3600},e];t&&e[t]&&n.push(e[t]),n.push(e[this._clientInfo.platform]);const i=Object.assign(...n);return["tokenSecret","tokenExpiresIn"].forEach(e=>{if(!i||!i[e])throw new Error(`Config parameter missing, ${e} is required`)}),i}_getConfig(){return this._getPlatformConfig()}}for(const e in E)A.prototype[e]=E[e];function y(e){const t=new A(e);return new Proxy(t,{get(e,t){if(t in e&&0!==t.indexOf("_")){if("function"==typeof e[t])return(n=e[t],function(){let e;try{e=n.apply(this,arguments)}catch(e){if(a(e))return c.call(this,e),e;throw e}return i(e)?e.then(e=>(a(e)&&c.call(this,e),e),e=>{if(a(e))return c.call(this,e),e;throw e}):(a(e)&&c.call(this,e),e)}).bind(e);if("context"!==t&&"config"!==t)return e[t]}var n}})}A.prototype.createInstance=y;const x={createInstance:y};module.exports=x;
diff --git a/uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/package.json b/uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/package.json
deleted file mode 100644
index ada62ae..0000000
--- a/uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/package.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "name": "uni-id-common",
-  "version": "1.0.14",
-  "description": "uni-id token生成、校验、刷新",
-  "main": "index.js",
-  "homepage": "https://uniapp.dcloud.io/uniCloud/uni-id-common.html",
-  "repository": {
-    "type": "git",
-    "url": "git+https://gitee.com/dcloud/uni-id-common.git"
-  },
-  "author": "DCloud",
-  "license": "Apache-2.0",
-  "dependencies": {
-    "uni-config-center": "file:../../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center"
-  }
-}
\ No newline at end of file