diff --git a/components/cloud-image/cloud-image.vue b/components/cloud-image/cloud-image.vue
deleted file mode 100644
index d714a3ae59ebb7c5ab834ea48b65583dae97bb96..0000000000000000000000000000000000000000
--- a/components/cloud-image/cloud-image.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<template>
-	<view @click="onClick" :style="{width,height}" style="justify-content: center;">
-		<image v-if="cSrc" :style="{width,height}" :src="cSrc" :mode="mode"></image>
-	</view>
-</template>
-
-<script>
-	/**
-	* cloud-image 
-	* @description 兼容普通资源和unicloud图片资源渲染的组件
-	* @property {String} mode	图片裁剪、缩放的模式。默认为widthFix，支持所有image组件的mode值
-	* @property {String} src	资源完了链接或uniCloud云存储资源的fileid
-	* @property {String} width	图片的宽，默认为：100rpx
-	* @property {String} height	图片的高，默认为：100rpx
-	* @event {Function} click 点击 cloud-image 触发事件
-	*/
-	export default {
-		name: "cloud-image",
-		emits:['click'],
-		props: {
-			mode: {
-				type:String,
-				default () {
-					return 'widthFix'
-				}
-			},
-			src: {
-				// type:String,
-				default () {
-					return ""
-				}
-			},
-			width: {
-				type:String,
-				default () {
-					return '100rpx'
-				}
-			},
-			height: {
-				type:String,
-				default () {
-					return '100rpx'
-				}
-			}
-		},
-		watch: {
-			src:{
-				handler(src) {
-					if (src&&src.substring(0, 8) == "cloud://") {
-						uniCloud.getTempFileURL({
-							fileList: [src]
-						}).then(res=>{
-							this.cSrc = res.fileList[0].tempFileURL
-						})
-					}else{
-						this.cSrc = src
-					}
-				},
-				immediate: true
-			}
-		},
-		methods:{
-			onClick(){
-				this.$emit('click')
-			}
-		},
-		data() {
-			return {
-				cSrc:false
-			};
-		}
-	}
-</script>
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 6baba677d5cd0e968f5123243a8a38867055c99c..3e760d6a281a5d2cc72a0fa4821d39150689b67b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -43,29 +43,32 @@
                 }
             }
         }
+      }
+    }
+  },
+  "quickapp": {
+  },
+  "mp-weixin": {
+    "appid": "",
+    "setting": {
+      "urlCheck": false
     },
-    "quickapp" : {},
-    "mp-weixin" : {
-        "appid" : "",
-        "setting" : {
-            "urlCheck" : false
-        },
-        "usingComponents" : true,
-        "optimization" : {
-            "subPackages" : true
-        }
-    },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "uniStatistics" : {
-        "enable" : false
-    },
-    "vueVersion" : "2"
-}
+    "usingComponents": true,
+    "optimization": {
+      "subPackages": true
+    }
+  },
+  "mp-alipay": {
+    "usingComponents": true
+  },
+  "mp-baidu": {
+    "usingComponents": true
+  },
+  "mp-toutiao": {
+    "usingComponents": true
+  },
+  "uniStatistics": {
+    "enable": false
+  },
+  "vueVersion": "2"
+}
\ No newline at end of file
diff --git a/uniCloud-aliyun/database/db_init.json b/uniCloud-aliyun/database/db_init.json
index 8a0734060c9b1f65a82204a062706eef297e3be9..1d10771f330ae5d7ee70fda779547cad49f2bf3c 100644
--- a/uniCloud-aliyun/database/db_init.json
+++ b/uniCloud-aliyun/database/db_init.json
@@ -1,16 +1,27 @@
 // 在本文件中可配置云数据库初始化，数据格式见：https://uniapp.dcloud.io/uniCloud/hellodb?id=db-init
+
 // 编写完毕后对本文件点右键，可按配置规则创建表和添加数据
+
 {
 	"uni-id-users": {
 		"data": [{
 			"_id": "_uni_starter_test_user_id",
 			"username": "uni-starter预置用户名",
 			"nickname": "测试用户昵称",
-			"avatar": "https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png",
+			"avatar": "https://unicloud.dcloud.net.cn/assets/logo.dca09351.png",
 			"mobile": "18888888888",
 			"mobile_confirmed": 1
 		}]
 	},
+	"uni-id-roles": {
+		"data": [{
+			"role_id": "admin",
+			"role_name": "超级管理员",
+			"permission": [],
+			"comment": "超级管理员拥有所有权限",
+			"create_date": 0
+		}]
+	},
 	"opendb-banner": {
 		"data": [{
 				"status": true,
@@ -18,14 +29,13 @@
 					"name": "094a9dc0-50c0-11eb-b680-7980c8a877b8.jpg",
 					"extname": "jpg",
 					"fileType": "image",
-					"url": "https://vkceyugu.cdn.bspapp.com/VKCEYUGU-76ce2c5e-31c7-4d81-8fcf-ed1541ecbc6e/b88a7e17-35f0-4d0d-bc32-93f8909baf03.jpg",
+					"url": "https://web-assets.dcloud.net.cn/unidoc/zh/shuijiao.jpg",
 					"size": 70880,
 					"image": {
 						"width": 500,
-						"height": 333,
-						"location": "blob:http://localhost:8081/a3bfaab4-7ee6-44d5-a171-dc8225d83598"
+						"height": 333
 					},
-					"path": "https://vkceyugu.cdn.bspapp.com/VKCEYUGU-76ce2c5e-31c7-4d81-8fcf-ed1541ecbc6e/b88a7e17-35f0-4d0d-bc32-93f8909baf03.jpg"
+					"path": "https://web-assets.dcloud.net.cn/unidoc/zh/shuijiao.jpg"
 				},
 				"open_url": "https://www.dcloud.io/",
 				"title": "测试",
@@ -39,14 +49,13 @@
 					"name": "094a9dc0-50c0-11eb-b680-7980c8a877b8.jpg",
 					"extname": "jpg",
 					"fileType": "image",
-					"url": "https://vkceyugu.cdn.bspapp.com/VKCEYUGU-76ce2c5e-31c7-4d81-8fcf-ed1541ecbc6e/9db94cb4-a5e0-4ed9-b356-b42a392b3112.jpg",
+					"url": "https://web-assets.dcloud.net.cn/unidoc/zh/shuijiao.jpg",
 					"size": 70880,
 					"image": {
 						"width": 500,
-						"height": 333,
-						"location": "blob:http://localhost:8081/1a6f718a-4012-476a-9172-590fef2cc518"
+						"height": 333
 					},
-					"path": "https://vkceyugu.cdn.bspapp.com/VKCEYUGU-76ce2c5e-31c7-4d81-8fcf-ed1541ecbc6e/9db94cb4-a5e0-4ed9-b356-b42a392b3112.jpg"
+					"path": "https://web-assets.dcloud.net.cn/unidoc/zh/shuijiao.jpg"
 				},
 				"open_url": "https://www.dcloud.io/",
 				"title": "",
@@ -59,8 +68,8 @@
 		"data": [{
 			"title": "阿里小程序IDE官方内嵌uni-app，为开发者提供多端开发服务",
 			"excerpt": "阿里小程序IDE官方内嵌uni-app，为开发者提供多端开发服务",
-			"content": "<p>随着微信、阿里、百度、头条、QQ纷纷推出小程序，开发者的开发维护成本持续上升，负担过重。这点已经成为共识，现在连小程序平台厂商也充分意识到了。</p>\n<p>阿里小程序团队，为了减轻开发者的负担，在官方的小程序开发者工具中整合了多端框架。</p>\n<p>经过阿里团队仔细评估，uni-app 在产品完成度、跨平台支持度、开发者社区、可持续发展等多方面优势明显，最终选定 uni-app内置于阿里小程序开发工具中，为开发者提供多端开发解决方案。</p>\n<p>经过之前1个月的公测，10月10日，阿里小程序正式发布0.70版开发者工具，通过 uni-app 实现多端开发，成为本次版本更新的亮点功能！</p>\n<p>如下图，在阿里小程序工具左侧主导航选择 uni-app，创建项目，即可开发。</p>\n<div class=\"aw-comment-upload-img-list active\"><img class=\"img-polaroid\" width=\"100%\" src=\"https://vkceyugu.cdn.bspapp.com/VKCEYUGU-76ce2c5e-31c7-4d81-8fcf-ed1541ecbc6e/b698232a-e608-4b2d-8019-8dc6bbf343a8.png\" /></div>\n<p><br />阿里小程序开发工具更新说明详见：https://docs.alipay.com/mini/ide/0.70-stable</p>\n<p>&nbsp;</p>\n<p>集成uni-app，这对于阿里团队而言，并不是一个容易做出的决定。毕竟 uni-app 是一个三方产品，要经过复杂的评审流程。</p>\n<p>这一方面突显出阿里团队以开发者需求为本的优秀价值观，另一方面也证明 uni-app的产品确实过硬。</p>\n<p>很多开发者都有多端需求，但又没有足够精力去了解、评估 uni-app，而处于观望态度。现在大家可以更放心的使用 uni-app 了，它没有让阿里失望，也不会让你失望。</p>\n<p>自从uni-app推出以来，DCloud也取得了高速的发展，目前拥有370万开发者，框架运行在4.6亿手机用户设备上，月活达到1.35亿（仅包括部分接入DCloud统计平台的数据）。并且数据仍在高速增长中，在市场占有率上处于遥遥领先的位置。</p>\n<p>本次阿里小程序工具集成 uni-app，会让 uni-app 继续快速爆发，取得更大的成功。</p>\n<p>后续DCloud还将深化与阿里的合作，在serverless等领域给开发者提供更多优质服务。</p>\n<p>使用多端框架开发各端应用，是多赢的模式。开发者减轻了负担，获得了更多新流量。而小程序平台厂商，也能保证自己平台上的各种应用可以被及时的更新。</p>\n<p>DCloud欢迎更多小程序平台厂商，与我们一起合作，为开发者、平台、用户的多赢而努力。</p>\n<p>进一步了解uni-app，详见：https://uniapp.dcloud.io</p>\n<p>欢迎扫码关注DCloud公众号，转发消息到朋友圈。<br /><img src=\"https://vkceyugu.cdn.bspapp.com/VKCEYUGU-76ce2c5e-31c7-4d81-8fcf-ed1541ecbc6e/27302ea5-e369-4e6c-89b1-431408497b3d.jpg\"  width=\"80%\" /></p>",
-			"avatar": "https://vkceyugu.cdn.bspapp.com/VKCEYUGU-aliyun-gacrhzeynhss7c6d04/249516a0-3941-11eb-899d-733ae62bed2f.jpg",
+			"content": "<p>随着微信、阿里、百度、头条、QQ纷纷推出小程序，开发者的开发维护成本持续上升，负担过重。这点已经成为共识，现在连小程序平台厂商也充分意识到了。</p>\n<p>阿里小程序团队，为了减轻开发者的负担，在官方的小程序开发者工具中整合了多端框架。</p>\n<p>经过阿里团队仔细评估，uni-app 在产品完成度、跨平台支持度、开发者社区、可持续发展等多方面优势明显，最终选定 uni-app内置于阿里小程序开发工具中，为开发者提供多端开发解决方案。</p>\n<p>经过之前1个月的公测，10月10日，阿里小程序正式发布0.70版开发者工具，通过 uni-app 实现多端开发，成为本次版本更新的亮点功能！</p>\n<p>如下图，在阿里小程序工具左侧主导航选择 uni-app，创建项目，即可开发。</p>\n<div class=\"aw-comment-upload-img-list active\"><img class=\"img-polaroid\" width=\"100%\" src=\"https://ask.dcloud.net.cn/uploads/article/20191014/56f7dc1bd5f265e824649f7cb4f78d5b.png\" /></div>\n<p><br />阿里小程序开发工具更新说明详见：https://docs.alipay.com/mini/ide/0.70-stable</p>\n<p>&nbsp;</p>\n<p>集成uni-app，这对于阿里团队而言，并不是一个容易做出的决定。毕竟 uni-app 是一个三方产品，要经过复杂的评审流程。</p>\n<p>这一方面突显出阿里团队以开发者需求为本的优秀价值观，另一方面也证明 uni-app的产品确实过硬。</p>\n<p>很多开发者都有多端需求，但又没有足够精力去了解、评估 uni-app，而处于观望态度。现在大家可以更放心的使用 uni-app 了，它没有让阿里失望，也不会让你失望。</p>\n<p>自从uni-app推出以来，DCloud也取得了高速的发展，目前拥有370万开发者，框架运行在4.6亿手机用户设备上，月活达到1.35亿（仅包括部分接入DCloud统计平台的数据）。并且数据仍在高速增长中，在市场占有率上处于遥遥领先的位置。</p>\n<p>本次阿里小程序工具集成 uni-app，会让 uni-app 继续快速爆发，取得更大的成功。</p>\n<p>后续DCloud还将深化与阿里的合作，在serverless等领域给开发者提供更多优质服务。</p>\n<p>使用多端框架开发各端应用，是多赢的模式。开发者减轻了负担，获得了更多新流量。而小程序平台厂商，也能保证自己平台上的各种应用可以被及时的更新。</p>\n<p>DCloud欢迎更多小程序平台厂商，与我们一起合作，为开发者、平台、用户的多赢而努力。</p>\n<p>进一步了解uni-app，详见：https://uniapp.dcloud.io</p>\n<p>欢迎扫码关注DCloud公众号，转发消息到朋友圈。<br /><img src=\"https://web-assets.dcloud.net.cn/unidoc/zh/weixin.jpg\"  width=\"80%\" /></p>",
+			"avatar": "https://ask.dcloud.net.cn/uploads/article/20191014/56f7dc1bd5f265e824649f7cb4f78d5b.png",
 			"type": 0,
 			"user_id": "_uni_starter_test_user_id",
 			"comment_count": 0,
@@ -69,98 +78,9 @@
 			"article_status": 1,
 			"publish_date": 1616092287006,
 			"last_modify_date": 1616092303031,
-			"create_time": "2021-03-19T08:25:06.109Z"
+			"create_date": 1616092287006
 		}]
 	},
-	"opendb-app-versions": {
-		"data": [{
-			"is_silently": false,
-			"is_mandatory": false,
-			"appid": "__UNI__03B096E",
-			"name": "uni-starter",
-			"title": "新增升级中心",
-			"contents": "新增升级中心",
-			"platform": [
-				"Android"
-			],
-			"version": "1.0.1",
-			"url": "https://vkceyugu.cdn.bspapp.com/VKCEYUGU-3469aac7-a663-4c5d-8ee8-94275f8c09ab/3128d010-01c5-4121-a1d6-f3f919944a23.apk",
-			"stable_publish": false,
-			"type": "native_app",
-			"create_date": 1616771628150
-		}],
-		"index": [{
-			"IndexName": "appid",
-			"MgoKeySchema": {
-				"MgoIndexKeys": [{
-					"Name": "appid",
-					"Direction": "1"
-				}, {
-					"Name": "uni_platform",
-					"Direction": "1"
-				}, {
-					"Name": "create_env",
-					"Direction": "1"
-				}],
-				"MgoIsUnique": false
-			}
-		}, {
-			"IndexName": "查找上线发行应用",
-			"MgoKeySchema": {
-				"MgoIndexKeys": [{
-					"Name": "appid",
-					"Direction": "1"
-				}, {
-					"Name": "platform",
-					"Direction": "1"
-				}, {
-					"Name": "stable_publish",
-					"Direction": "1"
-				}, {
-					"Name": "uni_platform",
-					"Direction": "1"
-				}, {
-					"Name": "create_env",
-					"Direction": "1"
-				}],
-				"MgoIsUnique": false
-			}
-		}]
-	},
-	"opendb-verify-codes": {
-		"data": []
-	},
-	"opendb-app-list": {
-		"data": [],
-		"index": [{
-			"IndexName": "appid",
-			"MgoKeySchema": {
-				"MgoIndexKeys": [{
-					"Name": "appid",
-					"Direction": "1"
-				}],
-				"MgoIsUnique": true
-			}
-		}, {
-			"IndexName": "name",
-			"MgoKeySchema": {
-				"MgoIndexKeys": [{
-					"Name": "name",
-					"Direction": "1"
-				}],
-				"MgoIsUnique": false
-			}
-		}]
-	},
-	"uni-id-roles": {
-		"data": []
-	},
-	"uni-id-permissions": {
-		"data": []
-	},
-	"uni-id-log": {
-		"data": []
-	},
 	"opendb-admin-menus": {
 		"data": [{
 				"menu_id": "index",
@@ -578,9 +498,15 @@
 				"create_date": 1667387078947
 			}
 		]
-	},
+	},
+	"uni-id-permissions": {},
+	"uni-id-log": {},
 	"uni-id-tag": {},
 	"uni-id-device": {},
+	"uni-id-scores": {},
+	"opendb-verify-codes": {},
+	"opendb-app-list": {},
+	"opendb-app-versions": {},
 	"opendb-device": {},
 	"opendb-department": {},
 	"opendb-sms-task": {},
@@ -595,6 +521,7 @@
 	"uni-stat-app-platforms": {},
 	"uni-stat-error-logs": {},
 	"uni-stat-error-result": {},
+	"uni-stat-error-source-map": {},
 	"uni-stat-event-logs": {},
 	"uni-stat-event-result": {},
 	"uni-stat-events": {},
@@ -608,8 +535,8 @@
 	"uni-stat-session-logs": {},
 	"uni-stat-share-logs": {},
 	"uni-stat-user-session-logs": {},
-	"uni-pay-orders": {},
 	"uni-stat-pay-result": {},
+	"uni-pay-orders": {},
 	"opendb-tempdata": {},
 	"opendb-feedback": {},
 	"opendb-news-categories": {},
@@ -618,6 +545,5 @@
 	"opendb-search-hot": {},
 	"opendb-search-log": {},
 	"opendb-sign-in": {},
-	"read-news-log": {},
-	"uni-id-scores": {}
+	"read-news-log": {}
 }
diff --git a/uniCloud-aliyun/database/uni-stat-error-source-map.schema.ext.js b/uniCloud-aliyun/database/uni-stat-error-source-map.schema.ext.js
new file mode 100644
index 0000000000000000000000000000000000000000..556f31e79d55976c3b7e851a06afef9f20ea10ef
--- /dev/null
+++ b/uniCloud-aliyun/database/uni-stat-error-source-map.schema.ext.js
@@ -0,0 +1,29 @@
+module.exports = {
+	trigger: {
+		// 监听 - 删除前
+		beforeDelete: async function(obj = {}) {
+			let {
+				collection,
+				operation,
+				where,
+				field
+			} = obj;
+			// 删除表记录前先删除云存储内的文件
+			const db = uniCloud.database();
+			const _ = db.command;
+			let getRes = await db.collection("uni-stat-error-source-map").where(where).limit(1000).get();
+			let list = getRes.data;
+			if (list && list.length > 0) {
+				let fileList = list.map((item, index) => {
+					return item.file_id;
+				});
+				try {
+					let deleteFileRes = await uniCloud.deleteFile({
+						fileList
+					});
+					// console.log('deleteFileRes: ', deleteFileRes)
+				} catch (err) {}
+			}
+		}
+	}
+}
diff --git a/uniCloud-aliyun/database/uni-stat-error-source-map.schema.json b/uniCloud-aliyun/database/uni-stat-error-source-map.schema.json
new file mode 100644
index 0000000000000000000000000000000000000000..98b53efdfbe94b422644037d1753967c73a46c81
--- /dev/null
+++ b/uniCloud-aliyun/database/uni-stat-error-source-map.schema.json
@@ -0,0 +1,61 @@
+{
+	"bsonType": "object",
+	"description": "存储sourceMap文件资源地址",
+	"required": [],
+	"permission": {
+		"read": "'READ_UNI_STAT_ERROR_RESULT' in auth.permission",
+		"create": "'READ_UNI_STAT_ERROR_RESULT' in auth.permission",
+		"update": "'READ_UNI_STAT_ERROR_RESULT' in auth.permission",
+		"delete": "'READ_UNI_STAT_ERROR_RESULT' in auth.permission"
+	},
+	"properties": {
+		"_id": {
+			"description": "ID，系统自动生成"
+		},
+		"appid": {
+		  "bsonType": "string",
+		  "description": "应用ID"
+		},
+		"uni_platform": {
+			"title": "应用平台",
+			"bsonType": "string",
+			"description": "uni客户端平台,如：web、mp-weixin、mp-alipay、app等",
+			"trim": "both"
+		},
+		"version": {
+			"bsonType": "string",
+			"description": "客户端上报的应用版本号"
+		},
+		"file_id": {
+			"bsonType": "string",
+			"description": "fileID"
+		},
+		"url": {
+			"bsonType": "string",
+			"description": "文件外网url路径"
+		},
+		"name": {
+			"bsonType": "string",
+			"description": "文件名"
+		},
+		"size": {
+			"bsonType": "int",
+			"description": "文件大小"
+		},
+		"cloud_path": {
+			"bsonType": "string",
+			"description": "云端路径，通过该值识别是否是同一个文件"
+		},
+		"base": {
+			"bsonType": "string",
+			"description": "基础路径"
+		},
+		"create_time": {
+			"bsonType": "timestamp",
+			"description": "上传时间",
+			"forceDefaultValue": {
+				"$env": "now"
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-id-pages/changelog.md b/uni_modules/uni-id-pages/changelog.md
index 9b1fe26c18c4c923662c8074eb746f76b75e8ebe..6c1de4efc08319ba4926a2d4a77a934c28beecc3 100644
--- a/uni_modules/uni-id-pages/changelog.md
+++ b/uni_modules/uni-id-pages/changelog.md
@@ -1,130 +1,166 @@
-## 1.1.1（2023-02-02）
-- 新增 微信小程序端 支持选择使用微信资料的“头像”和“昵称” 设置用户资料 [详情参考](https://wdoc-76491.picgzc.qpic.cn/MTY4ODg1MDUyNzQyMDUxNw_21263_rTNhg68FTngQGdvQ_1647431233?w=1280&h=695.7176470588236)
-## 1.1.0（2023-01-31）
-- 【重要】优化 小程序端资源包大小（运行时大小为：731KB，发行后为：583KB；注：可以直接将本插件作为分包使用）
-- 更新 微信小程序端 上传头像功能 用`wx.cropImage`实现图片裁剪
-- 修复 选择一键登录时会先显示 非密码登录页面的问题
-- 修复 一键登录 点击右上角的关闭按钮没有返回上一页的问题
-## 1.0.41（2023-01-16）
-- 优化 压缩依赖的文件资源大小
-## 1.0.40（2023-01-16）
-- 更新依赖的 验证码插件`uni-captcha`版本的版本为 0.6.4 修复 部分情况下APP端无法获取验证码的问题 [详情参考](https://ext.dcloud.net.cn/plugin?id=4048)
-- 修复 客户端token过期后，点击退出登录按钮报错的问题
-- uni-id-co 修复 updateUser 接口`手机号`和`邮箱`参数值为空字符串时，修改无效的问题
-## 1.0.39（2022-12-28）
-- uni-id-co 修复 URL化时第三方登录无法获取 uniPlatform 参数
-- uni-id-co 修复 validator error
-## 1.0.38（2022-12-26）
-- uni-id-co 优化 手机号与邮箱验证规则为空字符串时不校验
-## 1.0.37（2022-12-09）
-- 优化admin端样式
-## 1.0.36（2022-12-08）
-- uni-id-co 修复 `updateUser` 接口部分参数为空时数据修改异常
-## 1.0.35（2022-11-30）
-- uni-id-co 新增 匹配到的用户不可在当前应用登录时的错误码 `uni-id-account-not-exists-in-current-app` [错误码说明](https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary.html#errcode)
-## 1.0.34（2022-11-29）
-- 优化 toast 错误提示时间为3秒
-- uni-id-co 修复 无法从 clientInfo 中获取 uniIdToken
-## 1.0.33（2022-11-25）
-- uni-id-co 新增 外部系统联登接口，可为外部系统创建与uni-id相对应的账号，使该账号可以使用依赖uniId的系统及功能 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#external)
-- uni-id-co 新增 URL化请求时鉴权签名验证 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#http-reqeust-auth)
-- uni-id-co 修复 微信登录时用户未设置头像的报错问题
-## 1.0.32（2022-11-21）
-- 新增 设置密码页面
-- 新增 登录后跳转设置密码页面配置项`setPasswordAfterLogin` [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#set-pwd-after-login)
-- uni-id-co 新增 设置密码接口 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#set-pwd)
-## 1.0.31（2022-11-16）
-- uni-id-co 修复 验证码可能无法收到的bug
-## 1.0.30（2022-11-11）
-- uni-id-co 修复 用户只有openid时绑定微信/QQ报错
-## 1.0.29（2022-11-10）
-- uni-id-co 支持URL化方式请求 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#adapter-http)
-## 1.0.28（2022-11-09）
-- uni-id-co 升级密码加密算法，支持hmac-sha256加密 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary.html#password-safe)
-- uni-id-co 新增 开发者可以自定义密码加密规则 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary.html#custom-password-encrypt)
-- uni-id-co 新增 支持将其他系统用户迁移至uni-id [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary.html#move-users-to-uni-id)
-## 1.0.27（2022-10-26）
-- uni-id-co 新增 secureNetworkHandshakeByWeixin 接口，用于建立和微信小程序的安全网络连接
-## 1.0.26（2022-10-18）
-- 修复 uni-id-pages 导入时异常的Bug
-## 1.0.25（2022-10-14）
-- uni-id-co 增加 微信授权手机号登录方式 [文档](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-weixin-mobile)
-- uni-id-co 增加 解绑第三方平台账号 [文档](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#unbind-third-account)
-- uni-id-co 微信绑定手机号支持通过`getPhoneNumber`事件回调的`code`绑定 [文档](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#bind-mobile-by-mp-weixin)
-- 修复 sendSmsCode 接口未在参数内传递 templateId 时 未能从配置文件读取 templateId 的Bug
-## 1.0.24（2022-10-08）
-- 修复 报uni-id-users表schema内错误的bug
-## 1.0.23（2022-10-08）
-- 修复 vue3下vite编译发行打包失败
-- 修复 某些情况下注册账号，报TypeErroe：Cannot read properties of undefined （reading ’showToast‘）的错误
-## 1.0.22（2022-09-23）
-- 修复 某些情况下，修改密码报“两次输入密码不一致”的bug
-## 1.0.21（2022-09-21）
-- 修复 store.hasLogin的值在某些情况下会出错的bug
-## 1.0.20（2022-09-21）
-- 新增 store 账号信息状态管理，详情：用户中心页面 路径：`/uni_modules/uni-id-pages/pages/userinfo/userinfo`
-## 1.0.19（2022-09-20）
-- 修复 小程序端，使用将自定义节点设置成[虚拟节点](https://uniapp.dcloud.net.cn/tutorial/vue-api.html#%E5%85%B6%E4%BB%96%E9%85%8D%E7%BD%AE)的uni-ui组件，样式错乱的问题
-## 1.0.18（2022-09-20）
-- 修复 微信小程序端 WXSS 编译报错的bug
-## 1.0.17（2022.09-19）
-- 修复 无法退出登录的bug
-## 1.0.16（2022-09-19）
-- 修复 在 Edge 浏览器下 input[type="password"] 会出现浏览器自带的密码查看按钮
-- 优化 退出登录重定向页面为 uniIdRouter.loginPage
-- 新增 注册账号页面支持返回登录页面
-## 1.0.15（2022-09-19）
-- 更新表结构，解决在uni-admin中部分clientDB操作没有权限的问题
-## 1.0.14（2022-09-16）
-- 修改 配置项`isAdmin`默认值为`false`
-## 1.0.13（2022-09-16）
-- 新增 管理员注册页面
-- 新增 配置项`isAdmin`区分是否为管理端
-- 新增 登录成功后自动跳转；跳转优先级：路由携带(`uniIdRedirectUrl`参数) > 返回上一路由 > 跳转首页
-- uni-id-co 优化 注册管理员时管理员存在提示文案
-## 1.0.12（2022-09-07）
-- 修复 getSupportedLoginType判断是否支持微信公众号、PC网页微信扫码登录方式报错的Bug
-- 优化 适配pc端样式
-- 新增 邮箱验证码注册
-- 新增 邮箱验证码找回密码
-- 新增 退出登录(全局)回调事件：`uni-id-pages-logout`，支持通过[uni.$on](https://uniapp.dcloud.net.cn/api/window/communication.html#on)监听;
-- 调整 抽离退出登录方法至`/uni_modules/uni-id-pages/common/common.js`中，方便在项目其他页面中调用
-- 调整 用户中心（路径：`/uni_modules/uni-id-pages/pages/userinfo/userinfo`）默认不再显示退出登录按钮。支持页面传参数`showLoginManage=true`恢复显示
-## 1.0.11（2022-09-01）
-- 修复 iOS端，一键登录功能卡在showLoading的问题
-- 更新 合并密码强度与长度配置 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#config)
-- uni-id-co 修复 调用 removeAuthorizedApp 接口报错的Bug
-- uni-id-co 新增 管理端接口 updateUser [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#update-user)
-- uni-id-co 调整 为兼容旧版本，未配置密码强度时提供最简单的密码规则校验（长度大于6即可）
-- uni-id-co 调整 注册、登录时如果携带了token则尝试对此token进行登出操作
-- uni-id-co 调整 管理端接口 addUser 增加 mobile、email等参数 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#add-user)
-## 1.0.10（2022-08-25）
-- 修复 导入uni-id-pages插件时未自动导入uni-open-bridge-common的Bug
-## 1.0.9（2022-08-23）
-- 修复 uni-id-co 缺失uni-open-bridge-common依赖的Bug
-## 1.0.8（2022-08-23）
-- 新增 H5端支持微信登录（含微信公众号内的网页授权登录 和 普通浏览器内网页生成二维码，实现手机微信扫码登录）[详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#weixinlogin)
-- 新增 登录成功(全局)回调事件：`uni-id-pages-login-success`，支持通过[uni.$on](https://uniapp.dcloud.net.cn/api/window/communication.html#on)监听;
-- 新增 密码强度（是否必须包含大小写字母、数字和特殊符号以及长度）配置 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#config)
-- 调整 uni-id-co 密码规则调整，废除之前的简单校验，允许配置密码强度 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary.html#password-strength)
-- 调整 uni-id-co 存储用户 openid 时同时以客户端 AppId 为 Key 的副本，参考：[微信登录](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-weixin)、[QQ登录](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-qq)
-- 调整 uni-id-co 依赖 uni-open-bridge-common 存储用户 session_key、access_token 等信息 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary.html#save-user-token)
-- 新增 uni-id-co 增加 beforeRegister 钩子用户在注册前向用户记录内添加一些数据 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary.html#before-register)
-## 1.0.7（2022-07-19）
-- 修复 uni-id-co接口 logout时没有删除token的Bug
-## 1.0.6（2022-07-13）
-- 新增 允许覆盖内置校验规则 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#custom-validator)
-- 修复 app端clientInfo.appVersionCode为数字导致校验无法通过的Bug
-## 1.0.5（2022-07-11）
-修复 微信小程序调用uni-id-co接口报错的Bug [详情](https://ask.dcloud.net.cn/question/148877)
-## 1.0.4（2022-07-06）
-- uni-id-co增加clientInfo字段类型校验
-- 监听token更新时机，同步客户端push_clientid至uni-id-device表，改为：同步客户端push_clientid至uni-id-device表和opendb-device表
-## 1.0.3（2022-07-05）
-新增监听token更新时机，同步客户端push_clientid至uni-id-device表
-## 1.0.2（2022-07-04）
-修复微信小程序登录时无unionid报错的Bug [详情](https://ask.dcloud.net.cn/question/148016)
-## 1.0.1（2022-06-28）
-添加相关uni-id表
-## 1.0.0（2022-06-23）
-正式版
+## 1.1.13（2023-05-10）
+- 修复 启用摇树优化 报错的问题
+## 1.1.12（2023-05-05）
+- uni-id-co 新增 调用 add-user 接口创建用户时允许触发 beforeRegister 钩子方法，beforeRegister 钩子[详见](https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary.html#before-register)
+- uni-id-co 新增 自无 unionid 到有 unionid 状态进行登录时为用户补充 unionid 字段
+- uni-id-co 修复 i18n 在特定场景下报错的 bug
+- uni-id-co 修复 跨平台解绑微信/QQ时无法解绑的 bug
+- uni-id-co 修复 微信小程序等平台创建验证码时无法展示的 bug
+- uni-id-co 修复 更新 push_clientid 时因 device_id 没有变化导致无法更新
+## 1.1.11（2023-03-24）
+- 修复 tabbar页面因为token无效而强制跳转至登录页面（url参数包含`uniIdRedirectUrl`）后无法返回的问题
+## 1.1.10（2023-03-24）
+- 修复 PC微信扫码登录跳转地址错误
+- uni-id-co 新增 请求鉴权支持 uni-cloud-s2s 模块验证签名 [uni-cloud-s2s文档](https://uniapp.dcloud.net.cn/uniCloud/uni-cloud-s2s.html)
+## 1.1.9（2023-03-24）
+- 修复 跳转至登录页面的url参数包含`uniIdRedirectUrl`后无法返回的问题
+## 1.1.8（2023-03-02）
+- 修复 调试模式下没有对微信授权手机号登录方式进行配置检测
+## 1.1.7（2023-02-27）
+- 【重要】新增 实名认证功能 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary.html#frv)
+## 1.1.6（2023-02-24）
+- uni-id-co 新增 注册用户时允许配置默认角色 [文档](https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary.html#config-defult-role)
+- uni-id-co 优化 `updateUserInfoByExternal`接口，允许修改头像、性别
+- uni-id-co 修复 请求签名密钥字段 `requestAuthSecret` 缺少为空判断
+- uni-id-co 修复 `externalRegister`接口头像未使用`avatar_file`字段保存
+- 修复 web微信登录回调地址不正确
+## 1.1.5（2023-02-23）
+- 更新 微信小程序端 更新头像信息，如果是使用微信的头像则不再调用裁剪接口
+## 1.1.4（2023-02-21）
+- 修复 部分情况下 `uniIdRedirectUrl` 参数无效的问题
+## 1.1.3（2023-02-20）
+- 修复 非微信小程序端报`TypeError: uni.hideHomeButton is not a function`的问题
+## 1.1.2（2023-02-10）
+- 新增 微信小程序端 首页需强制登录时，隐藏返回首页按钮
+- uni-id-co 新增 外部联登后修改用户信息接口(updateUserInfoByExternal) [文档](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#external-update-userinfo)
+- uni-id-co 优化外部联登接口（登录、注册）逻辑
+## 1.1.1（2023-02-02）
+- 新增 微信小程序端 支持选择使用微信资料的“头像”和“昵称” 设置用户资料 [详情参考](https://wdoc-76491.picgzc.qpic.cn/MTY4ODg1MDUyNzQyMDUxNw_21263_rTNhg68FTngQGdvQ_1647431233?w=1280&h=695.7176470588236)
+## 1.1.0（2023-01-31）
+- 【重要】优化 小程序端资源包大小（运行时大小为：731KB，发行后为：583KB；注：可以直接将本插件作为分包使用）
+- 更新 微信小程序端 上传头像功能 用`wx.cropImage`实现图片裁剪
+- 修复 选择一键登录时会先显示 非密码登录页面的问题
+- 修复 一键登录 点击右上角的关闭按钮没有返回上一页的问题
+## 1.0.41（2023-01-16）
+- 优化 压缩依赖的文件资源大小
+## 1.0.40（2023-01-16）
+- 更新依赖的 验证码插件`uni-captcha`版本的版本为 0.6.4 修复 部分情况下APP端无法获取验证码的问题 [详情参考](https://ext.dcloud.net.cn/plugin?id=4048)
+- 修复 客户端token过期后，点击退出登录按钮报错的问题
+- uni-id-co 修复 updateUser 接口`手机号`和`邮箱`参数值为空字符串时，修改无效的问题
+## 1.0.39（2022-12-28）
+- uni-id-co 修复 URL化时第三方登录无法获取 uniPlatform 参数
+- uni-id-co 修复 validator error
+## 1.0.38（2022-12-26）
+- uni-id-co 优化 手机号与邮箱验证规则为空字符串时不校验
+## 1.0.37（2022-12-09）
+- 优化admin端样式
+## 1.0.36（2022-12-08）
+- uni-id-co 修复 `updateUser` 接口部分参数为空时数据修改异常
+## 1.0.35（2022-11-30）
+- uni-id-co 新增 匹配到的用户不可在当前应用登录时的错误码 `uni-id-account-not-exists-in-current-app` [错误码说明](https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary.html#errcode)
+## 1.0.34（2022-11-29）
+- 优化 toast 错误提示时间为3秒
+- uni-id-co 修复 无法从 clientInfo 中获取 uniIdToken
+## 1.0.33（2022-11-25）
+- uni-id-co 新增 外部系统联登接口，可为外部系统创建与uni-id相对应的账号，使该账号可以使用依赖uniId的系统及功能 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#external)
+- uni-id-co 新增 URL化请求时鉴权签名验证 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#http-reqeust-auth)
+- uni-id-co 修复 微信登录时用户未设置头像的报错问题
+## 1.0.32（2022-11-21）
+- 新增 设置密码页面
+- 新增 登录后跳转设置密码页面配置项`setPasswordAfterLogin` [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#set-pwd-after-login)
+- uni-id-co 新增 设置密码接口 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#set-pwd)
+## 1.0.31（2022-11-16）
+- uni-id-co 修复 验证码可能无法收到的bug
+## 1.0.30（2022-11-11）
+- uni-id-co 修复 用户只有openid时绑定微信/QQ报错
+## 1.0.29（2022-11-10）
+- uni-id-co 支持URL化方式请求 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#adapter-http)
+## 1.0.28（2022-11-09）
+- uni-id-co 升级密码加密算法，支持hmac-sha256加密 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary.html#password-safe)
+- uni-id-co 新增 开发者可以自定义密码加密规则 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary.html#custom-password-encrypt)
+- uni-id-co 新增 支持将其他系统用户迁移至uni-id [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary.html#move-users-to-uni-id)
+## 1.0.27（2022-10-26）
+- uni-id-co 新增 secureNetworkHandshakeByWeixin 接口，用于建立和微信小程序的安全网络连接
+## 1.0.26（2022-10-18）
+- 修复 uni-id-pages 导入时异常的Bug
+## 1.0.25（2022-10-14）
+- uni-id-co 增加 微信授权手机号登录方式 [文档](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-weixin-mobile)
+- uni-id-co 增加 解绑第三方平台账号 [文档](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#unbind-third-account)
+- uni-id-co 微信绑定手机号支持通过`getPhoneNumber`事件回调的`code`绑定 [文档](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#bind-mobile-by-mp-weixin)
+- 修复 sendSmsCode 接口未在参数内传递 templateId 时 未能从配置文件读取 templateId 的Bug
+## 1.0.24（2022-10-08）
+- 修复 报uni-id-users表schema内错误的bug
+## 1.0.23（2022-10-08）
+- 修复 vue3下vite编译发行打包失败
+- 修复 某些情况下注册账号，报TypeErroe：Cannot read properties of undefined （reading ’showToast‘）的错误
+## 1.0.22（2022-09-23）
+- 修复 某些情况下，修改密码报“两次输入密码不一致”的bug
+## 1.0.21（2022-09-21）
+- 修复 store.hasLogin的值在某些情况下会出错的bug
+## 1.0.20（2022-09-21）
+- 新增 store 账号信息状态管理，详情：用户中心页面 路径：`/uni_modules/uni-id-pages/pages/userinfo/userinfo`
+## 1.0.19（2022-09-20）
+- 修复 小程序端，使用将自定义节点设置成[虚拟节点](https://uniapp.dcloud.net.cn/tutorial/vue-api.html#%E5%85%B6%E4%BB%96%E9%85%8D%E7%BD%AE)的uni-ui组件，样式错乱的问题
+## 1.0.18（2022-09-20）
+- 修复 微信小程序端 WXSS 编译报错的bug
+## 1.0.17（2022.09-19）
+- 修复 无法退出登录的bug
+## 1.0.16（2022-09-19）
+- 修复 在 Edge 浏览器下 input[type="password"] 会出现浏览器自带的密码查看按钮
+- 优化 退出登录重定向页面为 uniIdRouter.loginPage
+- 新增 注册账号页面支持返回登录页面
+## 1.0.15（2022-09-19）
+- 更新表结构，解决在uni-admin中部分clientDB操作没有权限的问题
+## 1.0.14（2022-09-16）
+- 修改 配置项`isAdmin`默认值为`false`
+## 1.0.13（2022-09-16）
+- 新增 管理员注册页面
+- 新增 配置项`isAdmin`区分是否为管理端
+- 新增 登录成功后自动跳转；跳转优先级：路由携带(`uniIdRedirectUrl`参数) > 返回上一路由 > 跳转首页
+- uni-id-co 优化 注册管理员时管理员存在提示文案
+## 1.0.12（2022-09-07）
+- 修复 getSupportedLoginType判断是否支持微信公众号、PC网页微信扫码登录方式报错的Bug
+- 优化 适配pc端样式
+- 新增 邮箱验证码注册
+- 新增 邮箱验证码找回密码
+- 新增 退出登录(全局)回调事件：`uni-id-pages-logout`，支持通过[uni.$on](https://uniapp.dcloud.net.cn/api/window/communication.html#on)监听;
+- 调整 抽离退出登录方法至`/uni_modules/uni-id-pages/common/common.js`中，方便在项目其他页面中调用
+- 调整 用户中心（路径：`/uni_modules/uni-id-pages/pages/userinfo/userinfo`）默认不再显示退出登录按钮。支持页面传参数`showLoginManage=true`恢复显示
+## 1.0.11（2022-09-01）
+- 修复 iOS端，一键登录功能卡在showLoading的问题
+- 更新 合并密码强度与长度配置 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#config)
+- uni-id-co 修复 调用 removeAuthorizedApp 接口报错的Bug
+- uni-id-co 新增 管理端接口 updateUser [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#update-user)
+- uni-id-co 调整 为兼容旧版本，未配置密码强度时提供最简单的密码规则校验（长度大于6即可）
+- uni-id-co 调整 注册、登录时如果携带了token则尝试对此token进行登出操作
+- uni-id-co 调整 管理端接口 addUser 增加 mobile、email等参数 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#add-user)
+## 1.0.10（2022-08-25）
+- 修复 导入uni-id-pages插件时未自动导入uni-open-bridge-common的Bug
+## 1.0.9（2022-08-23）
+- 修复 uni-id-co 缺失uni-open-bridge-common依赖的Bug
+## 1.0.8（2022-08-23）
+- 新增 H5端支持微信登录（含微信公众号内的网页授权登录 和 普通浏览器内网页生成二维码，实现手机微信扫码登录）[详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#weixinlogin)
+- 新增 登录成功(全局)回调事件：`uni-id-pages-login-success`，支持通过[uni.$on](https://uniapp.dcloud.net.cn/api/window/communication.html#on)监听;
+- 新增 密码强度（是否必须包含大小写字母、数字和特殊符号以及长度）配置 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#config)
+- 调整 uni-id-co 密码规则调整，废除之前的简单校验，允许配置密码强度 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary.html#password-strength)
+- 调整 uni-id-co 存储用户 openid 时同时以客户端 AppId 为 Key 的副本，参考：[微信登录](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-weixin)、[QQ登录](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-qq)
+- 调整 uni-id-co 依赖 uni-open-bridge-common 存储用户 session_key、access_token 等信息 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary.html#save-user-token)
+- 新增 uni-id-co 增加 beforeRegister 钩子用户在注册前向用户记录内添加一些数据 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary.html#before-register)
+## 1.0.7（2022-07-19）
+- 修复 uni-id-co接口 logout时没有删除token的Bug
+## 1.0.6（2022-07-13）
+- 新增 允许覆盖内置校验规则 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#custom-validator)
+- 修复 app端clientInfo.appVersionCode为数字导致校验无法通过的Bug
+## 1.0.5（2022-07-11）
+修复 微信小程序调用uni-id-co接口报错的Bug [详情](https://ask.dcloud.net.cn/question/148877)
+## 1.0.4（2022-07-06）
+- uni-id-co增加clientInfo字段类型校验
+- 监听token更新时机，同步客户端push_clientid至uni-id-device表，改为：同步客户端push_clientid至uni-id-device表和opendb-device表
+## 1.0.3（2022-07-05）
+新增监听token更新时机，同步客户端push_clientid至uni-id-device表
+## 1.0.2（2022-07-04）
+修复微信小程序登录时无unionid报错的Bug [详情](https://ask.dcloud.net.cn/question/148016)
+## 1.0.1（2022-06-28）
+添加相关uni-id表
+## 1.0.0（2022-06-23）
+正式版
diff --git a/uni_modules/uni-id-pages/common/check-id-card.js b/uni_modules/uni-id-pages/common/check-id-card.js
index b3ca0c37142fbe1f9b6ce331e9214d990f8831ae..cba63f9afc4300d211dce131e95cc34907d31460 100644
--- a/uni_modules/uni-id-pages/common/check-id-card.js
+++ b/uni_modules/uni-id-pages/common/check-id-card.js
@@ -1,4 +1,4 @@
-function checkIdCard (idCardNumber) {
+export default function checkIdCard (idCardNumber) {
   if (!idCardNumber || typeof idCardNumber !== 'string' || idCardNumber.length !== 18) return false
 
   const coefficient = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2]
@@ -12,5 +12,3 @@ function checkIdCard (idCardNumber) {
 
   return checkCode[sum % 11].toString() === code.toLowerCase()
 }
-
-export default checkIdCard
diff --git a/uni_modules/uni-id-pages/common/login-page.mixin.js b/uni_modules/uni-id-pages/common/login-page.mixin.js
index 35e50302ca90e4120124a9438924d30b50e6312c..de9b35015e0012b225b72a1319117ba88213605f 100644
--- a/uni_modules/uni-id-pages/common/login-page.mixin.js
+++ b/uni_modules/uni-id-pages/common/login-page.mixin.js
@@ -92,4 +92,4 @@ const mixin = {
 	}
 }
 
-export default mixin
+export default mixin
diff --git a/uni_modules/uni-id-pages/common/store.js b/uni_modules/uni-id-pages/common/store.js
index 83fdd1e22cd2ed8af58b24018306d1a800601e48..991a81677509f9d82910834f693e7c17e3a3ae0d 100644
--- a/uni_modules/uni-id-pages/common/store.js
+++ b/uni_modules/uni-id-pages/common/store.js
@@ -79,7 +79,7 @@ export const mutations = {
 		uni.removeStorageSync('uni_id_token');
 		uni.setStorageSync('uni_id_token_expired', 0)
 		uni.redirectTo({
-			url: `/${pagesJson.uniIdRouter && pagesJson.uniIdRouter.loginPage ? pagesJson.uniIdRouter.loginPage: 'uni_modules/uni-id-pages/pages/login/login-withoutpwd'}`,
+			url: `/${pagesJson.uniIdRouter && pagesJson.uniIdRouter.loginPage ? 'uni_modules/uni-id-pages/pages/login/login-withoutpwd': ''}`,
 		});
 		uni.$emit('uni-id-pages-logout')
 		this.setUserInfo({},{cover:true})
diff --git a/uni_modules/uni-id-pages/components/uni-id-pages-avatar/uni-id-pages-avatar.vue b/uni_modules/uni-id-pages/components/uni-id-pages-avatar/uni-id-pages-avatar.vue
index f477de4300c23563aa874b56ba3ce1fae33a6cf6..7aa606206c09eb2c834afaa50a07b18747919fe2 100644
--- a/uni_modules/uni-id-pages/components/uni-id-pages-avatar/uni-id-pages-avatar.vue
+++ b/uni_modules/uni-id-pages/components/uni-id-pages-avatar/uni-id-pages-avatar.vue
@@ -71,31 +71,8 @@
 				let avatar_file = {
 					extname: avatarUrl.split('.')[avatarUrl.split('.').length - 1],
 					name:'',
-					url:avatarUrl
+					url:''
 				}
-				
-				// 裁剪
-				let filePath = await new Promise((callback) => {
-					wx.cropImage({
-						src:avatarUrl,
-						cropScale:"1:1",
-						success: res => {
-							callback(res.tempFilePath)
-						},
-						fail(e){
-							console.error(e)
-							uni.showModal({
-								content: 'wx.cropImage ' + e.errMsg,
-								showCancel: false,
-								confirmText:"跳过裁剪",
-								complete() {
-									callback(avatarUrl)
-								}
-							});
-						}
-					})
-				})
-				
 				//上传到服务器
 				let cloudPath = this.userInfo._id + '' + Date.now()
 				avatar_file.name = cloudPath
@@ -107,7 +84,7 @@
 					let {
 						fileID
 					} = await uniCloud.uploadFile({
-						filePath,
+						filePath:avatarUrl,
 						cloudPath,
 						fileType: "image"
 					});
@@ -116,20 +93,20 @@
 				}catch(e){
 					console.error(e);
 				}
+				console.log('avatar_file',avatar_file);
 				this.setAvatarFile(avatar_file)
 			},
 			uploadAvatarImg(res) {
-				
 				// #ifdef MP-WEIXIN
 				return false // 微信小程序走 bindchooseavatar方法
 				// #endif
 				
+				// #ifndef MP-WEIXIN
 				if(!this.hasLogin){
 					return uni.navigateTo({
 						url:'/uni_modules/uni-id-pages/pages/login/login-withoutpwd'
 					})
 				}
-				
 				const crop = {
 					quality: 100,
 					width: 600,
@@ -192,6 +169,7 @@
 						this.setAvatarFile(avatar_file)
 					}
 				})
+				// #endif
 			}
 		}
 	}
diff --git a/uni_modules/uni-id-pages/components/uni-id-pages-email-form/uni-id-pages-email-form.vue b/uni_modules/uni-id-pages/components/uni-id-pages-email-form/uni-id-pages-email-form.vue
index b10d7dc013f1c42ba9abef74d69822e2380b0e30..179452f1c07759aeb0aafdf1d699353bfc9aeb18 100644
--- a/uni_modules/uni-id-pages/components/uni-id-pages-email-form/uni-id-pages-email-form.vue
+++ b/uni_modules/uni-id-pages/components/uni-id-pages-email-form/uni-id-pages-email-form.vue
@@ -1,248 +1,248 @@
-<template>
-	<view>
-		<uni-captcha :focus="focusCaptchaInput" ref="captcha" scene="send-email-code" v-model="captcha" />
-		<view class="box">
-			<uni-easyinput :focus="focusEmailCodeInput" @blur="focusEmailCodeInput = false" type="number" class="input-box" :inputBorder="false" v-model="modelValue" maxlength="6"
-				placeholder="请输入邮箱验证码">
-			</uni-easyinput>
-			<view class="short-code-btn" hover-class="hover" @click="start">
-				<text class="inner-text" :class="reverseNumber==0?'inner-text-active':''">{{innerText}}</text>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	function debounce(func, wait) {
-		let timer;
-		wait = wait || 500;
-		return function() {
-			let context = this;
-			let args = arguments;
-			if (timer) clearTimeout(timer);
-			let callNow = !timer;
-			timer = setTimeout(() => {
-				timer = null;
-			}, wait)
-			if (callNow) func.apply(context, args);
-		}
-	}
-	/**
-	 * email-code-form 
-	 * @description 获取邮箱验证码组件
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=
-	 * @property {Number} count 倒计时时长 s
-	 * @property {String} email 邮箱
-	 * @property {String} type = [login-by-email-code|reset-pwd-by-email-code|bind-email] 	验证码类型，用于防止不同功能的验证码混用，目前支持的类型login登录、register注册、bind绑定邮箱、unbind解绑邮箱
-	 * @property {false} focusCaptchaInput = [true|false] 验证码输入框是否默认获取焦点
-	 */
-	export default {
-		name: "uni-email-code-form",
-		model: {
-			prop: 'modelValue',
-			event: 'update:modelValue'
-		},
-		props: {
-			event: ['update:modelValue'],
-			/**
-			 * 倒计时时长 s
-			 */
-			count: {
-				type: [String, Number],
-				default: 60
-			},
-			/**
-			 * 邮箱
-			 */
-			email: {
-				type: [String],
-				default: ''
-			},
-			/*
-				验证码类型，用于防止不同功能的验证码混用，目前支持的类型login登录、register注册、bind绑定邮箱、unbind解绑邮箱
-			*/
-			type: {
-				type: String,
-				default () {
-					return 'register'
-				}
-			},
-			/*
-				验证码输入框是否默认获取焦点
-			*/
-			focusCaptchaInput: {
-				type: Boolean,
-				default () {
-					return false
-				}
-			},
-		},
-		data() {
-			return {
-				captcha: "",
-				reverseNumber: 0,
-				reverseTimer: null,
-				modelValue: "",
-				focusEmailCodeInput:false
-			};
-		},
-		watch: {
-			captcha(value, oldValue) {
-				if (value.length == 4 && oldValue.length != 4) {
-					this.start()
-				}
-			},
-			modelValue(value) {
-				// TODO 兼容 vue2
-				this.$emit('input', value);
-				// TODO　兼容　vue3
-				this.$emit('update:modelValue', value)
-			}
-		},
-		computed: {
-			innerText() {
-				if (this.reverseNumber == 0) return "获取邮箱验证码";
-				return "重新发送" + '(' + this.reverseNumber + 's)';
-			}
-		},
-		created() {
-			this.initClick();
-		},
-		methods: {
-			getImageCaptcha(focus) {
-				this.$refs.captcha.getImageCaptcha(focus)
-			},
-			initClick() {
-				this.start = debounce(() => {
-					if (this.reverseNumber != 0) return;
-					this.sendMsg();
-				})
-			},
-			sendMsg() {
-				if (this.captcha.length != 4) {
-					this.$refs.captcha.focusCaptchaInput = true
-					return uni.showToast({
-						title: '请先输入图形验证码',
-						icon: 'none',
-						duration: 3000
-					});
-				}
-				if(!this.email) return uni.showToast({
-					title: "请输入邮箱",
-					icon: 'none',
-					duration: 3000
-				});
-				let reg_email = /@/;
-				if (!reg_email.test(this.email)) return uni.showToast({
-					title: "邮箱格式错误",
-					icon: 'none',
-					duration: 3000
-				});
-				const uniIdCo = uniCloud.importObject("uni-id-co", {
-					customUI: true
-				})
-				console.log('sendEmailCode',{
-					"email": this.email,
-					"scene": this.type,
-					"captcha": this.captcha
-				});
-				uniIdCo.sendEmailCode({
-					"email": this.email,
-					"scene": this.type,
-					"captcha": this.captcha
-				}).then(result => {
-					uni.showToast({
-						title: "邮箱验证码发送成功",
-						icon: 'none',
-						duration: 3000
-					});
-					this.reverseNumber = Number(this.count);
-					this.getCode();
-				}).catch(e => {
-					if (e.code == "uni-id-invalid-mail-template") {
-						this.modelValue = "123456"
-						uni.showToast({
-							title: '已启动测试模式,详情【控制台信息】',
-							icon: 'none',
-							duration: 3000
-						});
-						console.warn(e.message);
-					} else {
-						this.getImageCaptcha()
-						this.captcha = ""
-						uni.showToast({
-							title: e.message,
-							icon: 'none',
-							duration: 3000
-						});
-					}
-				})
-			},
-			getCode() {
-				if (this.reverseNumber == 0) {
-					clearTimeout(this.reverseTimer);
-					this.reverseTimer = null;
-					return;
-				}
-				this.reverseNumber--;
-				this.reverseTimer = setTimeout(() => {
-					this.getCode();
-				}, 1000)
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.box {
-		position: relative;
-		margin-top: 10px;
-	}
-
-	.short-code-btn {
-		padding: 0;
-		position: absolute;
-		top: 0;
-		right: 8px;
-		width: 260rpx;
-		max-width: 130px;
-		height: 44px;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		justify-content: center;
-		align-items: center;
-		
-	}
-
-	.inner-text {
-		font-size: 14px;
-		color: #AAAAAA;
-	}
-
-	.inner-text-active {
-		color: #04498c;
-	}
-
-	.captcha {
-		width: 350rpx;
-	}
-
-	.input-box {
-		margin: 0;
-		padding: 4px;
-		background-color: #F8F8F8;
-		font-size: 14px;
-	}
-
-	.box ::v-deep .content-clear-icon {
-		margin-right: 100px;
-	}
-
-	.box {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-	}
-</style>
+<template>
+	<view>
+		<uni-captcha :focus="focusCaptchaInput" ref="captcha" scene="send-email-code" v-model="captcha" />
+		<view class="box">
+			<uni-easyinput :focus="focusEmailCodeInput" @blur="focusEmailCodeInput = false" type="number" class="input-box" :inputBorder="false" v-model="modelValue" maxlength="6"
+				placeholder="请输入邮箱验证码">
+			</uni-easyinput>
+			<view class="short-code-btn" hover-class="hover" @click="start">
+				<text class="inner-text" :class="reverseNumber==0?'inner-text-active':''">{{innerText}}</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	function debounce(func, wait) {
+		let timer;
+		wait = wait || 500;
+		return function() {
+			let context = this;
+			let args = arguments;
+			if (timer) clearTimeout(timer);
+			let callNow = !timer;
+			timer = setTimeout(() => {
+				timer = null;
+			}, wait)
+			if (callNow) func.apply(context, args);
+		}
+	}
+	/**
+	 * email-code-form 
+	 * @description 获取邮箱验证码组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=
+	 * @property {Number} count 倒计时时长 s
+	 * @property {String} email 邮箱
+	 * @property {String} type = [login-by-email-code|reset-pwd-by-email-code|bind-email] 	验证码类型，用于防止不同功能的验证码混用，目前支持的类型login登录、register注册、bind绑定邮箱、unbind解绑邮箱
+	 * @property {false} focusCaptchaInput = [true|false] 验证码输入框是否默认获取焦点
+	 */
+	export default {
+		name: "uni-email-code-form",
+		model: {
+			prop: 'modelValue',
+			event: 'update:modelValue'
+		},
+		props: {
+			event: ['update:modelValue'],
+			/**
+			 * 倒计时时长 s
+			 */
+			count: {
+				type: [String, Number],
+				default: 60
+			},
+			/**
+			 * 邮箱
+			 */
+			email: {
+				type: [String],
+				default: ''
+			},
+			/*
+				验证码类型，用于防止不同功能的验证码混用，目前支持的类型login登录、register注册、bind绑定邮箱、unbind解绑邮箱
+			*/
+			type: {
+				type: String,
+				default () {
+					return 'register'
+				}
+			},
+			/*
+				验证码输入框是否默认获取焦点
+			*/
+			focusCaptchaInput: {
+				type: Boolean,
+				default () {
+					return false
+				}
+			},
+		},
+		data() {
+			return {
+				captcha: "",
+				reverseNumber: 0,
+				reverseTimer: null,
+				modelValue: "",
+				focusEmailCodeInput:false
+			};
+		},
+		watch: {
+			captcha(value, oldValue) {
+				if (value.length == 4 && oldValue.length != 4) {
+					this.start()
+				}
+			},
+			modelValue(value) {
+				// TODO 兼容 vue2
+				this.$emit('input', value);
+				// TODO　兼容　vue3
+				this.$emit('update:modelValue', value)
+			}
+		},
+		computed: {
+			innerText() {
+				if (this.reverseNumber == 0) return "获取邮箱验证码";
+				return "重新发送" + '(' + this.reverseNumber + 's)';
+			}
+		},
+		created() {
+			this.initClick();
+		},
+		methods: {
+			getImageCaptcha(focus) {
+				this.$refs.captcha.getImageCaptcha(focus)
+			},
+			initClick() {
+				this.start = debounce(() => {
+					if (this.reverseNumber != 0) return;
+					this.sendMsg();
+				})
+			},
+			sendMsg() {
+				if (this.captcha.length != 4) {
+					this.$refs.captcha.focusCaptchaInput = true
+					return uni.showToast({
+						title: '请先输入图形验证码',
+						icon: 'none',
+						duration: 3000
+					});
+				}
+				if(!this.email) return uni.showToast({
+					title: "请输入邮箱",
+					icon: 'none',
+					duration: 3000
+				});
+				let reg_email = /@/;
+				if (!reg_email.test(this.email)) return uni.showToast({
+					title: "邮箱格式错误",
+					icon: 'none',
+					duration: 3000
+				});
+				const uniIdCo = uniCloud.importObject("uni-id-co", {
+					customUI: true
+				})
+				console.log('sendEmailCode',{
+					"email": this.email,
+					"scene": this.type,
+					"captcha": this.captcha
+				});
+				uniIdCo.sendEmailCode({
+					"email": this.email,
+					"scene": this.type,
+					"captcha": this.captcha
+				}).then(result => {
+					uni.showToast({
+						title: "邮箱验证码发送成功",
+						icon: 'none',
+						duration: 3000
+					});
+					this.reverseNumber = Number(this.count);
+					this.getCode();
+				}).catch(e => {
+					if (e.code == "uni-id-invalid-mail-template") {
+						this.modelValue = "123456"
+						uni.showToast({
+							title: '已启动测试模式,详情【控制台信息】',
+							icon: 'none',
+							duration: 3000
+						});
+						console.warn(e.message);
+					} else {
+						this.getImageCaptcha()
+						this.captcha = ""
+						uni.showToast({
+							title: e.message,
+							icon: 'none',
+							duration: 3000
+						});
+					}
+				})
+			},
+			getCode() {
+				if (this.reverseNumber == 0) {
+					clearTimeout(this.reverseTimer);
+					this.reverseTimer = null;
+					return;
+				}
+				this.reverseNumber--;
+				this.reverseTimer = setTimeout(() => {
+					this.getCode();
+				}, 1000)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.box {
+		position: relative;
+		margin-top: 10px;
+	}
+
+	.short-code-btn {
+		padding: 0;
+		position: absolute;
+		top: 0;
+		right: 8px;
+		width: 260rpx;
+		max-width: 130px;
+		height: 44px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		
+	}
+
+	.inner-text {
+		font-size: 14px;
+		color: #AAAAAA;
+	}
+
+	.inner-text-active {
+		color: #04498c;
+	}
+
+	.captcha {
+		width: 350rpx;
+	}
+
+	.input-box {
+		margin: 0;
+		padding: 4px;
+		background-color: #F8F8F8;
+		font-size: 14px;
+	}
+
+	.box ::v-deep .content-clear-icon {
+		margin-right: 100px;
+	}
+
+	.box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+</style>
diff --git a/uni_modules/uni-id-pages/package.json b/uni_modules/uni-id-pages/package.json
index a0eb825fa3a43de79d28d6045e05c0a2de97e276..2d9945a0d26cf2ef579cca13ea84f02c6eccac99 100644
--- a/uni_modules/uni-id-pages/package.json
+++ b/uni_modules/uni-id-pages/package.json
@@ -1,7 +1,7 @@
 {
 	"id": "uni-id-pages",
 	"displayName": "uni-id-pages",
-	"version": "1.1.1",
+	"version": "1.1.13",
 	"description": "云端一体简单、统一、可扩展的用户中心页面模版",
 	"keywords": [
         "用户管理",
diff --git a/uni_modules/uni-id-pages/pages/common/webview/webview.vue b/uni_modules/uni-id-pages/pages/common/webview/webview.vue
index 71ff55c953dd1ff42048c52b0bd79f36ab7f55a9..c122623c61babbcb034aa0a8a88adb22f95f5731 100644
--- a/uni_modules/uni-id-pages/pages/common/webview/webview.vue
+++ b/uni_modules/uni-id-pages/pages/common/webview/webview.vue
@@ -1,35 +1,35 @@
-<!-- 网络链接内容展示页（uni-id-pages中用于展示隐私政策协议内容） -->
-<template>
-	<view>
-		<web-view v-if="url" :src="url"></web-view>
-	</view>
-</template>
-
-<script>
-	export default {
-		onLoad({url,title}) {
-			if(url.substring(0, 4) != 'http'){
-				uni.showModal({
-					title:"错误",
-					content: '不是一个有效的网站链接,'+'"'+url+'"',
-					showCancel: false,
-					confirmText:"知道了",
-					complete: () => {
-						uni.navigateBack()
-					}
-				});
-				title = "页面路径错误"
-			}else{
-				this.url = url;
-			}
-			if(title){
-				uni.setNavigationBarTitle({title});
-			}
-		},
-		data() {
-			return {
-				url:null
-			};
-		}
-	}
-</script>
+<!-- 网络链接内容展示页（uni-id-pages中用于展示隐私政策协议内容） -->
+<template>
+	<view>
+		<web-view v-if="url" :src="url"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		onLoad({url,title}) {
+			if(url.substring(0, 4) != 'http'){
+				uni.showModal({
+					title:"错误",
+					content: '不是一个有效的网站链接,'+'"'+url+'"',
+					showCancel: false,
+					confirmText:"知道了",
+					complete: () => {
+						uni.navigateBack()
+					}
+				});
+				title = "页面路径错误"
+			}else{
+				this.url = url;
+			}
+			if(title){
+				uni.setNavigationBarTitle({title});
+			}
+		},
+		data() {
+			return {
+				url:null
+			};
+		}
+	}
+</script>
diff --git a/uni_modules/uni-id-pages/pages/login/login-smscode.vue b/uni_modules/uni-id-pages/pages/login/login-smscode.vue
index f847cc57c0e223f5915739cab73202ccce9eaeda..0651fd9662faadd8115a19ea97a7b20e63f9426a 100644
--- a/uni_modules/uni-id-pages/pages/login/login-smscode.vue
+++ b/uni_modules/uni-id-pages/pages/login/login-smscode.vue
@@ -1,120 +1,120 @@
-<!-- 短信验证码登录页 -->
-<template>
-	<view class="uni-content">
-		<view class="login-logo">
-			<image :src="logo"></image>
-		</view>
-		<!-- 顶部文字 -->
-		<text class="title">请输入验证码</text>
-		<text class="tip">先输入图形验证码，再获取短信验证码</text>
-		<uni-forms>
-			<uni-id-pages-sms-form focusCaptchaInput v-model="code" type="login-by-sms" ref="smsCode" :phone="phone">
-			</uni-id-pages-sms-form>
-			<button class="uni-btn send-btn" type="primary" @click="submit">登录</button>
-		</uni-forms>
-		<uni-popup-captcha @confirm="submit" v-model="captcha" scene="login-by-sms" ref="popup"></uni-popup-captcha>
-	</view>
-</template>
-<script>
-	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
-	export default {
-		mixins: [mixin],
-		data() {
-			return {
-				"code": "",
-				"phone": "",
-				"captcha": "",
-				"logo": "/static/logo.png"
-			}
-		},
-		computed: {
-			tipText() {
-				return '验证码已通过短信发送至' + this.phone;
-			},
-		},
-		onLoad({
-			phoneNumber
-		}) {
-			this.phone = phoneNumber;
-		},
-		onShow() {
-			// #ifdef H5
-			document.onkeydown = event => {
-				var e = event || window.event;
-				if (e && e.keyCode == 13) { //回车键的键值为13
-					this.submit()
-				}
-			};
-			// #endif
-		},
-		methods: {
-			submit() { //完成并提交
-				const uniIdCo = uniCloud.importObject("uni-id-co", {
-					errorOptions: {
-						type: 'toast'
-					}
-				})
-				if (this.code.length != 6) {
-					this.$refs.smsCode.focusSmsCodeInput = true
-					return uni.showToast({
-						title: '验证码不能为空',
-						icon: 'none',
-						duration: 3000
-					});
-				}
-				uniIdCo.loginBySms({
-					"mobile": this.phone,
-					"code": this.code,
-					"captcha": this.captcha
-				}).then(e => {
-					this.loginSuccess(e)
-				}).catch(e => {
-					if (e.errCode == 'uni-id-captcha-required') {
-						this.$refs.popup.open()
-					} else {
-						console.log(e.errMsg);
-					}
-				}).finally(e => {
-					this.captcha = ''
-				})
-			}
-		}
-	}
-</script>
-<style scoped lang="scss">
-	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
-
-	.tip {
-		margin-top: -15px;
-		margin-bottom: 15px;
-	}
-
-	.popup-captcha {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		padding: 20rpx;
-		background-color: #FFF;
-		border-radius: 2px;
-		flex-direction: column;
-		position: relative;
-	}
-
-	.popup-captcha .title {
-		font-weight: normal;
-		padding: 0;
-		padding-bottom: 15px;
-		color: #666;
-	}
-
-	.popup-captcha .close {
-		position: absolute;
-		bottom: -40px;
-		margin-left: -13px;
-		left: 50%;
-	}
-
-	.popup-captcha .uni-btn {
-		margin: 0;
-	}
-</style>
+<!-- 短信验证码登录页 -->
+<template>
+	<view class="uni-content">
+		<view class="login-logo">
+			<image :src="logo"></image>
+		</view>
+		<!-- 顶部文字 -->
+		<text class="title">请输入验证码</text>
+		<text class="tip">先输入图形验证码，再获取短信验证码</text>
+		<uni-forms>
+			<uni-id-pages-sms-form focusCaptchaInput v-model="code" type="login-by-sms" ref="smsCode" :phone="phone">
+			</uni-id-pages-sms-form>
+			<button class="uni-btn send-btn" type="primary" @click="submit">登录</button>
+		</uni-forms>
+		<uni-popup-captcha @confirm="submit" v-model="captcha" scene="login-by-sms" ref="popup"></uni-popup-captcha>
+	</view>
+</template>
+<script>
+	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
+	export default {
+		mixins: [mixin],
+		data() {
+			return {
+				"code": "",
+				"phone": "",
+				"captcha": "",
+				"logo": "/static/logo.png"
+			}
+		},
+		computed: {
+			tipText() {
+				return '验证码已通过短信发送至' + this.phone;
+			},
+		},
+		onLoad({
+			phoneNumber
+		}) {
+			this.phone = phoneNumber;
+		},
+		onShow() {
+			// #ifdef H5
+			document.onkeydown = event => {
+				var e = event || window.event;
+				if (e && e.keyCode == 13) { //回车键的键值为13
+					this.submit()
+				}
+			};
+			// #endif
+		},
+		methods: {
+			submit() { //完成并提交
+				const uniIdCo = uniCloud.importObject("uni-id-co", {
+					errorOptions: {
+						type: 'toast'
+					}
+				})
+				if (this.code.length != 6) {
+					this.$refs.smsCode.focusSmsCodeInput = true
+					return uni.showToast({
+						title: '验证码不能为空',
+						icon: 'none',
+						duration: 3000
+					});
+				}
+				uniIdCo.loginBySms({
+					"mobile": this.phone,
+					"code": this.code,
+					"captcha": this.captcha
+				}).then(e => {
+					this.loginSuccess(e)
+				}).catch(e => {
+					if (e.errCode == 'uni-id-captcha-required') {
+						this.$refs.popup.open()
+					} else {
+						console.log(e.errMsg);
+					}
+				}).finally(e => {
+					this.captcha = ''
+				})
+			}
+		}
+	}
+</script>
+<style scoped lang="scss">
+	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
+
+	.tip {
+		margin-top: -15px;
+		margin-bottom: 15px;
+	}
+
+	.popup-captcha {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		padding: 20rpx;
+		background-color: #FFF;
+		border-radius: 2px;
+		flex-direction: column;
+		position: relative;
+	}
+
+	.popup-captcha .title {
+		font-weight: normal;
+		padding: 0;
+		padding-bottom: 15px;
+		color: #666;
+	}
+
+	.popup-captcha .close {
+		position: absolute;
+		bottom: -40px;
+		margin-left: -13px;
+		left: 50%;
+	}
+
+	.popup-captcha .uni-btn {
+		margin: 0;
+	}
+</style>
diff --git a/uni_modules/uni-id-pages/pages/login/login-withoutpwd.vue b/uni_modules/uni-id-pages/pages/login/login-withoutpwd.vue
index 5e88727feb17dcb63e10df909f7be019791ce52d..a93859742b96d5bec192d911f1dc7d2b692f7dc4 100644
--- a/uni_modules/uni-id-pages/pages/login/login-withoutpwd.vue
+++ b/uni_modules/uni-id-pages/pages/login/login-withoutpwd.vue
@@ -1,241 +1,241 @@
-<!-- 免密登录页 -->
-<template>
-	<view class="uni-content">
-		<view class="login-logo">
-			<image :src="logo"></image>
-		</view>
-		<!-- 顶部文字 -->
-		<text class="title">请选择登录方式</text>
-		<!-- 快捷登录框 当url带参数时有效 -->
-		<template v-if="['apple','weixin', 'weixinMobile'].includes(type)">
-			<text class="tip">将根据第三方账号服务平台的授权范围获取你的信息</text>
-			<view class="quickLogin">
-				<image v-if="type !== 'weixinMobile'" @click="quickLogin" :src="imgSrc" mode="widthFix"
-					class="quickLoginBtn"></image>
-				<button v-else type="primary" open-type="getPhoneNumber" @getphonenumber="quickLogin"
-					class="uni-btn">微信授权手机号登录</button>
-				<uni-id-pages-agreements scope="register" ref="agreements"></uni-id-pages-agreements>
-			</view>
-		</template>
-		<template v-else>
-			<text class="tip">未注册的账号验证通过后将自动注册</text>
-			<view class="phone-box">
-				<view @click="chooseArea" class="area">+86</view>
-				<uni-easyinput :focus="focusPhone" @blur="focusPhone = false" class="input-box" type="number"
-					:inputBorder="false" v-model="phone" maxlength="11" placeholder="请输入手机号" />
-			</view>
-			<uni-id-pages-agreements scope="register" ref="agreements"></uni-id-pages-agreements>
-			<button class="uni-btn" type="primary" @click="toSmsPage">获取验证码</button>
-		</template>
-		<!-- 固定定位的快捷登录按钮 -->
-		<uni-id-pages-fab-login ref="uniFabLogin"></uni-id-pages-fab-login>
-	</view>
-</template>
-
-<script>
-	let currentWebview; //当前窗口对象
-	import config from '@/uni_modules/uni-id-pages/config.js'
-	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
-	export default {
-		mixins: [mixin],
-		data() {
-			return {
-				type: "", //快捷登录方式
-				phone: "", //手机号码
-				focusPhone: false,
-				logo: "/static/logo.png"
-			}
-		},
-		computed: {
-			async loginTypes() { //读取配置的登录优先级
-				return config.loginTypes
-			},
-			isPhone() { //手机号码校验正则
-				return /^1\d{10}$/.test(this.phone);
-			},
-			imgSrc() { //大快捷登录按钮图
-				return this.type == 'weixin' ? '/uni_modules/uni-id-pages/static/login/weixin.png' :
-					'/uni_modules/uni-id-pages/static/app-plus/apple.png'
-			}
-		},
-		async onLoad(e) {
-			//获取通过url传递的参数type设置当前登录方式，如果没传递直接默认以配置的登录
-			let type = e.type || config.loginTypes[0]
-			this.type = type
-
-			// console.log("this.type: -----------",this.type);
-			if (type != 'univerify') {
-				this.focusPhone = true
-			}
-			this.$nextTick(() => {
-				//关闭重复显示的登录快捷方式
-				if (['weixin', 'apple'].includes(type)) {
-					this.$refs.uniFabLogin.servicesList = this.$refs.uniFabLogin.servicesList.filter(item =>
-						item.id != type)
-				}
-			})
-			uni.$on('uni-id-pages-setLoginType', type => {
-				this.type = type
-			})
-		},
-		onShow() {
-			// #ifdef H5
-			document.onkeydown = event => {
-				var e = event || window.event;
-				if (e && e.keyCode == 13) { //回车键的键值为13
-					this.toSmsPage()
-				}
-			};
-			// #endif
-		},
-		onUnload() {
-			uni.$off('uni-id-pages-setLoginType')
-		},
-		onReady() {
-			// 是否优先启动一键登录。即：页面一加载就启动一键登录
-			//#ifdef APP-PLUS
-			if (this.type == "univerify") {
-				const pages = getCurrentPages();
-				currentWebview = pages[pages.length - 1].$getAppWebview();
-				currentWebview.setStyle({
-					"top": "2000px" // 隐藏当前页面窗体
-				})
-				this.type == this.loginTypes[1]
-				// console.log('开始一键登录');
-				this.$refs.uniFabLogin.login_before('univerify')
-			}
-			//#endif
-		},
-		methods: {
-			showCurrentWebview(){
-				// 恢复当前页面窗体的显示 一键登录，默认不显示当前窗口
-				currentWebview.setStyle({
-					"top": 0
-				})
-			},
-			quickLogin(e) {
-				let options = {}
-
-				if (e.detail?.code) {
-					options.phoneNumberCode = e.detail.code
-				}
-
-				if (this.type === 'weixinMobile' && !e.detail?.code) return
-
-				this.$refs.uniFabLogin.login_before(this.type, true, options)
-			},
-			toSmsPage() {
-				if (!this.isPhone) {
-					this.focusPhone = true
-					return uni.showToast({
-						title: "手机号码格式不正确",
-						icon: 'none',
-						duration: 3000
-					});
-				}
-				if (this.needAgreements && !this.agree) {
-					return this.$refs.agreements.popup(this.toSmsPage)
-				}
-				// 发送验证吗
-				uni.navigateTo({
-					url: '/uni_modules/uni-id-pages/pages/login/login-smscode?phoneNumber=' + this.phone
-				});
-			},
-			//去密码登录页
-			toPwdLogin() {
-				uni.navigateTo({
-					url: '../login/password'
-				})
-			},
-			chooseArea() {
-				uni.showToast({
-					title: '暂不支持其他国家',
-					icon: 'none',
-					duration: 3000
-				});
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
-
-	@media screen and (min-width: 690px) {
-		.uni-content {
-			height: 350px;
-		}
-	}
-
-	.uni-content,
-	.quickLogin {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		flex-direction: column;
-		/* #endif */
-	}
-
-	.phone-box {
-		position: relative;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-	}
-
-	.area {
-		position: absolute;
-		left: 10px;
-		z-index: 9;
-		top: 12px;
-		font-size: 14px;
-	}
-
-	.area::after {
-		content: "";
-		border: 3px solid transparent;
-		border-top-color: #000;
-		top: 12px;
-		left: 3px;
-		position: relative;
-	}
-
-	/* #ifdef MP */
-	// 解决小程序端开启虚拟节点virtualHost引起的 class = input-box丢失的问题 [详情参考](https://uniapp.dcloud.net.cn/matter.html#%E5%90%84%E5%AE%B6%E5%B0%8F%E7%A8%8B%E5%BA%8F%E5%AE%9E%E7%8E%B0%E6%9C%BA%E5%88%B6%E4%B8%8D%E5%90%8C-%E5%8F%AF%E8%83%BD%E5%AD%98%E5%9C%A8%E7%9A%84%E5%B9%B3%E5%8F%B0%E5%85%BC%E5%AE%B9%E9%97%AE%E9%A2%98)
-	.phone-box ::v-deep .uni-easyinput__content,
-	/* #endif */
-	.input-box {
-		/* #ifndef APP-NVUE */
-		box-sizing: border-box;
-		/* #endif */
-		flex: 1;
-		padding-left: 45px;
-		margin-bottom: 10px;
-		border-radius: 0;
-	}
-
-	.quickLogin {
-		height: 350px;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.quickLoginBtn {
-		margin: 20px 0;
-		width: 450rpx;
-		/* #ifndef APP-NVUE */
-		max-width: 230px;
-		/* #endif */
-		height: 82rpx;
-	}
-
-	.tip {
-		margin-top: -15px;
-		margin-bottom: 20px;
-	}
-
-	@media screen and (min-width: 690px) {
-		.quickLogin {
-			height: auto;
-		}
-	}
-</style>
+<!-- 免密登录页 -->
+<template>
+	<view class="uni-content">
+		<view class="login-logo">
+			<image :src="logo"></image>
+		</view>
+		<!-- 顶部文字 -->
+		<text class="title">请选择登录方式</text>
+		<!-- 快捷登录框 当url带参数时有效 -->
+		<template v-if="['apple','weixin', 'weixinMobile'].includes(type)">
+			<text class="tip">将根据第三方账号服务平台的授权范围获取你的信息</text>
+			<view class="quickLogin">
+				<image v-if="type !== 'weixinMobile'" @click="quickLogin" :src="imgSrc" mode="widthFix"
+					class="quickLoginBtn"></image>
+				<button v-else type="primary" open-type="getPhoneNumber" @getphonenumber="quickLogin"
+					class="uni-btn">微信授权手机号登录</button>
+				<uni-id-pages-agreements scope="register" ref="agreements"></uni-id-pages-agreements>
+			</view>
+		</template>
+		<template v-else>
+			<text class="tip">未注册的账号验证通过后将自动注册</text>
+			<view class="phone-box">
+				<view @click="chooseArea" class="area">+86</view>
+				<uni-easyinput :focus="focusPhone" @blur="focusPhone = false" class="input-box" type="number"
+					:inputBorder="false" v-model="phone" maxlength="11" placeholder="请输入手机号" />
+			</view>
+			<uni-id-pages-agreements scope="register" ref="agreements"></uni-id-pages-agreements>
+			<button class="uni-btn" type="primary" @click="toSmsPage">获取验证码</button>
+		</template>
+		<!-- 固定定位的快捷登录按钮 -->
+		<uni-id-pages-fab-login ref="uniFabLogin"></uni-id-pages-fab-login>
+	</view>
+</template>
+
+<script>
+	let currentWebview; //当前窗口对象
+	import config from '@/uni_modules/uni-id-pages/config.js'
+	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
+	export default {
+		mixins: [mixin],
+		data() {
+			return {
+				type: "", //快捷登录方式
+				phone: "", //手机号码
+				focusPhone: false,
+				logo: "/static/logo.png"
+			}
+		},
+		computed: {
+			async loginTypes() { //读取配置的登录优先级
+				return config.loginTypes
+			},
+			isPhone() { //手机号码校验正则
+				return /^1\d{10}$/.test(this.phone);
+			},
+			imgSrc() { //大快捷登录按钮图
+				return this.type == 'weixin' ? '/uni_modules/uni-id-pages/static/login/weixin.png' :
+					'/uni_modules/uni-id-pages/static/app-plus/apple.png'
+			}
+		},
+		async onLoad(e) {
+			//获取通过url传递的参数type设置当前登录方式，如果没传递直接默认以配置的登录
+			let type = e.type || config.loginTypes[0]
+			this.type = type
+
+			// console.log("this.type: -----------",this.type);
+			if (type != 'univerify') {
+				this.focusPhone = true
+			}
+			this.$nextTick(() => {
+				//关闭重复显示的登录快捷方式
+				if (['weixin', 'apple'].includes(type)) {
+					this.$refs.uniFabLogin.servicesList = this.$refs.uniFabLogin.servicesList.filter(item =>
+						item.id != type)
+				}
+			})
+			uni.$on('uni-id-pages-setLoginType', type => {
+				this.type = type
+			})
+		},
+		onShow() {
+			// #ifdef H5
+			document.onkeydown = event => {
+				var e = event || window.event;
+				if (e && e.keyCode == 13) { //回车键的键值为13
+					this.toSmsPage()
+				}
+			};
+			// #endif
+		},
+		onUnload() {
+			uni.$off('uni-id-pages-setLoginType')
+		},
+		onReady() {
+			// 是否优先启动一键登录。即：页面一加载就启动一键登录
+			//#ifdef APP-PLUS
+			if (this.type == "univerify") {
+				const pages = getCurrentPages();
+				currentWebview = pages[pages.length - 1].$getAppWebview();
+				currentWebview.setStyle({
+					"top": "2000px" // 隐藏当前页面窗体
+				})
+				this.type == this.loginTypes[1]
+				// console.log('开始一键登录');
+				this.$refs.uniFabLogin.login_before('univerify')
+			}
+			//#endif
+		},
+		methods: {
+			showCurrentWebview(){
+				// 恢复当前页面窗体的显示 一键登录，默认不显示当前窗口
+				currentWebview.setStyle({
+					"top": 0
+				})
+			},
+			quickLogin(e) {
+				let options = {}
+
+				if (e.detail?.code) {
+					options.phoneNumberCode = e.detail.code
+				}
+
+				if (this.type === 'weixinMobile' && !e.detail?.code) return
+
+				this.$refs.uniFabLogin.login_before(this.type, true, options)
+			},
+			toSmsPage() {
+				if (!this.isPhone) {
+					this.focusPhone = true
+					return uni.showToast({
+						title: "手机号码格式不正确",
+						icon: 'none',
+						duration: 3000
+					});
+				}
+				if (this.needAgreements && !this.agree) {
+					return this.$refs.agreements.popup(this.toSmsPage)
+				}
+				// 发送验证吗
+				uni.navigateTo({
+					url: '/uni_modules/uni-id-pages/pages/login/login-smscode?phoneNumber=' + this.phone
+				});
+			},
+			//去密码登录页
+			toPwdLogin() {
+				uni.navigateTo({
+					url: '../login/password'
+				})
+			},
+			chooseArea() {
+				uni.showToast({
+					title: '暂不支持其他国家',
+					icon: 'none',
+					duration: 3000
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
+
+	@media screen and (min-width: 690px) {
+		.uni-content {
+			height: 350px;
+		}
+	}
+
+	.uni-content,
+	.quickLogin {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		flex-direction: column;
+		/* #endif */
+	}
+
+	.phone-box {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+	}
+
+	.area {
+		position: absolute;
+		left: 10px;
+		z-index: 9;
+		top: 12px;
+		font-size: 14px;
+	}
+
+	.area::after {
+		content: "";
+		border: 3px solid transparent;
+		border-top-color: #000;
+		top: 12px;
+		left: 3px;
+		position: relative;
+	}
+
+	/* #ifdef MP */
+	// 解决小程序端开启虚拟节点virtualHost引起的 class = input-box丢失的问题 [详情参考](https://uniapp.dcloud.net.cn/matter.html#%E5%90%84%E5%AE%B6%E5%B0%8F%E7%A8%8B%E5%BA%8F%E5%AE%9E%E7%8E%B0%E6%9C%BA%E5%88%B6%E4%B8%8D%E5%90%8C-%E5%8F%AF%E8%83%BD%E5%AD%98%E5%9C%A8%E7%9A%84%E5%B9%B3%E5%8F%B0%E5%85%BC%E5%AE%B9%E9%97%AE%E9%A2%98)
+	.phone-box ::v-deep .uni-easyinput__content,
+	/* #endif */
+	.input-box {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+		flex: 1;
+		padding-left: 45px;
+		margin-bottom: 10px;
+		border-radius: 0;
+	}
+
+	.quickLogin {
+		height: 350px;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.quickLoginBtn {
+		margin: 20px 0;
+		width: 450rpx;
+		/* #ifndef APP-NVUE */
+		max-width: 230px;
+		/* #endif */
+		height: 82rpx;
+	}
+
+	.tip {
+		margin-top: -15px;
+		margin-bottom: 20px;
+	}
+
+	@media screen and (min-width: 690px) {
+		.quickLogin {
+			height: auto;
+		}
+	}
+</style>
diff --git a/uni_modules/uni-id-pages/pages/register/register-admin.vue b/uni_modules/uni-id-pages/pages/register/register-admin.vue
index be2c1d38fa5fabf06f186045c0fee14bd6f9b6a6..fcaf88a15202d6595b569c550df5cf8db813938e 100644
--- a/uni_modules/uni-id-pages/pages/register/register-admin.vue
+++ b/uni_modules/uni-id-pages/pages/register/register-admin.vue
@@ -27,9 +27,9 @@
 					class="input-box" placeholder="再次输入密码" maxlength="20" type="password" v-model="formData.password2"
 					trim="both" />
 			</uni-forms-item>
-<!--			<uni-forms-item>-->
-<!--				<uni-captcha ref="captcha" scene="register" v-model="formData.captcha" />-->
-<!--			</uni-forms-item>-->
+			<uni-forms-item>
+				<uni-captcha ref="captcha" scene="register" v-model="formData.captcha" />
+			</uni-forms-item>
 			<uni-id-pages-agreements scope="register" ref="agreements" ></uni-id-pages-agreements>
 			<button class="uni-btn" type="primary" @click="submit">注册</button>
 			<button @click="navigateBack" class="register-back">返回</button>
@@ -85,14 +85,14 @@
 			 */
 			submit() {
 				this.$refs.form.validate().then((res) => {
-					// if(this.formData.captcha.length != 4){
-					// 	this.$refs.captcha.focusCaptchaInput = true
-					// 	return uni.showToast({
-					// 		title: '请输入验证码',
-					// 		icon: 'none',
-					// 		duration: 3000
-					// 	});
-					// }
+					if(this.formData.captcha.length != 4){
+						this.$refs.captcha.focusCaptchaInput = true
+						return uni.showToast({
+							title: '请输入验证码',
+							icon: 'none',
+							duration: 3000
+						});
+					}
 					if (this.needAgreements && !this.agree) {
 						return this.$refs.agreements.popup(()=>{
 							this.submitForm(res)
@@ -139,7 +139,7 @@
 
 <style lang="scss">
 	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
-
+	
 	@media screen and (max-width: 690px) {
 		.uni-content{
 			margin-top: 15px;
@@ -152,7 +152,7 @@
 			padding: 30px 40px 60px;
 			max-height: 520px;
 		}
-
+		
 		.link-box {
 			/* #ifndef APP-NVUE */
 			display: flex;
@@ -161,12 +161,12 @@
 			justify-content: space-between;
 			margin-top: 10px;
 		}
-
+		
 		.link {
 			font-size: 12px;
 		}
 	}
-
+	
 	.uni-content ::v-deep .uni-forms-item__label {
 		position: absolute;
 		left: -15px;
diff --git a/uni_modules/uni-id-pages/pages/register/register-by-email.vue b/uni_modules/uni-id-pages/pages/register/register-by-email.vue
index 6f05c8a6acdbcd55422165df892041ab6a6785ce..bb51d436a328d7717e9c39e4f3462805596f929b 100644
--- a/uni_modules/uni-id-pages/pages/register/register-by-email.vue
+++ b/uni_modules/uni-id-pages/pages/register/register-by-email.vue
@@ -1,216 +1,216 @@
-<!-- 邮箱验证码注册 -->
-<template>
-	<view class="uni-content">
-		<match-media :min-width="690">
-			<view class="login-logo">
-				<image :src="logo"></image>
-			</view>
-			<!-- 顶部文字 -->
-			<text class="title title-box">邮箱验证码注册</text>
-		</match-media>
-		<uni-forms ref="form" :value="formData" :rules="rules" validate-trigger="submit" err-show-type="toast">
-			<uni-forms-item name="email" required>
-				<uni-easyinput :inputBorder="false" :focus="focusEmail" @blur="focusEmail = false"
-					class="input-box" placeholder="请输入邮箱" v-model="formData.email" trim="both" />
-			</uni-forms-item>
-			<uni-forms-item name="nickname">
-				<uni-easyinput :inputBorder="false" :focus="focusNickname" @blur="focusNickname = false" class="input-box" placeholder="请输入用户昵称" 
-				v-model="formData.nickname" trim="both" />
-			</uni-forms-item>
-			<uni-forms-item name="password" v-model="formData.password" required>
-				<uni-easyinput :inputBorder="false" :focus="focusPassword" @blur="focusPassword = false"
-					class="input-box" maxlength="20" :placeholder="'请输入' + (config.passwordStrength == 'weak'?'6':'8') + '-16位密码'" type="password"
-					v-model="formData.password" trim="both" />
-			</uni-forms-item>
-			<uni-forms-item name="password2" v-model="formData.password2" required>
-				<uni-easyinput :inputBorder="false" :focus="focusPassword2" @blur="focusPassword2 =false"
-					class="input-box" placeholder="再次输入密码" maxlength="20" type="password" v-model="formData.password2"
-					trim="both" />
-			</uni-forms-item>
-			<uni-forms-item name="code" >
-				<uni-id-pages-email-form ref="shortCode" :email="formData.email" type="register" v-model="formData.code">
-				</uni-id-pages-email-form>
-			</uni-forms-item>
-			<uni-id-pages-agreements scope="register" ref="agreements" ></uni-id-pages-agreements>
-			<button class="uni-btn" type="primary" @click="submit">注册</button>
-			<button @click="navigateBack" class="register-back">返回</button>
-			<match-media :min-width="690">
-				<view class="link-box">
-					<text class="link" @click="registerByUserName">用户名密码注册</text>
-					<text class="link" @click="toLogin">已有账号？点此登录</text>
-				</view>
-			</match-media>
-		</uni-forms>
-	</view>
-</template>
-
-<script>
-	import rules from './validator.js';
-	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
-	import config from '@/uni_modules/uni-id-pages/config.js'
-	import passwordMod from '@/uni_modules/uni-id-pages/common/password.js'
-	const uniIdCo = uniCloud.importObject("uni-id-co")
-	export default {
-		mixins: [mixin],
-		data() {
-			return {
-				formData: {
-					email: "",
-					nickname: "",
-					password: "",
-					password2: "",
-					code: ""
-				},
-				rules: {
-					email: {
-						rules: [{
-								required: true,
-								errorMessage: '请输入邮箱',
-							},{
-								format:'email',
-								errorMessage: '邮箱格式不正确',
-							}
-						]
-					},
-					nickname: {
-						rules: [{
-								minLength: 3,
-								maxLength: 32,
-								errorMessage: '昵称长度在 {minLength} 到 {maxLength} 个字符',
-							},
-							{
-								validateFunction: function(rule, value, data, callback) {
-									// console.log(value);
-									if (/^1\d{10}$/.test(value) || /^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/.test(value)) {
-										callback('昵称不能是：手机号或邮箱')
-									};
-									if (/^\d+$/.test(value)) {
-										callback('昵称不能为纯数字')
-									};
-									if(/[\u4E00-\u9FA5\uF900-\uFA2D]{1,}/.test(value)){
-										callback('昵称不能包含中文')
-									}
-									return true
-								}
-							}
-						],
-						label: "昵称"
-					},
-					...passwordMod.getPwdRules(),
-					code: {
-						rules: [{
-								required: true,
-								errorMessage: '请输入邮箱验证码',
-							},
-							{
-								pattern: /^.{6}$/,
-								errorMessage: '邮箱验证码不正确',
-							}
-						]
-					}
-				},
-				focusEmail:false,
-				focusNickname:false,
-				focusPassword:false,
-				focusPassword2:false,
-				logo: "/static/logo.png"
-			}
-		},
-		onReady() {
-			this.$refs.form.setRules(this.rules)
-		},
-		onShow() {
-			// #ifdef H5
-			document.onkeydown = event => {
-				var e = event || window.event;
-				if (e && e.keyCode == 13) { //回车键的键值为13
-					this.submit()
-				}
-			};
-			// #endif
-		},
-		methods: {
-			/**
-			 * 触发表单提交
-			 */
-			submit() {
-				this.$refs.form.validate().then((res) => {
-					if (this.needAgreements && !this.agree) {
-						return this.$refs.agreements.popup(()=>{
-							this.submitForm(res)
-						})
-					}
-					this.submitForm(res)
-				}).catch((errors) => {
-					let key = errors[0].key
-					key = key.replace(key[0], key[0].toUpperCase())
-					// console.log(key);
-					this['focus'+key] = true
-				})
-			},
-			submitForm(params) {
-				uniIdCo.registerUserByEmail(this.formData).then(e => {
-					// console.log(e);
-					uni.navigateTo({
-						url: '/uni_modules/uni-id-pages/pages/login/login-withpwd',
-						complete: (e) => {
-							// console.log(e);
-						}
-					})
-				})
-				.catch(e => {
-					// console.log(e);
-					console.log(e.message);
-				})
-			},
-			navigateBack() {
-				uni.navigateBack()
-			},
-			toLogin() {
-				uni.navigateTo({
-					url: '/uni_modules/uni-id-pages/pages/login/login-withpwd'
-				})
-			},
-			registerByUserName() {
-				uni.navigateTo({
-					url: '/uni_modules/uni-id-pages/pages/register/register'
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
-	
-	@media screen and (max-width: 690px) {
-		.uni-content{
-			margin-top: 15px;
-		}
-	}
-	@media screen and (min-width: 690px) {
-		.uni-content{
-			padding: 30px 40px;
-			max-height: 650px;
-		}
-		.link-box {
-			/* #ifndef APP-NVUE */
-			display: flex;
-			/* #endif */
-			flex-direction: row;
-			justify-content: space-between;
-			margin-top: 10px;
-		}
-		.link {
-			font-size: 12px;
-		}
-	}
-	.uni-content ::v-deep .uni-forms-item__label {
-		position: absolute;
-		left: -15px;
-	}
-
-	button {
-		margin-top: 15px;
-	}
-</style>
+<!-- 邮箱验证码注册 -->
+<template>
+	<view class="uni-content">
+		<match-media :min-width="690">
+			<view class="login-logo">
+				<image :src="logo"></image>
+			</view>
+			<!-- 顶部文字 -->
+			<text class="title title-box">邮箱验证码注册</text>
+		</match-media>
+		<uni-forms ref="form" :value="formData" :rules="rules" validate-trigger="submit" err-show-type="toast">
+			<uni-forms-item name="email" required>
+				<uni-easyinput :inputBorder="false" :focus="focusEmail" @blur="focusEmail = false"
+					class="input-box" placeholder="请输入邮箱" v-model="formData.email" trim="both" />
+			</uni-forms-item>
+			<uni-forms-item name="nickname">
+				<uni-easyinput :inputBorder="false" :focus="focusNickname" @blur="focusNickname = false" class="input-box" placeholder="请输入用户昵称" 
+				v-model="formData.nickname" trim="both" />
+			</uni-forms-item>
+			<uni-forms-item name="password" v-model="formData.password" required>
+				<uni-easyinput :inputBorder="false" :focus="focusPassword" @blur="focusPassword = false"
+					class="input-box" maxlength="20" :placeholder="'请输入' + (config.passwordStrength == 'weak'?'6':'8') + '-16位密码'" type="password"
+					v-model="formData.password" trim="both" />
+			</uni-forms-item>
+			<uni-forms-item name="password2" v-model="formData.password2" required>
+				<uni-easyinput :inputBorder="false" :focus="focusPassword2" @blur="focusPassword2 =false"
+					class="input-box" placeholder="再次输入密码" maxlength="20" type="password" v-model="formData.password2"
+					trim="both" />
+			</uni-forms-item>
+			<uni-forms-item name="code" >
+				<uni-id-pages-email-form ref="shortCode" :email="formData.email" type="register" v-model="formData.code">
+				</uni-id-pages-email-form>
+			</uni-forms-item>
+			<uni-id-pages-agreements scope="register" ref="agreements" ></uni-id-pages-agreements>
+			<button class="uni-btn" type="primary" @click="submit">注册</button>
+			<button @click="navigateBack" class="register-back">返回</button>
+			<match-media :min-width="690">
+				<view class="link-box">
+					<text class="link" @click="registerByUserName">用户名密码注册</text>
+					<text class="link" @click="toLogin">已有账号？点此登录</text>
+				</view>
+			</match-media>
+		</uni-forms>
+	</view>
+</template>
+
+<script>
+	import rules from './validator.js';
+	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
+	import config from '@/uni_modules/uni-id-pages/config.js'
+	import passwordMod from '@/uni_modules/uni-id-pages/common/password.js'
+	const uniIdCo = uniCloud.importObject("uni-id-co")
+	export default {
+		mixins: [mixin],
+		data() {
+			return {
+				formData: {
+					email: "",
+					nickname: "",
+					password: "",
+					password2: "",
+					code: ""
+				},
+				rules: {
+					email: {
+						rules: [{
+								required: true,
+								errorMessage: '请输入邮箱',
+							},{
+								format:'email',
+								errorMessage: '邮箱格式不正确',
+							}
+						]
+					},
+					nickname: {
+						rules: [{
+								minLength: 3,
+								maxLength: 32,
+								errorMessage: '昵称长度在 {minLength} 到 {maxLength} 个字符',
+							},
+							{
+								validateFunction: function(rule, value, data, callback) {
+									// console.log(value);
+									if (/^1\d{10}$/.test(value) || /^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/.test(value)) {
+										callback('昵称不能是：手机号或邮箱')
+									};
+									if (/^\d+$/.test(value)) {
+										callback('昵称不能为纯数字')
+									};
+									if(/[\u4E00-\u9FA5\uF900-\uFA2D]{1,}/.test(value)){
+										callback('昵称不能包含中文')
+									}
+									return true
+								}
+							}
+						],
+						label: "昵称"
+					},
+					...passwordMod.getPwdRules(),
+					code: {
+						rules: [{
+								required: true,
+								errorMessage: '请输入邮箱验证码',
+							},
+							{
+								pattern: /^.{6}$/,
+								errorMessage: '邮箱验证码不正确',
+							}
+						]
+					}
+				},
+				focusEmail:false,
+				focusNickname:false,
+				focusPassword:false,
+				focusPassword2:false,
+				logo: "/static/logo.png"
+			}
+		},
+		onReady() {
+			this.$refs.form.setRules(this.rules)
+		},
+		onShow() {
+			// #ifdef H5
+			document.onkeydown = event => {
+				var e = event || window.event;
+				if (e && e.keyCode == 13) { //回车键的键值为13
+					this.submit()
+				}
+			};
+			// #endif
+		},
+		methods: {
+			/**
+			 * 触发表单提交
+			 */
+			submit() {
+				this.$refs.form.validate().then((res) => {
+					if (this.needAgreements && !this.agree) {
+						return this.$refs.agreements.popup(()=>{
+							this.submitForm(res)
+						})
+					}
+					this.submitForm(res)
+				}).catch((errors) => {
+					let key = errors[0].key
+					key = key.replace(key[0], key[0].toUpperCase())
+					// console.log(key);
+					this['focus'+key] = true
+				})
+			},
+			submitForm(params) {
+				uniIdCo.registerUserByEmail(this.formData).then(e => {
+					// console.log(e);
+					uni.navigateTo({
+						url: '/uni_modules/uni-id-pages/pages/login/login-withpwd',
+						complete: (e) => {
+							// console.log(e);
+						}
+					})
+				})
+				.catch(e => {
+					// console.log(e);
+					console.log(e.message);
+				})
+			},
+			navigateBack() {
+				uni.navigateBack()
+			},
+			toLogin() {
+				uni.navigateTo({
+					url: '/uni_modules/uni-id-pages/pages/login/login-withpwd'
+				})
+			},
+			registerByUserName() {
+				uni.navigateTo({
+					url: '/uni_modules/uni-id-pages/pages/register/register'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
+	
+	@media screen and (max-width: 690px) {
+		.uni-content{
+			margin-top: 15px;
+		}
+	}
+	@media screen and (min-width: 690px) {
+		.uni-content{
+			padding: 30px 40px;
+			max-height: 650px;
+		}
+		.link-box {
+			/* #ifndef APP-NVUE */
+			display: flex;
+			/* #endif */
+			flex-direction: row;
+			justify-content: space-between;
+			margin-top: 10px;
+		}
+		.link {
+			font-size: 12px;
+		}
+	}
+	.uni-content ::v-deep .uni-forms-item__label {
+		position: absolute;
+		left: -15px;
+	}
+
+	button {
+		margin-top: 15px;
+	}
+</style>
diff --git a/uni_modules/uni-id-pages/pages/retrieve/retrieve-by-email.vue b/uni_modules/uni-id-pages/pages/retrieve/retrieve-by-email.vue
index b6e770436b05e801be58b931195294911365c66e..bf30c7689fa1daab92631d977571fd4d9f47b9b5 100644
--- a/uni_modules/uni-id-pages/pages/retrieve/retrieve-by-email.vue
+++ b/uni_modules/uni-id-pages/pages/retrieve/retrieve-by-email.vue
@@ -1,218 +1,218 @@
-<!-- 找回密码页 -->
-<template>
-	<view class="uni-content">
-		<match-media :min-width="690">
-			<view class="login-logo">
-				<image :src="logo"></image>
-			</view>
-			<!-- 顶部文字 -->
-			<text class="title title-box">通过邮箱验证码找回密码</text>
-		</match-media>
-		<uni-forms ref="form" :value="formData" err-show-type="toast">
-			<uni-forms-item name="email">
-				<uni-easyinput :focus="focusEmail" @blur="focusEmail = false" class="input-box" :disabled="lock" :inputBorder="false"
-					v-model="formData.email" placeholder="请输入邮箱">
-				</uni-easyinput>
-			</uni-forms-item>
-			<uni-forms-item name="code">
-				<uni-id-pages-email-form ref="shortCode" :email="formData.email" type="reset-pwd-by-email" v-model="formData.code">
-				</uni-id-pages-email-form>
-			</uni-forms-item>
-			<uni-forms-item name="password">
-				<uni-easyinput :focus="focusPassword" @blur="focusPassword = false" class="input-box" type="password" :inputBorder="false" v-model="formData.password"
-					placeholder="请输入新密码"></uni-easyinput>
-			</uni-forms-item>
-			<uni-forms-item name="password2">
-				<uni-easyinput :focus="focusPassword2" @blur="focusPassword2 = false" class="input-box" type="password" :inputBorder="false" v-model="formData.password2"
-					placeholder="请再次输入新密码"></uni-easyinput>
-			</uni-forms-item>
-			<button class="uni-btn send-btn-box" type="primary" @click="submit">提交</button>
-			<match-media :min-width="690">
-				<view class="link-box">
-					<text class="link" @click="retrieveByPhone">通过手机验证码找回密码</text>
-					<view></view>
-          <text class="link" @click="backLogin">返回登录</text>
-        </view>
-			</match-media>
-		</uni-forms>
-		<uni-popup-captcha @confirm="submit" v-model="formData.captcha" scene="reset-pwd-by-sms" ref="popup"></uni-popup-captcha>
-	</view>
-</template>
-
-<script>
-	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
-	import passwordMod from '@/uni_modules/uni-id-pages/common/password.js'
-	const uniIdCo = uniCloud.importObject("uni-id-co",{
-		errorOptions:{
-			type:'toast'
-		}
-	})
-	export default {
-		mixins: [mixin],
-		data() {
-			return {
-				lock: false,
-				focusEmail:true,
-				focusPassword:false,
-				focusPassword2:false,
-				formData: {
-					"email": "",
-					"code": "",
-					'password': '',
-					'password2': '',
-					"captcha": ""
-				},
-				rules: {
-					email: {
-						rules: [{
-								required: true,
-								errorMessage: '请输入邮箱',
-							},
-							{
-								format:'email',
-								errorMessage: '邮箱格式不正确',
-							}
-						]
-					},
-					code: {
-						rules: [{
-								required: true,
-								errorMessage: '请输入邮箱验证码',
-							},
-							{
-								pattern: /^.{6}$/,
-								errorMessage: '请输入6位验证码',
-							}
-						]
-					},
-					...passwordMod.getPwdRules()
-				},
-				logo: "/static/logo.png"
-			}
-		},
-		computed: {
-			isEmail() {
-				let reg_email = /@/;
-				let isEmail = reg_email.test(this.formData.email);
-				return isEmail;
-			},
-			isPwd() {
-				let reg_pwd = /^.{6,20}$/;
-				let isPwd = reg_pwd.test(this.formData.password);
-				return isPwd;
-			},
-			isCode() {
-				let reg_code = /^\d{6}$/;
-				let isCode = reg_code.test(this.formData.code);
-				return isCode;
-			}
-		},
-		onLoad(event) {
-			if (event && event.emailNumber) {
-				this.formData.email = event.emailNumber;
-				if(event.lock){
-					this.lock = event.lock //如果是已经登录的账号，点击找回密码就锁定指定的账号绑定的邮箱码
-					this.focusEmail = true
-				}
-			}
-		},
-		onReady() {
-			if (this.formData.email) {
-				this.$refs.shortCode.start();
-			}
-			this.$refs.form.setRules(this.rules)
-		},
-		onShow() {
-			// #ifdef H5
-			document.onkeydown = event => {
-				var e = event || window.event;
-				if (e && e.keyCode == 13) { //回车键的键值为13
-					this.submit()
-				}
-			};
-			// #endif
-		},
-		methods: {
-			/**
-			 * 完成并提交
-			 */
-			submit() {
-				this.$refs.form.validate()
-					.then(res => {
-						let {
-							email,
-							password: password,
-							captcha,
-							code
-						} = this.formData
-						uniIdCo.resetPwdByEmail({
-								email,
-								code,
-								password,
-								captcha
-							}).then(e => {
-								uni.navigateTo({
-									url: '/uni_modules/uni-id-pages/pages/login/login-withpwd',
-									complete: (e) => {
-										// console.log(e);
-									}
-								})
-							})
-							.catch(e => {
-								if (e.errCode == 'uni-id-captcha-required') {
-									this.$refs.popup.open()
-								}
-							}).finally(e => {
-								this.formData.captcha = ""
-							})
-					}).catch(errors=>{
-						let key = errors[0].key
-						if(key == 'code'){
-							return this.$refs.shortCode.focusSmsCodeInput = true
-						}
-						key = key.replace(key[0], key[0].toUpperCase())
-						this['focus'+key] = true
-					})
-			},
-			retrieveByPhone() {
-				uni.navigateTo({
-					url: '/uni_modules/uni-id-pages/pages/retrieve/retrieve'
-				})
-			},
-			backLogin () {
-				uni.redirectTo({
-					url: '/uni_modules/uni-id-pages/pages/login/login-withpwd'
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
-
-	@media screen and (max-width: 690px) {
-		.uni-content{
-			margin-top: 15px;
-		}
-	}
-	@media screen and (min-width: 690px) {
-		.uni-content{
-			padding: 30px 40px 40px;
-			max-height: 650px;
-		}
-
-		.link-box {
-			/* #ifndef APP-NVUE */
-			display: flex;
-			/* #endif */
-			flex-direction: row;
-			justify-content: space-between;
-			margin-top: 10px;
-		}
-
-		.link {
-			font-size: 12px;
-		}
-	}
-</style>
+<!-- 找回密码页 -->
+<template>
+	<view class="uni-content">
+		<match-media :min-width="690">
+			<view class="login-logo">
+				<image :src="logo"></image>
+			</view>
+			<!-- 顶部文字 -->
+			<text class="title title-box">通过邮箱验证码找回密码</text>
+		</match-media>
+		<uni-forms ref="form" :value="formData" err-show-type="toast">
+			<uni-forms-item name="email">
+				<uni-easyinput :focus="focusEmail" @blur="focusEmail = false" class="input-box" :disabled="lock" :inputBorder="false"
+					v-model="formData.email" placeholder="请输入邮箱">
+				</uni-easyinput>
+			</uni-forms-item>
+			<uni-forms-item name="code">
+				<uni-id-pages-email-form ref="shortCode" :email="formData.email" type="reset-pwd-by-email" v-model="formData.code">
+				</uni-id-pages-email-form>
+			</uni-forms-item>
+			<uni-forms-item name="password">
+				<uni-easyinput :focus="focusPassword" @blur="focusPassword = false" class="input-box" type="password" :inputBorder="false" v-model="formData.password"
+					placeholder="请输入新密码"></uni-easyinput>
+			</uni-forms-item>
+			<uni-forms-item name="password2">
+				<uni-easyinput :focus="focusPassword2" @blur="focusPassword2 = false" class="input-box" type="password" :inputBorder="false" v-model="formData.password2"
+					placeholder="请再次输入新密码"></uni-easyinput>
+			</uni-forms-item>
+			<button class="uni-btn send-btn-box" type="primary" @click="submit">提交</button>
+			<match-media :min-width="690">
+				<view class="link-box">
+					<text class="link" @click="retrieveByPhone">通过手机验证码找回密码</text>
+					<view></view>
+          <text class="link" @click="backLogin">返回登录</text>
+        </view>
+			</match-media>
+		</uni-forms>
+		<uni-popup-captcha @confirm="submit" v-model="formData.captcha" scene="reset-pwd-by-sms" ref="popup"></uni-popup-captcha>
+	</view>
+</template>
+
+<script>
+	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
+	import passwordMod from '@/uni_modules/uni-id-pages/common/password.js'
+	const uniIdCo = uniCloud.importObject("uni-id-co",{
+		errorOptions:{
+			type:'toast'
+		}
+	})
+	export default {
+		mixins: [mixin],
+		data() {
+			return {
+				lock: false,
+				focusEmail:true,
+				focusPassword:false,
+				focusPassword2:false,
+				formData: {
+					"email": "",
+					"code": "",
+					'password': '',
+					'password2': '',
+					"captcha": ""
+				},
+				rules: {
+					email: {
+						rules: [{
+								required: true,
+								errorMessage: '请输入邮箱',
+							},
+							{
+								format:'email',
+								errorMessage: '邮箱格式不正确',
+							}
+						]
+					},
+					code: {
+						rules: [{
+								required: true,
+								errorMessage: '请输入邮箱验证码',
+							},
+							{
+								pattern: /^.{6}$/,
+								errorMessage: '请输入6位验证码',
+							}
+						]
+					},
+					...passwordMod.getPwdRules()
+				},
+				logo: "/static/logo.png"
+			}
+		},
+		computed: {
+			isEmail() {
+				let reg_email = /@/;
+				let isEmail = reg_email.test(this.formData.email);
+				return isEmail;
+			},
+			isPwd() {
+				let reg_pwd = /^.{6,20}$/;
+				let isPwd = reg_pwd.test(this.formData.password);
+				return isPwd;
+			},
+			isCode() {
+				let reg_code = /^\d{6}$/;
+				let isCode = reg_code.test(this.formData.code);
+				return isCode;
+			}
+		},
+		onLoad(event) {
+			if (event && event.emailNumber) {
+				this.formData.email = event.emailNumber;
+				if(event.lock){
+					this.lock = event.lock //如果是已经登录的账号，点击找回密码就锁定指定的账号绑定的邮箱码
+					this.focusEmail = true
+				}
+			}
+		},
+		onReady() {
+			if (this.formData.email) {
+				this.$refs.shortCode.start();
+			}
+			this.$refs.form.setRules(this.rules)
+		},
+		onShow() {
+			// #ifdef H5
+			document.onkeydown = event => {
+				var e = event || window.event;
+				if (e && e.keyCode == 13) { //回车键的键值为13
+					this.submit()
+				}
+			};
+			// #endif
+		},
+		methods: {
+			/**
+			 * 完成并提交
+			 */
+			submit() {
+				this.$refs.form.validate()
+					.then(res => {
+						let {
+							email,
+							password: password,
+							captcha,
+							code
+						} = this.formData
+						uniIdCo.resetPwdByEmail({
+								email,
+								code,
+								password,
+								captcha
+							}).then(e => {
+								uni.navigateTo({
+									url: '/uni_modules/uni-id-pages/pages/login/login-withpwd',
+									complete: (e) => {
+										// console.log(e);
+									}
+								})
+							})
+							.catch(e => {
+								if (e.errCode == 'uni-id-captcha-required') {
+									this.$refs.popup.open()
+								}
+							}).finally(e => {
+								this.formData.captcha = ""
+							})
+					}).catch(errors=>{
+						let key = errors[0].key
+						if(key == 'code'){
+							return this.$refs.shortCode.focusSmsCodeInput = true
+						}
+						key = key.replace(key[0], key[0].toUpperCase())
+						this['focus'+key] = true
+					})
+			},
+			retrieveByPhone() {
+				uni.navigateTo({
+					url: '/uni_modules/uni-id-pages/pages/retrieve/retrieve'
+				})
+			},
+			backLogin () {
+				uni.redirectTo({
+					url: '/uni_modules/uni-id-pages/pages/login/login-withpwd'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
+
+	@media screen and (max-width: 690px) {
+		.uni-content{
+			margin-top: 15px;
+		}
+	}
+	@media screen and (min-width: 690px) {
+		.uni-content{
+			padding: 30px 40px 40px;
+			max-height: 650px;
+		}
+
+		.link-box {
+			/* #ifndef APP-NVUE */
+			display: flex;
+			/* #endif */
+			flex-direction: row;
+			justify-content: space-between;
+			margin-top: 10px;
+		}
+
+		.link {
+			font-size: 12px;
+		}
+	}
+</style>
diff --git a/uni_modules/uni-id-pages/pages/retrieve/retrieve.vue b/uni_modules/uni-id-pages/pages/retrieve/retrieve.vue
index 6e1976ba37daddf9d3b77a9a703934f74b8b81b9..73cfa36b6830a5c3c88d0b99e956aca8533f0d2e 100644
--- a/uni_modules/uni-id-pages/pages/retrieve/retrieve.vue
+++ b/uni_modules/uni-id-pages/pages/retrieve/retrieve.vue
@@ -1,241 +1,241 @@
-<!-- 找回密码页 -->
-<template>
-	<view class="uni-content">
-		<match-media :min-width="690">
-		<view class="login-logo">
-			<image :src="logo"></image>
-		</view>
-		<!-- 顶部文字 -->
-		<text class="title title-box">通过手机验证码找回密码</text>
-		</match-media>
-		<uni-forms ref="form" :value="formData" err-show-type="toast">
-			<uni-forms-item name="phone">
-				<uni-easyinput :focus="focusPhone" @blur="focusPhone = false" class="input-box" :disabled="lock" type="number" :inputBorder="false"
-					v-model="formData.phone" maxlength="11" placeholder="请输入手机号">
-				</uni-easyinput>
-			</uni-forms-item>
-			<uni-forms-item name="code">
-				<uni-id-pages-sms-form ref="shortCode" :phone="formData.phone" type="reset-pwd-by-sms" v-model="formData.code">
-				</uni-id-pages-sms-form>
-			</uni-forms-item>
-			<uni-forms-item name="password">
-				<uni-easyinput :focus="focusPassword" @blur="focusPassword = false" class="input-box" type="password" :inputBorder="false" v-model="formData.password"
-					placeholder="请输入新密码"></uni-easyinput>
-			</uni-forms-item>
-			<uni-forms-item name="password2">
-				<uni-easyinput :focus="focusPassword2" @blur="focusPassword2 = false" class="input-box" type="password" :inputBorder="false" v-model="formData.password2"
-					placeholder="请再次输入新密码"></uni-easyinput>
-			</uni-forms-item>
-			<button class="uni-btn send-btn-box" type="primary" @click="submit">提交</button>
-			<match-media :min-width="690">
-				<view class="link-box">
-					<text class="link" @click="retrieveByEmail">通过邮箱验证码找回密码</text>
-					<view></view>
-          <text class="link" @click="backLogin">返回登录</text>
-        </view>
-			</match-media>
-		</uni-forms>
-		<uni-popup-captcha @confirm="submit" v-model="formData.captcha" scene="reset-pwd-by-sms" ref="popup"></uni-popup-captcha>
-	</view>
-</template>
-
-<script>
-	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
-	const uniIdCo = uniCloud.importObject("uni-id-co",{
-		errorOptions:{
-			type:'toast'
-		}
-	})
-	export default {
-		mixins: [mixin],
-		data() {
-			return {
-				lock: false,
-				focusPhone:true,
-				focusPassword:false,
-				focusPassword2:false,
-				formData: {
-					"phone": "",
-					"code": "",
-					'password': '',
-					'password2': '',
-					"captcha": ""
-				},
-				rules: {
-					phone: {
-						rules: [{
-								required: true,
-								errorMessage: '请输入手机号',
-							},
-							{
-								pattern: /^1\d{10}$/,
-								errorMessage: '手机号码格式不正确',
-							}
-						]
-					},
-					code: {
-						rules: [{
-								required: true,
-								errorMessage: '请输入短信验证码',
-							},
-							{
-								pattern: /^.{6}$/,
-								errorMessage: '请输入6位验证码',
-							}
-						]
-					},
-					password: {
-						rules: [{
-								required: true,
-								errorMessage: '请输入新密码',
-							},
-							{
-								pattern: /^.{6,20}$/,
-								errorMessage: '密码为6 - 20位',
-							}
-						]
-					},
-					password2: {
-						rules: [{
-								required: true,
-								errorMessage: '请确认密码',
-							},
-							{
-								pattern: /^.{6,20}$/,
-								errorMessage: '密码为6 - 20位',
-							},
-							{
-								validateFunction: function(rule, value, data, callback) {
-									// console.log(value);
-									if (value != data.password) {
-										callback('两次输入密码不一致')
-									};
-									return true
-								}
-							}
-						]
-					}
-				},
-				logo: "/static/logo.png"
-			}
-		},
-		computed: {
-			isPhone() {
-				let reg_phone = /^1\d{10}$/;
-				let isPhone = reg_phone.test(this.formData.phone);
-				return isPhone;
-			},
-			isPwd() {
-				let reg_pwd = /^.{6,20}$/;
-				let isPwd = reg_pwd.test(this.formData.password);
-				return isPwd;
-			},
-			isCode() {
-				let reg_code = /^\d{6}$/;
-				let isCode = reg_code.test(this.formData.code);
-				return isCode;
-			}
-		},
-		onLoad(event) {
-			if (event && event.phoneNumber) {
-				this.formData.phone = event.phoneNumber;
-				if(event.lock){
-					this.lock = event.lock //如果是已经登录的账号，点击找回密码就锁定指定的账号绑定的手机号码
-					this.focusPhone = true
-				}
-			}
-		},
-		onReady() {
-			if (this.formData.phone) {
-				this.$refs.shortCode.start();
-			}
-			this.$refs.form.setRules(this.rules)
-		},
-		onShow() {
-			// #ifdef H5
-			document.onkeydown = event => {
-				var e = event || window.event;
-				if (e && e.keyCode == 13) { //回车键的键值为13
-					this.submit()
-				}
-			};
-			// #endif
-		},
-		methods: {
-			/**
-			 * 完成并提交
-			 */
-			submit() {
-				this.$refs.form.validate()
-					.then(res => {
-						let {
-							"phone": mobile,
-							"password": password,
-							captcha,
-							code
-						} = this.formData
-						uniIdCo.resetPwdBySms({
-								mobile,
-								code,
-								password,
-								captcha
-							}).then(e => {
-								uni.navigateBack()
-							})
-							.catch(e => {
-								if (e.errCode == 'uni-id-captcha-required') {
-									this.$refs.popup.open()
-								}
-							}).finally(e => {
-								this.formData.captcha = ""
-							})
-					}).catch(errors=>{
-						let key = errors[0].key
-						if(key == 'code'){
-							return this.$refs.shortCode.focusSmsCodeInput = true
-						}
-						key = key.replace(key[0], key[0].toUpperCase())
-						this['focus'+key] = true
-					})
-			},
-			retrieveByEmail() {
-				uni.navigateTo({
-					url: '/uni_modules/uni-id-pages/pages/retrieve/retrieve-by-email'
-				})
-			},
-			backLogin () {
-				uni.redirectTo({
-					url: '/uni_modules/uni-id-pages/pages/login/login-withpwd'
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
-
-	@media screen and (max-width: 690px) {
-		.uni-content{
-			margin-top: 15px;
-		}
-	}
-	@media screen and (min-width: 690px) {
-		.uni-content{
-			padding: 30px 40px 40px;
-			max-height: 650px;
-		}
-		.link-box {
-			/* #ifndef APP-NVUE */
-			display: flex;
-			/* #endif */
-			flex-direction: row;
-			justify-content: space-between;
-			margin-top: 10px;
-		}
-
-		.link {
-			font-size: 12px;
-		}
-	}
-</style>
+<!-- 找回密码页 -->
+<template>
+	<view class="uni-content">
+		<match-media :min-width="690">
+		<view class="login-logo">
+			<image :src="logo"></image>
+		</view>
+		<!-- 顶部文字 -->
+		<text class="title title-box">通过手机验证码找回密码</text>
+		</match-media>
+		<uni-forms ref="form" :value="formData" err-show-type="toast">
+			<uni-forms-item name="phone">
+				<uni-easyinput :focus="focusPhone" @blur="focusPhone = false" class="input-box" :disabled="lock" type="number" :inputBorder="false"
+					v-model="formData.phone" maxlength="11" placeholder="请输入手机号">
+				</uni-easyinput>
+			</uni-forms-item>
+			<uni-forms-item name="code">
+				<uni-id-pages-sms-form ref="shortCode" :phone="formData.phone" type="reset-pwd-by-sms" v-model="formData.code">
+				</uni-id-pages-sms-form>
+			</uni-forms-item>
+			<uni-forms-item name="password">
+				<uni-easyinput :focus="focusPassword" @blur="focusPassword = false" class="input-box" type="password" :inputBorder="false" v-model="formData.password"
+					placeholder="请输入新密码"></uni-easyinput>
+			</uni-forms-item>
+			<uni-forms-item name="password2">
+				<uni-easyinput :focus="focusPassword2" @blur="focusPassword2 = false" class="input-box" type="password" :inputBorder="false" v-model="formData.password2"
+					placeholder="请再次输入新密码"></uni-easyinput>
+			</uni-forms-item>
+			<button class="uni-btn send-btn-box" type="primary" @click="submit">提交</button>
+			<match-media :min-width="690">
+				<view class="link-box">
+					<text class="link" @click="retrieveByEmail">通过邮箱验证码找回密码</text>
+					<view></view>
+          <text class="link" @click="backLogin">返回登录</text>
+        </view>
+			</match-media>
+		</uni-forms>
+		<uni-popup-captcha @confirm="submit" v-model="formData.captcha" scene="reset-pwd-by-sms" ref="popup"></uni-popup-captcha>
+	</view>
+</template>
+
+<script>
+	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
+	const uniIdCo = uniCloud.importObject("uni-id-co",{
+		errorOptions:{
+			type:'toast'
+		}
+	})
+	export default {
+		mixins: [mixin],
+		data() {
+			return {
+				lock: false,
+				focusPhone:true,
+				focusPassword:false,
+				focusPassword2:false,
+				formData: {
+					"phone": "",
+					"code": "",
+					'password': '',
+					'password2': '',
+					"captcha": ""
+				},
+				rules: {
+					phone: {
+						rules: [{
+								required: true,
+								errorMessage: '请输入手机号',
+							},
+							{
+								pattern: /^1\d{10}$/,
+								errorMessage: '手机号码格式不正确',
+							}
+						]
+					},
+					code: {
+						rules: [{
+								required: true,
+								errorMessage: '请输入短信验证码',
+							},
+							{
+								pattern: /^.{6}$/,
+								errorMessage: '请输入6位验证码',
+							}
+						]
+					},
+					password: {
+						rules: [{
+								required: true,
+								errorMessage: '请输入新密码',
+							},
+							{
+								pattern: /^.{6,20}$/,
+								errorMessage: '密码为6 - 20位',
+							}
+						]
+					},
+					password2: {
+						rules: [{
+								required: true,
+								errorMessage: '请确认密码',
+							},
+							{
+								pattern: /^.{6,20}$/,
+								errorMessage: '密码为6 - 20位',
+							},
+							{
+								validateFunction: function(rule, value, data, callback) {
+									// console.log(value);
+									if (value != data.password) {
+										callback('两次输入密码不一致')
+									};
+									return true
+								}
+							}
+						]
+					}
+				},
+				logo: "/static/logo.png"
+			}
+		},
+		computed: {
+			isPhone() {
+				let reg_phone = /^1\d{10}$/;
+				let isPhone = reg_phone.test(this.formData.phone);
+				return isPhone;
+			},
+			isPwd() {
+				let reg_pwd = /^.{6,20}$/;
+				let isPwd = reg_pwd.test(this.formData.password);
+				return isPwd;
+			},
+			isCode() {
+				let reg_code = /^\d{6}$/;
+				let isCode = reg_code.test(this.formData.code);
+				return isCode;
+			}
+		},
+		onLoad(event) {
+			if (event && event.phoneNumber) {
+				this.formData.phone = event.phoneNumber;
+				if(event.lock){
+					this.lock = event.lock //如果是已经登录的账号，点击找回密码就锁定指定的账号绑定的手机号码
+					this.focusPhone = true
+				}
+			}
+		},
+		onReady() {
+			if (this.formData.phone) {
+				this.$refs.shortCode.start();
+			}
+			this.$refs.form.setRules(this.rules)
+		},
+		onShow() {
+			// #ifdef H5
+			document.onkeydown = event => {
+				var e = event || window.event;
+				if (e && e.keyCode == 13) { //回车键的键值为13
+					this.submit()
+				}
+			};
+			// #endif
+		},
+		methods: {
+			/**
+			 * 完成并提交
+			 */
+			submit() {
+				this.$refs.form.validate()
+					.then(res => {
+						let {
+							"phone": mobile,
+							"password": password,
+							captcha,
+							code
+						} = this.formData
+						uniIdCo.resetPwdBySms({
+								mobile,
+								code,
+								password,
+								captcha
+							}).then(e => {
+								uni.navigateBack()
+							})
+							.catch(e => {
+								if (e.errCode == 'uni-id-captcha-required') {
+									this.$refs.popup.open()
+								}
+							}).finally(e => {
+								this.formData.captcha = ""
+							})
+					}).catch(errors=>{
+						let key = errors[0].key
+						if(key == 'code'){
+							return this.$refs.shortCode.focusSmsCodeInput = true
+						}
+						key = key.replace(key[0], key[0].toUpperCase())
+						this['focus'+key] = true
+					})
+			},
+			retrieveByEmail() {
+				uni.navigateTo({
+					url: '/uni_modules/uni-id-pages/pages/retrieve/retrieve-by-email'
+				})
+			},
+			backLogin () {
+				uni.redirectTo({
+					url: '/uni_modules/uni-id-pages/pages/login/login-withpwd'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
+
+	@media screen and (max-width: 690px) {
+		.uni-content{
+			margin-top: 15px;
+		}
+	}
+	@media screen and (min-width: 690px) {
+		.uni-content{
+			padding: 30px 40px 40px;
+			max-height: 650px;
+		}
+		.link-box {
+			/* #ifndef APP-NVUE */
+			display: flex;
+			/* #endif */
+			flex-direction: row;
+			justify-content: space-between;
+			margin-top: 10px;
+		}
+
+		.link {
+			font-size: 12px;
+		}
+	}
+</style>
diff --git a/uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile.vue b/uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile.vue
index 3be8fef6f782c9d37b42bf960d88abf192c0b885..a6b2b1f49f4eb3a27c1add3e5fdcd563cff566b5 100644
--- a/uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile.vue
+++ b/uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile.vue
@@ -41,15 +41,13 @@
 			}
 		},
 		onLoad(event) {},
-		onReady() {
-			this.uniToken = uni.getStorageSync('uni_id_token')
-			console.log("uniToken: ", this.uniToken);
-		},
+		onReady() {},
+
 		methods: {
 			/**
 			 * 完成并提交
 			 */
-			async submit() {
+			submit() {
 				if(! /^1\d{10}$/.test(this.formData.mobile)){
 					this.focusMobile = true 
 					return uni.showToast({
@@ -68,7 +66,7 @@
 				}
 				
 				const uniIdCo = uniCloud.importObject("uni-id-co")
-				return await uniIdCo.bindMobileBySms(this.formData).then(e => {
+				uniIdCo.bindMobileBySms(this.formData).then(e => {
 					uni.showToast({
 						title: e.errMsg,
 						icon: 'none',
@@ -82,16 +80,13 @@
 					// #endif
 					mutations.setUserInfo(this.formData)
 					uni.navigateBack()
-					return e
 				}).catch(e => {
 					console.log(e);
 					if (e.errCode == 'uni-id-captcha-required') {
 						this.$refs.popup.open()
 					}
-					return e
 				}).finally(e => {
 					this.formData.captcha = ""
-					return e
 				})
 			}
 		}
diff --git a/uni_modules/uni-id-pages/pages/userinfo/cropImage/cropImage.vue b/uni_modules/uni-id-pages/pages/userinfo/cropImage/cropImage.vue
index 2317b9b9834654c460bc4618e99a7b70933ea3fa..ffc0e8b23d685bb66bbec0799db69518fce563ce 100644
--- a/uni_modules/uni-id-pages/pages/userinfo/cropImage/cropImage.vue
+++ b/uni_modules/uni-id-pages/pages/userinfo/cropImage/cropImage.vue
@@ -1,39 +1,39 @@
-<!-- 图片裁剪页 -->
-<template>
-	<view class="content" >
-		<limeClipper :width="options.width" :scale-ratio="2" :is-lock-width="false" :is-lock-height="false" :height="options.height" :image-url="path"  
-			@success="successFn" @cancel="cancel"  />
-	</view>
-</template>
-<script>
-import limeClipper from './limeClipper/limeClipper.vue';
-export default {
-	components: {limeClipper},
-	data() {return {path: '',options:{"width":600,"height":600}}},
-	onLoad({path,options}) {
-		this.path = path
-		// console.log('path-path-path-path',path);
-		if(options){
-			this.options = JSON.parse(options)
-		}
-	},
-	methods:{
-		successFn(e){
-			this.getOpenerEventChannel().emit('success',e.url)
-			uni.navigateBack()
-		},
-		cancel(){
-			uni.navigateBack()
-		}
-	}
-}
-</script>
-
-<style>
-	.box{
-		width: 400rpx;
-	}
-	.mt{
-		margin-top: -10px;
-	}
+<!-- 图片裁剪页 -->
+<template>
+	<view class="content" >
+		<limeClipper :width="options.width" :scale-ratio="2" :is-lock-width="false" :is-lock-height="false" :height="options.height" :image-url="path"  
+			@success="successFn" @cancel="cancel"  />
+	</view>
+</template>
+<script>
+import limeClipper from './limeClipper/limeClipper.vue';
+export default {
+	components: {limeClipper},
+	data() {return {path: '',options:{"width":600,"height":600}}},
+	onLoad({path,options}) {
+		this.path = path
+		// console.log('path-path-path-path',path);
+		if(options){
+			this.options = JSON.parse(options)
+		}
+	},
+	methods:{
+		successFn(e){
+			this.getOpenerEventChannel().emit('success',e.url)
+			uni.navigateBack()
+		},
+		cancel(){
+			uni.navigateBack()
+		}
+	}
+}
+</script>
+
+<style>
+	.box{
+		width: 400rpx;
+	}
+	.mt{
+		margin-top: -10px;
+	}
 </style>
\ No newline at end of file
diff --git a/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/README.md b/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/README.md
index 9219f815af48cf5b2c5b999f22af1e608e9970d8..160c207dcda67881e8a02ef9ff5ce2f8e67422d7 100644
--- a/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/README.md
+++ b/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/README.md
@@ -1,227 +1,227 @@
-> 插件来源：[https://ext.dcloud.net.cn/plugin?id=3594](https://ext.dcloud.net.cn/plugin?id=3594)
-##### 以下是作者写的插件介绍：
-
-# Clipper 图片裁剪
-> uniapp 图片裁剪，可用于图片头像等裁剪处理
-> [查看更多](http://liangei.gitee.io/limeui/#/clipper) <br>
-> Q群：458377637
-
-
-## 平台兼容
-
-| H5  | 微信小程序 | 支付宝小程序 | 百度小程序 | 头条小程序 | QQ 小程序 | App |
-| --- | ---------- | ------------ | ---------- | ---------- | --------- | --- |
-| √   | √          | √         | 未测       | √          | √      | √   |
-
-
-## 代码演示
-### 基本用法
-`@success` 事件点击 👉 **确定** 后会返回生成的图片信息，包含 `url`、`width`、`height`
-
-```html
-<image :src="url" v-if="url" mode="widthFix"></image>
-<l-clipper v-if="show" @success="url = $event.url; show = false" @cancel="show = false"  ></l-clipper>
-<button @tap="show = true">裁剪</button>
-```
-
-```js
-// 非uni_modules引入
-import lClipper from '@/components/lime-clipper/'
-// uni_modules引入
-import lClipper from '@/uni_modules/lime-clipper/components/lime-clipper/'
-export default {
-	components: {lClipper},
-    data() {
-        return {
-            show: false,
-			url: '',
-        }
-    }
-}
-```
-
-
-### 传入图片
-`image-url`可传入**相对路径**、**临时路径**、**本地路径**、**网络图片**<br>
-
-* **当为网络地址时**
-* H5：👉 需要解决跨域问题。 <br>
-* 小程序：👉 需要配置 downloadFile 域名 <br>
-
-
-```html
-<image :src="url" v-if="url" mode="widthFix"></image>
-<l-clipper v-if="show" :image-url="imageUrl"  @success="url = $event.url; show = false" @cancel="show = false"  ></l-clipper>
-<button @tap="show = true">裁剪</button>
-```
-
-```js
-export default {
-	components: {lClipper},
-    data() {
-        return {
-			imageUrl: 'https://img12.360buyimg.com/pop/s1180x940_jfs/t1/97205/26/1142/87801/5dbac55aEf795d962/48a4d7a63ff80b8b.jpg',
-            show: false,
-			url: '',
-        }
-    }
-}
-```
-
-
-### 确定按钮颜色
-样式变量名：`--l-clipper-confirm-color`
-可放到全局样式的 `page` 里或节点的 `style`
-```html
-<l-clipper class="clipper" style="--l-clipper-confirm-color: linear-gradient(to right, #ff6034, #ee0a24)"  ></l-clipper>
-```
-```css
-// css 中为组件设置 CSS 变量
-.clipper {
-	--l-clipper-confirm-color: linear-gradient(to right, #ff6034, #ee0a24)
-}
-// 全局
-page {
-	--l-clipper-confirm-color: linear-gradient(to right, #ff6034, #ee0a24)
-}
-```
-
-
-### 使用插槽
-共五个插槽 `cancel` 取消按钮、 `photo` 选择图片按钮、 `rotate` 旋转按钮、 `confirm` 确定按钮和默认插槽。
-
-```html
-<image :src="url" v-if="url" mode="widthFix"></image>
-<l-clipper 
-	v-if="show" 
-	:isLockWidth="isLockWidth"
-	:isLockHeight="isLockHeight"
-	:isLockRatio="isLockRatio"
-	:isLimitMove="isLimitMove"
-	:isDisableScale="isDisableScale"
-	:isDisableRotate="isDisableRotate"
-	:isShowCancelBtn="isShowCancelBtn"
-	:isShowPhotoBtn="isShowPhotoBtn"
-	:isShowRotateBtn="isShowRotateBtn"
-	:isShowConfirmBtn="isShowConfirmBtn"
-	@success="url = $event.url; show = false" 
-	@cancel="show = false" >
-	<!-- 四个基本按钮插槽 -->
-	<view slot="cancel">取消</view>
-	<view slot="photo">选择图片</view>
-	<view slot="rotate">旋转</view>
-	<view slot="confirm">确定</view>
-	<!-- 默认插槽 -->
-	<view class="tools">
-		<view>显示取消按钮
-			<switch :checked="isShowCancelBtn" @change="isShowCancelBtn = $event.target.value" ></switch>
-		</view>
-		<view>显示选择图片按钮
-			<switch :checked="isShowPhotoBtn" @change="isShowPhotoBtn = $event.target.value" ></switch>
-		</view>
-		<view>显示旋转按钮
-			<switch :checked="isShowRotateBtn" @change="isShowRotateBtn = $event.target.value" ></switch>
-		</view>
-		<view>显示确定按钮
-			<switch :checked="isShowConfirmBtn" @change="isShowConfirmBtn = $event.target.value" ></switch>
-		</view>
-		<view>锁定裁剪框宽度
-			<switch :checked="isLockWidth" @change="isLockWidth = $event.target.value" ></switch>
-		</view>
-		<view>锁定裁剪框高度
-			<switch :checked="isLockHeight" @change="isLockHeight = $event.target.value" ></switch>
-		</view>
-		<view>锁定裁剪框比例
-			<switch :checked="isLockRatio" @change="isLockRatio = $event.target.value" ></switch>
-		</view>
-		<view>限制移动范围
-			<switch :checked="isLimitMove" @change="isLimitMove = $event.target.value" ></switch>
-		</view>
-		<view>禁止缩放
-			<switch :checked="isDisableScale" @change="isDisableScale = $event.target.value" ></switch>
-		</view>
-		<view>禁止旋转
-			<switch :checked="isDisableRotate" @change="isDisableRotate = $event.target.value" ></switch>
-		</view>
-	</view>
-</l-clipper>
-<button @tap="show = true">裁剪</button>
-```
-
-```js
-export default {
-	components: {lClipper},
-    data() {
-        return {
-            show: false,
-            url: '',
-            isLockWidth: false,
-            isLockHeight: false,
-            isLockRatio: true,
-            isLimitMove: false,
-            isDisableScale: false,
-            isDisableRotate: false,
-            isShowCancelBtn: true,
-            isShowPhotoBtn: true,
-            isShowRotateBtn: true,
-            isShowConfirmBtn: true
-        }
-    }
-}
-```
-
-
-## API
-
-### Props
-
-| 参数           | 说明         | 类型             | 默认值       |
-| ------------- | ------------ | ---------------- | ------------ |
-| image-url     | 图片路径     | <em>string</em>   |              |
-| quality       | 图片的质量，取值范围为 [0, 1]，不在范围内时当作1处理   | <em>number</em>  |    `1`      |
-| source       | `{album: '从相册中选择'}`key为图片来源类型，value为选项说明   | <em>Object</em>  |         |
-| width | 裁剪框宽度，单位为 `rpx` | <em>number</em> | `400`      |
-| height | 裁剪框高度 | <em>number</em> | `400`      |
-| min-width | 裁剪框最小宽度 | <em>number</em> | `200`      |
-| min-height |裁剪框最小高度 | <em>number</em> | `200`  |
-| max-width | 裁剪框最大宽度 | <em>number</em> | `600`  |
-| max-height | 裁剪框最大宽度 | <em>number</em> | `600`  |
-| min-ratio | 图片最小缩放比 | <em>number</em> | `0.5`  |
-| max-ratio | 图片最大缩放比 | <em>number</em> | `2`  |
-| rotate-angle | 旋转按钮每次旋转的角度 | <em>number</em> | `90`  |
-| scale-ratio | 生成图片相对于裁剪框的比例， **比例越高生成图片越清晰**	 | <em>number</em> | `1`  |
-| is-lock-width | 是否锁定裁剪框宽度 | <em>boolean</em> | `false`  |
-| is-lock-height | 是否锁定裁剪框高度上 | <em>boolean</em> | `false`  |
-| is-lock-ratio | 是否锁定裁剪框比例 | <em>boolean</em> | `true`  |
-| is-disable-scale | 是否禁止缩放 | <em>boolean</em> | `false`  |
-| is-disable-rotate | 是否禁止旋转 | <em>boolean</em> | `false`  |
-| is-limit-move | 是否限制移动范围 | <em>boolean</em> | `false`  |
-| is-show-photo-btn | 是否显示选择图片按钮 | <em>boolean</em> | `true`  |
-| is-show-rotate-btn | 是否显示转按钮 | <em>boolean</em> | `true`  |
-| is-show-confirm-btn | 是否显示确定按钮 | <em>boolean</em> | `true`  |
-| is-show-cancel-btn | 是否显示关闭按钮 | <em>boolean</em> | `true`  |
-
-
-
-### 事件 Events
-
-| 事件名  | 说明         | 回调           |
-| ------- | ------------ | -------------- |
-| success | 生成图片成功 | {`width`, `height`, `url`} |
-| fail | 生成图片失败 | `error` |
-| cancel | 关闭 | `false` |
-| ready   | 图片加载完成 | {`width`, `height`, `path`, `orientation`, `type`} |
-| change | 图片大小改变时触发 | {`width`, `height`} |
-| rotate | 图片旋转时触发 | `angle` |
-
-## 常见问题
-> 1、H5端使用网络图片需要解决跨域问题。<br>
-> 2、小程序使用网络图片需要去公众平台增加下载白名单！二级域名也需要配！<br>
-> 3、H5端生成图片是base64，有时显示只有一半可以使用原生标签`<IMG/>`<br>
-> 4、IOS APP 请勿使用HBX2.9.3.20201014的版本！这个版本无法生成图片。<br>
-> 5、APP端无成功反馈、也无失败反馈时，请更新基座和HBX。<br>
-
-
-## 打赏
-如果你觉得本插件，解决了你的问题，赠人玫瑰，手留余香。<br>
+> 插件来源：[https://ext.dcloud.net.cn/plugin?id=3594](https://ext.dcloud.net.cn/plugin?id=3594)
+##### 以下是作者写的插件介绍：
+
+# Clipper 图片裁剪
+> uniapp 图片裁剪，可用于图片头像等裁剪处理
+> [查看更多](http://liangei.gitee.io/limeui/#/clipper) <br>
+> Q群：458377637
+
+
+## 平台兼容
+
+| H5  | 微信小程序 | 支付宝小程序 | 百度小程序 | 头条小程序 | QQ 小程序 | App |
+| --- | ---------- | ------------ | ---------- | ---------- | --------- | --- |
+| √   | √          | √         | 未测       | √          | √      | √   |
+
+
+## 代码演示
+### 基本用法
+`@success` 事件点击 👉 **确定** 后会返回生成的图片信息，包含 `url`、`width`、`height`
+
+```html
+<image :src="url" v-if="url" mode="widthFix"></image>
+<l-clipper v-if="show" @success="url = $event.url; show = false" @cancel="show = false"  ></l-clipper>
+<button @tap="show = true">裁剪</button>
+```
+
+```js
+// 非uni_modules引入
+import lClipper from '@/components/lime-clipper/'
+// uni_modules引入
+import lClipper from '@/uni_modules/lime-clipper/components/lime-clipper/'
+export default {
+	components: {lClipper},
+    data() {
+        return {
+            show: false,
+			url: '',
+        }
+    }
+}
+```
+
+
+### 传入图片
+`image-url`可传入**相对路径**、**临时路径**、**本地路径**、**网络图片**<br>
+
+* **当为网络地址时**
+* H5：👉 需要解决跨域问题。 <br>
+* 小程序：👉 需要配置 downloadFile 域名 <br>
+
+
+```html
+<image :src="url" v-if="url" mode="widthFix"></image>
+<l-clipper v-if="show" :image-url="imageUrl"  @success="url = $event.url; show = false" @cancel="show = false"  ></l-clipper>
+<button @tap="show = true">裁剪</button>
+```
+
+```js
+export default {
+	components: {lClipper},
+    data() {
+        return {
+			imageUrl: 'https://img12.360buyimg.com/pop/s1180x940_jfs/t1/97205/26/1142/87801/5dbac55aEf795d962/48a4d7a63ff80b8b.jpg',
+            show: false,
+			url: '',
+        }
+    }
+}
+```
+
+
+### 确定按钮颜色
+样式变量名：`--l-clipper-confirm-color`
+可放到全局样式的 `page` 里或节点的 `style`
+```html
+<l-clipper class="clipper" style="--l-clipper-confirm-color: linear-gradient(to right, #ff6034, #ee0a24)"  ></l-clipper>
+```
+```css
+// css 中为组件设置 CSS 变量
+.clipper {
+	--l-clipper-confirm-color: linear-gradient(to right, #ff6034, #ee0a24)
+}
+// 全局
+page {
+	--l-clipper-confirm-color: linear-gradient(to right, #ff6034, #ee0a24)
+}
+```
+
+
+### 使用插槽
+共五个插槽 `cancel` 取消按钮、 `photo` 选择图片按钮、 `rotate` 旋转按钮、 `confirm` 确定按钮和默认插槽。
+
+```html
+<image :src="url" v-if="url" mode="widthFix"></image>
+<l-clipper 
+	v-if="show" 
+	:isLockWidth="isLockWidth"
+	:isLockHeight="isLockHeight"
+	:isLockRatio="isLockRatio"
+	:isLimitMove="isLimitMove"
+	:isDisableScale="isDisableScale"
+	:isDisableRotate="isDisableRotate"
+	:isShowCancelBtn="isShowCancelBtn"
+	:isShowPhotoBtn="isShowPhotoBtn"
+	:isShowRotateBtn="isShowRotateBtn"
+	:isShowConfirmBtn="isShowConfirmBtn"
+	@success="url = $event.url; show = false" 
+	@cancel="show = false" >
+	<!-- 四个基本按钮插槽 -->
+	<view slot="cancel">取消</view>
+	<view slot="photo">选择图片</view>
+	<view slot="rotate">旋转</view>
+	<view slot="confirm">确定</view>
+	<!-- 默认插槽 -->
+	<view class="tools">
+		<view>显示取消按钮
+			<switch :checked="isShowCancelBtn" @change="isShowCancelBtn = $event.target.value" ></switch>
+		</view>
+		<view>显示选择图片按钮
+			<switch :checked="isShowPhotoBtn" @change="isShowPhotoBtn = $event.target.value" ></switch>
+		</view>
+		<view>显示旋转按钮
+			<switch :checked="isShowRotateBtn" @change="isShowRotateBtn = $event.target.value" ></switch>
+		</view>
+		<view>显示确定按钮
+			<switch :checked="isShowConfirmBtn" @change="isShowConfirmBtn = $event.target.value" ></switch>
+		</view>
+		<view>锁定裁剪框宽度
+			<switch :checked="isLockWidth" @change="isLockWidth = $event.target.value" ></switch>
+		</view>
+		<view>锁定裁剪框高度
+			<switch :checked="isLockHeight" @change="isLockHeight = $event.target.value" ></switch>
+		</view>
+		<view>锁定裁剪框比例
+			<switch :checked="isLockRatio" @change="isLockRatio = $event.target.value" ></switch>
+		</view>
+		<view>限制移动范围
+			<switch :checked="isLimitMove" @change="isLimitMove = $event.target.value" ></switch>
+		</view>
+		<view>禁止缩放
+			<switch :checked="isDisableScale" @change="isDisableScale = $event.target.value" ></switch>
+		</view>
+		<view>禁止旋转
+			<switch :checked="isDisableRotate" @change="isDisableRotate = $event.target.value" ></switch>
+		</view>
+	</view>
+</l-clipper>
+<button @tap="show = true">裁剪</button>
+```
+
+```js
+export default {
+	components: {lClipper},
+    data() {
+        return {
+            show: false,
+            url: '',
+            isLockWidth: false,
+            isLockHeight: false,
+            isLockRatio: true,
+            isLimitMove: false,
+            isDisableScale: false,
+            isDisableRotate: false,
+            isShowCancelBtn: true,
+            isShowPhotoBtn: true,
+            isShowRotateBtn: true,
+            isShowConfirmBtn: true
+        }
+    }
+}
+```
+
+
+## API
+
+### Props
+
+| 参数           | 说明         | 类型             | 默认值       |
+| ------------- | ------------ | ---------------- | ------------ |
+| image-url     | 图片路径     | <em>string</em>   |              |
+| quality       | 图片的质量，取值范围为 [0, 1]，不在范围内时当作1处理   | <em>number</em>  |    `1`      |
+| source       | `{album: '从相册中选择'}`key为图片来源类型，value为选项说明   | <em>Object</em>  |         |
+| width | 裁剪框宽度，单位为 `rpx` | <em>number</em> | `400`      |
+| height | 裁剪框高度 | <em>number</em> | `400`      |
+| min-width | 裁剪框最小宽度 | <em>number</em> | `200`      |
+| min-height |裁剪框最小高度 | <em>number</em> | `200`  |
+| max-width | 裁剪框最大宽度 | <em>number</em> | `600`  |
+| max-height | 裁剪框最大宽度 | <em>number</em> | `600`  |
+| min-ratio | 图片最小缩放比 | <em>number</em> | `0.5`  |
+| max-ratio | 图片最大缩放比 | <em>number</em> | `2`  |
+| rotate-angle | 旋转按钮每次旋转的角度 | <em>number</em> | `90`  |
+| scale-ratio | 生成图片相对于裁剪框的比例， **比例越高生成图片越清晰**	 | <em>number</em> | `1`  |
+| is-lock-width | 是否锁定裁剪框宽度 | <em>boolean</em> | `false`  |
+| is-lock-height | 是否锁定裁剪框高度上 | <em>boolean</em> | `false`  |
+| is-lock-ratio | 是否锁定裁剪框比例 | <em>boolean</em> | `true`  |
+| is-disable-scale | 是否禁止缩放 | <em>boolean</em> | `false`  |
+| is-disable-rotate | 是否禁止旋转 | <em>boolean</em> | `false`  |
+| is-limit-move | 是否限制移动范围 | <em>boolean</em> | `false`  |
+| is-show-photo-btn | 是否显示选择图片按钮 | <em>boolean</em> | `true`  |
+| is-show-rotate-btn | 是否显示转按钮 | <em>boolean</em> | `true`  |
+| is-show-confirm-btn | 是否显示确定按钮 | <em>boolean</em> | `true`  |
+| is-show-cancel-btn | 是否显示关闭按钮 | <em>boolean</em> | `true`  |
+
+
+
+### 事件 Events
+
+| 事件名  | 说明         | 回调           |
+| ------- | ------------ | -------------- |
+| success | 生成图片成功 | {`width`, `height`, `url`} |
+| fail | 生成图片失败 | `error` |
+| cancel | 关闭 | `false` |
+| ready   | 图片加载完成 | {`width`, `height`, `path`, `orientation`, `type`} |
+| change | 图片大小改变时触发 | {`width`, `height`} |
+| rotate | 图片旋转时触发 | `angle` |
+
+## 常见问题
+> 1、H5端使用网络图片需要解决跨域问题。<br>
+> 2、小程序使用网络图片需要去公众平台增加下载白名单！二级域名也需要配！<br>
+> 3、H5端生成图片是base64，有时显示只有一半可以使用原生标签`<IMG/>`<br>
+> 4、IOS APP 请勿使用HBX2.9.3.20201014的版本！这个版本无法生成图片。<br>
+> 5、APP端无成功反馈、也无失败反馈时，请更新基座和HBX。<br>
+
+
+## 打赏
+如果你觉得本插件，解决了你的问题，赠人玫瑰，手留余香。<br>
 ![输入图片说明](https://images.gitee.com/uploads/images/2020/1122/222521_bb543f96_518581.jpeg "微信图片编辑_20201122220352.jpg")
\ No newline at end of file
diff --git a/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/images/photo.svg b/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/images/photo.svg
index 7b4b59058376794d6e6a78035f627678102f96ad..4fd415f2e78b3cad9b5759be7be05a77734db6fe 100644
--- a/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/images/photo.svg
+++ b/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/images/photo.svg
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 30 30" style="enable-background:new 0 0 30 30;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#606060;}
-	.st1{fill:none;stroke:#FFFFFF;stroke-width:2.4306;stroke-miterlimit:10;}
-	.st2{fill:#FFFFFF;}
-</style>
-<g>
-	<path class="st2" d="M11.6,11c0.4,0.4,0.6,0.9,0.6,1.5c0,0.6-0.2,1.1-0.6,1.4c-0.4,0.4-0.9,0.6-1.5,0.6c-0.6,0-1.1-0.2-1.5-0.6
-		c-0.4-0.4-0.6-0.9-0.6-1.4s0.2-1.1,0.6-1.5c0.4-0.4,0.9-0.6,1.5-0.6C10.8,10.4,11.2,10.6,11.6,11z M24.6,18.4V6.7H5.4v12l1.8-1.8
-		c0.3-0.3,0.6-0.4,1-0.4c0.4,0,0.7,0.1,1,0.4l1.8,1.8l5.8-7c0.3-0.3,0.6-0.5,1.1-0.5c0.4,0,0.8,0.2,1.1,0.5
-		C18.8,11.6,24.6,18.4,24.6,18.4z M25.6,5.7C25.9,6,26,6.3,26,6.7v16.1c0,0.4-0.1,0.7-0.4,1c-0.3,0.3-0.6,0.4-1,0.4H5.4
-		c-0.4,0-0.7-0.1-1-0.4c-0.3-0.3-0.4-0.6-0.4-1V6.7c0-0.4,0.1-0.7,0.4-1c0.3-0.3,0.6-0.4,1-0.4h19.3C25,5.3,25.3,5.4,25.6,5.7z"/>
-	<path class="st1" d="M24.3,21.5H5.7c-0.2,0-0.3-0.2-0.3-0.3V7c0-0.2,0.2-0.3,0.3-0.3h18.6c0.2,0,0.3,0.2,0.3,0.3v14.2
-		C24.6,21.3,24.5,21.5,24.3,21.5z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 30 30" style="enable-background:new 0 0 30 30;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#606060;}
+	.st1{fill:none;stroke:#FFFFFF;stroke-width:2.4306;stroke-miterlimit:10;}
+	.st2{fill:#FFFFFF;}
+</style>
+<g>
+	<path class="st2" d="M11.6,11c0.4,0.4,0.6,0.9,0.6,1.5c0,0.6-0.2,1.1-0.6,1.4c-0.4,0.4-0.9,0.6-1.5,0.6c-0.6,0-1.1-0.2-1.5-0.6
+		c-0.4-0.4-0.6-0.9-0.6-1.4s0.2-1.1,0.6-1.5c0.4-0.4,0.9-0.6,1.5-0.6C10.8,10.4,11.2,10.6,11.6,11z M24.6,18.4V6.7H5.4v12l1.8-1.8
+		c0.3-0.3,0.6-0.4,1-0.4c0.4,0,0.7,0.1,1,0.4l1.8,1.8l5.8-7c0.3-0.3,0.6-0.5,1.1-0.5c0.4,0,0.8,0.2,1.1,0.5
+		C18.8,11.6,24.6,18.4,24.6,18.4z M25.6,5.7C25.9,6,26,6.3,26,6.7v16.1c0,0.4-0.1,0.7-0.4,1c-0.3,0.3-0.6,0.4-1,0.4H5.4
+		c-0.4,0-0.7-0.1-1-0.4c-0.3-0.3-0.4-0.6-0.4-1V6.7c0-0.4,0.1-0.7,0.4-1c0.3-0.3,0.6-0.4,1-0.4h19.3C25,5.3,25.3,5.4,25.6,5.7z"/>
+	<path class="st1" d="M24.3,21.5H5.7c-0.2,0-0.3-0.2-0.3-0.3V7c0-0.2,0.2-0.3,0.3-0.3h18.6c0.2,0,0.3,0.2,0.3,0.3v14.2
+		C24.6,21.3,24.5,21.5,24.3,21.5z"/>
+</g>
+</svg>
diff --git a/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/images/rotate.svg b/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/images/rotate.svg
index 0143706ca7adea484ed38339980c2cc23559595e..4cc7dbae8b0df01802f66f0b88f177f1adc96913 100644
--- a/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/images/rotate.svg
+++ b/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/images/rotate.svg
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="30px" height="30px" viewBox="0 0 30 30" style="enable-background:new 0 0 30 30;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:none;stroke:#FFFFFF;stroke-width:2.4306;stroke-miterlimit:10;}
-	.st1{fill:#FFFFFF;}
-</style>
-<g>
-	<path class="st0" d="M17.1,24.2h-12c-0.2,0-0.3-0.2-0.3-0.3v-9.3c0-0.2,0.2-0.3,0.3-0.3h12c0.2,0,0.3,0.2,0.3,0.3v9.3
-		C17.5,24.1,17.3,24.2,17.1,24.2z"/>
-	<path class="st0" d="M16.6,5.4c4.8,0,8.7,3.9,8.7,8.7"/>
-	<polyline class="st0" points="19.3,10.1 14.9,5.6 19.3,1.2 	"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="30px" height="30px" viewBox="0 0 30 30" style="enable-background:new 0 0 30 30;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;stroke:#FFFFFF;stroke-width:2.4306;stroke-miterlimit:10;}
+	.st1{fill:#FFFFFF;}
+</style>
+<g>
+	<path class="st0" d="M17.1,24.2h-12c-0.2,0-0.3-0.2-0.3-0.3v-9.3c0-0.2,0.2-0.3,0.3-0.3h12c0.2,0,0.3,0.2,0.3,0.3v9.3
+		C17.5,24.1,17.3,24.2,17.1,24.2z"/>
+	<path class="st0" d="M16.6,5.4c4.8,0,8.7,3.9,8.7,8.7"/>
+	<polyline class="st0" points="19.3,10.1 14.9,5.6 19.3,1.2 	"/>
+</g>
+</svg>
diff --git a/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/index.css b/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/index.css
index ce542bf1193799b39f006d08e71b4fb3cbecf1cc..3794573a59ec8fb3efd065e9f5020b5a37e63ad2 100644
--- a/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/index.css
+++ b/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/index.css
@@ -1,160 +1,160 @@
-.flex-auto {
-  flex: auto;
-}
-.bg-transparent {
-  background-color: rgba(0,0,0,0.9);
-  transition-duration: 0.35s;
-}
-.l-clipper {
-  width: 100vw;
-  height: calc(100vh - var(--window-top));
-  background-color: rgba(0,0,0,0.9);
-  position: fixed;
-  top: var(--window-top);
-  left: 0;
-  z-index: 1;
-}
-.l-clipper-mask {
-  position: relative;
-  z-index: 2;
-  pointer-events: none;
-}
-.l-clipper__content {
-  pointer-events: none;
-  position: absolute;
-  border: 1rpx solid rgba(255,255,255,0.3);
-  box-sizing: border-box;
-  box-shadow: rgba(0,0,0,0.5) 0 0 0 80vh;
-  background: transparent;
-}
-.l-clipper__content::before,
-.l-clipper__content::after {
-  content: '';
-  position: absolute;
-  border: 1rpx dashed rgba(255,255,255,0.3);
-}
-.l-clipper__content::before {
-  width: 100%;
-  top: 33.33%;
-  height: 33.33%;
-  border-left: none;
-  border-right: none;
-}
-.l-clipper__content::after {
-  width: 33.33%;
-  left: 33.33%;
-  height: 100%;
-  border-top: none;
-  border-bottom: none;
-}
-.l-clipper__edge {
-  position: absolute;
-  width: 34rpx;
-  height: 34rpx;
-  border: 6rpx solid #fff;
-  pointer-events: auto;
-}
-.l-clipper__edge::before {
-  content: '';
-  position: absolute;
-  width: 40rpx;
-  height: 40rpx;
-  background-color: transparent;
-}
-.l-clipper__edge:nth-child(1) {
-  left: -6rpx;
-  top: -6rpx;
-  border-bottom-width: 0 !important;
-  border-right-width: 0 !important;
-}
-.l-clipper__edge:nth-child(1):before {
-  top: -50%;
-  left: -50%;
-}
-.l-clipper__edge:nth-child(2) {
-  right: -6rpx;
-  top: -6rpx;
-  border-bottom-width: 0 !important;
-  border-left-width: 0 !important;
-}
-.l-clipper__edge:nth-child(2):before {
-  top: -50%;
-  left: 50%;
-}
-.l-clipper__edge:nth-child(3) {
-  left: -6rpx;
-  bottom: -6rpx;
-  border-top-width: 0 !important;
-  border-right-width: 0 !important;
-}
-.l-clipper__edge:nth-child(3):before {
-  bottom: -50%;
-  left: -50%;
-}
-.l-clipper__edge:nth-child(4) {
-  right: -6rpx;
-  bottom: -6rpx;
-  border-top-width: 0 !important;
-  border-left-width: 0 !important;
-}
-.l-clipper__edge:nth-child(4):before {
-  bottom: -50%;
-  left: 50%;
-}
-.l-clipper-image {
-  width: 100%;
-  border-style: none;
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 1;
-  -webkit-backface-visibility: hidden;
-  backface-visibility: hidden;
-  transform-origin: center;
-}
-.l-clipper-canvas {
-  position: fixed;
-  z-index: 10;
-  left: -200vw;
-  top: -200vw;
-  pointer-events: none;
-}
-.l-clipper-tools {
-  position: fixed;
-  left: 0;
-  bottom: 10px;
-  width: 100%;
-  z-index: 99;
-  color: #fff;
-}
-.l-clipper-tools__btns {
-  font-weight: bold;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  width: 100%;
-  padding: 20rpx 40rpx;
-  box-sizing: border-box;
-}
-.l-clipper-tools__btns .cancel {
-  width: 112rpx;
-  height: 60rpx;
-  text-align: center;
-  line-height: 60rpx;
-}
-.l-clipper-tools__btns .confirm {
-  width: 112rpx;
-  height: 60rpx;
-  line-height: 60rpx;
-  background-color: #07c160;
-  border-radius: 6rpx;
-  text-align: center;
-}
-.l-clipper-tools__btns image {
-  display: block;
-  width: 60rpx;
-  height: 60rpx;
-}
-.l-clipper-tools__btns {
-  flex-direction: row;
-}
+.flex-auto {
+  flex: auto;
+}
+.bg-transparent {
+  background-color: rgba(0,0,0,0.9);
+  transition-duration: 0.35s;
+}
+.l-clipper {
+  width: 100vw;
+  height: calc(100vh - var(--window-top));
+  background-color: rgba(0,0,0,0.9);
+  position: fixed;
+  top: var(--window-top);
+  left: 0;
+  z-index: 1;
+}
+.l-clipper-mask {
+  position: relative;
+  z-index: 2;
+  pointer-events: none;
+}
+.l-clipper__content {
+  pointer-events: none;
+  position: absolute;
+  border: 1rpx solid rgba(255,255,255,0.3);
+  box-sizing: border-box;
+  box-shadow: rgba(0,0,0,0.5) 0 0 0 80vh;
+  background: transparent;
+}
+.l-clipper__content::before,
+.l-clipper__content::after {
+  content: '';
+  position: absolute;
+  border: 1rpx dashed rgba(255,255,255,0.3);
+}
+.l-clipper__content::before {
+  width: 100%;
+  top: 33.33%;
+  height: 33.33%;
+  border-left: none;
+  border-right: none;
+}
+.l-clipper__content::after {
+  width: 33.33%;
+  left: 33.33%;
+  height: 100%;
+  border-top: none;
+  border-bottom: none;
+}
+.l-clipper__edge {
+  position: absolute;
+  width: 34rpx;
+  height: 34rpx;
+  border: 6rpx solid #fff;
+  pointer-events: auto;
+}
+.l-clipper__edge::before {
+  content: '';
+  position: absolute;
+  width: 40rpx;
+  height: 40rpx;
+  background-color: transparent;
+}
+.l-clipper__edge:nth-child(1) {
+  left: -6rpx;
+  top: -6rpx;
+  border-bottom-width: 0 !important;
+  border-right-width: 0 !important;
+}
+.l-clipper__edge:nth-child(1):before {
+  top: -50%;
+  left: -50%;
+}
+.l-clipper__edge:nth-child(2) {
+  right: -6rpx;
+  top: -6rpx;
+  border-bottom-width: 0 !important;
+  border-left-width: 0 !important;
+}
+.l-clipper__edge:nth-child(2):before {
+  top: -50%;
+  left: 50%;
+}
+.l-clipper__edge:nth-child(3) {
+  left: -6rpx;
+  bottom: -6rpx;
+  border-top-width: 0 !important;
+  border-right-width: 0 !important;
+}
+.l-clipper__edge:nth-child(3):before {
+  bottom: -50%;
+  left: -50%;
+}
+.l-clipper__edge:nth-child(4) {
+  right: -6rpx;
+  bottom: -6rpx;
+  border-top-width: 0 !important;
+  border-left-width: 0 !important;
+}
+.l-clipper__edge:nth-child(4):before {
+  bottom: -50%;
+  left: 50%;
+}
+.l-clipper-image {
+  width: 100%;
+  border-style: none;
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 1;
+  -webkit-backface-visibility: hidden;
+  backface-visibility: hidden;
+  transform-origin: center;
+}
+.l-clipper-canvas {
+  position: fixed;
+  z-index: 10;
+  left: -200vw;
+  top: -200vw;
+  pointer-events: none;
+}
+.l-clipper-tools {
+  position: fixed;
+  left: 0;
+  bottom: 10px;
+  width: 100%;
+  z-index: 99;
+  color: #fff;
+}
+.l-clipper-tools__btns {
+  font-weight: bold;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+  padding: 20rpx 40rpx;
+  box-sizing: border-box;
+}
+.l-clipper-tools__btns .cancel {
+  width: 112rpx;
+  height: 60rpx;
+  text-align: center;
+  line-height: 60rpx;
+}
+.l-clipper-tools__btns .confirm {
+  width: 112rpx;
+  height: 60rpx;
+  line-height: 60rpx;
+  background-color: #07c160;
+  border-radius: 6rpx;
+  text-align: center;
+}
+.l-clipper-tools__btns image {
+  display: block;
+  width: 60rpx;
+  height: 60rpx;
+}
+.l-clipper-tools__btns {
+  flex-direction: row;
+}
diff --git a/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/limeClipper.vue b/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/limeClipper.vue
index 4fc62b3e3746ab2317a821b4351695f8de153bbf..e6db3eac5148545b2d914c0615ea062ec1571123 100644
--- a/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/limeClipper.vue
+++ b/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/limeClipper.vue
@@ -1,820 +1,820 @@
-<template>
-	<view class="l-clipper" :class="{open: value}" disable-scroll :style="'z-index: ' + zIndex + ';' + customStyle">
-		<view class="l-clipper-mask" @touchstart.stop.prevent="clipTouchStart" @touchmove.stop.prevent="clipTouchMove" @touchend.stop.prevent="clipTouchEnd">
-			<view class="l-clipper__content" :style="clipStyle"><view class="l-clipper__edge" v-for="(item, index) in [0, 0, 0, 0]" :key="index"></view></view>
-		</view>
-		<image
-			class="l-clipper-image"
-			@error="imageLoad"
-			@load="imageLoad"
-			@touchstart.stop.prevent="imageTouchStart"
-			@touchmove.stop.prevent="imageTouchMove"
-			@touchend.stop.prevent="imageTouchEnd"
-			:src="image"
-			:mode="imageWidth == 'auto' ? 'widthFix' : ''"
-			v-if="image"
-			:style="imageStyle"
-		/>
-		<canvas
-			:canvas-id="canvasId"
-			id="l-clipper"
-			disable-scroll
-			:style="'width: ' + canvasWidth * scaleRatio + 'px; height:' + canvasHeight * scaleRatio + 'px;'"
-			class="l-clipper-canvas"
-		></canvas>
-		<view class="l-clipper-tools">
-			<view class="l-clipper-tools__btns">
-				<view v-if="isShowCancelBtn" @tap="cancel">
-					<slot name="cancel" v-if="$slots.cancel" />
-					<view v-else class="cancel">取消</view>
-				</view>
-				<view v-if="isShowPhotoBtn" @tap="uploadImage">
-					<slot name="photo" v-if="$slots.photo" />
-					<image v-else src="./images/photo.svg" />
-				</view>
-				<view v-if="isShowRotateBtn" @tap="rotate">
-					<slot name="rotate" v-if="$slots.rotate" />
-					<image v-else src="./images/rotate.svg" data-type="inverse" />
-				</view>
-				<view v-if="isShowConfirmBtn" @tap="confirm">
-					<slot name="confirm" v-if="$slots.confirm" />
-					<view v-else class="confirm">确定</view>
-				</view>
-			</view>
-			<slot></slot>
-		</view>
-	</view>
-</template>
-
-<script>
-import { determineDirection, calcImageOffset, calcImageScale, calcImageSize, calcPythagoreanTheorem, clipTouchMoveOfCalculate, imageTouchMoveOfCalcOffset } from './utils';
-const cache = {}
-export default {
-	// version: '0.6.3',
-	name: 'l-clipper',
-	props: {
-		value: {
-			type: Boolean,
-			default: true
-		},
-		// #ifdef MP-WEIXIN
-		type: {
-			type: String,
-			default: '2d'
-		},
-		// #endif
-		customStyle: {
-			type: String,
-		},
-		canvasId: {
-			type: String,
-			default: 'l-clipper'
-		},
-		zIndex: {
-			type: Number,
-			default: 99
-		},
-		imageUrl: {
-			type: String
-		},
-		fileType: {
-			type: String,
-			default: 'png'
-		},
-		quality: {
-			type: Number,
-			default: 1
-		},
-		width: {
-			type: Number,
-			default: 400
-		},
-		height: {
-			type: Number,
-			default: 400
-		},
-		minWidth: {
-			type: Number,
-			default: 200
-		},
-		maxWidth: {
-			type: Number,
-			default: 600
-		},
-		minHeight: {
-			type: Number,
-			default: 200
-		},
-		maxHeight: {
-			type: Number,
-			default: 600
-		},
-		isLockWidth: {
-			type: Boolean,
-			default: false
-		},
-		isLockHeight: {
-			type: Boolean,
-			default: false
-		},
-		isLockRatio: {
-			type: Boolean,
-			default: true
-		},
-		scaleRatio: {
-			type: Number,
-			default: 1
-		},
-		minRatio: {
-			type: Number,
-			default: 0.5
-		},
-		maxRatio: {
-			type: Number,
-			default: 2
-		},
-		isDisableScale: {
-			type: Boolean,
-			default: false
-		},
-		isDisableRotate: {
-			type: Boolean,
-			default: false
-		},
-		isLimitMove: {
-			type: Boolean,
-			default: false
-		},
-		isShowPhotoBtn: {
-			type: Boolean,
-			default: true
-		},
-		isShowRotateBtn: {
-			type: Boolean,
-			default: true
-		},
-		isShowConfirmBtn: {
-			type: Boolean,
-			default: true
-		},
-		isShowCancelBtn: {
-			type: Boolean,
-			default: true
-		},
-		rotateAngle: {
-			type: Number,
-			default: 90
-		},
-		source: {
-			type: Object,
-			default: () => ({
-					album: '从相册中选择',
-					camera: '拍照',
-					// #ifdef MP-WEIXIN
-					message: '从微信中选择'
-					// #endif
-				})
-		}
-	},
-	data() {
-		return {
-			canvasWidth: 0,
-			canvasHeight: 0,
-			clipX: 0,
-			clipY: 0,
-			clipWidth: 0,
-			clipHeight: 0,
-			animation: false,
-			imageWidth: 0,
-			imageHeight: 0,
-			imageTop: 0,
-			imageLeft: 0,
-			scale: 1,
-			angle: 0,
-			image: this.imageUrl,
-			sysinfo: {},
-			throttleTimer: null,
-			throttleFlag: true,
-			timeClipCenter: null,
-			flagClipTouch: false,
-			flagEndTouch: false,
-			clipStart: {},
-			animationTimer: null,
-			touchRelative: [{x: 0,y: 0}],
-			hypotenuseLength: 0,
-			ctx: null
-		};
-	},
-	computed: {
-		clipStyle() {
-			const {clipWidth, clipHeight, clipY, clipX, animation} = this
-			return  `
-			width: ${clipWidth}px;
-			height:${clipHeight}px;
-			transition-property: ${animation ? '' : 'background'};
-			left: ${clipX}px;
-			top: ${clipY}px
-			`
-		},
-		imageStyle() {
-			const {imageWidth, imageHeight, imageLeft, imageTop, animation, scale, angle} = this
-			return `
-				width: ${imageWidth ? imageWidth + 'px' : 'auto'};
-				height: ${imageHeight ? imageHeight + 'px' : 'auto'};
-				transform: translate3d(${imageLeft - imageWidth / 2}px, ${imageTop - imageHeight / 2}px, 0) scale(${scale}) rotate(${angle}deg);
-				transition-duration: ${animation ? 0.35 : 0}s
-			`
-		},
-		clipSize() {
-			const { clipWidth, clipHeight } = this;
-			return { clipWidth, clipHeight };
-		},
-		clipPoint() {
-			const { clipY, clipX } = this;
-			return { clipY, clipX };
-		}
-	},
-	watch: {
-		value(val) {
-			if(!val) {
-				this.animation = 0
-				this.angle = 0
-			} else {
-				if(this.imageUrl) {
-					const {imageWidth, imageHeight, imageLeft, imageTop, scale, clipX, clipY, clipWidth, clipHeight, path} = cache?.[this.imageUrl] || {}
-					if(path != this.image) {
-						this.image = this.imageUrl;
-					} else {
-						this.setDiffData({imageWidth, imageHeight, imageLeft, imageTop, scale, clipX, clipY, clipWidth, clipHeight})
-					}
-					
-				}
-				
-			}
-		},
-		imageUrl(url) {
-			this.image = url
-		},
-		image:{
-			handler: async function(url) {
-				this.getImageInfo(url)
-			},
-			// immediate: true,
-		},
-		clipSize({ widthVal, heightVal }) {
-			let { minWidth, minHeight } = this;
-			minWidth = minWidth / 2;
-			minHeight = minHeight / 2;
-			if (widthVal < minWidth) {
-				this.setDiffData({clipWidth: minWidth})
-			}
-			if (heightVal < minHeight) {
-				this.setDiffData({clipHeight: minHeight})
-			}
-			this.calcClipSize();
-		},
-		angle(val) {
-			this.animation = true;
-			this.moveStop();
-			const { isLimitMove } = this;
-			if (isLimitMove && val % 90) {
-				this.setDiffData({
-					angle: Math.round(val / 90) * 90
-				})
-			}
-			this.imgMarginDetectionScale();
-		},
-		animation(val) {
-			clearTimeout(this.animationTimer);
-			if (val) {
-				let animationTimer = setTimeout(() => {
-					this.setDiffData({
-						animation: false
-					})
-				}, 260);
-				this.setDiffData({animationTimer})
-				this.animationTimer = animationTimer;
-			}
-		},
-		isLimitMove(val) {
-			if (val) {
-				if (this.angle % 90) {
-					this.setDiffData({
-						angle : Math.round(this.angle / 90) * 90
-					})
-				}
-				this.imgMarginDetectionScale();
-			}
-		},
-		clipPoint() {
-			this.cutDetectionPosition();
-		},
-		width(width, oWidth) {
-			if (width !== oWidth) {
-				this.setDiffData({
-					clipWidth:  width / 2
-				})
-			}
-		},
-		height(height, oHeight) {
-			if (height !== oHeight) {
-				this.setDiffData({
-					clipHeight:  height / 2
-				})
-			}
-		}
-	},
-	mounted() {
-		const sysinfo = uni.getSystemInfoSync();
-		this.sysinfo = sysinfo;
-		this.setClipInfo();
-		if(this.image) {
-			this.getImageInfo(this.image)
-		}
-		this.setClipCenter();
-		this.calcClipSize();
-		this.cutDetectionPosition();
-	},
-	methods: {
-		setDiffData(data) {
-			Object.keys(data).forEach(key => {
-			  if (this[key] !== data[key]) {
-				this[key] = data[key];
-			  }
-			});
-		},
-		getImageInfo(url) {
-			if (!url) return;
-			if(this.value) {
-				uni.showLoading({
-					title: '请稍候...',
-					mask: true
-				});
-			}
-			uni.getImageInfo({
-				src: url,
-				success: res => {
-					this.imgComputeSize(res.width, res.height);
-					this.image = res.path;
-					if (this.isLimitMove) {
-						this.imgMarginDetectionScale();
-						this.$emit('ready', res);
-					}
-					const {imageWidth, imageHeight, imageLeft, imageTop, scale, clipX, clipY, clipWidth, clipHeight} = this
-					cache[url] = Object.assign(res, {imageWidth, imageHeight, imageLeft, imageTop, scale, clipX, clipY, clipWidth, clipHeight});
-				},
-				fail: (err) => {
-					this.imgComputeSize();
-					if (this.isLimitMove) {
-						this.imgMarginDetectionScale();
-					}
-				}
-			});
-			
-		},
-		setClipInfo() {
-			const { width, height, sysinfo, canvasId } = this;
-			const clipWidth = width / 2;
-			const clipHeight = height / 2;
-			const clipY = (sysinfo.windowHeight - clipHeight) / 2;
-			const clipX = (sysinfo.windowWidth - clipWidth) / 2;
-			const imageLeft = sysinfo.windowWidth / 2;
-			const imageTop = sysinfo.windowHeight / 2;
-			this.ctx = uni.createCanvasContext(canvasId, this);
-			this.clipWidth = clipWidth;
-			this.clipHeight = clipHeight;
-			this.clipX = clipX;
-			this.clipY = clipY;
-			this.canvasHeight = clipHeight;
-			this.canvasWidth = clipWidth;
-			this.imageLeft = imageLeft;
-			this.imageTop = imageTop;
-		},
-		setClipCenter() {
-			const { sysInfo, clipHeight, clipWidth, imageTop, imageLeft } = this;
-			let sys = sysInfo || uni.getSystemInfoSync();
-			let clipY = (sys.windowHeight - clipHeight) * 0.5;
-			let clipX = (sys.windowWidth - clipWidth) * 0.5;
-			this.imageTop = imageTop - this.clipY + clipY;
-			this.imageLeft = imageLeft - this.clipX + clipX;
-			this.clipY = clipY;
-			this.clipX = clipX;
-		},
-		calcClipSize() {
-			const { clipHeight, clipWidth, sysinfo, clipX, clipY } = this;
-			if (clipWidth > sysinfo.windowWidth) {
-				this.setDiffData({
-					clipWidth:  sysinfo.windowWidth
-				})
-			} else if (clipWidth + clipX > sysinfo.windowWidth) {
-				this.setDiffData({
-					clipX: sysinfo.windowWidth - clipX
-				})
-			}
-			if (clipHeight > sysinfo.windowHeight) {
-				this.setDiffData({
-					clipHeight: sysinfo.windowHeight
-				})
-			} else if (clipHeight + clipY > sysinfo.windowHeight) {
-				this.clipY = sysinfo.windowHeight - clipY;
-				this.setDiffData({
-					clipY: sysinfo.windowHeight - clipY
-				})
-			}
-		},
-		cutDetectionPosition() {
-			const { clipX, clipY, sysinfo, clipHeight, clipWidth } = this;
-			let cutDetectionPositionTop = () => {
-					if (clipY < 0) {
-						this.setDiffData({clipY: 0})
-					}
-					if (clipY > sysinfo.windowHeight - clipHeight) {
-						this.setDiffData({clipY: sysinfo.windowHeight - clipHeight})
-					}
-				},
-				cutDetectionPositionLeft = () => {
-					if (clipX < 0) {
-						this.setDiffData({clipX: 0})
-					}
-					if (clipX > sysinfo.windowWidth - clipWidth) {
-						this.setDiffData({clipX: sysinfo.windowWidth - clipWidth})
-					}
-				};
-			if (clipY === null && clipX === null) {
-				let newClipY = (sysinfo.windowHeight - clipHeight) * 0.5;
-				let newClipX = (sysinfo.windowWidth - clipWidth) * 0.5;
-				this.setDiffData({
-					clipX: newClipX,
-					clipY: newClipY
-				})
-			} else if (clipY !== null && clipX !== null) {
-				cutDetectionPositionTop();
-				cutDetectionPositionLeft();
-			} else if (clipY !== null && clipX === null) {
-				cutDetectionPositionTop();
-				this.setDiffData({
-					clipX: (sysinfo.windowWidth - clipWidth) / 2
-				})
-			} else if (clipY === null && clipX !== null) {
-				cutDetectionPositionLeft();
-				this.setDiffData({
-					clipY: (sysinfo.windowHeight - clipHeight) / 2
-				})
-			}
-		},
-		imgComputeSize(width, height) {
-			const { imageWidth, imageHeight } = calcImageSize(width, height, this);
-			this.imageWidth = imageWidth;
-			this.imageHeight = imageHeight;
-		},
-		imgMarginDetectionScale(scale) {
-			if (!this.isLimitMove) return;
-			const currentScale = calcImageScale(this, scale);
-			this.imgMarginDetectionPosition(currentScale);
-		},
-		imgMarginDetectionPosition(scale) {
-			if (!this.isLimitMove) return;
-			const { scale: currentScale, left, top } = calcImageOffset(this, scale);
-			this.setDiffData({
-				imageLeft: left,
-				imageTop: top,
-				scale: currentScale
-			})
-		},
-		throttle() {
-			this.setDiffData({
-				throttleFlag: true
-			})
-		},
-		moveDuring() {
-			clearTimeout(this.timeClipCenter);
-		},
-		moveStop() {
-			clearTimeout(this.timeClipCenter);
-			const timeClipCenter = setTimeout(() => {
-				if (!this.animation) {
-					this.setDiffData({animation: true})
-				}
-				this.setClipCenter();
-			}, 800);
-			this.setDiffData({timeClipCenter})
-		},
-		clipTouchStart(event) {
-			// #ifdef H5
-			event.preventDefault()
-			// #endif
-			if (!this.image) {
-				uni.showToast({
-					title: '请选择图片',
-					icon: 'none',
-					duration: 3000
-				});
-				return;
-			}
-			const currentX = event.touches[0].clientX;
-			const currentY = event.touches[0].clientY;
-			const { clipX, clipY, clipWidth, clipHeight } = this;
-			const corner = determineDirection(clipX, clipY, clipWidth, clipHeight, currentX, currentY);
-			this.moveDuring();
-			if(!corner) {return}
-			this.clipStart = {
-				width: clipWidth,
-				height: clipHeight,
-				x: currentX,
-				y: currentY,
-				clipY,
-				clipX,
-				corner
-			};
-			this.flagClipTouch = true;
-			this.flagEndTouch = true;
-		},
-		clipTouchMove(event) {
-			// #ifdef H5
-			event.stopPropagation()
-			event.preventDefault()
-			// #endif
-			if (!this.image) {
-				uni.showToast({
-					title: '请选择图片',
-					icon: 'none',
-					duration: 3000
-				});
-				return;
-			}
-			// 只针对单指点击做处理
-			if (event.touches.length !== 1) {
-				return;
-				
-			}
-			const { flagClipTouch, throttleFlag } = this;
-			if (flagClipTouch && throttleFlag) {
-				const { isLockRatio, isLockHeight, isLockWidth } = this;
-				if (isLockRatio && (isLockWidth || isLockHeight)) return;
-				this.setDiffData({
-					throttleFlag: false
-				})
-				this.throttle();
-				const clipData = clipTouchMoveOfCalculate(this, event);
-				if(clipData) {
-					const { width, height, clipX, clipY } = clipData;
-					if (!isLockWidth && !isLockHeight) {
-						this.setDiffData({
-							clipWidth: width,
-							clipHeight: height,
-							clipX,
-							clipY
-						})
-					} else if (!isLockWidth) {
-						this.setDiffData({
-							clipWidth: width,
-							clipX
-						})
-					} else if (!isLockHeight) {
-						this.setDiffData({
-							clipHeight: height,
-							clipY
-						})
-					}
-					this.imgMarginDetectionScale();
-				}
-
-			}
-		},
-		clipTouchEnd() {
-			this.moveStop();
-			this.flagClipTouch = false;
-		},
-		imageTouchStart(e) {
-			// #ifdef H5
-			event.preventDefault()
-			// #endif
-			this.flagEndTouch = false;
-			const { imageLeft, imageTop } = this;
-			const clientXForLeft = e.touches[0].clientX;
-			const clientYForLeft = e.touches[0].clientY;
-
-			let touchRelative = [];
-			if (e.touches.length === 1) {
-				touchRelative[0] = {
-					x: clientXForLeft - imageLeft,
-					y: clientYForLeft - imageTop
-				};
-				this.touchRelative = touchRelative;
-			} else {
-				const clientXForRight = e.touches[1].clientX;
-				const clientYForRight = e.touches[1].clientY;
-				let width = Math.abs(clientXForLeft - clientXForRight);
-				let height = Math.abs(clientYForLeft - clientYForRight);
-				const hypotenuseLength = calcPythagoreanTheorem(width, height);
-
-				touchRelative = [
-					{
-						x: clientXForLeft - imageLeft,
-						y: clientYForLeft - imageTop
-					},
-					{
-						x: clientXForRight - imageLeft,
-						y: clientYForRight - imageTop
-					}
-				];
-				this.touchRelative = touchRelative;
-				this.hypotenuseLength = hypotenuseLength;
-			}
-		},
-		imageTouchMove(e) {
-			// #ifdef H5
-			event.preventDefault()
-			// #endif
-			const { flagEndTouch, throttleFlag } = this;
-			if (flagEndTouch || !throttleFlag) return;
-			const clientXForLeft = e.touches[0].clientX;
-			const clientYForLeft = e.touches[0].clientY;
-			this.setDiffData({throttleFlag: false})
-			this.throttle();
-			this.moveDuring();
-			if (e.touches.length === 1) {
-				const { left: imageLeft, top:  imageTop} = imageTouchMoveOfCalcOffset(this, clientXForLeft, clientYForLeft);
-				this.setDiffData({
-					imageLeft,
-					imageTop
-				})
-				this.imgMarginDetectionPosition();
-			} else {
-				const clientXForRight = e.touches[1].clientX;
-				const clientYForRight = e.touches[1].clientY;
-				let width = Math.abs(clientXForLeft - clientXForRight),
-					height = Math.abs(clientYForLeft - clientYForRight),
-					hypotenuse = calcPythagoreanTheorem(width, height),
-					scale = this.scale * (hypotenuse / this.hypotenuseLength);
-				if (this.isDisableScale) {
-
-					scale = 1;
-				} else {
-					scale = scale <= this.minRatio ? this.minRatio : scale;
-					scale = scale >= this.maxRatio ? this.maxRatio : scale;
-					this.$emit('change', {
-						width: this.imageWidth * scale,
-						height: this.imageHeight * scale
-					});
-				}
-
-				this.imgMarginDetectionScale(scale);
-				this.hypotenuseLength = Math.sqrt(Math.pow(width, 2) + Math.pow(height, 2));
-				this.scale = scale;
-			}
-		},
-		imageTouchEnd() {
-			this.setDiffData({
-				flagEndTouch: true
-			})
-			this.moveStop();
-		},
-		uploadImage() {
-			const itemList = Object.entries(this.source)
-			const sizeType = ['original', 'compressed']
-			const success = ({tempFilePaths:a, tempFiles: b}) => {
-				this.image = a ? a[0] : b[0].path
-			};
-			const _uploadImage = (type) => {
-				if(type !== 'message') {
-					uni.chooseImage({
-						count: 1,
-						sizeType,
-						sourceType: [type],
-						success
-					});
-				}
-				// #ifdef MP-WEIXIN
-				if(type == 'message') {
-					wx.chooseMessageFile({
-					  count: 1,
-					  type: 'image',
-					  success
-					})
-				}
-				// #endif
-			}
-			if(itemList.length > 1) {
-				uni.showActionSheet({
-					itemList: itemList.map(v => v[1]),
-					success: ({tapIndex: i}) => {
-						_uploadImage(itemList[i][0])
-					}
-				})
-			} else {
-				_uploadImage(itemList[0][0])
-			}
-		},
-		imageReset() {
-			const sys = this.sysinfo || uni.getSystemInfoSync();
-			this.scale = 1;
-			this.angle = 0;
-			this.imageTop = sys.windowHeight / 2;
-			this.imageLeft = sys.windowWidth / 2;
-		},
-		imageLoad(e) {
-			this.imageReset();
-			uni.hideLoading();
-			this.$emit('ready', e.detail);
-		},
-		rotate(event) {
-			if (this.isDisableRotate) return;
-			if (!this.image) {
-				uni.showToast({
-					title: '请选择图片',
-					icon: 'none',
-					duration: 3000
-				});
-				return;
-			}
-			const { rotateAngle } = this;
-			const originAngle = this.angle
-			const type = event.currentTarget.dataset.type;
-			if (type === 'along') {
-				this.angle = originAngle + rotateAngle
-			} else {
-				this.angle = originAngle - rotateAngle
-			}
-			this.$emit('rotate', this.angle);
-		},
-		confirm() {
-			if (!this.image) {
-				uni.showToast({
-					title: '请选择图片',
-					icon: 'none',
-					duration: 3000
-				});
-				return;
-			}
-			uni.showLoading({
-				title: '加载中'
-			});
-			const { canvasHeight, canvasWidth, clipHeight, clipWidth, ctx, scale, imageLeft, imageTop, clipX, clipY, angle, scaleRatio: dpr, image, quality, fileType, type: imageType, canvasId } = this;
-			const draw = () => {
-				const imageWidth = this.imageWidth * scale * dpr;
-				const imageHeight = this.imageHeight * scale * dpr;
-				const xpos = imageLeft - clipX;
-				const ypos = imageTop - clipY;
-				ctx.translate(xpos * dpr, ypos * dpr);
-				ctx.rotate((angle * Math.PI) / 180);
-				ctx.drawImage(image, -imageWidth / 2, -imageHeight / 2, imageWidth, imageHeight);
-				ctx.draw(false, () => {
-					const width = clipWidth * dpr
-					const height = clipHeight * dpr
-					let params = {
-						x: 0,
-						y: 0,
-						width,
-						height,
-						destWidth: width,
-						destHeight: height,
-						canvasId: canvasId,
-						fileType,
-						quality,
-						success: (res) => {
-							data.url = res.tempFilePath;
-							uni.hideLoading();
-							this.$emit('success', data);
-							this.$emit('input', false)
-						},
-						fail: (error) => {
-							console.error('error', error)
-							this.$emit('fail', error);
-							this.$emit('input', false)
-						}
-					};
-
-					let data = {
-						url: '',
-						width,
-						height
-					};
-					uni.canvasToTempFilePath(params, this)
-				});
-			};
-
-			if (canvasWidth !== clipWidth || canvasHeight !== clipHeight) {
-				this.canvasWidth = clipWidth;
-				this.canvasHeight = clipHeight;
-				ctx.draw();
-				this.$nextTick(() => {
-					setTimeout(() => {
-						draw();
-					}, 100);
-				})
-			} else {
-				draw();
-			}
-		},
-		cancel() {
-			this.$emit('cancel', false)
-			this.$emit('input', false)
-		},
-	}
-};
-</script>
-
-<style scoped>
-@import './index'
+<template>
+	<view class="l-clipper" :class="{open: value}" disable-scroll :style="'z-index: ' + zIndex + ';' + customStyle">
+		<view class="l-clipper-mask" @touchstart.stop.prevent="clipTouchStart" @touchmove.stop.prevent="clipTouchMove" @touchend.stop.prevent="clipTouchEnd">
+			<view class="l-clipper__content" :style="clipStyle"><view class="l-clipper__edge" v-for="(item, index) in [0, 0, 0, 0]" :key="index"></view></view>
+		</view>
+		<image
+			class="l-clipper-image"
+			@error="imageLoad"
+			@load="imageLoad"
+			@touchstart.stop.prevent="imageTouchStart"
+			@touchmove.stop.prevent="imageTouchMove"
+			@touchend.stop.prevent="imageTouchEnd"
+			:src="image"
+			:mode="imageWidth == 'auto' ? 'widthFix' : ''"
+			v-if="image"
+			:style="imageStyle"
+		/>
+		<canvas
+			:canvas-id="canvasId"
+			id="l-clipper"
+			disable-scroll
+			:style="'width: ' + canvasWidth * scaleRatio + 'px; height:' + canvasHeight * scaleRatio + 'px;'"
+			class="l-clipper-canvas"
+		></canvas>
+		<view class="l-clipper-tools">
+			<view class="l-clipper-tools__btns">
+				<view v-if="isShowCancelBtn" @tap="cancel">
+					<slot name="cancel" v-if="$slots.cancel" />
+					<view v-else class="cancel">取消</view>
+				</view>
+				<view v-if="isShowPhotoBtn" @tap="uploadImage">
+					<slot name="photo" v-if="$slots.photo" />
+					<image v-else src="./images/photo.svg" />
+				</view>
+				<view v-if="isShowRotateBtn" @tap="rotate">
+					<slot name="rotate" v-if="$slots.rotate" />
+					<image v-else src="./images/rotate.svg" data-type="inverse" />
+				</view>
+				<view v-if="isShowConfirmBtn" @tap="confirm">
+					<slot name="confirm" v-if="$slots.confirm" />
+					<view v-else class="confirm">确定</view>
+				</view>
+			</view>
+			<slot></slot>
+		</view>
+	</view>
+</template>
+
+<script>
+import { determineDirection, calcImageOffset, calcImageScale, calcImageSize, calcPythagoreanTheorem, clipTouchMoveOfCalculate, imageTouchMoveOfCalcOffset } from './utils';
+const cache = {}
+export default {
+	// version: '0.6.3',
+	name: 'l-clipper',
+	props: {
+		value: {
+			type: Boolean,
+			default: true
+		},
+		// #ifdef MP-WEIXIN
+		type: {
+			type: String,
+			default: '2d'
+		},
+		// #endif
+		customStyle: {
+			type: String,
+		},
+		canvasId: {
+			type: String,
+			default: 'l-clipper'
+		},
+		zIndex: {
+			type: Number,
+			default: 99
+		},
+		imageUrl: {
+			type: String
+		},
+		fileType: {
+			type: String,
+			default: 'png'
+		},
+		quality: {
+			type: Number,
+			default: 1
+		},
+		width: {
+			type: Number,
+			default: 400
+		},
+		height: {
+			type: Number,
+			default: 400
+		},
+		minWidth: {
+			type: Number,
+			default: 200
+		},
+		maxWidth: {
+			type: Number,
+			default: 600
+		},
+		minHeight: {
+			type: Number,
+			default: 200
+		},
+		maxHeight: {
+			type: Number,
+			default: 600
+		},
+		isLockWidth: {
+			type: Boolean,
+			default: false
+		},
+		isLockHeight: {
+			type: Boolean,
+			default: false
+		},
+		isLockRatio: {
+			type: Boolean,
+			default: true
+		},
+		scaleRatio: {
+			type: Number,
+			default: 1
+		},
+		minRatio: {
+			type: Number,
+			default: 0.5
+		},
+		maxRatio: {
+			type: Number,
+			default: 2
+		},
+		isDisableScale: {
+			type: Boolean,
+			default: false
+		},
+		isDisableRotate: {
+			type: Boolean,
+			default: false
+		},
+		isLimitMove: {
+			type: Boolean,
+			default: false
+		},
+		isShowPhotoBtn: {
+			type: Boolean,
+			default: true
+		},
+		isShowRotateBtn: {
+			type: Boolean,
+			default: true
+		},
+		isShowConfirmBtn: {
+			type: Boolean,
+			default: true
+		},
+		isShowCancelBtn: {
+			type: Boolean,
+			default: true
+		},
+		rotateAngle: {
+			type: Number,
+			default: 90
+		},
+		source: {
+			type: Object,
+			default: () => ({
+					album: '从相册中选择',
+					camera: '拍照',
+					// #ifdef MP-WEIXIN
+					message: '从微信中选择'
+					// #endif
+				})
+		}
+	},
+	data() {
+		return {
+			canvasWidth: 0,
+			canvasHeight: 0,
+			clipX: 0,
+			clipY: 0,
+			clipWidth: 0,
+			clipHeight: 0,
+			animation: false,
+			imageWidth: 0,
+			imageHeight: 0,
+			imageTop: 0,
+			imageLeft: 0,
+			scale: 1,
+			angle: 0,
+			image: this.imageUrl,
+			sysinfo: {},
+			throttleTimer: null,
+			throttleFlag: true,
+			timeClipCenter: null,
+			flagClipTouch: false,
+			flagEndTouch: false,
+			clipStart: {},
+			animationTimer: null,
+			touchRelative: [{x: 0,y: 0}],
+			hypotenuseLength: 0,
+			ctx: null
+		};
+	},
+	computed: {
+		clipStyle() {
+			const {clipWidth, clipHeight, clipY, clipX, animation} = this
+			return  `
+			width: ${clipWidth}px;
+			height:${clipHeight}px;
+			transition-property: ${animation ? '' : 'background'};
+			left: ${clipX}px;
+			top: ${clipY}px
+			`
+		},
+		imageStyle() {
+			const {imageWidth, imageHeight, imageLeft, imageTop, animation, scale, angle} = this
+			return `
+				width: ${imageWidth ? imageWidth + 'px' : 'auto'};
+				height: ${imageHeight ? imageHeight + 'px' : 'auto'};
+				transform: translate3d(${imageLeft - imageWidth / 2}px, ${imageTop - imageHeight / 2}px, 0) scale(${scale}) rotate(${angle}deg);
+				transition-duration: ${animation ? 0.35 : 0}s
+			`
+		},
+		clipSize() {
+			const { clipWidth, clipHeight } = this;
+			return { clipWidth, clipHeight };
+		},
+		clipPoint() {
+			const { clipY, clipX } = this;
+			return { clipY, clipX };
+		}
+	},
+	watch: {
+		value(val) {
+			if(!val) {
+				this.animation = 0
+				this.angle = 0
+			} else {
+				if(this.imageUrl) {
+					const {imageWidth, imageHeight, imageLeft, imageTop, scale, clipX, clipY, clipWidth, clipHeight, path} = cache?.[this.imageUrl] || {}
+					if(path != this.image) {
+						this.image = this.imageUrl;
+					} else {
+						this.setDiffData({imageWidth, imageHeight, imageLeft, imageTop, scale, clipX, clipY, clipWidth, clipHeight})
+					}
+					
+				}
+				
+			}
+		},
+		imageUrl(url) {
+			this.image = url
+		},
+		image:{
+			handler: async function(url) {
+				this.getImageInfo(url)
+			},
+			// immediate: true,
+		},
+		clipSize({ widthVal, heightVal }) {
+			let { minWidth, minHeight } = this;
+			minWidth = minWidth / 2;
+			minHeight = minHeight / 2;
+			if (widthVal < minWidth) {
+				this.setDiffData({clipWidth: minWidth})
+			}
+			if (heightVal < minHeight) {
+				this.setDiffData({clipHeight: minHeight})
+			}
+			this.calcClipSize();
+		},
+		angle(val) {
+			this.animation = true;
+			this.moveStop();
+			const { isLimitMove } = this;
+			if (isLimitMove && val % 90) {
+				this.setDiffData({
+					angle: Math.round(val / 90) * 90
+				})
+			}
+			this.imgMarginDetectionScale();
+		},
+		animation(val) {
+			clearTimeout(this.animationTimer);
+			if (val) {
+				let animationTimer = setTimeout(() => {
+					this.setDiffData({
+						animation: false
+					})
+				}, 260);
+				this.setDiffData({animationTimer})
+				this.animationTimer = animationTimer;
+			}
+		},
+		isLimitMove(val) {
+			if (val) {
+				if (this.angle % 90) {
+					this.setDiffData({
+						angle : Math.round(this.angle / 90) * 90
+					})
+				}
+				this.imgMarginDetectionScale();
+			}
+		},
+		clipPoint() {
+			this.cutDetectionPosition();
+		},
+		width(width, oWidth) {
+			if (width !== oWidth) {
+				this.setDiffData({
+					clipWidth:  width / 2
+				})
+			}
+		},
+		height(height, oHeight) {
+			if (height !== oHeight) {
+				this.setDiffData({
+					clipHeight:  height / 2
+				})
+			}
+		}
+	},
+	mounted() {
+		const sysinfo = uni.getSystemInfoSync();
+		this.sysinfo = sysinfo;
+		this.setClipInfo();
+		if(this.image) {
+			this.getImageInfo(this.image)
+		}
+		this.setClipCenter();
+		this.calcClipSize();
+		this.cutDetectionPosition();
+	},
+	methods: {
+		setDiffData(data) {
+			Object.keys(data).forEach(key => {
+			  if (this[key] !== data[key]) {
+				this[key] = data[key];
+			  }
+			});
+		},
+		getImageInfo(url) {
+			if (!url) return;
+			if(this.value) {
+				uni.showLoading({
+					title: '请稍候...',
+					mask: true
+				});
+			}
+			uni.getImageInfo({
+				src: url,
+				success: res => {
+					this.imgComputeSize(res.width, res.height);
+					this.image = res.path;
+					if (this.isLimitMove) {
+						this.imgMarginDetectionScale();
+						this.$emit('ready', res);
+					}
+					const {imageWidth, imageHeight, imageLeft, imageTop, scale, clipX, clipY, clipWidth, clipHeight} = this
+					cache[url] = Object.assign(res, {imageWidth, imageHeight, imageLeft, imageTop, scale, clipX, clipY, clipWidth, clipHeight});
+				},
+				fail: (err) => {
+					this.imgComputeSize();
+					if (this.isLimitMove) {
+						this.imgMarginDetectionScale();
+					}
+				}
+			});
+			
+		},
+		setClipInfo() {
+			const { width, height, sysinfo, canvasId } = this;
+			const clipWidth = width / 2;
+			const clipHeight = height / 2;
+			const clipY = (sysinfo.windowHeight - clipHeight) / 2;
+			const clipX = (sysinfo.windowWidth - clipWidth) / 2;
+			const imageLeft = sysinfo.windowWidth / 2;
+			const imageTop = sysinfo.windowHeight / 2;
+			this.ctx = uni.createCanvasContext(canvasId, this);
+			this.clipWidth = clipWidth;
+			this.clipHeight = clipHeight;
+			this.clipX = clipX;
+			this.clipY = clipY;
+			this.canvasHeight = clipHeight;
+			this.canvasWidth = clipWidth;
+			this.imageLeft = imageLeft;
+			this.imageTop = imageTop;
+		},
+		setClipCenter() {
+			const { sysInfo, clipHeight, clipWidth, imageTop, imageLeft } = this;
+			let sys = sysInfo || uni.getSystemInfoSync();
+			let clipY = (sys.windowHeight - clipHeight) * 0.5;
+			let clipX = (sys.windowWidth - clipWidth) * 0.5;
+			this.imageTop = imageTop - this.clipY + clipY;
+			this.imageLeft = imageLeft - this.clipX + clipX;
+			this.clipY = clipY;
+			this.clipX = clipX;
+		},
+		calcClipSize() {
+			const { clipHeight, clipWidth, sysinfo, clipX, clipY } = this;
+			if (clipWidth > sysinfo.windowWidth) {
+				this.setDiffData({
+					clipWidth:  sysinfo.windowWidth
+				})
+			} else if (clipWidth + clipX > sysinfo.windowWidth) {
+				this.setDiffData({
+					clipX: sysinfo.windowWidth - clipX
+				})
+			}
+			if (clipHeight > sysinfo.windowHeight) {
+				this.setDiffData({
+					clipHeight: sysinfo.windowHeight
+				})
+			} else if (clipHeight + clipY > sysinfo.windowHeight) {
+				this.clipY = sysinfo.windowHeight - clipY;
+				this.setDiffData({
+					clipY: sysinfo.windowHeight - clipY
+				})
+			}
+		},
+		cutDetectionPosition() {
+			const { clipX, clipY, sysinfo, clipHeight, clipWidth } = this;
+			let cutDetectionPositionTop = () => {
+					if (clipY < 0) {
+						this.setDiffData({clipY: 0})
+					}
+					if (clipY > sysinfo.windowHeight - clipHeight) {
+						this.setDiffData({clipY: sysinfo.windowHeight - clipHeight})
+					}
+				},
+				cutDetectionPositionLeft = () => {
+					if (clipX < 0) {
+						this.setDiffData({clipX: 0})
+					}
+					if (clipX > sysinfo.windowWidth - clipWidth) {
+						this.setDiffData({clipX: sysinfo.windowWidth - clipWidth})
+					}
+				};
+			if (clipY === null && clipX === null) {
+				let newClipY = (sysinfo.windowHeight - clipHeight) * 0.5;
+				let newClipX = (sysinfo.windowWidth - clipWidth) * 0.5;
+				this.setDiffData({
+					clipX: newClipX,
+					clipY: newClipY
+				})
+			} else if (clipY !== null && clipX !== null) {
+				cutDetectionPositionTop();
+				cutDetectionPositionLeft();
+			} else if (clipY !== null && clipX === null) {
+				cutDetectionPositionTop();
+				this.setDiffData({
+					clipX: (sysinfo.windowWidth - clipWidth) / 2
+				})
+			} else if (clipY === null && clipX !== null) {
+				cutDetectionPositionLeft();
+				this.setDiffData({
+					clipY: (sysinfo.windowHeight - clipHeight) / 2
+				})
+			}
+		},
+		imgComputeSize(width, height) {
+			const { imageWidth, imageHeight } = calcImageSize(width, height, this);
+			this.imageWidth = imageWidth;
+			this.imageHeight = imageHeight;
+		},
+		imgMarginDetectionScale(scale) {
+			if (!this.isLimitMove) return;
+			const currentScale = calcImageScale(this, scale);
+			this.imgMarginDetectionPosition(currentScale);
+		},
+		imgMarginDetectionPosition(scale) {
+			if (!this.isLimitMove) return;
+			const { scale: currentScale, left, top } = calcImageOffset(this, scale);
+			this.setDiffData({
+				imageLeft: left,
+				imageTop: top,
+				scale: currentScale
+			})
+		},
+		throttle() {
+			this.setDiffData({
+				throttleFlag: true
+			})
+		},
+		moveDuring() {
+			clearTimeout(this.timeClipCenter);
+		},
+		moveStop() {
+			clearTimeout(this.timeClipCenter);
+			const timeClipCenter = setTimeout(() => {
+				if (!this.animation) {
+					this.setDiffData({animation: true})
+				}
+				this.setClipCenter();
+			}, 800);
+			this.setDiffData({timeClipCenter})
+		},
+		clipTouchStart(event) {
+			// #ifdef H5
+			event.preventDefault()
+			// #endif
+			if (!this.image) {
+				uni.showToast({
+					title: '请选择图片',
+					icon: 'none',
+					duration: 3000
+				});
+				return;
+			}
+			const currentX = event.touches[0].clientX;
+			const currentY = event.touches[0].clientY;
+			const { clipX, clipY, clipWidth, clipHeight } = this;
+			const corner = determineDirection(clipX, clipY, clipWidth, clipHeight, currentX, currentY);
+			this.moveDuring();
+			if(!corner) {return}
+			this.clipStart = {
+				width: clipWidth,
+				height: clipHeight,
+				x: currentX,
+				y: currentY,
+				clipY,
+				clipX,
+				corner
+			};
+			this.flagClipTouch = true;
+			this.flagEndTouch = true;
+		},
+		clipTouchMove(event) {
+			// #ifdef H5
+			event.stopPropagation()
+			event.preventDefault()
+			// #endif
+			if (!this.image) {
+				uni.showToast({
+					title: '请选择图片',
+					icon: 'none',
+					duration: 3000
+				});
+				return;
+			}
+			// 只针对单指点击做处理
+			if (event.touches.length !== 1) {
+				return;
+				
+			}
+			const { flagClipTouch, throttleFlag } = this;
+			if (flagClipTouch && throttleFlag) {
+				const { isLockRatio, isLockHeight, isLockWidth } = this;
+				if (isLockRatio && (isLockWidth || isLockHeight)) return;
+				this.setDiffData({
+					throttleFlag: false
+				})
+				this.throttle();
+				const clipData = clipTouchMoveOfCalculate(this, event);
+				if(clipData) {
+					const { width, height, clipX, clipY } = clipData;
+					if (!isLockWidth && !isLockHeight) {
+						this.setDiffData({
+							clipWidth: width,
+							clipHeight: height,
+							clipX,
+							clipY
+						})
+					} else if (!isLockWidth) {
+						this.setDiffData({
+							clipWidth: width,
+							clipX
+						})
+					} else if (!isLockHeight) {
+						this.setDiffData({
+							clipHeight: height,
+							clipY
+						})
+					}
+					this.imgMarginDetectionScale();
+				}
+
+			}
+		},
+		clipTouchEnd() {
+			this.moveStop();
+			this.flagClipTouch = false;
+		},
+		imageTouchStart(e) {
+			// #ifdef H5
+			event.preventDefault()
+			// #endif
+			this.flagEndTouch = false;
+			const { imageLeft, imageTop } = this;
+			const clientXForLeft = e.touches[0].clientX;
+			const clientYForLeft = e.touches[0].clientY;
+
+			let touchRelative = [];
+			if (e.touches.length === 1) {
+				touchRelative[0] = {
+					x: clientXForLeft - imageLeft,
+					y: clientYForLeft - imageTop
+				};
+				this.touchRelative = touchRelative;
+			} else {
+				const clientXForRight = e.touches[1].clientX;
+				const clientYForRight = e.touches[1].clientY;
+				let width = Math.abs(clientXForLeft - clientXForRight);
+				let height = Math.abs(clientYForLeft - clientYForRight);
+				const hypotenuseLength = calcPythagoreanTheorem(width, height);
+
+				touchRelative = [
+					{
+						x: clientXForLeft - imageLeft,
+						y: clientYForLeft - imageTop
+					},
+					{
+						x: clientXForRight - imageLeft,
+						y: clientYForRight - imageTop
+					}
+				];
+				this.touchRelative = touchRelative;
+				this.hypotenuseLength = hypotenuseLength;
+			}
+		},
+		imageTouchMove(e) {
+			// #ifdef H5
+			event.preventDefault()
+			// #endif
+			const { flagEndTouch, throttleFlag } = this;
+			if (flagEndTouch || !throttleFlag) return;
+			const clientXForLeft = e.touches[0].clientX;
+			const clientYForLeft = e.touches[0].clientY;
+			this.setDiffData({throttleFlag: false})
+			this.throttle();
+			this.moveDuring();
+			if (e.touches.length === 1) {
+				const { left: imageLeft, top:  imageTop} = imageTouchMoveOfCalcOffset(this, clientXForLeft, clientYForLeft);
+				this.setDiffData({
+					imageLeft,
+					imageTop
+				})
+				this.imgMarginDetectionPosition();
+			} else {
+				const clientXForRight = e.touches[1].clientX;
+				const clientYForRight = e.touches[1].clientY;
+				let width = Math.abs(clientXForLeft - clientXForRight),
+					height = Math.abs(clientYForLeft - clientYForRight),
+					hypotenuse = calcPythagoreanTheorem(width, height),
+					scale = this.scale * (hypotenuse / this.hypotenuseLength);
+				if (this.isDisableScale) {
+
+					scale = 1;
+				} else {
+					scale = scale <= this.minRatio ? this.minRatio : scale;
+					scale = scale >= this.maxRatio ? this.maxRatio : scale;
+					this.$emit('change', {
+						width: this.imageWidth * scale,
+						height: this.imageHeight * scale
+					});
+				}
+
+				this.imgMarginDetectionScale(scale);
+				this.hypotenuseLength = Math.sqrt(Math.pow(width, 2) + Math.pow(height, 2));
+				this.scale = scale;
+			}
+		},
+		imageTouchEnd() {
+			this.setDiffData({
+				flagEndTouch: true
+			})
+			this.moveStop();
+		},
+		uploadImage() {
+			const itemList = Object.entries(this.source)
+			const sizeType = ['original', 'compressed']
+			const success = ({tempFilePaths:a, tempFiles: b}) => {
+				this.image = a ? a[0] : b[0].path
+			};
+			const _uploadImage = (type) => {
+				if(type !== 'message') {
+					uni.chooseImage({
+						count: 1,
+						sizeType,
+						sourceType: [type],
+						success
+					});
+				}
+				// #ifdef MP-WEIXIN
+				if(type == 'message') {
+					wx.chooseMessageFile({
+					  count: 1,
+					  type: 'image',
+					  success
+					})
+				}
+				// #endif
+			}
+			if(itemList.length > 1) {
+				uni.showActionSheet({
+					itemList: itemList.map(v => v[1]),
+					success: ({tapIndex: i}) => {
+						_uploadImage(itemList[i][0])
+					}
+				})
+			} else {
+				_uploadImage(itemList[0][0])
+			}
+		},
+		imageReset() {
+			const sys = this.sysinfo || uni.getSystemInfoSync();
+			this.scale = 1;
+			this.angle = 0;
+			this.imageTop = sys.windowHeight / 2;
+			this.imageLeft = sys.windowWidth / 2;
+		},
+		imageLoad(e) {
+			this.imageReset();
+			uni.hideLoading();
+			this.$emit('ready', e.detail);
+		},
+		rotate(event) {
+			if (this.isDisableRotate) return;
+			if (!this.image) {
+				uni.showToast({
+					title: '请选择图片',
+					icon: 'none',
+					duration: 3000
+				});
+				return;
+			}
+			const { rotateAngle } = this;
+			const originAngle = this.angle
+			const type = event.currentTarget.dataset.type;
+			if (type === 'along') {
+				this.angle = originAngle + rotateAngle
+			} else {
+				this.angle = originAngle - rotateAngle
+			}
+			this.$emit('rotate', this.angle);
+		},
+		confirm() {
+			if (!this.image) {
+				uni.showToast({
+					title: '请选择图片',
+					icon: 'none',
+					duration: 3000
+				});
+				return;
+			}
+			uni.showLoading({
+				title: '加载中'
+			});
+			const { canvasHeight, canvasWidth, clipHeight, clipWidth, ctx, scale, imageLeft, imageTop, clipX, clipY, angle, scaleRatio: dpr, image, quality, fileType, type: imageType, canvasId } = this;
+			const draw = () => {
+				const imageWidth = this.imageWidth * scale * dpr;
+				const imageHeight = this.imageHeight * scale * dpr;
+				const xpos = imageLeft - clipX;
+				const ypos = imageTop - clipY;
+				ctx.translate(xpos * dpr, ypos * dpr);
+				ctx.rotate((angle * Math.PI) / 180);
+				ctx.drawImage(image, -imageWidth / 2, -imageHeight / 2, imageWidth, imageHeight);
+				ctx.draw(false, () => {
+					const width = clipWidth * dpr
+					const height = clipHeight * dpr
+					let params = {
+						x: 0,
+						y: 0,
+						width,
+						height,
+						destWidth: width,
+						destHeight: height,
+						canvasId: canvasId,
+						fileType,
+						quality,
+						success: (res) => {
+							data.url = res.tempFilePath;
+							uni.hideLoading();
+							this.$emit('success', data);
+							this.$emit('input', false)
+						},
+						fail: (error) => {
+							console.error('error', error)
+							this.$emit('fail', error);
+							this.$emit('input', false)
+						}
+					};
+
+					let data = {
+						url: '',
+						width,
+						height
+					};
+					uni.canvasToTempFilePath(params, this)
+				});
+			};
+
+			if (canvasWidth !== clipWidth || canvasHeight !== clipHeight) {
+				this.canvasWidth = clipWidth;
+				this.canvasHeight = clipHeight;
+				ctx.draw();
+				this.$nextTick(() => {
+					setTimeout(() => {
+						draw();
+					}, 100);
+				})
+			} else {
+				draw();
+			}
+		},
+		cancel() {
+			this.$emit('cancel', false)
+			this.$emit('input', false)
+		},
+	}
+};
+</script>
+
+<style scoped>
+@import './index'
 </style>
\ No newline at end of file
diff --git a/uni_modules/uni-id-pages/pages/userinfo/realname-verify/realname-verify.vue b/uni_modules/uni-id-pages/pages/userinfo/realname-verify/realname-verify.vue
index 001fa5a370dec300d4f98f21004a5b1080c1ccc7..cefbb23023167412d269da32e90c8ff0a1a22d83 100644
--- a/uni_modules/uni-id-pages/pages/userinfo/realname-verify/realname-verify.vue
+++ b/uni_modules/uni-id-pages/pages/userinfo/realname-verify/realname-verify.vue
@@ -40,9 +40,8 @@
 </template>
 
 <script>
-import checkIdCard from '@/uni_modules/uni-id-pages/common/check-id-card.js';
+import checkIdCard from '@/uni_modules/uni-id-pages/common/check-id-card.js'
 import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
-
 import {
   store,
   mutations
diff --git a/uni_modules/uni-id-pages/pages/userinfo/userinfo.vue b/uni_modules/uni-id-pages/pages/userinfo/userinfo.vue
index 70af19b941f6ffc1be2b07d8dab7886e31258484..729484a9d6785f28527704b612bd8917165ff6fc 100644
--- a/uni_modules/uni-id-pages/pages/userinfo/userinfo.vue
+++ b/uni_modules/uni-id-pages/pages/userinfo/userinfo.vue
@@ -11,6 +11,11 @@
 			</uni-list-item>
 			<uni-list-item v-if="userInfo.email" class="item" title="电子邮箱" :rightText="userInfo.email">
 			</uni-list-item>
+			<!-- #ifdef APP -->
+      <!-- 如未开通实人认证服务，可以将实名认证入口注释 -->
+			<uni-list-item class="item" @click="realNameVerify" title="实名认证" :rightText="realNameStatus !== 2 ? '未认证': '已认证'" link>
+			</uni-list-item>
+			<!-- #endif -->
 			<uni-list-item v-if="hasPwd" class="item" @click="changePassword" title="修改密码" link>
 			</uni-list-item>
 		</uni-list>
@@ -32,17 +37,24 @@
 	</view>
 </template>
 <script>
-	const uniIdCo = uniCloud.importObject("uni-id-co")
-	import {
-		store,
-		mutations
-	} from '@/uni_modules/uni-id-pages/common/store.js'
+const uniIdCo = uniCloud.importObject("uni-id-co")
+  import {
+    store,
+    mutations
+  } from '@/uni_modules/uni-id-pages/common/store.js'
 	export default {
-		computed: {
-			userInfo() {
-				return store.userInfo
-			}
-		},
+    computed: {
+      userInfo() {
+        return store.userInfo
+      },
+	  realNameStatus () {
+		  if (!this.userInfo.realNameAuth) {
+			  return 0
+		  }
+
+		  return this.userInfo.realNameAuth.authStatus
+	  }
+    },
 		data() {
 			return {
 				univerifyStyle: {
@@ -154,13 +166,12 @@
 					this.setNicknameIng = false
 					this.$refs.dialog.close()
 				} else {
-					this.setNicknameIng = true
 					this.$refs.dialog.open()
 				}
 			},
-			deactivate() {
+			deactivate(){
 				uni.navigateTo({
-					url: "/uni_modules/uni-id-pages/pages/userinfo/deactivate/deactivate"
+					url:"/uni_modules/uni-id-pages/pages/userinfo/deactivate/deactivate"
 				})
 			},
 			async bindThirdAccount(provider) {
@@ -170,7 +181,7 @@
 					alipay: 'ali_openid',
 					apple: 'apple_openid',
 					qq: 'qq_openid'
-				} [provider.toLowerCase()]
+				}[provider.toLowerCase()]
 
 				if (this.userInfo[bindField]) {
 					await uniIdCo['unbind' + provider]()
@@ -197,6 +208,11 @@
 						}
 					})
 				}
+			},
+			realNameVerify () {
+				uni.navigateTo({
+					url: "/uni_modules/uni-id-pages/pages/userinfo/realname-verify/realname-verify"
+				})
 			}
 		}
 	}
diff --git a/uni_modules/uni-id-pages/readme.md b/uni_modules/uni-id-pages/readme.md
index 1650e459c71e4bb0bf70d721f9b5c4f1e969c71f..1fa072633a3346c5b2dfaa0793ea5b852fbdace5 100644
--- a/uni_modules/uni-id-pages/readme.md
+++ b/uni_modules/uni-id-pages/readme.md
@@ -1,15 +1,15 @@
-# 文档已移至uni-id-pages文档[https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html)
-
-
-
-关于插件更新的说明：
-
-所有uni_modules，在HBuilderX里点右键都可以直接升级。或者在插件市场导入覆盖。
-
-覆盖时HBuilderX会弹出代码差异比对，可以决定接受哪些更改、拒绝哪些更改。
-
-当拒绝局部修改时，注意可能产生兼容性问题。
-
-你需要二次开发uni-id-pages的前端页面，
-- 如果改动不大，那么每次更新uni-id-pages时，在HBuilderX的对比界面对比一下就好
+# 文档已移至uni-id-pages文档[https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html)
+
+
+
+关于插件更新的说明：
+
+所有uni_modules，在HBuilderX里点右键都可以直接升级。或者在插件市场导入覆盖。
+
+覆盖时HBuilderX会弹出代码差异比对，可以决定接受哪些更改、拒绝哪些更改。
+
+当拒绝局部修改时，注意可能产生兼容性问题。
+
+你需要二次开发uni-id-pages的前端页面，
+- 如果改动不大，那么每次更新uni-id-pages时，在HBuilderX的对比界面对比一下就好
 - 如果改动较大，建议复制一套前端页面到自己工程的pages目录下，pages.json里只引用根目录pages下的页面，不引用uni_modules下的页面。然后每次uni-id-pages更新，你对比下比上一版uni-id-pages改了什么，看你是否需要再合并到你自己的pages里。pages.json里不引用uni_modules里的页面的话，打包时不会把这些页面打包进去，不影响发行后的包体积
\ No newline at end of file
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/common/universal.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/common/universal.js
index 4bf46a0b31d1588b62de43104d03cf63d5fdfffe..084d7593650ac09cc1cac76d81eb1a9d7bf16ff2 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/common/universal.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/common/universal.js
@@ -1,47 +1,47 @@
-const { ERROR } = require('./error')
-
-function getHttpClientInfo () {
-  const requestId = this.getUniCloudRequestId()
-  const { clientIP, userAgent, source, secretType = 'none' } = this.getClientInfo()
-  const { clientInfo = {} } = JSON.parse(this.getHttpInfo().body)
-
-  return {
-    ...clientInfo,
-    clientIP,
-    userAgent,
-    source,
-    secretType,
-    requestId
-  }
-}
-
-function getHttpUniIdToken () {
-  const { uniIdToken = '' } = JSON.parse(this.getHttpInfo().body)
-
-  return uniIdToken
-}
-
-function verifyHttpMethod () {
-  const { headers, httpMethod } = this.getHttpInfo()
-
-  if (!/^application\/json/.test(headers['content-type']) || httpMethod.toUpperCase() !== 'POST') {
-    throw {
-      errCode: ERROR.UNSUPPORTED_REQUEST,
-      errMsg: 'unsupported request'
-    }
-  }
-}
-
-function universal () {
-  if (this.getClientInfo().source === 'http') {
-    verifyHttpMethod.call(this)
-    this.getParams()[0] = JSON.parse(this.getHttpInfo().body).params
-    this.getUniversalClientInfo = getHttpClientInfo.bind(this)
-    this.getUniversalUniIdToken = getHttpUniIdToken.bind(this)
-  } else {
-    this.getUniversalClientInfo = this.getClientInfo
-    this.getUniversalUniIdToken = this.getUniIdToken
-  }
-}
-
-module.exports = universal
+const { ERROR } = require('./error')
+
+function getHttpClientInfo () {
+  const requestId = this.getUniCloudRequestId()
+  const { clientIP, userAgent, source, secretType = 'none' } = this.getClientInfo()
+  const { clientInfo = {} } = JSON.parse(this.getHttpInfo().body)
+
+  return {
+    ...clientInfo,
+    clientIP,
+    userAgent,
+    source,
+    secretType,
+    requestId
+  }
+}
+
+function getHttpUniIdToken () {
+  const { uniIdToken = '' } = JSON.parse(this.getHttpInfo().body)
+
+  return uniIdToken
+}
+
+function verifyHttpMethod () {
+  const { headers, httpMethod } = this.getHttpInfo()
+
+  if (!/^application\/json/.test(headers['content-type']) || httpMethod.toUpperCase() !== 'POST') {
+    throw {
+      errCode: ERROR.UNSUPPORTED_REQUEST,
+      errMsg: 'unsupported request'
+    }
+  }
+}
+
+function universal () {
+  if (this.getClientInfo().source === 'http') {
+    verifyHttpMethod.call(this)
+    this.getParams()[0] = JSON.parse(this.getHttpInfo().body).params
+    this.getUniversalClientInfo = getHttpClientInfo.bind(this)
+    this.getUniversalUniIdToken = getHttpUniIdToken.bind(this)
+  } else {
+    this.getUniversalClientInfo = this.getClientInfo
+    this.getUniversalUniIdToken = this.getUniIdToken
+  }
+}
+
+module.exports = universal
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/common/validator.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/common/validator.js
index 4b02104d2a1e1d01b7caed84b3da3ead5b8ca174..e14600c0836e35dec5d35204df34a4f01e4b5976 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/common/validator.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/common/validator.js
@@ -198,6 +198,52 @@ function getRuleCategory(rule) {
   }
 }
 
+function isMatchUnionType(val, rule) {
+  if (!rule.children || rule.children.length === 0) {
+    return true
+  }
+  const children = rule.children
+  for (let i = 0; i < children.length; i++) {
+    const child = children[i]
+    const category = getRuleCategory(child)
+    let pass = false
+    switch (category) {
+      case 'base':
+        pass = isMatchBaseType(val, child)
+        break
+      case 'array':
+        pass = isMatchArrayType(val, child)
+        break
+      default:
+        break
+    }
+    if (pass) {
+      return true
+    }
+  }
+  return false
+}
+
+function isMatchBaseType(val, rule) {
+  if (typeof baseValidator[rule.type] !== 'function') {
+    throw new Error(`invalid schema type: ${rule.type}`)
+  }
+  const validateRes = baseValidator[rule.type](val)
+  if (validateRes && validateRes.errCode) {
+    return false
+  }
+  return true
+}
+
+function isMatchArrayType(arr, rule) {
+  if (getType(arr) !== 'array') {
+    return false
+  }
+  if (rule.children && rule.children.length && arr.some(item => !isMatchUnionType(item, rule))) {
+    return false
+  }
+  return true
+}
 
 // 特殊符号 https://www.ibm.com/support/pages/password-strength-rules  ~!@#$%^&*_-+=`|\(){}[]:;"'<>,.?/
 // const specialChar = '~!@#$%^&*_-+=`|\(){}[]:;"\'<>,.?/'
@@ -274,57 +320,7 @@ class Validator {
     return this.customValidator[type] || this.baseValidator[type]
   }
 
-  
-  _isMatchUnionType(val, rule) {
-    if (!rule.children || rule.children.length === 0) {
-      return true
-    }
-    const children = rule.children
-    for (let i = 0; i < children.length; i++) {
-      const child = children[i]
-      const category = getRuleCategory(child)
-      let pass = false
-      switch (category) {
-        case 'base':
-          pass = this._isMatchBaseType(val, child)
-          break
-        case 'array':
-          pass = this._isMatchArrayType(val, child)
-          break
-        default:
-          break
-      }
-      if (pass) {
-        return true
-      }
-    }
-    return false
-  }
-
-  _isMatchBaseType(val, rule) {
-    const method = this.getRealBaseValidator(rule.type)
-    if (typeof method !== 'function') {
-      throw new Error(`invalid schema type: ${rule.type}`)
-    }
-    const validateRes = method(val)
-    if (validateRes && validateRes.errCode) {
-      return false
-    }
-    return true
-  }
-
-  _isMatchArrayType(arr, rule) {
-    if (getType(arr) !== 'array') {
-      return false
-    }
-    if (rule.children && rule.children.length && arr.some(item => !this._isMatchUnionType(item, rule))) {
-      return false
-    }
-    return true
-  }
-
   get validator() {
-    const _this = this
     return new Proxy({}, {
       get: (_, prop) => {
         if (typeof prop !== 'string') {
@@ -336,7 +332,7 @@ class Validator {
         }
         const rule = parseValidatorName(prop)
         return function (val) {
-          if (!_this._isMatchUnionType(val, rule)) {
+          if (!isMatchUnionType(val, rule)) {
             return {
               errCode: ERROR.INVALID_PARAM
             }
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/index.obj.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/index.obj.js
index 348d4161d9eeaf314a4c0266542260b1a461c838..147432c8261ef2705798e39f41c5317e590c300c 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/index.obj.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/index.obj.js
@@ -180,21 +180,21 @@ module.exports = {
     //   }
     // })
     // // 新增规则同样可以在数组验证规则中使用
-    // this.validator.validate({
+    // this.validator.valdate({
     //   timestamp: 123456789
     // }, {
     //   timestamp: 'timestamp'
     // })
-    // this.validator.validate({
+    // this.validator.valdate({
     //   timestampList: [123456789, 123123123123]
     // }, {
     //   timestampList: 'array<timestamp>'
     // })
     // // 甚至更复杂的写法
-    // this.validator.validate({
-    //   timestamp: [123456789123123123, 123123123123]
+    // this.validator.valdate({
+    //   timestamp: [123456789, 123123123123]
     // }, {
-    //   timestamp: 'timestamp|array<timestamp|number>'
+    //   timestamp: 'timestamp|array<timestamp>'
     // })
 
     // 挂载uni-captcha到this上，方便后续调用
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lang/index.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lang/index.js
index 1f22998929e37bcd713a0d0b0ef31060bc1576b8..557575d7eea78351ef2e87f4b7b3d4b1fa0538ef 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lang/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lang/index.js
@@ -1,22 +1,22 @@
-let lang = {
-  'zh-Hans': require('./zh-hans'),
-  en: require('./en')
-}
-
-function mergeLanguage (lang1, lang2) {
-  const localeList = Object.keys(lang1)
-  localeList.push(...Object.keys(lang2))
-  const result = {}
-  for (let i = 0; i < localeList.length; i++) {
-    const locale = localeList[i]
-    result[locale] = Object.assign({}, lang1[locale], lang2[locale])
-  }
-  return result
-}
-
-try {
-  const langPath = require.resolve('uni-config-center/uni-id/lang/index.js')
-  lang = mergeLanguage(lang, require(langPath))
-} catch (error) { }
-
-module.exports = lang
+let lang = {
+  'zh-Hans': require('./zh-hans'),
+  en: require('./en')
+}
+
+function mergeLanguage (lang1, lang2) {
+  const localeList = Object.keys(lang1)
+  localeList.push(...Object.keys(lang2))
+  const result = {}
+  for (let i = 0; i < localeList.length; i++) {
+    const locale = localeList[i]
+    result[locale] = Object.assign({}, lang1[locale], lang2[locale])
+  }
+  return result
+}
+
+try {
+  const langPath = require.resolve('uni-config-center/uni-id/lang/index.js')
+  lang = mergeLanguage(lang, require(langPath))
+} catch (error) { }
+
+module.exports = lang
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/README.md b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/README.md
index 47d8c4c87b02177f27b712d2f1bedde53fcbc7e8..69e66178b341a9490d5023ab401f6bd560f3b668 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/README.md
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/README.md
@@ -1,3 +1,3 @@
-# 说明
-
+# 说明
+
 此目录内为uni-id-co基础能力，不建议直接修改。如果你发现有些逻辑加入会更好，或者此部分代码有Bug可以向我们提交PR，仓库地址：[]()。如果有特殊的需求也可以在[论坛](https://ask.dcloud.net.cn/)提出，我们可以讨论下如何实现。
\ No newline at end of file
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/alipay/account/index.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/alipay/account/index.js
index dbec0817811ad8e36f4745f842a30712ea672525..fd4c7beda00b3ecdba548087be1c8e677aea7688 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/alipay/account/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/alipay/account/index.js
@@ -1,16 +1,16 @@
-const AlipayBase = require('../alipayBase')
-const protocols = require('./protocols')
-module.exports = class Auth extends AlipayBase {
-  constructor (options) {
-    super(options)
-    this._protocols = protocols
-  }
-
-  async code2Session (code) {
-    const result = await this._exec('alipay.system.oauth.token', {
-      grantType: 'authorization_code',
-      code
-    })
-    return result
-  }
-}
+const AlipayBase = require('../alipayBase')
+const protocols = require('./protocols')
+module.exports = class Auth extends AlipayBase {
+  constructor (options) {
+    super(options)
+    this._protocols = protocols
+  }
+
+  async code2Session (code) {
+    const result = await this._exec('alipay.system.oauth.token', {
+      grantType: 'authorization_code',
+      code
+    })
+    return result
+  }
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/alipay/account/protocols.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/alipay/account/protocols.js
index cff351d830562ba14ce52482daa54f82d490b714..17c9860d6b588fe333c353842435225b6143b249 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/alipay/account/protocols.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/alipay/account/protocols.js
@@ -1,10 +1,10 @@
-module.exports = {
-  code2Session: {
-    // args (fromArgs) {
-    //   return fromArgs
-    // },
-    returnValue: {
-      openid: 'userId'
-    }
-  }
-}
+module.exports = {
+  code2Session: {
+    // args (fromArgs) {
+    //   return fromArgs
+    // },
+    returnValue: {
+      openid: 'userId'
+    }
+  }
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/alipay/alipayBase.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/alipay/alipayBase.js
index 1462b046d1aae1f355a54f26c3e1739360fb2f76..8b18706ac573fab33fdcb04a7969529d80190192 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/alipay/alipayBase.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/alipay/alipayBase.js
@@ -1,231 +1,231 @@
-const {
-  camel2snakeJson,
-  snake2camelJson,
-  getOffsetDate,
-  getFullTimeStr
-} = require('../../../common/utils')
-const crypto = require('crypto')
-
-const ALIPAY_ALGORITHM_MAPPING = {
-  RSA: 'RSA-SHA1',
-  RSA2: 'RSA-SHA256'
-}
-
-module.exports = class AlipayBase {
-  constructor (options = {}) {
-    if (!options.appId) throw new Error('appId required')
-    if (!options.privateKey) throw new Error('privateKey required')
-    const defaultOptions = {
-      gateway: 'https://openapi.alipay.com/gateway.do',
-      timeout: 5000,
-      charset: 'utf-8',
-      version: '1.0',
-      signType: 'RSA2',
-      timeOffset: -new Date().getTimezoneOffset() / 60,
-      keyType: 'PKCS8'
-    }
-
-    if (options.sandbox) {
-      options.gateway = 'https://openapi.alipaydev.com/gateway.do'
-    }
-
-    this.options = Object.assign({}, defaultOptions, options)
-
-    const privateKeyType =
-      this.options.keyType === 'PKCS8' ? 'PRIVATE KEY' : 'RSA PRIVATE KEY'
-
-    this.options.privateKey = this._formatKey(
-      this.options.privateKey,
-      privateKeyType
-    )
-    if (this.options.alipayPublicKey) {
-      this.options.alipayPublicKey = this._formatKey(
-        this.options.alipayPublicKey,
-        'PUBLIC KEY'
-      )
-    }
-  }
-
-  _formatKey (key, type) {
-    return `-----BEGIN ${type}-----\n${key}\n-----END ${type}-----`
-  }
-
-  _formatUrl (url, params) {
-    let requestUrl = url
-    // 需要放在 url 中的参数列表
-    const urlArgs = [
-      'app_id',
-      'method',
-      'format',
-      'charset',
-      'sign_type',
-      'sign',
-      'timestamp',
-      'version',
-      'notify_url',
-      'return_url',
-      'auth_token',
-      'app_auth_token'
-    ]
-
-    for (const key in params) {
-      if (urlArgs.indexOf(key) > -1) {
-        const val = encodeURIComponent(params[key])
-        requestUrl = `${requestUrl}${requestUrl.includes('?') ? '&' : '?'
-          }${key}=${val}`
-        // 删除 postData 中对应的数据
-        delete params[key]
-      }
-    }
-
-    return { execParams: params, url: requestUrl }
-  }
-
-  _getSign (method, params) {
-    const bizContent = params.bizContent || null
-    delete params.bizContent
-
-    const signParams = Object.assign({
-      method,
-      appId: this.options.appId,
-      charset: this.options.charset,
-      version: this.options.version,
-      signType: this.options.signType,
-      timestamp: getFullTimeStr(getOffsetDate(this.options.timeOffset))
-    }, params)
-
-    if (bizContent) {
-      signParams.bizContent = JSON.stringify(camel2snakeJson(bizContent))
-    }
-
-    // params key 驼峰转下划线
-    const decamelizeParams = camel2snakeJson(signParams)
-
-    // 排序
-    const signStr = Object.keys(decamelizeParams)
-      .sort()
-      .map((key) => {
-        let data = decamelizeParams[key]
-        if (Array.prototype.toString.call(data) !== '[object String]') {
-          data = JSON.stringify(data)
-        }
-        return `${key}=${data}`
-      })
-      .join('&')
-
-    // 计算签名
-    const sign = crypto
-      .createSign(ALIPAY_ALGORITHM_MAPPING[this.options.signType])
-      .update(signStr, 'utf8')
-      .sign(this.options.privateKey, 'base64')
-
-    return Object.assign(decamelizeParams, { sign })
-  }
-
-  async _exec (method, params = {}, option = {}) {
-    // 计算签名
-    const signData = this._getSign(method, params)
-    const { url, execParams } = this._formatUrl(this.options.gateway, signData)
-    const { status, data } = await uniCloud.httpclient.request(url, {
-      method: 'POST',
-      data: execParams,
-      // 按 text 返回（为了验签）
-      dataType: 'text',
-      timeout: this.options.timeout
-    })
-    if (status !== 200) throw new Error('request fail')
-    /**
-     * 示例响应格式
-     * {"alipay_trade_precreate_response":
-     *  {"code": "10000","msg": "Success","out_trade_no": "111111","qr_code": "https:\/\/"},
-     *  "sign": "abcde="
-     * }
-     * 或者
-     * {"error_response":
-     *  {"code":"40002","msg":"Invalid Arguments","sub_code":"isv.code-invalid","sub_msg":"授权码code无效"},
-     * }
-     */
-    const result = JSON.parse(data)
-    const responseKey = `${method.replace(/\./g, '_')}_response`
-    const response = result[responseKey]
-    const errorResponse = result.error_response
-    if (response) {
-      // 按字符串验签
-      const validateSuccess = option.validateSign ? this._checkResponseSign(data, responseKey) : true
-      if (validateSuccess) {
-        if (!response.code || response.code === '10000') {
-          const errCode = 0
-          const errMsg = response.msg || ''
-          return {
-            errCode,
-            errMsg,
-            ...snake2camelJson(response)
-          }
-        }
-        const msg = response.sub_code ? `${response.sub_code} ${response.sub_msg}` : `${response.msg || 'unkonwn error'}`
-        throw new Error(msg)
-      } else {
-        throw new Error('check sign error')
-      }
-    } else if (errorResponse) {
-      throw new Error(errorResponse.sub_msg || errorResponse.msg || 'request fail')
-    }
-
-    throw new Error('request fail')
-  }
-
-  _checkResponseSign (signStr, responseKey) {
-    if (!this.options.alipayPublicKey || this.options.alipayPublicKey === '') {
-      console.warn('options.alipayPublicKey is empty')
-      // 支付宝公钥不存在时不做验签
-      return true
-    }
-
-    // 带验签的参数不存在时返回失败
-    if (!signStr) { return false }
-
-    // 根据服务端返回的结果截取需要验签的目标字符串
-    const validateStr = this._getSignStr(signStr, responseKey)
-    // 服务端返回的签名
-    const serverSign = JSON.parse(signStr).sign
-
-    // 参数存在，并且是正常的结果（不包含 sub_code）时才验签
-    const verifier = crypto.createVerify(ALIPAY_ALGORITHM_MAPPING[this.options.signType])
-    verifier.update(validateStr, 'utf8')
-    return verifier.verify(this.options.alipayPublicKey, serverSign, 'base64')
-  }
-
-  _getSignStr (originStr, responseKey) {
-    // 待签名的字符串
-    let validateStr = originStr.trim()
-    // 找到 xxx_response 开始的位置
-    const startIndex = originStr.indexOf(`${responseKey}"`)
-    // 找到最后一个 “"sign"” 字符串的位置（避免）
-    const lastIndex = originStr.lastIndexOf('"sign"')
-
-    /**
-     * 删除 xxx_response 及之前的字符串
-     * 假设原始字符串为
-     *  {"xxx_response":{"code":"10000"},"sign":"jumSvxTKwn24G5sAIN"}
-     * 删除后变为
-     *  :{"code":"10000"},"sign":"jumSvxTKwn24G5sAIN"}
-     */
-    validateStr = validateStr.substr(startIndex + responseKey.length + 1)
-
-    /**
-     * 删除最后一个 "sign" 及之后的字符串
-     * 删除后变为
-     *  :{"code":"10000"},
-     * {} 之间就是待验签的字符串
-     */
-    validateStr = validateStr.substr(0, lastIndex)
-
-    // 删除第一个 { 之前的任何字符
-    validateStr = validateStr.replace(/^[^{]*{/g, '{')
-
-    // 删除最后一个 } 之后的任何字符
-    validateStr = validateStr.replace(/\}([^}]*)$/g, '}')
-
-    return validateStr
-  }
-}
+const {
+  camel2snakeJson,
+  snake2camelJson,
+  getOffsetDate,
+  getFullTimeStr
+} = require('../../../common/utils')
+const crypto = require('crypto')
+
+const ALIPAY_ALGORITHM_MAPPING = {
+  RSA: 'RSA-SHA1',
+  RSA2: 'RSA-SHA256'
+}
+
+module.exports = class AlipayBase {
+  constructor (options = {}) {
+    if (!options.appId) throw new Error('appId required')
+    if (!options.privateKey) throw new Error('privateKey required')
+    const defaultOptions = {
+      gateway: 'https://openapi.alipay.com/gateway.do',
+      timeout: 5000,
+      charset: 'utf-8',
+      version: '1.0',
+      signType: 'RSA2',
+      timeOffset: -new Date().getTimezoneOffset() / 60,
+      keyType: 'PKCS8'
+    }
+
+    if (options.sandbox) {
+      options.gateway = 'https://openapi.alipaydev.com/gateway.do'
+    }
+
+    this.options = Object.assign({}, defaultOptions, options)
+
+    const privateKeyType =
+      this.options.keyType === 'PKCS8' ? 'PRIVATE KEY' : 'RSA PRIVATE KEY'
+
+    this.options.privateKey = this._formatKey(
+      this.options.privateKey,
+      privateKeyType
+    )
+    if (this.options.alipayPublicKey) {
+      this.options.alipayPublicKey = this._formatKey(
+        this.options.alipayPublicKey,
+        'PUBLIC KEY'
+      )
+    }
+  }
+
+  _formatKey (key, type) {
+    return `-----BEGIN ${type}-----\n${key}\n-----END ${type}-----`
+  }
+
+  _formatUrl (url, params) {
+    let requestUrl = url
+    // 需要放在 url 中的参数列表
+    const urlArgs = [
+      'app_id',
+      'method',
+      'format',
+      'charset',
+      'sign_type',
+      'sign',
+      'timestamp',
+      'version',
+      'notify_url',
+      'return_url',
+      'auth_token',
+      'app_auth_token'
+    ]
+
+    for (const key in params) {
+      if (urlArgs.indexOf(key) > -1) {
+        const val = encodeURIComponent(params[key])
+        requestUrl = `${requestUrl}${requestUrl.includes('?') ? '&' : '?'
+          }${key}=${val}`
+        // 删除 postData 中对应的数据
+        delete params[key]
+      }
+    }
+
+    return { execParams: params, url: requestUrl }
+  }
+
+  _getSign (method, params) {
+    const bizContent = params.bizContent || null
+    delete params.bizContent
+
+    const signParams = Object.assign({
+      method,
+      appId: this.options.appId,
+      charset: this.options.charset,
+      version: this.options.version,
+      signType: this.options.signType,
+      timestamp: getFullTimeStr(getOffsetDate(this.options.timeOffset))
+    }, params)
+
+    if (bizContent) {
+      signParams.bizContent = JSON.stringify(camel2snakeJson(bizContent))
+    }
+
+    // params key 驼峰转下划线
+    const decamelizeParams = camel2snakeJson(signParams)
+
+    // 排序
+    const signStr = Object.keys(decamelizeParams)
+      .sort()
+      .map((key) => {
+        let data = decamelizeParams[key]
+        if (Array.prototype.toString.call(data) !== '[object String]') {
+          data = JSON.stringify(data)
+        }
+        return `${key}=${data}`
+      })
+      .join('&')
+
+    // 计算签名
+    const sign = crypto
+      .createSign(ALIPAY_ALGORITHM_MAPPING[this.options.signType])
+      .update(signStr, 'utf8')
+      .sign(this.options.privateKey, 'base64')
+
+    return Object.assign(decamelizeParams, { sign })
+  }
+
+  async _exec (method, params = {}, option = {}) {
+    // 计算签名
+    const signData = this._getSign(method, params)
+    const { url, execParams } = this._formatUrl(this.options.gateway, signData)
+    const { status, data } = await uniCloud.httpclient.request(url, {
+      method: 'POST',
+      data: execParams,
+      // 按 text 返回（为了验签）
+      dataType: 'text',
+      timeout: this.options.timeout
+    })
+    if (status !== 200) throw new Error('request fail')
+    /**
+     * 示例响应格式
+     * {"alipay_trade_precreate_response":
+     *  {"code": "10000","msg": "Success","out_trade_no": "111111","qr_code": "https:\/\/"},
+     *  "sign": "abcde="
+     * }
+     * 或者
+     * {"error_response":
+     *  {"code":"40002","msg":"Invalid Arguments","sub_code":"isv.code-invalid","sub_msg":"授权码code无效"},
+     * }
+     */
+    const result = JSON.parse(data)
+    const responseKey = `${method.replace(/\./g, '_')}_response`
+    const response = result[responseKey]
+    const errorResponse = result.error_response
+    if (response) {
+      // 按字符串验签
+      const validateSuccess = option.validateSign ? this._checkResponseSign(data, responseKey) : true
+      if (validateSuccess) {
+        if (!response.code || response.code === '10000') {
+          const errCode = 0
+          const errMsg = response.msg || ''
+          return {
+            errCode,
+            errMsg,
+            ...snake2camelJson(response)
+          }
+        }
+        const msg = response.sub_code ? `${response.sub_code} ${response.sub_msg}` : `${response.msg || 'unkonwn error'}`
+        throw new Error(msg)
+      } else {
+        throw new Error('check sign error')
+      }
+    } else if (errorResponse) {
+      throw new Error(errorResponse.sub_msg || errorResponse.msg || 'request fail')
+    }
+
+    throw new Error('request fail')
+  }
+
+  _checkResponseSign (signStr, responseKey) {
+    if (!this.options.alipayPublicKey || this.options.alipayPublicKey === '') {
+      console.warn('options.alipayPublicKey is empty')
+      // 支付宝公钥不存在时不做验签
+      return true
+    }
+
+    // 带验签的参数不存在时返回失败
+    if (!signStr) { return false }
+
+    // 根据服务端返回的结果截取需要验签的目标字符串
+    const validateStr = this._getSignStr(signStr, responseKey)
+    // 服务端返回的签名
+    const serverSign = JSON.parse(signStr).sign
+
+    // 参数存在，并且是正常的结果（不包含 sub_code）时才验签
+    const verifier = crypto.createVerify(ALIPAY_ALGORITHM_MAPPING[this.options.signType])
+    verifier.update(validateStr, 'utf8')
+    return verifier.verify(this.options.alipayPublicKey, serverSign, 'base64')
+  }
+
+  _getSignStr (originStr, responseKey) {
+    // 待签名的字符串
+    let validateStr = originStr.trim()
+    // 找到 xxx_response 开始的位置
+    const startIndex = originStr.indexOf(`${responseKey}"`)
+    // 找到最后一个 “"sign"” 字符串的位置（避免）
+    const lastIndex = originStr.lastIndexOf('"sign"')
+
+    /**
+     * 删除 xxx_response 及之前的字符串
+     * 假设原始字符串为
+     *  {"xxx_response":{"code":"10000"},"sign":"jumSvxTKwn24G5sAIN"}
+     * 删除后变为
+     *  :{"code":"10000"},"sign":"jumSvxTKwn24G5sAIN"}
+     */
+    validateStr = validateStr.substr(startIndex + responseKey.length + 1)
+
+    /**
+     * 删除最后一个 "sign" 及之后的字符串
+     * 删除后变为
+     *  :{"code":"10000"},
+     * {} 之间就是待验签的字符串
+     */
+    validateStr = validateStr.substr(0, lastIndex)
+
+    // 删除第一个 { 之前的任何字符
+    validateStr = validateStr.replace(/^[^{]*{/g, '{')
+
+    // 删除最后一个 } 之后的任何字符
+    validateStr = validateStr.replace(/\}([^}]*)$/g, '}')
+
+    return validateStr
+  }
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/apple/account/index.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/apple/account/index.js
index 0e51b4dab2e2653d95d043f6cfa29717e7c24dcb..24cd60fc5a57aa7479e4ad82b620db382aad9e6d 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/apple/account/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/apple/account/index.js
@@ -1,76 +1,76 @@
-const rsaPublicKeyPem = require('../rsa-public-key-pem')
-let authKeysCache = null
-
-module.exports = class Auth {
-  constructor (options) {
-    this.options = Object.assign({
-      baseUrl: 'https://appleid.apple.com',
-      timeout: 10000
-    }, options)
-  }
-
-  async _fetch (url, options) {
-    const { baseUrl } = this.options
-    return uniCloud.httpclient.request(baseUrl + url, options)
-  }
-
-  async verifyIdentityToken (identityToken) {
-    // 解密出kid，拿取key
-    const jwtHeader = identityToken.split('.')[0]
-    const { kid } = JSON.parse(Buffer.from(jwtHeader, 'base64').toString())
-    let authKeys
-    if (authKeysCache) {
-      authKeys = authKeysCache
-    } else {
-      authKeys = await this.getAuthKeys()
-      authKeysCache = authKeys
-    }
-    const usedKey = authKeys.find(item => item.kid === kid)
-
-    /**
-     * identityToken 格式
-     *
-     * {
-     *   iss: 'https://appleid.apple.com',
-     *   aud: 'io.dcloud.hellouniapp',
-     *   exp: 1610626724,
-     *   iat: 1610540324,
-     *   sub: '000628.30119d332d9b45a3be4a297f9391fd5c.0403',
-     *   c_hash: 'oFfgewoG36cJX00KUbj45A',
-     *   email: 'x2awmap99s@privaterelay.appleid.com',
-     *   email_verified: 'true',
-     *   is_private_email: 'true',
-     *   auth_time: 1610540324,
-     *   nonce_supported: true
-     * }
-     */
-    const payload = require('jsonwebtoken').verify(
-      identityToken,
-      rsaPublicKeyPem(usedKey.n, usedKey.e),
-      {
-        algorithms: usedKey.alg
-      }
-    )
-
-    if (payload.iss !== 'https://appleid.apple.com' || payload.aud !== this.options.bundleId) {
-      throw new Error('Invalid identity token')
-    }
-
-    return {
-      openid: payload.sub,
-      email: payload.email,
-      emailVerified: payload.email_verified === 'true',
-      isPrivateEmail: payload.is_private_email === 'true'
-    }
-  }
-
-  async getAuthKeys () {
-    const { status, data } = await this._fetch('/auth/keys', {
-      method: 'GET',
-      dataType: 'json',
-      timeout: this.options.timeout
-    })
-    if (status !== 200) throw new Error('request https://appleid.apple.com/auth/keys fail')
-    return data.keys
-  }
-}
+const rsaPublicKeyPem = require('../rsa-public-key-pem')
+let authKeysCache = null
+
+module.exports = class Auth {
+  constructor (options) {
+    this.options = Object.assign({
+      baseUrl: 'https://appleid.apple.com',
+      timeout: 10000
+    }, options)
+  }
+
+  async _fetch (url, options) {
+    const { baseUrl } = this.options
+    return uniCloud.httpclient.request(baseUrl + url, options)
+  }
+
+  async verifyIdentityToken (identityToken) {
+    // 解密出kid，拿取key
+    const jwtHeader = identityToken.split('.')[0]
+    const { kid } = JSON.parse(Buffer.from(jwtHeader, 'base64').toString())
+    let authKeys
+    if (authKeysCache) {
+      authKeys = authKeysCache
+    } else {
+      authKeys = await this.getAuthKeys()
+      authKeysCache = authKeys
+    }
+    const usedKey = authKeys.find(item => item.kid === kid)
+
+    /**
+     * identityToken 格式
+     *
+     * {
+     *   iss: 'https://appleid.apple.com',
+     *   aud: 'io.dcloud.hellouniapp',
+     *   exp: 1610626724,
+     *   iat: 1610540324,
+     *   sub: '000628.30119d332d9b45a3be4a297f9391fd5c.0403',
+     *   c_hash: 'oFfgewoG36cJX00KUbj45A',
+     *   email: 'x2awmap99s@privaterelay.appleid.com',
+     *   email_verified: 'true',
+     *   is_private_email: 'true',
+     *   auth_time: 1610540324,
+     *   nonce_supported: true
+     * }
+     */
+    const payload = require('jsonwebtoken').verify(
+      identityToken,
+      rsaPublicKeyPem(usedKey.n, usedKey.e),
+      {
+        algorithms: usedKey.alg
+      }
+    )
+
+    if (payload.iss !== 'https://appleid.apple.com' || payload.aud !== this.options.bundleId) {
+      throw new Error('Invalid identity token')
+    }
+
+    return {
+      openid: payload.sub,
+      email: payload.email,
+      emailVerified: payload.email_verified === 'true',
+      isPrivateEmail: payload.is_private_email === 'true'
+    }
+  }
+
+  async getAuthKeys () {
+    const { status, data } = await this._fetch('/auth/keys', {
+      method: 'GET',
+      dataType: 'json',
+      timeout: this.options.timeout
+    })
+    if (status !== 200) throw new Error('request https://appleid.apple.com/auth/keys fail')
+    return data.keys
+  }
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/apple/rsa-public-key-pem.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/apple/rsa-public-key-pem.js
index e1dbb31db3894f81838a843ec667cda09ec9f23b..8fcc5690e136cb52dffdf807c5d300447fba7bb1 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/apple/rsa-public-key-pem.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/apple/rsa-public-key-pem.js
@@ -1,64 +1,64 @@
-// http://stackoverflow.com/questions/18835132/xml-to-pem-in-node-js
-/* eslint-disable camelcase */
-function rsaPublicKeyPem (modulus_b64, exponent_b64) {
-  const modulus = Buffer.from(modulus_b64, 'base64')
-  const exponent = Buffer.from(exponent_b64, 'base64')
-
-  let modulus_hex = modulus.toString('hex')
-  let exponent_hex = exponent.toString('hex')
-
-  modulus_hex = prepadSigned(modulus_hex)
-  exponent_hex = prepadSigned(exponent_hex)
-
-  const modlen = modulus_hex.length / 2
-  const explen = exponent_hex.length / 2
-
-  const encoded_modlen = encodeLengthHex(modlen)
-  const encoded_explen = encodeLengthHex(explen)
-  const encoded_pubkey = '30' +
-    encodeLengthHex(
-      modlen +
-      explen +
-      encoded_modlen.length / 2 +
-      encoded_explen.length / 2 + 2
-    ) +
-    '02' + encoded_modlen + modulus_hex +
-    '02' + encoded_explen + exponent_hex
-
-  const der_b64 = Buffer.from(encoded_pubkey, 'hex').toString('base64')
-
-  const pem = '-----BEGIN RSA PUBLIC KEY-----\n' +
-    der_b64.match(/.{1,64}/g).join('\n') +
-    '\n-----END RSA PUBLIC KEY-----\n'
-
-  return pem
-}
-
-function prepadSigned (hexStr) {
-  const msb = hexStr[0]
-  if (msb < '0' || msb > '7') {
-    return '00' + hexStr
-  } else {
-    return hexStr
-  }
-}
-
-function toHex (number) {
-  const nstr = number.toString(16)
-  if (nstr.length % 2) return '0' + nstr
-  return nstr
-}
-
-// encode ASN.1 DER length field
-// if <=127, short form
-// if >=128, long form
-function encodeLengthHex (n) {
-  if (n <= 127) return toHex(n)
-  else {
-    const n_hex = toHex(n)
-    const length_of_length_byte = 128 + n_hex.length / 2 // 0x80+numbytes
-    return toHex(length_of_length_byte) + n_hex
-  }
-}
-
-module.exports = rsaPublicKeyPem
+// http://stackoverflow.com/questions/18835132/xml-to-pem-in-node-js
+/* eslint-disable camelcase */
+function rsaPublicKeyPem (modulus_b64, exponent_b64) {
+  const modulus = Buffer.from(modulus_b64, 'base64')
+  const exponent = Buffer.from(exponent_b64, 'base64')
+
+  let modulus_hex = modulus.toString('hex')
+  let exponent_hex = exponent.toString('hex')
+
+  modulus_hex = prepadSigned(modulus_hex)
+  exponent_hex = prepadSigned(exponent_hex)
+
+  const modlen = modulus_hex.length / 2
+  const explen = exponent_hex.length / 2
+
+  const encoded_modlen = encodeLengthHex(modlen)
+  const encoded_explen = encodeLengthHex(explen)
+  const encoded_pubkey = '30' +
+    encodeLengthHex(
+      modlen +
+      explen +
+      encoded_modlen.length / 2 +
+      encoded_explen.length / 2 + 2
+    ) +
+    '02' + encoded_modlen + modulus_hex +
+    '02' + encoded_explen + exponent_hex
+
+  const der_b64 = Buffer.from(encoded_pubkey, 'hex').toString('base64')
+
+  const pem = '-----BEGIN RSA PUBLIC KEY-----\n' +
+    der_b64.match(/.{1,64}/g).join('\n') +
+    '\n-----END RSA PUBLIC KEY-----\n'
+
+  return pem
+}
+
+function prepadSigned (hexStr) {
+  const msb = hexStr[0]
+  if (msb < '0' || msb > '7') {
+    return '00' + hexStr
+  } else {
+    return hexStr
+  }
+}
+
+function toHex (number) {
+  const nstr = number.toString(16)
+  if (nstr.length % 2) return '0' + nstr
+  return nstr
+}
+
+// encode ASN.1 DER length field
+// if <=127, short form
+// if >=128, long form
+function encodeLengthHex (n) {
+  if (n <= 127) return toHex(n)
+  else {
+    const n_hex = toHex(n)
+    const length_of_length_byte = 128 + n_hex.length / 2 // 0x80+numbytes
+    return toHex(length_of_length_byte) + n_hex
+  }
+}
+
+module.exports = rsaPublicKeyPem
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/index.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/index.js
index 149c7de99cc214c10976e9728efd3b2f7f8a73f5..499265e47418c45867520714974451ae36784bba 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/index.js
@@ -1,36 +1,36 @@
-const WxAccount = require('./weixin/account/index')
-const QQAccount = require('./qq/account/index')
-const AliAccount = require('./alipay/account/index')
-const AppleAccount = require('./apple/account/index')
-
-const createApi = require('./share/create-api')
-
-module.exports = {
-  initWeixin: function () {
-    const oauthConfig = this.configUtils.getOauthConfig({ provider: 'weixin' })
-    return createApi(WxAccount, {
-      appId: oauthConfig.appid,
-      secret: oauthConfig.appsecret
-    })
-  },
-  initQQ: function () {
-    const oauthConfig = this.configUtils.getOauthConfig({ provider: 'qq' })
-    return createApi(QQAccount, {
-      appId: oauthConfig.appid,
-      secret: oauthConfig.appsecret
-    })
-  },
-  initAlipay: function () {
-    const oauthConfig = this.configUtils.getOauthConfig({ provider: 'alipay' })
-    return createApi(AliAccount, {
-      appId: oauthConfig.appid,
-      privateKey: oauthConfig.privateKey
-    })
-  },
-  initApple: function () {
-    const oauthConfig = this.configUtils.getOauthConfig({ provider: 'apple' })
-    return createApi(AppleAccount, {
-      bundleId: oauthConfig.bundleId
-    })
-  }
-}
+const WxAccount = require('./weixin/account/index')
+const QQAccount = require('./qq/account/index')
+const AliAccount = require('./alipay/account/index')
+const AppleAccount = require('./apple/account/index')
+
+const createApi = require('./share/create-api')
+
+module.exports = {
+  initWeixin: function () {
+    const oauthConfig = this.configUtils.getOauthConfig({ provider: 'weixin' })
+    return createApi(WxAccount, {
+      appId: oauthConfig.appid,
+      secret: oauthConfig.appsecret
+    })
+  },
+  initQQ: function () {
+    const oauthConfig = this.configUtils.getOauthConfig({ provider: 'qq' })
+    return createApi(QQAccount, {
+      appId: oauthConfig.appid,
+      secret: oauthConfig.appsecret
+    })
+  },
+  initAlipay: function () {
+    const oauthConfig = this.configUtils.getOauthConfig({ provider: 'alipay' })
+    return createApi(AliAccount, {
+      appId: oauthConfig.appid,
+      privateKey: oauthConfig.privateKey
+    })
+  },
+  initApple: function () {
+    const oauthConfig = this.configUtils.getOauthConfig({ provider: 'apple' })
+    return createApi(AppleAccount, {
+      bundleId: oauthConfig.bundleId
+    })
+  }
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/qq/account/index.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/qq/account/index.js
index 9b4879a0e1481e296f56425900278cf607bb59a0..35a1a335714e40e67290cabafc776ef3c6302afc 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/qq/account/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/qq/account/index.js
@@ -1,97 +1,97 @@
-const {
-  UniCloudError
-} = require('../../../../common/error')
-const {
-  resolveUrl
-} = require('../../../../common/utils')
-const {
-  callQQOpenApi
-} = require('../normalize')
-
-module.exports = class Auth {
-  constructor (options) {
-    this.options = Object.assign({
-      baseUrl: 'https://graph.qq.com',
-      timeout: 5000
-    }, options)
-  }
-
-  async _requestQQOpenapi ({ name, url, data, options }) {
-    const defaultOptions = {
-      method: 'GET',
-      dataType: 'json',
-      dataAsQueryString: true,
-      timeout: this.options.timeout
-    }
-    const result = await callQQOpenApi({
-      name: `auth.${name}`,
-      url: resolveUrl(this.options.baseUrl, url),
-      data,
-      options,
-      defaultOptions
-    })
-    return result
-  }
-
-  async getUserInfo ({
-    accessToken,
-    openid
-  } = {}) {
-    const url = '/user/get_user_info'
-    const result = await this._requestQQOpenapi({
-      name: 'getUserInfo',
-      url,
-      data: {
-        oauthConsumerKey: this.options.appId,
-        accessToken,
-        openid
-      }
-    })
-    return {
-      nickname: result.nickname,
-      avatar: result.figureurl_qq_1
-    }
-  }
-
-  async getOpenidByToken ({
-    accessToken
-  } = {}) {
-    const url = '/oauth2.0/me'
-    const result = await this._requestQQOpenapi({
-      name: 'getOpenidByToken',
-      url,
-      data: {
-        accessToken,
-        unionid: 1,
-        fmt: 'json'
-      }
-    })
-    if (result.clientId !== this.options.appId) {
-      throw new UniCloudError({
-        code: 'APPID_NOT_MATCH',
-        message: 'appid not match'
-      })
-    }
-    return {
-      openid: result.openid,
-      unionid: result.unionid
-    }
-  }
-
-  async code2Session ({
-    code
-  } = {}) {
-    const url = 'https://api.q.qq.com/sns/jscode2session'
-    const result = await this._requestQQOpenapi({
-      name: 'getOpenidByToken',
-      url,
-      data: {
-        grant_type: 'authorization_code',
-        appid: this.options.appId,
-        secret: this.options.secret,
-        js_code: code
-      }
-    })
-    return result
-  }
-}
+const {
+  UniCloudError
+} = require('../../../../common/error')
+const {
+  resolveUrl
+} = require('../../../../common/utils')
+const {
+  callQQOpenApi
+} = require('../normalize')
+
+module.exports = class Auth {
+  constructor (options) {
+    this.options = Object.assign({
+      baseUrl: 'https://graph.qq.com',
+      timeout: 5000
+    }, options)
+  }
+
+  async _requestQQOpenapi ({ name, url, data, options }) {
+    const defaultOptions = {
+      method: 'GET',
+      dataType: 'json',
+      dataAsQueryString: true,
+      timeout: this.options.timeout
+    }
+    const result = await callQQOpenApi({
+      name: `auth.${name}`,
+      url: resolveUrl(this.options.baseUrl, url),
+      data,
+      options,
+      defaultOptions
+    })
+    return result
+  }
+
+  async getUserInfo ({
+    accessToken,
+    openid
+  } = {}) {
+    const url = '/user/get_user_info'
+    const result = await this._requestQQOpenapi({
+      name: 'getUserInfo',
+      url,
+      data: {
+        oauthConsumerKey: this.options.appId,
+        accessToken,
+        openid
+      }
+    })
+    return {
+      nickname: result.nickname,
+      avatar: result.figureurl_qq_1
+    }
+  }
+
+  async getOpenidByToken ({
+    accessToken
+  } = {}) {
+    const url = '/oauth2.0/me'
+    const result = await this._requestQQOpenapi({
+      name: 'getOpenidByToken',
+      url,
+      data: {
+        accessToken,
+        unionid: 1,
+        fmt: 'json'
+      }
+    })
+    if (result.clientId !== this.options.appId) {
+      throw new UniCloudError({
+        code: 'APPID_NOT_MATCH',
+        message: 'appid not match'
+      })
+    }
+    return {
+      openid: result.openid,
+      unionid: result.unionid
+    }
+  }
+
+  async code2Session ({
+    code
+  } = {}) {
+    const url = 'https://api.q.qq.com/sns/jscode2session'
+    const result = await this._requestQQOpenapi({
+      name: 'getOpenidByToken',
+      url,
+      data: {
+        grant_type: 'authorization_code',
+        appid: this.options.appId,
+        secret: this.options.secret,
+        js_code: code
+      }
+    })
+    return result
+  }
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/qq/normalize.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/qq/normalize.js
index fcfdc1ef87ae27e8c3308fcf82d5cdb1404df89c..ca0ebe60dc991fd0c3e7e314f28e85e6fb2aa919 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/qq/normalize.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/qq/normalize.js
@@ -1,85 +1,85 @@
-const {
-  UniCloudError
-} = require('../../../common/error')
-const {
-  camel2snakeJson,
-  snake2camelJson
-} = require('../../../common/utils')
-
-function generateApiResult (apiName, data) {
-  if (data.ret || data.error) {
-    // 这三种都是qq的错误码规范
-    const code = data.ret || data.error || data.errcode || -2
-    const message = data.msg || data.error_description || data.errmsg || `${apiName} fail`
-    throw new UniCloudError({
-      code,
-      message
-    })
-  } else {
-    delete data.ret
-    delete data.msg
-    delete data.error
-    delete data.error_description
-    delete data.errcode
-    delete data.errmsg
-    return {
-      ...data,
-      errMsg: `${apiName} ok`,
-      errCode: 0
-    }
-  }
-}
-
-function nomalizeError (apiName, error) {
-  throw new UniCloudError({
-    code: error.code || -2,
-    message: error.message || `${apiName} fail`
-  })
-}
-
-async function callQQOpenApi ({
-  name,
-  url,
-  data,
-  options,
-  defaultOptions
-}) {
-  options = Object.assign({}, defaultOptions, options, { data: camel2snakeJson(Object.assign({}, data)) })
-  let result
-  try {
-    result = await uniCloud.httpclient.request(url, options)
-  } catch (e) {
-    return nomalizeError(name, e)
-  }
-  let resData = result.data
-  const contentType = result.headers['content-type']
-  if (
-    Buffer.isBuffer(resData) &&
-    (contentType.indexOf('text/plain') === 0 ||
-      contentType.indexOf('application/json') === 0)
-  ) {
-    try {
-      resData = JSON.parse(resData.toString())
-    } catch (e) {
-      resData = resData.toString()
-    }
-  } else if (Buffer.isBuffer(resData)) {
-    resData = {
-      buffer: resData,
-      contentType
-    }
-  }
-  return snake2camelJson(
-    generateApiResult(
-      name,
-      resData || {
-        errCode: -2,
-        errMsg: 'Request failed'
-      }
-    )
-  )
-}
-
-module.exports = {
-  callQQOpenApi
-}
+const {
+  UniCloudError
+} = require('../../../common/error')
+const {
+  camel2snakeJson,
+  snake2camelJson
+} = require('../../../common/utils')
+
+function generateApiResult (apiName, data) {
+  if (data.ret || data.error) {
+    // 这三种都是qq的错误码规范
+    const code = data.ret || data.error || data.errcode || -2
+    const message = data.msg || data.error_description || data.errmsg || `${apiName} fail`
+    throw new UniCloudError({
+      code,
+      message
+    })
+  } else {
+    delete data.ret
+    delete data.msg
+    delete data.error
+    delete data.error_description
+    delete data.errcode
+    delete data.errmsg
+    return {
+      ...data,
+      errMsg: `${apiName} ok`,
+      errCode: 0
+    }
+  }
+}
+
+function nomalizeError (apiName, error) {
+  throw new UniCloudError({
+    code: error.code || -2,
+    message: error.message || `${apiName} fail`
+  })
+}
+
+async function callQQOpenApi ({
+  name,
+  url,
+  data,
+  options,
+  defaultOptions
+}) {
+  options = Object.assign({}, defaultOptions, options, { data: camel2snakeJson(Object.assign({}, data)) })
+  let result
+  try {
+    result = await uniCloud.httpclient.request(url, options)
+  } catch (e) {
+    return nomalizeError(name, e)
+  }
+  let resData = result.data
+  const contentType = result.headers['content-type']
+  if (
+    Buffer.isBuffer(resData) &&
+    (contentType.indexOf('text/plain') === 0 ||
+      contentType.indexOf('application/json') === 0)
+  ) {
+    try {
+      resData = JSON.parse(resData.toString())
+    } catch (e) {
+      resData = resData.toString()
+    }
+  } else if (Buffer.isBuffer(resData)) {
+    resData = {
+      buffer: resData,
+      contentType
+    }
+  }
+  return snake2camelJson(
+    generateApiResult(
+      name,
+      resData || {
+        errCode: -2,
+        errMsg: 'Request failed'
+      }
+    )
+  )
+}
+
+module.exports = {
+  callQQOpenApi
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/share/create-api.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/share/create-api.js
index c58f1e8dbe1581767d15ffc6f141f5c8c63d4c8c..abb1f4146924e3dc7d57af656ffe59ac892718bf 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/share/create-api.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/share/create-api.js
@@ -1,73 +1,73 @@
-const {
-  isFn,
-  isPlainObject
-} = require('../../../common/utils')
-
-// 注意：不进行递归处理
-function parseParams (params = {}, rule) {
-  if (!rule || !params) {
-    return params
-  }
-  const internalKeys = ['_pre', '_purify', '_post']
-  // 转换之前的处理
-  if (rule._pre) {
-    params = rule._pre(params)
-  }
-  // 净化参数
-  let purify = { shouldDelete: new Set([]) }
-  if (rule._purify) {
-    const _purify = rule._purify
-    for (const purifyKey in _purify) {
-      _purify[purifyKey] = new Set(_purify[purifyKey])
-    }
-    purify = Object.assign(purify, _purify)
-  }
-  if (isPlainObject(rule)) {
-    for (const key in rule) {
-      const parser = rule[key]
-      if (isFn(parser) && internalKeys.indexOf(key) === -1) {
-        params[key] = parser(params)
-      } else if (typeof parser === 'string' && internalKeys.indexOf(key) === -1) {
-        // 直接转换属性名称的删除旧属性名
-        params[key] = params[parser]
-        purify.shouldDelete.add(parser)
-      }
-    }
-  } else if (isFn(rule)) {
-    params = rule(params)
-  }
-
-  if (purify.shouldDelete) {
-    for (const item of purify.shouldDelete) {
-      delete params[item]
-    }
-  }
-
-  // 转换之后的处理
-  if (rule._post) {
-    params = rule._post(params)
-  }
-
-  return params
-}
-
-function createApi (ApiClass, options) {
-  const apiInstance = new ApiClass(options)
-  return new Proxy(apiInstance, {
-    get: function (obj, prop) {
-      if (typeof obj[prop] === 'function' && prop.indexOf('_') !== 0 && obj._protocols && obj._protocols[prop]) {
-        const protocol = obj._protocols[prop]
-        return async function (params) {
-          params = parseParams(params, protocol.args)
-          let result = await obj[prop](params)
-          result = parseParams(result, protocol.returnValue)
-          return result
-        }
-      } else {
-        return obj[prop]
-      }
-    }
-  })
-}
-
-module.exports = createApi
+const {
+  isFn,
+  isPlainObject
+} = require('../../../common/utils')
+
+// 注意：不进行递归处理
+function parseParams (params = {}, rule) {
+  if (!rule || !params) {
+    return params
+  }
+  const internalKeys = ['_pre', '_purify', '_post']
+  // 转换之前的处理
+  if (rule._pre) {
+    params = rule._pre(params)
+  }
+  // 净化参数
+  let purify = { shouldDelete: new Set([]) }
+  if (rule._purify) {
+    const _purify = rule._purify
+    for (const purifyKey in _purify) {
+      _purify[purifyKey] = new Set(_purify[purifyKey])
+    }
+    purify = Object.assign(purify, _purify)
+  }
+  if (isPlainObject(rule)) {
+    for (const key in rule) {
+      const parser = rule[key]
+      if (isFn(parser) && internalKeys.indexOf(key) === -1) {
+        params[key] = parser(params)
+      } else if (typeof parser === 'string' && internalKeys.indexOf(key) === -1) {
+        // 直接转换属性名称的删除旧属性名
+        params[key] = params[parser]
+        purify.shouldDelete.add(parser)
+      }
+    }
+  } else if (isFn(rule)) {
+    params = rule(params)
+  }
+
+  if (purify.shouldDelete) {
+    for (const item of purify.shouldDelete) {
+      delete params[item]
+    }
+  }
+
+  // 转换之后的处理
+  if (rule._post) {
+    params = rule._post(params)
+  }
+
+  return params
+}
+
+function createApi (ApiClass, options) {
+  const apiInstance = new ApiClass(options)
+  return new Proxy(apiInstance, {
+    get: function (obj, prop) {
+      if (typeof obj[prop] === 'function' && prop.indexOf('_') !== 0 && obj._protocols && obj._protocols[prop]) {
+        const protocol = obj._protocols[prop]
+        return async function (params) {
+          params = parseParams(params, protocol.args)
+          let result = await obj[prop](params)
+          result = parseParams(result, protocol.returnValue)
+          return result
+        }
+      } else {
+        return obj[prop]
+      }
+    }
+  })
+}
+
+module.exports = createApi
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/weixin/account/index.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/weixin/account/index.js
index 7ecea841c7c88c72bf3169b323d882723d92f9f3..734f6423b3fead834cd296796ec66281ffe0b5ec 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/weixin/account/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/weixin/account/index.js
@@ -1,111 +1,111 @@
-const {
-  callWxOpenApi,
-  buildUrl
-} = require('../normalize')
-
-module.exports = class Auth {
-  constructor (options) {
-    this.options = Object.assign({
-      baseUrl: 'https://api.weixin.qq.com',
-      timeout: 5000
-    }, options)
-  }
-
-  async _requestWxOpenapi ({ name, url, data, options }) {
-    const defaultOptions = {
-      method: 'GET',
-      dataType: 'json',
-      dataAsQueryString: true,
-      timeout: this.options.timeout
-    }
-    const result = await callWxOpenApi({
-      name: `auth.${name}`,
-      url: `${this.options.baseUrl}${buildUrl(url, data)}`,
-      data,
-      options,
-      defaultOptions
-    })
-    return result
-  }
-
-  async code2Session (code) {
-    const url = '/sns/jscode2session'
-    const result = await this._requestWxOpenapi({
-      name: 'code2Session',
-      url,
-      data: {
-        grant_type: 'authorization_code',
-        appid: this.options.appId,
-        secret: this.options.secret,
-        js_code: code
-      }
-    })
-    return result
-  }
-
-  async getOauthAccessToken (code) {
-    const url = '/sns/oauth2/access_token'
-    const result = await this._requestWxOpenapi({
-      name: 'getOauthAccessToken',
-      url,
-      data: {
-        grant_type: 'authorization_code',
-        appid: this.options.appId,
-        secret: this.options.secret,
-        code
-      }
-    })
-    if (result.expiresIn) {
-      result.expired = Date.now() + result.expiresIn * 1000
-      // delete result.expiresIn
-    }
-    return result
-  }
-
-  async getUserInfo ({
-    accessToken,
-    openid
-  } = {}) {
-    const url = '/sns/userinfo'
-    const {
-      nickname,
-      headimgurl: avatar
-    } = await this._requestWxOpenapi({
-      name: 'getUserInfo',
-      url,
-      data: {
-        accessToken,
-        openid,
-        appid: this.options.appId,
-        secret: this.options.secret,
-        scope: 'snsapi_userinfo'
-      }
-    })
-    return {
-      nickname,
-      avatar
-    }
-  }
-
-  async getPhoneNumber (accessToken, code) {
-    const url = `/wxa/business/getuserphonenumber?access_token=${accessToken}`
-    const { phoneInfo } = await this._requestWxOpenapi({
-      name: 'getPhoneNumber',
-      url,
-      data: {
-        code
-      },
-      options: {
-        method: 'POST',
-        dataAsQueryString: false,
-        headers: {
-          'content-type': 'application/json'
-        }
-      }
-    })
-
-    return {
-      purePhoneNumber: phoneInfo.purePhoneNumber
-    }
-  }
-}
+const {
+  callWxOpenApi,
+  buildUrl
+} = require('../normalize')
+
+module.exports = class Auth {
+  constructor (options) {
+    this.options = Object.assign({
+      baseUrl: 'https://api.weixin.qq.com',
+      timeout: 5000
+    }, options)
+  }
+
+  async _requestWxOpenapi ({ name, url, data, options }) {
+    const defaultOptions = {
+      method: 'GET',
+      dataType: 'json',
+      dataAsQueryString: true,
+      timeout: this.options.timeout
+    }
+    const result = await callWxOpenApi({
+      name: `auth.${name}`,
+      url: `${this.options.baseUrl}${buildUrl(url, data)}`,
+      data,
+      options,
+      defaultOptions
+    })
+    return result
+  }
+
+  async code2Session (code) {
+    const url = '/sns/jscode2session'
+    const result = await this._requestWxOpenapi({
+      name: 'code2Session',
+      url,
+      data: {
+        grant_type: 'authorization_code',
+        appid: this.options.appId,
+        secret: this.options.secret,
+        js_code: code
+      }
+    })
+    return result
+  }
+
+  async getOauthAccessToken (code) {
+    const url = '/sns/oauth2/access_token'
+    const result = await this._requestWxOpenapi({
+      name: 'getOauthAccessToken',
+      url,
+      data: {
+        grant_type: 'authorization_code',
+        appid: this.options.appId,
+        secret: this.options.secret,
+        code
+      }
+    })
+    if (result.expiresIn) {
+      result.expired = Date.now() + result.expiresIn * 1000
+      // delete result.expiresIn
+    }
+    return result
+  }
+
+  async getUserInfo ({
+    accessToken,
+    openid
+  } = {}) {
+    const url = '/sns/userinfo'
+    const {
+      nickname,
+      headimgurl: avatar
+    } = await this._requestWxOpenapi({
+      name: 'getUserInfo',
+      url,
+      data: {
+        accessToken,
+        openid,
+        appid: this.options.appId,
+        secret: this.options.secret,
+        scope: 'snsapi_userinfo'
+      }
+    })
+    return {
+      nickname,
+      avatar
+    }
+  }
+
+  async getPhoneNumber (accessToken, code) {
+    const url = `/wxa/business/getuserphonenumber?access_token=${accessToken}`
+    const { phoneInfo } = await this._requestWxOpenapi({
+      name: 'getPhoneNumber',
+      url,
+      data: {
+        code
+      },
+      options: {
+        method: 'POST',
+        dataAsQueryString: false,
+        headers: {
+          'content-type': 'application/json'
+        }
+      }
+    })
+
+    return {
+      purePhoneNumber: phoneInfo.purePhoneNumber
+    }
+  }
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/weixin/normalize.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/weixin/normalize.js
index 908d916dc6349e5cb326d4f1b8927f24faed9b3c..9749c3838ddb96d7119d99ad65f438df9b612ea3 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/weixin/normalize.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/weixin/normalize.js
@@ -1,95 +1,95 @@
-const {
-  UniCloudError
-} = require('../../../common/error')
-const {
-  camel2snakeJson, snake2camelJson
-} = require('../../../common/utils')
-
-function generateApiResult (apiName, data) {
-  if (data.errcode) {
-    throw new UniCloudError({
-      code: data.errcode || -2,
-      message: data.errmsg || `${apiName} fail`
-    })
-  } else {
-    delete data.errcode
-    delete data.errmsg
-    return {
-      ...data,
-      errMsg: `${apiName} ok`,
-      errCode: 0
-    }
-  }
-}
-
-function nomalizeError (apiName, error) {
-  throw new UniCloudError({
-    code: error.code || -2,
-    message: error.message || `${apiName} fail`
-  })
-}
-
-// 微信openapi接口接收蛇形（snake case）参数返回蛇形参数，这里进行转化，如果是formdata里面的参数需要在对应api实现时就转为蛇形
-async function callWxOpenApi ({
-  name,
-  url,
-  data,
-  options,
-  defaultOptions
-}) {
-  let result = {}
-  // 获取二维码的接口wxacode.get和wxacode.getUnlimited不可以传入access_token（可能有其他接口也不可以），否则会返回data format error
-  const dataCopy = camel2snakeJson(Object.assign({}, data))
-  if (dataCopy && dataCopy.access_token) {
-    delete dataCopy.access_token
-  }
-  try {
-    options = Object.assign({}, defaultOptions, options, { data: dataCopy })
-    result = await uniCloud.httpclient.request(url, options)
-  } catch (e) {
-    return nomalizeError(name, e)
-  }
-
-  // 有几个接口成功返回buffer失败返回json，对这些接口统一成返回buffer，然后分别解析
-  let resData = result.data
-  const contentType = result.headers['content-type']
-  if (
-    Buffer.isBuffer(resData) &&
-    (contentType.indexOf('text/plain') === 0 ||
-      contentType.indexOf('application/json') === 0)
-  ) {
-    try {
-      resData = JSON.parse(resData.toString())
-    } catch (e) {
-      resData = resData.toString()
-    }
-  } else if (Buffer.isBuffer(resData)) {
-    resData = {
-      buffer: resData,
-      contentType
-    }
-  }
-  return snake2camelJson(
-    generateApiResult(
-      name,
-      resData || {
-        errCode: -2,
-        errMsg: 'Request failed'
-      }
-    )
-  )
-}
-
-function buildUrl (url, data) {
-  let query = ''
-  if (data && data.accessToken) {
-    const divider = url.indexOf('?') > -1 ? '&' : '?'
-    query = `${divider}access_token=${data.accessToken}`
-  }
-  return `${url}${query}`
-}
-
-module.exports = {
-  callWxOpenApi,
-  buildUrl
-}
+const {
+  UniCloudError
+} = require('../../../common/error')
+const {
+  camel2snakeJson, snake2camelJson
+} = require('../../../common/utils')
+
+function generateApiResult (apiName, data) {
+  if (data.errcode) {
+    throw new UniCloudError({
+      code: data.errcode || -2,
+      message: data.errmsg || `${apiName} fail`
+    })
+  } else {
+    delete data.errcode
+    delete data.errmsg
+    return {
+      ...data,
+      errMsg: `${apiName} ok`,
+      errCode: 0
+    }
+  }
+}
+
+function nomalizeError (apiName, error) {
+  throw new UniCloudError({
+    code: error.code || -2,
+    message: error.message || `${apiName} fail`
+  })
+}
+
+// 微信openapi接口接收蛇形（snake case）参数返回蛇形参数，这里进行转化，如果是formdata里面的参数需要在对应api实现时就转为蛇形
+async function callWxOpenApi ({
+  name,
+  url,
+  data,
+  options,
+  defaultOptions
+}) {
+  let result = {}
+  // 获取二维码的接口wxacode.get和wxacode.getUnlimited不可以传入access_token（可能有其他接口也不可以），否则会返回data format error
+  const dataCopy = camel2snakeJson(Object.assign({}, data))
+  if (dataCopy && dataCopy.access_token) {
+    delete dataCopy.access_token
+  }
+  try {
+    options = Object.assign({}, defaultOptions, options, { data: dataCopy })
+    result = await uniCloud.httpclient.request(url, options)
+  } catch (e) {
+    return nomalizeError(name, e)
+  }
+
+  // 有几个接口成功返回buffer失败返回json，对这些接口统一成返回buffer，然后分别解析
+  let resData = result.data
+  const contentType = result.headers['content-type']
+  if (
+    Buffer.isBuffer(resData) &&
+    (contentType.indexOf('text/plain') === 0 ||
+      contentType.indexOf('application/json') === 0)
+  ) {
+    try {
+      resData = JSON.parse(resData.toString())
+    } catch (e) {
+      resData = resData.toString()
+    }
+  } else if (Buffer.isBuffer(resData)) {
+    resData = {
+      buffer: resData,
+      contentType
+    }
+  }
+  return snake2camelJson(
+    generateApiResult(
+      name,
+      resData || {
+        errCode: -2,
+        errMsg: 'Request failed'
+      }
+    )
+  )
+}
+
+function buildUrl (url, data) {
+  let query = ''
+  if (data && data.accessToken) {
+    const divider = url.indexOf('?') > -1 ? '&' : '?'
+    query = `${divider}access_token=${data.accessToken}`
+  }
+  return `${url}${query}`
+}
+
+module.exports = {
+  callWxOpenApi,
+  buildUrl
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/weixin/utils.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/weixin/utils.js
index c1410169a68fe4ffca80d7949d3e54dcd0479b2b..acb053adfd6ab490e06695939150fefcfabb8019 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/weixin/utils.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/weixin/utils.js
@@ -1,87 +1,87 @@
-const crypto = require('crypto')
-const {
-  isPlainObject
-} = require('../../../common/utils')
-
-// 退款通知解密key=md5(key)
-function decryptData (encryptedData, key, iv = '') {
-  // 解密
-  const decipher = crypto.createDecipheriv('aes-128-cbc', key, iv)
-  // 设置自动 padding 为 true，删除填充补位
-  decipher.setAutoPadding(true)
-  let decoded = decipher.update(encryptedData, 'base64', 'utf8')
-  decoded += decipher.final('utf8')
-  return decoded
-}
-
-function md5 (str, encoding = 'utf8') {
-  return crypto
-    .createHash('md5')
-    .update(str, encoding)
-    .digest('hex')
-}
-
-function sha256 (str, key, encoding = 'utf8') {
-  return crypto
-    .createHmac('sha256', key)
-    .update(str, encoding)
-    .digest('hex')
-}
-
-function getSignStr (obj) {
-  return Object.keys(obj)
-    .filter(key => key !== 'sign' && obj[key] !== undefined && obj[key] !== '')
-    .sort()
-    .map(key => key + '=' + obj[key])
-    .join('&')
-}
-
-function getNonceStr (length = 16) {
-  let str = ''
-  while (str.length < length) {
-    str += Math.random().toString(32).substring(2)
-  }
-  return str.substring(0, length)
-}
-
-// 简易版Object转XML，只可在微信支付时使用，不支持嵌套
-function buildXML (obj, rootName = 'xml') {
-  const content = Object.keys(obj).map(item => {
-    if (isPlainObject(obj[item])) {
-      return `<${item}><![CDATA[${JSON.stringify(obj[item])}]]></${item}>`
-    } else {
-      return `<${item}><![CDATA[${obj[item]}]]></${item}>`
-    }
-  })
-  return `<${rootName}>${content.join('')}</${rootName}>`
-}
-
-function isXML (str) {
-  const reg = /^(<\?xml.*\?>)?(\r?\n)*<xml>(.|\r?\n)*<\/xml>$/i
-  return reg.test(str.trim())
-};
-
-// 简易版XML转Object，只可在微信支付时使用，不支持嵌套
-function parseXML (xml) {
-  const xmlReg = /<(?:xml|root).*?>([\s|\S]*)<\/(?:xml|root)>/
-  const str = xmlReg.exec(xml)[1]
-  const obj = {}
-  const nodeReg = /<(.*?)>(?:<!\[CDATA\[){0,1}(.*?)(?:\]\]>){0,1}<\/.*?>/g
-  let matches = null
-  // eslint-disable-next-line no-cond-assign
-  while ((matches = nodeReg.exec(str))) {
-    obj[matches[1]] = matches[2]
-  }
-  return obj
-}
-
-module.exports = {
-  decryptData,
-  md5,
-  sha256,
-  getSignStr,
-  getNonceStr,
-  buildXML,
-  parseXML,
-  isXML
-}
+const crypto = require('crypto')
+const {
+  isPlainObject
+} = require('../../../common/utils')
+
+// 退款通知解密key=md5(key)
+function decryptData (encryptedData, key, iv = '') {
+  // 解密
+  const decipher = crypto.createDecipheriv('aes-128-cbc', key, iv)
+  // 设置自动 padding 为 true，删除填充补位
+  decipher.setAutoPadding(true)
+  let decoded = decipher.update(encryptedData, 'base64', 'utf8')
+  decoded += decipher.final('utf8')
+  return decoded
+}
+
+function md5 (str, encoding = 'utf8') {
+  return crypto
+    .createHash('md5')
+    .update(str, encoding)
+    .digest('hex')
+}
+
+function sha256 (str, key, encoding = 'utf8') {
+  return crypto
+    .createHmac('sha256', key)
+    .update(str, encoding)
+    .digest('hex')
+}
+
+function getSignStr (obj) {
+  return Object.keys(obj)
+    .filter(key => key !== 'sign' && obj[key] !== undefined && obj[key] !== '')
+    .sort()
+    .map(key => key + '=' + obj[key])
+    .join('&')
+}
+
+function getNonceStr (length = 16) {
+  let str = ''
+  while (str.length < length) {
+    str += Math.random().toString(32).substring(2)
+  }
+  return str.substring(0, length)
+}
+
+// 简易版Object转XML，只可在微信支付时使用，不支持嵌套
+function buildXML (obj, rootName = 'xml') {
+  const content = Object.keys(obj).map(item => {
+    if (isPlainObject(obj[item])) {
+      return `<${item}><![CDATA[${JSON.stringify(obj[item])}]]></${item}>`
+    } else {
+      return `<${item}><![CDATA[${obj[item]}]]></${item}>`
+    }
+  })
+  return `<${rootName}>${content.join('')}</${rootName}>`
+}
+
+function isXML (str) {
+  const reg = /^(<\?xml.*\?>)?(\r?\n)*<xml>(.|\r?\n)*<\/xml>$/i
+  return reg.test(str.trim())
+};
+
+// 简易版XML转Object，只可在微信支付时使用，不支持嵌套
+function parseXML (xml) {
+  const xmlReg = /<(?:xml|root).*?>([\s|\S]*)<\/(?:xml|root)>/
+  const str = xmlReg.exec(xml)[1]
+  const obj = {}
+  const nodeReg = /<(.*?)>(?:<!\[CDATA\[){0,1}(.*?)(?:\]\]>){0,1}<\/.*?>/g
+  let matches = null
+  // eslint-disable-next-line no-cond-assign
+  while ((matches = nodeReg.exec(str))) {
+    obj[matches[1]] = matches[2]
+  }
+  return obj
+}
+
+module.exports = {
+  decryptData,
+  md5,
+  sha256,
+  getSignStr,
+  getNonceStr,
+  buildXML,
+  parseXML,
+  isXML
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/account.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/account.js
index 1fd25f0ecfa029bc7c5319f80f2ebf8c07dca937..8943dc0d9918681aee4de1b0bc62807ef5fb9470 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/account.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/account.js
@@ -1,98 +1,98 @@
-const {
-  dbCmd,
-  userCollection
-} = require('../../common/constants')
-const {
-  USER_IDENTIFIER
-} = require('../../common/constants')
-const {
-  batchFindObjctValue,
-  getType,
-  isMatchUserApp
-} = require('../../common/utils')
-
-/**
- * 查询满足条件的用户
- * @param {Object} params
- * @param {Object} params.userQuery 用户唯一标识组成的查询条件
- * @param {Object} params.authorizedApp 用户允许登录的应用
- * @returns userMatched 满足条件的用户列表
- */
-async function findUser (params = {}) {
-  const {
-    userQuery,
-    authorizedApp = []
-  } = params
-  const condition = getUserQueryCondition(userQuery)
-  if (condition.length === 0) {
-    throw new Error('Invalid user query')
-  }
-  const authorizedAppType = getType(authorizedApp)
-  if (authorizedAppType !== 'string' && authorizedAppType !== 'array') {
-    throw new Error('Invalid authorized app')
-  }
-
-  let finalQuery
-
-  if (condition.length === 1) {
-    finalQuery = condition[0]
-  } else {
-    finalQuery = dbCmd.or(condition)
-  }
-  const userQueryRes = await userCollection.where(finalQuery).get()
-  return {
-    total: userQueryRes.data.length,
-    userMatched: userQueryRes.data.filter(item => {
-      return isMatchUserApp(item.dcloud_appid, authorizedApp)
-    })
-  }
-}
-
-function getUserIdentifier (userRecord = {}) {
-  const keys = Object.keys(USER_IDENTIFIER)
-  return batchFindObjctValue(userRecord, keys)
-}
-
-function getUserQueryCondition (userRecord = {}) {
-  const userIdentifier = getUserIdentifier(userRecord)
-  const condition = []
-  for (const key in userIdentifier) {
-    const value = userIdentifier[key]
-    if (!value) {
-      // 过滤所有value为假值的条件，在查询用户时没有意义
-      continue
-    }
-    const queryItem = {
-      [key]: value
-    }
-    // 为兼容用户老数据用户名及邮箱需要同时查小写及原始大小写数据
-    if (key === 'mobile') {
-      queryItem.mobile_confirmed = 1
-    } else if (key === 'email') {
-      queryItem.email_confirmed = 1
-      const email = userIdentifier.email
-      if (email.toLowerCase() !== email) {
-        condition.push({
-          email: email.toLowerCase(),
-          email_confirmed: 1
-        })
-      }
-    } else if (key === 'username') {
-      const username = userIdentifier.username
-      if (username.toLowerCase() !== username) {
-        condition.push({
-          username: username.toLowerCase()
-        })
-      }
-    } else if (key === 'identities') {
-      queryItem.identities = dbCmd.elemMatch(value)
-    }
-    condition.push(queryItem)
-  }
-  return condition
-}
-
-module.exports = {
-  findUser,
-  getUserIdentifier
-}
+const {
+  dbCmd,
+  userCollection
+} = require('../../common/constants')
+const {
+  USER_IDENTIFIER
+} = require('../../common/constants')
+const {
+  batchFindObjctValue,
+  getType,
+  isMatchUserApp
+} = require('../../common/utils')
+
+/**
+ * 查询满足条件的用户
+ * @param {Object} params
+ * @param {Object} params.userQuery 用户唯一标识组成的查询条件
+ * @param {Object} params.authorizedApp 用户允许登录的应用
+ * @returns userMatched 满足条件的用户列表
+ */
+async function findUser (params = {}) {
+  const {
+    userQuery,
+    authorizedApp = []
+  } = params
+  const condition = getUserQueryCondition(userQuery)
+  if (condition.length === 0) {
+    throw new Error('Invalid user query')
+  }
+  const authorizedAppType = getType(authorizedApp)
+  if (authorizedAppType !== 'string' && authorizedAppType !== 'array') {
+    throw new Error('Invalid authorized app')
+  }
+
+  let finalQuery
+
+  if (condition.length === 1) {
+    finalQuery = condition[0]
+  } else {
+    finalQuery = dbCmd.or(condition)
+  }
+  const userQueryRes = await userCollection.where(finalQuery).get()
+  return {
+    total: userQueryRes.data.length,
+    userMatched: userQueryRes.data.filter(item => {
+      return isMatchUserApp(item.dcloud_appid, authorizedApp)
+    })
+  }
+}
+
+function getUserIdentifier (userRecord = {}) {
+  const keys = Object.keys(USER_IDENTIFIER)
+  return batchFindObjctValue(userRecord, keys)
+}
+
+function getUserQueryCondition (userRecord = {}) {
+  const userIdentifier = getUserIdentifier(userRecord)
+  const condition = []
+  for (const key in userIdentifier) {
+    const value = userIdentifier[key]
+    if (!value) {
+      // 过滤所有value为假值的条件，在查询用户时没有意义
+      continue
+    }
+    const queryItem = {
+      [key]: value
+    }
+    // 为兼容用户老数据用户名及邮箱需要同时查小写及原始大小写数据
+    if (key === 'mobile') {
+      queryItem.mobile_confirmed = 1
+    } else if (key === 'email') {
+      queryItem.email_confirmed = 1
+      const email = userIdentifier.email
+      if (email.toLowerCase() !== email) {
+        condition.push({
+          email: email.toLowerCase(),
+          email_confirmed: 1
+        })
+      }
+    } else if (key === 'username') {
+      const username = userIdentifier.username
+      if (username.toLowerCase() !== username) {
+        condition.push({
+          username: username.toLowerCase()
+        })
+      }
+    } else if (key === 'identities') {
+      queryItem.identities = dbCmd.elemMatch(value)
+    }
+    condition.push(queryItem)
+  }
+  return condition
+}
+
+module.exports = {
+  findUser,
+  getUserIdentifier
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/captcha.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/captcha.js
index 0dd620eaf553a6da787ffeb80bc5d43e3a929407..07c1f349dc37ea5c8b56d46f9f0789501495a6f9 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/captcha.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/captcha.js
@@ -1,76 +1,76 @@
-const {
-  ERROR
-} = require('../../common/error')
-
-async function getNeedCaptcha ({
-  uid,
-  username,
-  mobile,
-  email,
-  type = 'login',
-  limitDuration = 7200000, // 两小时
-  limitTimes = 3 // 记录次数
-} = {}) {
-  const db = uniCloud.database()
-  const dbCmd = db.command
-  // 当用户最近“2小时内(limitDuration)”登录失败达到3次(limitTimes)时。要求用户提交验证码
-  const now = Date.now()
-  const uniIdLogCollection = db.collection('uni-id-log')
-  const userIdentifier = {
-    user_id: uid,
-    username,
-    mobile,
-    email
-  }
-
-  let totalKey = 0; let deleteKey = 0
-  for (const key in userIdentifier) {
-    totalKey++
-    if (!userIdentifier[key] || typeof userIdentifier[key] !== 'string') {
-      deleteKey++
-      delete userIdentifier[key]
-    }
-  }
-
-  if (deleteKey === totalKey) {
-    throw new Error('System error') // 正常情况下不会进入此条件，但是考虑到后续会有其他开发者修改此云对象，在此处做一个判断
-  }
-
-  const {
-    data: recentRecord
-  } = await uniIdLogCollection.where({
-    ip: this.getUniversalClientInfo().clientIP,
-    ...userIdentifier,
-    type,
-    create_date: dbCmd.gt(now - limitDuration)
-  })
-    .orderBy('create_date', 'desc')
-    .limit(limitTimes)
-    .get()
-  return recentRecord.length === limitTimes && recentRecord.every(item => item.state === 0)
-}
-
-async function verifyCaptcha (params = {}) {
-  const {
-    captcha,
-    scene
-  } = params
-  if (!captcha) {
-    throw {
-      errCode: ERROR.CAPTCHA_REQUIRED
-    }
-  }
-  const payload = await this.uniCaptcha.verify({
-    deviceId: this.getUniversalClientInfo().deviceId,
-    captcha,
-    scene
-  })
-  if (payload.errCode) {
-    throw payload
-  }
-}
-
-module.exports = {
-  getNeedCaptcha,
-  verifyCaptcha
-}
+const {
+  ERROR
+} = require('../../common/error')
+
+async function getNeedCaptcha ({
+  uid,
+  username,
+  mobile,
+  email,
+  type = 'login',
+  limitDuration = 7200000, // 两小时
+  limitTimes = 3 // 记录次数
+} = {}) {
+  const db = uniCloud.database()
+  const dbCmd = db.command
+  // 当用户最近“2小时内(limitDuration)”登录失败达到3次(limitTimes)时。要求用户提交验证码
+  const now = Date.now()
+  const uniIdLogCollection = db.collection('uni-id-log')
+  const userIdentifier = {
+    user_id: uid,
+    username,
+    mobile,
+    email
+  }
+
+  let totalKey = 0; let deleteKey = 0
+  for (const key in userIdentifier) {
+    totalKey++
+    if (!userIdentifier[key] || typeof userIdentifier[key] !== 'string') {
+      deleteKey++
+      delete userIdentifier[key]
+    }
+  }
+
+  if (deleteKey === totalKey) {
+    throw new Error('System error') // 正常情况下不会进入此条件，但是考虑到后续会有其他开发者修改此云对象，在此处做一个判断
+  }
+
+  const {
+    data: recentRecord
+  } = await uniIdLogCollection.where({
+    ip: this.getUniversalClientInfo().clientIP,
+    ...userIdentifier,
+    type,
+    create_date: dbCmd.gt(now - limitDuration)
+  })
+    .orderBy('create_date', 'desc')
+    .limit(limitTimes)
+    .get()
+  return recentRecord.length === limitTimes && recentRecord.every(item => item.state === 0)
+}
+
+async function verifyCaptcha (params = {}) {
+  const {
+    captcha,
+    scene
+  } = params
+  if (!captcha) {
+    throw {
+      errCode: ERROR.CAPTCHA_REQUIRED
+    }
+  }
+  const payload = await this.uniCaptcha.verify({
+    deviceId: this.getUniversalClientInfo().deviceId,
+    captcha,
+    scene
+  })
+  if (payload.errCode) {
+    throw payload
+  }
+}
+
+module.exports = {
+  getNeedCaptcha,
+  verifyCaptcha
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/config.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/config.js
index 48d568894d732ad23fa3ef2b9e2757d4fcebd9c9..ed77667a2a16a74285253aaa979d4f435ad9348e 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/config.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/config.js
@@ -1,135 +1,135 @@
-const {
-  getWeixinPlatform
-} = require('./weixin')
-const createConfig = require('uni-config-center')
-
-const requiredConfig = {
-  'web.weixin-h5': ['appid', 'appsecret'],
-  'web.weixin-web': ['appid', 'appsecret'],
-  'app.weixin': ['appid', 'appsecret'],
-  'mp-weixin.weixin': ['appid', 'appsecret'],
-  'app.qq': ['appid', 'appsecret'],
-  'mp-alipay.alipay': ['appid', 'privateKey'],
-  'app.apple': ['bundleId']
-}
-
-const uniIdConfig = createConfig({
-  pluginId: 'uni-id'
-})
-
-class ConfigUtils {
-  constructor ({
-    context
-  } = {}) {
-    this.context = context
-    this.clientInfo = context.getUniversalClientInfo()
-    const {
-      appId,
-      uniPlatform
-    } = this.clientInfo
-    this.appId = appId
-    switch (uniPlatform) {
-      case 'app':
-      case 'app-plus':
-        this.platform = 'app'
-        break
-      case 'web':
-      case 'h5':
-        this.platform = 'web'
-        break
-      default:
-        this.platform = uniPlatform
-        break
-    }
-  }
-
-  getConfigArray () {
-    let configContent
-    try {
-      configContent = require('uni-config-center/uni-id/config.json')
-    } catch (error) {
-      throw new Error('Invalid config file\n' + error.message)
-    }
-    if (configContent[0]) {
-      return Object.values(configContent)
-    }
-    configContent.isDefaultConfig = true
-    return [configContent]
-  }
-
-  getAppConfig () {
-    const configArray = this.getConfigArray()
-    return configArray.find(item => item.dcloudAppid === this.appId) || configArray.find(item => item.isDefaultConfig)
-  }
-
-  getPlatformConfig () {
-    const appConfig = this.getAppConfig()
-    if (!appConfig) {
-      throw new Error(
-        `Config for current app (${this.appId}) was not found, please check your config file or client appId`)
-    }
-    const platform = this.platform
-    if (
-      (this.platform === 'app' && appConfig['app-plus']) ||
-      (this.platform === 'web' && appConfig.h5)
-    ) {
-      throw new Error(
-        `Client platform is ${this.platform}, but ${this.platform === 'web' ? 'h5' : 'app-plus'} was found in config. Please refer to: https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary?id=m-to-co`
-      )
-    }
-
-    const defaultConfig = {
-      tokenExpiresIn: 7200,
-      tokenExpiresThreshold: 1200,
-      passwordErrorLimit: 6,
-      passwordErrorRetryTime: 3600
-    }
-    return Object.assign(defaultConfig, appConfig, appConfig[platform])
-  }
-
-  getOauthProvider ({
-    provider
-  } = {}) {
-    const clientPlatform = this.platform
-    let oatuhProivder = provider
-    if (provider === 'weixin' && clientPlatform === 'web') {
-      const weixinPlatform = getWeixinPlatform.call(this.context)
-      if (weixinPlatform === 'h5' || weixinPlatform === 'web') {
-        oatuhProivder = 'weixin-' + weixinPlatform // weixin-h5 公众号，weixin-web pc端
-      }
-    }
-    return oatuhProivder
-  }
-
-  getOauthConfig ({
-    provider
-  } = {}) {
-    const config = this.getPlatformConfig()
-    const clientPlatform = this.platform
-    const oatuhProivder = this.getOauthProvider({
-      provider
-    })
-    const requireConfigKey = requiredConfig[`${clientPlatform}.${oatuhProivder}`] || []
-    if (!config.oauth || !config.oauth[oatuhProivder]) {
-      throw new Error(`Config param required: ${clientPlatform}.oauth.${oatuhProivder}`)
-    }
-    const oauthConfig = config.oauth[oatuhProivder]
-    requireConfigKey.forEach((item) => {
-      if (!oauthConfig[item]) {
-        throw new Error(`Config param required: ${clientPlatform}.oauth.${oatuhProivder}.${item}`)
-      }
-    })
-    return oauthConfig
-  }
-
-  getHooks () {
-    if (uniIdConfig.hasFile('hooks/index.js')) {
-      return require(
-        uniIdConfig.resolve('hooks/index.js')
-      )
-    }
-    return {}
-  }
-}
-
-module.exports = ConfigUtils
+const {
+  getWeixinPlatform
+} = require('./weixin')
+const createConfig = require('uni-config-center')
+
+const requiredConfig = {
+  'web.weixin-h5': ['appid', 'appsecret'],
+  'web.weixin-web': ['appid', 'appsecret'],
+  'app.weixin': ['appid', 'appsecret'],
+  'mp-weixin.weixin': ['appid', 'appsecret'],
+  'app.qq': ['appid', 'appsecret'],
+  'mp-alipay.alipay': ['appid', 'privateKey'],
+  'app.apple': ['bundleId']
+}
+
+const uniIdConfig = createConfig({
+  pluginId: 'uni-id'
+})
+
+class ConfigUtils {
+  constructor ({
+    context
+  } = {}) {
+    this.context = context
+    this.clientInfo = context.getUniversalClientInfo()
+    const {
+      appId,
+      uniPlatform
+    } = this.clientInfo
+    this.appId = appId
+    switch (uniPlatform) {
+      case 'app':
+      case 'app-plus':
+        this.platform = 'app'
+        break
+      case 'web':
+      case 'h5':
+        this.platform = 'web'
+        break
+      default:
+        this.platform = uniPlatform
+        break
+    }
+  }
+
+  getConfigArray () {
+    let configContent
+    try {
+      configContent = require('uni-config-center/uni-id/config.json')
+    } catch (error) {
+      throw new Error('Invalid config file\n' + error.message)
+    }
+    if (configContent[0]) {
+      return Object.values(configContent)
+    }
+    configContent.isDefaultConfig = true
+    return [configContent]
+  }
+
+  getAppConfig () {
+    const configArray = this.getConfigArray()
+    return configArray.find(item => item.dcloudAppid === this.appId) || configArray.find(item => item.isDefaultConfig)
+  }
+
+  getPlatformConfig () {
+    const appConfig = this.getAppConfig()
+    if (!appConfig) {
+      throw new Error(
+        `Config for current app (${this.appId}) was not found, please check your config file or client appId`)
+    }
+    const platform = this.platform
+    if (
+      (this.platform === 'app' && appConfig['app-plus']) ||
+      (this.platform === 'web' && appConfig.h5)
+    ) {
+      throw new Error(
+        `Client platform is ${this.platform}, but ${this.platform === 'web' ? 'h5' : 'app-plus'} was found in config. Please refer to: https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary?id=m-to-co`
+      )
+    }
+
+    const defaultConfig = {
+      tokenExpiresIn: 7200,
+      tokenExpiresThreshold: 1200,
+      passwordErrorLimit: 6,
+      passwordErrorRetryTime: 3600
+    }
+    return Object.assign(defaultConfig, appConfig, appConfig[platform])
+  }
+
+  getOauthProvider ({
+    provider
+  } = {}) {
+    const clientPlatform = this.platform
+    let oatuhProivder = provider
+    if (provider === 'weixin' && clientPlatform === 'web') {
+      const weixinPlatform = getWeixinPlatform.call(this.context)
+      if (weixinPlatform === 'h5' || weixinPlatform === 'web') {
+        oatuhProivder = 'weixin-' + weixinPlatform // weixin-h5 公众号，weixin-web pc端
+      }
+    }
+    return oatuhProivder
+  }
+
+  getOauthConfig ({
+    provider
+  } = {}) {
+    const config = this.getPlatformConfig()
+    const clientPlatform = this.platform
+    const oatuhProivder = this.getOauthProvider({
+      provider
+    })
+    const requireConfigKey = requiredConfig[`${clientPlatform}.${oatuhProivder}`] || []
+    if (!config.oauth || !config.oauth[oatuhProivder]) {
+      throw new Error(`Config param required: ${clientPlatform}.oauth.${oatuhProivder}`)
+    }
+    const oauthConfig = config.oauth[oatuhProivder]
+    requireConfigKey.forEach((item) => {
+      if (!oauthConfig[item]) {
+        throw new Error(`Config param required: ${clientPlatform}.oauth.${oatuhProivder}.${item}`)
+      }
+    })
+    return oauthConfig
+  }
+
+  getHooks () {
+    if (uniIdConfig.hasFile('hooks/index.js')) {
+      return require(
+        uniIdConfig.resolve('hooks/index.js')
+      )
+    }
+    return {}
+  }
+}
+
+module.exports = ConfigUtils
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/fission.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/fission.js
index 84233c3ed8bb311680ac13d23e7dbcaa50564bf7..65d48e27e3d81e0bcad2340fb07c7a4b695295e1 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/fission.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/fission.js
@@ -1,192 +1,192 @@
-const {
-  dbCmd,
-  userCollection
-} = require('../../common/constants')
-const {
-  ERROR
-} = require('../../common/error')
-/**
- * 获取随机邀请码，邀请码由大写字母加数字组成，由于存在手动输入邀请码的场景，从可选字符中去除 0、1、I、O
- * @param {number} len 邀请码长度，默认6位
- * @returns {string} 随机邀请码
- */
-function getRandomInviteCode (len = 6) {
-  const charArr = ['2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'J', 'K', 'L', 'M', 'N', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z']
-  let code = ''
-  for (let i = 0; i < len; i++) {
-    code += charArr[Math.floor(Math.random() * charArr.length)]
-  }
-  return code
-}
-
-/**
- * 获取可用的邀请码，至多尝试十次以获取可用邀请码。从10亿可选值中随机，碰撞概率较低
- * 也有其他方案可以尝试，比如在数据库内设置一个从0开始计数的数字，每次调用此方法时使用updateAndReturn使数字加1并返回加1后的值，根据这个值生成对应的邀请码，比如（22222A + 1 == 22222B），此方式性能理论更好，但是不适用于旧项目
- * @param {object} param
- * @param {string} param.inviteCode 初始随机邀请码
- */
-async function getValidInviteCode () {
-  let retry = 10
-  let code
-  let codeValid = false
-  while (retry > 0 && !codeValid) {
-    retry--
-    code = getRandomInviteCode()
-    const getUserRes = await userCollection.where({
-      my_invite_code: code
-    }).limit(1).get()
-    if (getUserRes.data.length === 0) {
-      codeValid = true
-      break
-    }
-  }
-  if (!codeValid) {
-    throw {
-      errCode: ERROR.SET_INVITE_CODE_FAILED
-    }
-  }
-  return code
-}
-
-/**
- * 根据邀请码查询邀请人
- * @param {object} param
- * @param {string} param.inviteCode 邀请码
- * @param {string} param.queryUid 受邀人id，非空时校验不可被下家或自己邀请
- * @returns
- */
-async function findUserByInviteCode ({
-  inviteCode,
-  queryUid
-} = {}) {
-  if (typeof inviteCode !== 'string') {
-    throw {
-      errCode: ERROR.SYSTEM_ERROR
-    }
-  }
-  // 根据邀请码查询邀请人
-  let getInviterRes
-  if (queryUid) {
-    getInviterRes = await userCollection.where({
-      _id: dbCmd.neq(queryUid),
-      inviter_uid: dbCmd.not(dbCmd.all([queryUid])),
-      my_invite_code: inviteCode
-    }).get()
-  } else {
-    getInviterRes = await userCollection.where({
-      my_invite_code: inviteCode
-    }).get()
-  }
-  if (getInviterRes.data.length > 1) {
-    // 正常情况下不可能进入此条件，以防用户自行修改数据库出错，在此做出判断
-    throw {
-      errCode: ERROR.SYSTEM_ERROR
-    }
-  }
-  const inviterRecord = getInviterRes.data[0]
-  if (!inviterRecord) {
-    throw {
-      errCode: ERROR.INVALID_INVITE_CODE
-    }
-  }
-  return inviterRecord
-}
-
-/**
- * 根据邀请码生成邀请信息
- * @param {object} param
- * @param {string} param.inviteCode 邀请码
- * @param {string} param.queryUid 受邀人id，非空时校验不可被下家或自己邀请
- * @returns
- */
-async function generateInviteInfo ({
-  inviteCode,
-  queryUid
-} = {}) {
-  const inviterRecord = await findUserByInviteCode({
-    inviteCode,
-    queryUid
-  })
-  // 倒叙拼接当前用户邀请链
-  const inviterUid = inviterRecord.inviter_uid || []
-  inviterUid.unshift(inviterRecord._id)
-  return {
-    inviterUid,
-    inviteTime: Date.now()
-  }
-}
-
-/**
- * 检查当前用户是否可以接受邀请，如果可以返回用户记录
- * @param {string} uid
- */
-async function checkInviteInfo (uid) {
-  // 检查当前用户是否已有邀请人
-  const getUserRes = await userCollection.doc(uid).field({
-    my_invite_code: true,
-    inviter_uid: true
-  }).get()
-  const userRecord = getUserRes.data[0]
-  if (!userRecord) {
-    throw {
-      errCode: ERROR.ACCOUNT_NOT_EXISTS
-    }
-  }
-  if (userRecord.inviter_uid && userRecord.inviter_uid.length > 0) {
-    throw {
-      errCode: ERROR.CHANGE_INVITER_FORBIDDEN
-    }
-  }
-  return userRecord
-}
-
-/**
- * 指定用户接受邀请码邀请
- * @param {object} param
- * @param {string} param.uid 用户uid
- * @param {string} param.inviteCode 邀请人的邀请码
- * @returns
- */
-async function acceptInvite ({
-  uid,
-  inviteCode
-} = {}) {
-  await checkInviteInfo(uid)
-  const {
-    inviterUid,
-    inviteTime
-  } = await generateInviteInfo({
-    inviteCode,
-    queryUid: uid
-  })
-
-  if (inviterUid === uid) {
-    throw {
-      errCode: ERROR.INVALID_INVITE_CODE
-    }
-  }
-
-  // 更新当前用户的邀请人信息
-  await userCollection.doc(uid).update({
-    inviter_uid: inviterUid,
-    invite_time: inviteTime
-  })
-
-  // 更新当前用户邀请的用户的邀请人信息，这步可能较为耗时
-  await userCollection.where({
-    inviter_uid: uid
-  }).update({
-    inviter_uid: dbCmd.push(inviterUid)
-  })
-
-  return {
-    errCode: 0,
-    errMsg: ''
-  }
-}
-
-module.exports = {
-  acceptInvite,
-  generateInviteInfo,
-  getValidInviteCode
-}
+const {
+  dbCmd,
+  userCollection
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
+/**
+ * 获取随机邀请码，邀请码由大写字母加数字组成，由于存在手动输入邀请码的场景，从可选字符中去除 0、1、I、O
+ * @param {number} len 邀请码长度，默认6位
+ * @returns {string} 随机邀请码
+ */
+function getRandomInviteCode (len = 6) {
+  const charArr = ['2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'J', 'K', 'L', 'M', 'N', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z']
+  let code = ''
+  for (let i = 0; i < len; i++) {
+    code += charArr[Math.floor(Math.random() * charArr.length)]
+  }
+  return code
+}
+
+/**
+ * 获取可用的邀请码，至多尝试十次以获取可用邀请码。从10亿可选值中随机，碰撞概率较低
+ * 也有其他方案可以尝试，比如在数据库内设置一个从0开始计数的数字，每次调用此方法时使用updateAndReturn使数字加1并返回加1后的值，根据这个值生成对应的邀请码，比如（22222A + 1 == 22222B），此方式性能理论更好，但是不适用于旧项目
+ * @param {object} param
+ * @param {string} param.inviteCode 初始随机邀请码
+ */
+async function getValidInviteCode () {
+  let retry = 10
+  let code
+  let codeValid = false
+  while (retry > 0 && !codeValid) {
+    retry--
+    code = getRandomInviteCode()
+    const getUserRes = await userCollection.where({
+      my_invite_code: code
+    }).limit(1).get()
+    if (getUserRes.data.length === 0) {
+      codeValid = true
+      break
+    }
+  }
+  if (!codeValid) {
+    throw {
+      errCode: ERROR.SET_INVITE_CODE_FAILED
+    }
+  }
+  return code
+}
+
+/**
+ * 根据邀请码查询邀请人
+ * @param {object} param
+ * @param {string} param.inviteCode 邀请码
+ * @param {string} param.queryUid 受邀人id，非空时校验不可被下家或自己邀请
+ * @returns
+ */
+async function findUserByInviteCode ({
+  inviteCode,
+  queryUid
+} = {}) {
+  if (typeof inviteCode !== 'string') {
+    throw {
+      errCode: ERROR.SYSTEM_ERROR
+    }
+  }
+  // 根据邀请码查询邀请人
+  let getInviterRes
+  if (queryUid) {
+    getInviterRes = await userCollection.where({
+      _id: dbCmd.neq(queryUid),
+      inviter_uid: dbCmd.not(dbCmd.all([queryUid])),
+      my_invite_code: inviteCode
+    }).get()
+  } else {
+    getInviterRes = await userCollection.where({
+      my_invite_code: inviteCode
+    }).get()
+  }
+  if (getInviterRes.data.length > 1) {
+    // 正常情况下不可能进入此条件，以防用户自行修改数据库出错，在此做出判断
+    throw {
+      errCode: ERROR.SYSTEM_ERROR
+    }
+  }
+  const inviterRecord = getInviterRes.data[0]
+  if (!inviterRecord) {
+    throw {
+      errCode: ERROR.INVALID_INVITE_CODE
+    }
+  }
+  return inviterRecord
+}
+
+/**
+ * 根据邀请码生成邀请信息
+ * @param {object} param
+ * @param {string} param.inviteCode 邀请码
+ * @param {string} param.queryUid 受邀人id，非空时校验不可被下家或自己邀请
+ * @returns
+ */
+async function generateInviteInfo ({
+  inviteCode,
+  queryUid
+} = {}) {
+  const inviterRecord = await findUserByInviteCode({
+    inviteCode,
+    queryUid
+  })
+  // 倒叙拼接当前用户邀请链
+  const inviterUid = inviterRecord.inviter_uid || []
+  inviterUid.unshift(inviterRecord._id)
+  return {
+    inviterUid,
+    inviteTime: Date.now()
+  }
+}
+
+/**
+ * 检查当前用户是否可以接受邀请，如果可以返回用户记录
+ * @param {string} uid
+ */
+async function checkInviteInfo (uid) {
+  // 检查当前用户是否已有邀请人
+  const getUserRes = await userCollection.doc(uid).field({
+    my_invite_code: true,
+    inviter_uid: true
+  }).get()
+  const userRecord = getUserRes.data[0]
+  if (!userRecord) {
+    throw {
+      errCode: ERROR.ACCOUNT_NOT_EXISTS
+    }
+  }
+  if (userRecord.inviter_uid && userRecord.inviter_uid.length > 0) {
+    throw {
+      errCode: ERROR.CHANGE_INVITER_FORBIDDEN
+    }
+  }
+  return userRecord
+}
+
+/**
+ * 指定用户接受邀请码邀请
+ * @param {object} param
+ * @param {string} param.uid 用户uid
+ * @param {string} param.inviteCode 邀请人的邀请码
+ * @returns
+ */
+async function acceptInvite ({
+  uid,
+  inviteCode
+} = {}) {
+  await checkInviteInfo(uid)
+  const {
+    inviterUid,
+    inviteTime
+  } = await generateInviteInfo({
+    inviteCode,
+    queryUid: uid
+  })
+
+  if (inviterUid === uid) {
+    throw {
+      errCode: ERROR.INVALID_INVITE_CODE
+    }
+  }
+
+  // 更新当前用户的邀请人信息
+  await userCollection.doc(uid).update({
+    inviter_uid: inviterUid,
+    invite_time: inviteTime
+  })
+
+  // 更新当前用户邀请的用户的邀请人信息，这步可能较为耗时
+  await userCollection.where({
+    inviter_uid: uid
+  }).update({
+    inviter_uid: dbCmd.push(inviterUid)
+  })
+
+  return {
+    errCode: 0,
+    errMsg: ''
+  }
+}
+
+module.exports = {
+  acceptInvite,
+  generateInviteInfo,
+  getValidInviteCode
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/logout.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/logout.js
index ddcbb97563fa70887a630b6cfca9e2b68b16b65a..9005cef2c24fe968df4d13d3abf2b05e104dc490 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/logout.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/logout.js
@@ -1,49 +1,49 @@
-const {
-  dbCmd,
-  LOG_TYPE,
-  deviceCollection,
-  userCollection
-} = require('../../common/constants')
-
-async function logout () {
-  const {
-    deviceId
-  } = this.getUniversalClientInfo()
-  const uniIdToken = this.getUniversalUniIdToken()
-  const payload = await this.uniIdCommon.checkToken(
-    uniIdToken,
-    {
-      autoRefresh: false
-    }
-  )
-  if (payload.errCode) {
-    throw payload
-  }
-  const uid = payload.uid
-
-  // 删除token
-  await userCollection.doc(uid).update({
-    token: dbCmd.pull(uniIdToken)
-  })
-
-  // 仅当device表的device_id和user_id均对应时才进行更新
-  await deviceCollection.where({
-    device_id: deviceId,
-    user_id: uid
-  }).update({
-    token_expired: 0
-  })
-  await this.middleware.uniIdLog({
-    data: {
-      user_id: uid
-    },
-    type: LOG_TYPE.LOGOUT
-  })
-  return {
-    errCode: 0
-  }
-}
-
-module.exports = {
-  logout
-}
+const {
+  dbCmd,
+  LOG_TYPE,
+  deviceCollection,
+  userCollection
+} = require('../../common/constants')
+
+async function logout () {
+  const {
+    deviceId
+  } = this.getUniversalClientInfo()
+  const uniIdToken = this.getUniversalUniIdToken()
+  const payload = await this.uniIdCommon.checkToken(
+    uniIdToken,
+    {
+      autoRefresh: false
+    }
+  )
+  if (payload.errCode) {
+    throw payload
+  }
+  const uid = payload.uid
+
+  // 删除token
+  await userCollection.doc(uid).update({
+    token: dbCmd.pull(uniIdToken)
+  })
+
+  // 仅当device表的device_id和user_id均对应时才进行更新
+  await deviceCollection.where({
+    device_id: deviceId,
+    user_id: uid
+  }).update({
+    token_expired: 0
+  })
+  await this.middleware.uniIdLog({
+    data: {
+      user_id: uid
+    },
+    type: LOG_TYPE.LOGOUT
+  })
+  return {
+    errCode: 0
+  }
+}
+
+module.exports = {
+  logout
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/password.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/password.js
index 0e46757eb6c36ce9ef5316c81b220e8efbd782f2..92294df35f077258a1b1b0eee78a82f202940694 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/password.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/password.js
@@ -1,261 +1,261 @@
-const {
-  getType
-} = require('../../common/utils')
-const crypto = require('crypto')
-const createConfig = require('uni-config-center')
-const shareConfig = createConfig({
-  pluginId: 'uni-id'
-})
-let customPassword = {}
-if (shareConfig.hasFile('custom-password.js')) {
-  customPassword = shareConfig.requireFile('custom-password.js') || {}
-}
-
-const passwordAlgorithmMap = {
-  UNI_ID_HMAC_SHA1: 'hmac-sha1',
-  UNI_ID_HMAC_SHA256: 'hmac-sha256',
-  UNI_ID_CUSTOM: 'custom'
-}
-
-const passwordAlgorithmKeyMap = Object.keys(passwordAlgorithmMap).reduce((res, item) => {
-  res[passwordAlgorithmMap[item]] = item
-  return res
-}, {})
-
-const passwordExtMethod = {
-  [passwordAlgorithmMap.UNI_ID_HMAC_SHA1]: {
-    verify ({ password }) {
-      const { password_secret_version: passwordSecretVersion } = this.userRecord
-
-      const passwordSecret = this._getSecretByVersion({
-        version: passwordSecretVersion
-      })
-
-      const { passwordHash } = this.encrypt({
-        password,
-        passwordSecret
-      })
-
-      return passwordHash === this.userRecord.password
-    },
-    encrypt ({ password, passwordSecret }) {
-      const { value: secret, version } = passwordSecret
-      const hmac = crypto.createHmac('sha1', secret.toString('ascii'))
-
-      hmac.update(password)
-
-      return {
-        passwordHash: hmac.digest('hex'),
-        version
-      }
-    }
-  },
-  [passwordAlgorithmMap.UNI_ID_HMAC_SHA256]: {
-    verify ({ password }) {
-      const parse = this._parsePassword()
-      const passwordHash = crypto.createHmac(parse.algorithm, parse.salt).update(password).digest('hex')
-
-      return passwordHash === parse.hash
-    },
-    encrypt ({ password, passwordSecret }) {
-      const { version } = passwordSecret
-
-      // 默认使用 sha256 加密算法
-      const salt = crypto.randomBytes(10).toString('hex')
-      const sha256Hash = crypto.createHmac(passwordAlgorithmMap.UNI_ID_HMAC_SHA256.substring(5), salt).update(password).digest('hex')
-      const algorithm = passwordAlgorithmKeyMap[passwordAlgorithmMap.UNI_ID_HMAC_SHA256]
-      // B 为固定值，对应 PasswordMethodMaps 中的 sha256算法
-      // hash 格式 $[PasswordMethodFlagMapsKey]$[salt size]$[salt][Hash]
-      const passwordHash = `$${algorithm}$${salt.length}$${salt}${sha256Hash}`
-
-      return {
-        passwordHash,
-        version
-      }
-    }
-  },
-  [passwordAlgorithmMap.UNI_ID_CUSTOM]: {
-    verify ({ password, passwordSecret }) {
-      if (!customPassword.verifyPassword) throw new Error('verifyPassword method not found in custom password file')
-
-      // return true or false
-      return customPassword.verifyPassword({
-        password,
-        passwordSecret,
-        userRecord: this.userRecord,
-        clientInfo: this.clientInfo
-      })
-    },
-    encrypt ({ password, passwordSecret }) {
-      if (!customPassword.encryptPassword) throw new Error('encryptPassword method not found in custom password file')
-
-      // return object<{passwordHash: string, version: number}>
-      return customPassword.encryptPassword({
-        password,
-        passwordSecret,
-        clientInfo: this.clientInfo
-      })
-    }
-  }
-}
-
-class PasswordUtils {
-  constructor ({
-    userRecord = {},
-    clientInfo,
-    passwordSecret
-  } = {}) {
-    if (!clientInfo) throw new Error('Invalid clientInfo')
-    if (!passwordSecret) throw new Error('Invalid password secret')
-
-    this.clientInfo = clientInfo
-    this.userRecord = userRecord
-    this.passwordSecret = this.prePasswordSecret(passwordSecret)
-  }
-
-  /**
-   * passwordSecret 预处理
-   * @param passwordSecret
-   * @return {*[]}
-   */
-  prePasswordSecret (passwordSecret) {
-    const newPasswordSecret = []
-    if (getType(passwordSecret) === 'string') {
-      newPasswordSecret.push({
-        value: passwordSecret,
-        type: passwordAlgorithmMap.UNI_ID_HMAC_SHA1
-      })
-    } else if (getType(passwordSecret) === 'array') {
-      for (const secret of passwordSecret.sort((a, b) => a.version - b.version)) {
-        newPasswordSecret.push({
-          ...secret,
-          // 没有 type 设置默认 type hmac-sha1
-          type: secret.type || passwordAlgorithmMap.UNI_ID_HMAC_SHA1
-        })
-      }
-    } else {
-      throw new Error('Invalid password secret')
-    }
-
-    return newPasswordSecret
-  }
-
-  /**
-   * 获取最新加密密钥
-   * @return {*}
-   * @private
-   */
-  _getLastestSecret () {
-    return this.passwordSecret[this.passwordSecret.length - 1]
-  }
-
-  _getOldestSecret () {
-    return this.passwordSecret[0]
-  }
-
-  _getSecretByVersion ({ version } = {}) {
-    if (!version && version !== 0) {
-      return this._getOldestSecret()
-    }
-    if (this.passwordSecret.length === 1) {
-      return this.passwordSecret[0]
-    }
-    return this.passwordSecret.find(item => item.version === version)
-  }
-
-  /**
-   * 获取密码的验证/加密方法
-   * @param passwordSecret
-   * @return {*[]}
-   * @private
-   */
-  _getPasswordExt (passwordSecret) {
-    const ext = passwordExtMethod[passwordSecret.type]
-    if (!ext) {
-      throw new Error(`暂不支持 ${passwordSecret.type} 类型的加密算法`)
-    }
-
-    const passwordExt = Object.create(null)
-
-    for (const key in ext) {
-      passwordExt[key] = ext[key].bind(Object.assign(this, Object.keys(ext).reduce((res, item) => {
-        if (item !== key) {
-          res[item] = ext[item].bind(this)
-        }
-        return res
-      }, {})))
-    }
-
-    return passwordExt
-  }
-
-  _parsePassword () {
-    const [algorithmKey = '', cost = 0, hashStr = ''] = this.userRecord.password.split('$').filter(key => key)
-    const algorithm = passwordAlgorithmMap[algorithmKey] ? passwordAlgorithmMap[algorithmKey].substring(5) : null
-    const salt = hashStr.substring(0, Number(cost))
-    const hash = hashStr.substring(Number(cost))
-
-    return {
-      algorithm,
-      salt,
-      hash
-    }
-  }
-
-  /**
-   * 生成加密后的密码
-   * @param {String} password 密码
-   */
-  generatePasswordHash ({ password }) {
-    if (!password) throw new Error('Invalid password')
-
-    const passwordSecret = this._getLastestSecret()
-    const ext = this._getPasswordExt(passwordSecret)
-
-    const { passwordHash, version } = ext.encrypt({
-      password,
-      passwordSecret
-    })
-
-    return {
-      passwordHash,
-      version
-    }
-  }
-
-  /**
-   * 密码校验
-   * @param {String} password
-   * @param {Boolean} autoRefresh
-   * @return {{refreshPasswordInfo: {version: *, passwordHash: *}, success: boolean}|{success: boolean}}
-   */
-  checkUserPassword ({ password, autoRefresh = true }) {
-    if (!password) throw new Error('Invalid password')
-
-    const { password_secret_version: passwordSecretVersion } = this.userRecord
-    const passwordSecret = this._getSecretByVersion({
-      version: passwordSecretVersion
-    })
-    const ext = this._getPasswordExt(passwordSecret)
-
-    const success = ext.verify({ password, passwordSecret })
-
-    if (!success) {
-      return {
-        success: false
-      }
-    }
-
-    let refreshPasswordInfo
-    if (autoRefresh && passwordSecretVersion !== this._getLastestSecret().version) {
-      refreshPasswordInfo = this.generatePasswordHash({ password })
-    }
-
-    return {
-      success: true,
-      refreshPasswordInfo
-    }
-  }
-}
-
-module.exports = PasswordUtils
+const {
+  getType
+} = require('../../common/utils')
+const crypto = require('crypto')
+const createConfig = require('uni-config-center')
+const shareConfig = createConfig({
+  pluginId: 'uni-id'
+})
+let customPassword = {}
+if (shareConfig.hasFile('custom-password.js')) {
+  customPassword = shareConfig.requireFile('custom-password.js') || {}
+}
+
+const passwordAlgorithmMap = {
+  UNI_ID_HMAC_SHA1: 'hmac-sha1',
+  UNI_ID_HMAC_SHA256: 'hmac-sha256',
+  UNI_ID_CUSTOM: 'custom'
+}
+
+const passwordAlgorithmKeyMap = Object.keys(passwordAlgorithmMap).reduce((res, item) => {
+  res[passwordAlgorithmMap[item]] = item
+  return res
+}, {})
+
+const passwordExtMethod = {
+  [passwordAlgorithmMap.UNI_ID_HMAC_SHA1]: {
+    verify ({ password }) {
+      const { password_secret_version: passwordSecretVersion } = this.userRecord
+
+      const passwordSecret = this._getSecretByVersion({
+        version: passwordSecretVersion
+      })
+
+      const { passwordHash } = this.encrypt({
+        password,
+        passwordSecret
+      })
+
+      return passwordHash === this.userRecord.password
+    },
+    encrypt ({ password, passwordSecret }) {
+      const { value: secret, version } = passwordSecret
+      const hmac = crypto.createHmac('sha1', secret.toString('ascii'))
+
+      hmac.update(password)
+
+      return {
+        passwordHash: hmac.digest('hex'),
+        version
+      }
+    }
+  },
+  [passwordAlgorithmMap.UNI_ID_HMAC_SHA256]: {
+    verify ({ password }) {
+      const parse = this._parsePassword()
+      const passwordHash = crypto.createHmac(parse.algorithm, parse.salt).update(password).digest('hex')
+
+      return passwordHash === parse.hash
+    },
+    encrypt ({ password, passwordSecret }) {
+      const { version } = passwordSecret
+
+      // 默认使用 sha256 加密算法
+      const salt = crypto.randomBytes(10).toString('hex')
+      const sha256Hash = crypto.createHmac(passwordAlgorithmMap.UNI_ID_HMAC_SHA256.substring(5), salt).update(password).digest('hex')
+      const algorithm = passwordAlgorithmKeyMap[passwordAlgorithmMap.UNI_ID_HMAC_SHA256]
+      // B 为固定值，对应 PasswordMethodMaps 中的 sha256算法
+      // hash 格式 $[PasswordMethodFlagMapsKey]$[salt size]$[salt][Hash]
+      const passwordHash = `$${algorithm}$${salt.length}$${salt}${sha256Hash}`
+
+      return {
+        passwordHash,
+        version
+      }
+    }
+  },
+  [passwordAlgorithmMap.UNI_ID_CUSTOM]: {
+    verify ({ password, passwordSecret }) {
+      if (!customPassword.verifyPassword) throw new Error('verifyPassword method not found in custom password file')
+
+      // return true or false
+      return customPassword.verifyPassword({
+        password,
+        passwordSecret,
+        userRecord: this.userRecord,
+        clientInfo: this.clientInfo
+      })
+    },
+    encrypt ({ password, passwordSecret }) {
+      if (!customPassword.encryptPassword) throw new Error('encryptPassword method not found in custom password file')
+
+      // return object<{passwordHash: string, version: number}>
+      return customPassword.encryptPassword({
+        password,
+        passwordSecret,
+        clientInfo: this.clientInfo
+      })
+    }
+  }
+}
+
+class PasswordUtils {
+  constructor ({
+    userRecord = {},
+    clientInfo,
+    passwordSecret
+  } = {}) {
+    if (!clientInfo) throw new Error('Invalid clientInfo')
+    if (!passwordSecret) throw new Error('Invalid password secret')
+
+    this.clientInfo = clientInfo
+    this.userRecord = userRecord
+    this.passwordSecret = this.prePasswordSecret(passwordSecret)
+  }
+
+  /**
+   * passwordSecret 预处理
+   * @param passwordSecret
+   * @return {*[]}
+   */
+  prePasswordSecret (passwordSecret) {
+    const newPasswordSecret = []
+    if (getType(passwordSecret) === 'string') {
+      newPasswordSecret.push({
+        value: passwordSecret,
+        type: passwordAlgorithmMap.UNI_ID_HMAC_SHA1
+      })
+    } else if (getType(passwordSecret) === 'array') {
+      for (const secret of passwordSecret.sort((a, b) => a.version - b.version)) {
+        newPasswordSecret.push({
+          ...secret,
+          // 没有 type 设置默认 type hmac-sha1
+          type: secret.type || passwordAlgorithmMap.UNI_ID_HMAC_SHA1
+        })
+      }
+    } else {
+      throw new Error('Invalid password secret')
+    }
+
+    return newPasswordSecret
+  }
+
+  /**
+   * 获取最新加密密钥
+   * @return {*}
+   * @private
+   */
+  _getLastestSecret () {
+    return this.passwordSecret[this.passwordSecret.length - 1]
+  }
+
+  _getOldestSecret () {
+    return this.passwordSecret[0]
+  }
+
+  _getSecretByVersion ({ version } = {}) {
+    if (!version && version !== 0) {
+      return this._getOldestSecret()
+    }
+    if (this.passwordSecret.length === 1) {
+      return this.passwordSecret[0]
+    }
+    return this.passwordSecret.find(item => item.version === version)
+  }
+
+  /**
+   * 获取密码的验证/加密方法
+   * @param passwordSecret
+   * @return {*[]}
+   * @private
+   */
+  _getPasswordExt (passwordSecret) {
+    const ext = passwordExtMethod[passwordSecret.type]
+    if (!ext) {
+      throw new Error(`暂不支持 ${passwordSecret.type} 类型的加密算法`)
+    }
+
+    const passwordExt = Object.create(null)
+
+    for (const key in ext) {
+      passwordExt[key] = ext[key].bind(Object.assign(this, Object.keys(ext).reduce((res, item) => {
+        if (item !== key) {
+          res[item] = ext[item].bind(this)
+        }
+        return res
+      }, {})))
+    }
+
+    return passwordExt
+  }
+
+  _parsePassword () {
+    const [algorithmKey = '', cost = 0, hashStr = ''] = this.userRecord.password.split('$').filter(key => key)
+    const algorithm = passwordAlgorithmMap[algorithmKey] ? passwordAlgorithmMap[algorithmKey].substring(5) : null
+    const salt = hashStr.substring(0, Number(cost))
+    const hash = hashStr.substring(Number(cost))
+
+    return {
+      algorithm,
+      salt,
+      hash
+    }
+  }
+
+  /**
+   * 生成加密后的密码
+   * @param {String} password 密码
+   */
+  generatePasswordHash ({ password }) {
+    if (!password) throw new Error('Invalid password')
+
+    const passwordSecret = this._getLastestSecret()
+    const ext = this._getPasswordExt(passwordSecret)
+
+    const { passwordHash, version } = ext.encrypt({
+      password,
+      passwordSecret
+    })
+
+    return {
+      passwordHash,
+      version
+    }
+  }
+
+  /**
+   * 密码校验
+   * @param {String} password
+   * @param {Boolean} autoRefresh
+   * @return {{refreshPasswordInfo: {version: *, passwordHash: *}, success: boolean}|{success: boolean}}
+   */
+  checkUserPassword ({ password, autoRefresh = true }) {
+    if (!password) throw new Error('Invalid password')
+
+    const { password_secret_version: passwordSecretVersion } = this.userRecord
+    const passwordSecret = this._getSecretByVersion({
+      version: passwordSecretVersion
+    })
+    const ext = this._getPasswordExt(passwordSecret)
+
+    const success = ext.verify({ password, passwordSecret })
+
+    if (!success) {
+      return {
+        success: false
+      }
+    }
+
+    let refreshPasswordInfo
+    if (autoRefresh && passwordSecretVersion !== this._getLastestSecret().version) {
+      refreshPasswordInfo = this.generatePasswordHash({ password })
+    }
+
+    return {
+      success: true,
+      refreshPasswordInfo
+    }
+  }
+}
+
+module.exports = PasswordUtils
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/qq.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/qq.js
index 7ea612d870e9a45eafc67e68f370516eeb74a82e..18f5b559574e1e8d24ee41c66e443c80e4fbb890 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/qq.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/qq.js
@@ -1,152 +1,152 @@
-const {
-  userCollection
-} = require('../../common/constants')
-const {
-  ERROR
-} = require('../../common/error')
-
-function getQQPlatform () {
-  const platform = this.clientPlatform
-  switch (platform) {
-    case 'app':
-    case 'app-plus':
-      return 'app'
-    case 'mp-qq':
-      return 'mp'
-    default:
-      throw new Error('Unsupported qq platform')
-  }
-}
-
-async function saveQQUserKey ({
-  openid,
-  sessionKey, // QQ小程序用户sessionKey
-  accessToken, // App端QQ用户accessToken
-  accessTokenExpired // App端QQ用户accessToken过期时间
-} = {}) {
-  // 微信公众平台、开放平台refreshToken有效期均为30天（微信没有在网络请求里面返回30天这个值，务必注意未来可能出现调整，需及时更新此处逻辑）。
-  // 此前QQ开放平台有调整过accessToken的过期时间：[access_token有效期由90天缩短至30天](https://wiki.connect.qq.com/%E3%80%90qq%E4%BA%92%E8%81%94%E3%80%91access_token%E6%9C%89%E6%95%88%E6%9C%9F%E8%B0%83%E6%95%B4)
-  const appId = this.getUniversalClientInfo().appId
-  const qqPlatform = getQQPlatform.call(this)
-  const keyObj = {
-    dcloudAppid: appId,
-    openid,
-    platform: 'qq-' + qqPlatform
-  }
-  switch (qqPlatform) {
-    case 'mp':
-      await this.uniOpenBridge.setSessionKey(keyObj, {
-        session_key: sessionKey
-      }, 30 * 24 * 60 * 60)
-      break
-    case 'app':
-    case 'h5':
-    case 'web':
-      await this.uniOpenBridge.setUserAccessToken(keyObj, {
-        access_token: accessToken,
-        access_token_expired: accessTokenExpired
-      }, accessTokenExpired
-        ? Math.floor((accessTokenExpired - Date.now()) / 1000)
-        : 30 * 24 * 60 * 60
-      )
-      break
-    default:
-      break
-  }
-}
-
-function generateQQCache ({
-  sessionKey, // QQ小程序用户sessionKey
-  accessToken, // App端QQ用户accessToken
-  accessTokenExpired // App端QQ用户accessToken过期时间
-} = {}) {
-  const platform = getQQPlatform.call(this)
-  let cache
-  switch (platform) {
-    case 'app':
-      cache = {
-        access_token: accessToken,
-        access_token_expired: accessTokenExpired
-      }
-      break
-    case 'mp':
-      cache = {
-        session_key: sessionKey
-      }
-      break
-    default:
-      throw new Error('Unsupported qq platform')
-  }
-  return {
-    third_party: {
-      [`${platform}_qq`]: cache
-    }
-  }
-}
-
-function getQQOpenid ({
-  userRecord
-} = {}) {
-  const qqPlatform = getQQPlatform.call(this)
-  const appId = this.getUniversalClientInfo().appId
-  const qqOpenidObj = userRecord.qq_openid
-  if (!qqOpenidObj) {
-    return
-  }
-  return qqOpenidObj[`${qqPlatform}_${appId}`] || qqOpenidObj[qqPlatform]
-}
-
-async function getQQCacheFallback ({
-  userRecord,
-  key
-} = {}) {
-  const platform = getQQPlatform.call(this)
-  const thirdParty = userRecord && userRecord.third_party
-  if (!thirdParty) {
-    return
-  }
-  const qqCache = thirdParty[`${platform}_qq`]
-  return qqCache && qqCache[key]
-}
-
-async function getQQCache ({
-  uid,
-  userRecord,
-  key
-} = {}) {
-  const qqPlatform = getQQPlatform.call(this)
-  const appId = this.getUniversalClientInfo().appId
-
-  if (!userRecord) {
-    const getUserRes = await userCollection.doc(uid).get()
-    userRecord = getUserRes.data[0]
-  }
-  if (!userRecord) {
-    throw {
-      errCode: ERROR.ACCOUNT_NOT_EXISTS
-    }
-  }
-  const openid = getQQOpenid.call(this, {
-    userRecord
-  })
-  const getCacheMethod = qqPlatform === 'mp' ? 'getSessionKey' : 'getUserAccessToken'
-  const userKey = await this.uniOpenBridge[getCacheMethod]({
-    dcloudAppid: appId,
-    platform: 'qq-' + qqPlatform,
-    openid
-  })
-  if (userKey) {
-    return userKey[key]
-  }
-  return getQQCacheFallback({
-    userRecord,
-    key
-  })
-}
-
-module.exports = {
-  getQQPlatform,
-  generateQQCache,
-  getQQCache,
-  saveQQUserKey
-}
+const {
+  userCollection
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
+
+function getQQPlatform () {
+  const platform = this.clientPlatform
+  switch (platform) {
+    case 'app':
+    case 'app-plus':
+      return 'app'
+    case 'mp-qq':
+      return 'mp'
+    default:
+      throw new Error('Unsupported qq platform')
+  }
+}
+
+async function saveQQUserKey ({
+  openid,
+  sessionKey, // QQ小程序用户sessionKey
+  accessToken, // App端QQ用户accessToken
+  accessTokenExpired // App端QQ用户accessToken过期时间
+} = {}) {
+  // 微信公众平台、开放平台refreshToken有效期均为30天（微信没有在网络请求里面返回30天这个值，务必注意未来可能出现调整，需及时更新此处逻辑）。
+  // 此前QQ开放平台有调整过accessToken的过期时间：[access_token有效期由90天缩短至30天](https://wiki.connect.qq.com/%E3%80%90qq%E4%BA%92%E8%81%94%E3%80%91access_token%E6%9C%89%E6%95%88%E6%9C%9F%E8%B0%83%E6%95%B4)
+  const appId = this.getUniversalClientInfo().appId
+  const qqPlatform = getQQPlatform.call(this)
+  const keyObj = {
+    dcloudAppid: appId,
+    openid,
+    platform: 'qq-' + qqPlatform
+  }
+  switch (qqPlatform) {
+    case 'mp':
+      await this.uniOpenBridge.setSessionKey(keyObj, {
+        session_key: sessionKey
+      }, 30 * 24 * 60 * 60)
+      break
+    case 'app':
+    case 'h5':
+    case 'web':
+      await this.uniOpenBridge.setUserAccessToken(keyObj, {
+        access_token: accessToken,
+        access_token_expired: accessTokenExpired
+      }, accessTokenExpired
+        ? Math.floor((accessTokenExpired - Date.now()) / 1000)
+        : 30 * 24 * 60 * 60
+      )
+      break
+    default:
+      break
+  }
+}
+
+function generateQQCache ({
+  sessionKey, // QQ小程序用户sessionKey
+  accessToken, // App端QQ用户accessToken
+  accessTokenExpired // App端QQ用户accessToken过期时间
+} = {}) {
+  const platform = getQQPlatform.call(this)
+  let cache
+  switch (platform) {
+    case 'app':
+      cache = {
+        access_token: accessToken,
+        access_token_expired: accessTokenExpired
+      }
+      break
+    case 'mp':
+      cache = {
+        session_key: sessionKey
+      }
+      break
+    default:
+      throw new Error('Unsupported qq platform')
+  }
+  return {
+    third_party: {
+      [`${platform}_qq`]: cache
+    }
+  }
+}
+
+function getQQOpenid ({
+  userRecord
+} = {}) {
+  const qqPlatform = getQQPlatform.call(this)
+  const appId = this.getUniversalClientInfo().appId
+  const qqOpenidObj = userRecord.qq_openid
+  if (!qqOpenidObj) {
+    return
+  }
+  return qqOpenidObj[`${qqPlatform}_${appId}`] || qqOpenidObj[qqPlatform]
+}
+
+async function getQQCacheFallback ({
+  userRecord,
+  key
+} = {}) {
+  const platform = getQQPlatform.call(this)
+  const thirdParty = userRecord && userRecord.third_party
+  if (!thirdParty) {
+    return
+  }
+  const qqCache = thirdParty[`${platform}_qq`]
+  return qqCache && qqCache[key]
+}
+
+async function getQQCache ({
+  uid,
+  userRecord,
+  key
+} = {}) {
+  const qqPlatform = getQQPlatform.call(this)
+  const appId = this.getUniversalClientInfo().appId
+
+  if (!userRecord) {
+    const getUserRes = await userCollection.doc(uid).get()
+    userRecord = getUserRes.data[0]
+  }
+  if (!userRecord) {
+    throw {
+      errCode: ERROR.ACCOUNT_NOT_EXISTS
+    }
+  }
+  const openid = getQQOpenid.call(this, {
+    userRecord
+  })
+  const getCacheMethod = qqPlatform === 'mp' ? 'getSessionKey' : 'getUserAccessToken'
+  const userKey = await this.uniOpenBridge[getCacheMethod]({
+    dcloudAppid: appId,
+    platform: 'qq-' + qqPlatform,
+    openid
+  })
+  if (userKey) {
+    return userKey[key]
+  }
+  return getQQCacheFallback({
+    userRecord,
+    key
+  })
+}
+
+module.exports = {
+  getQQPlatform,
+  generateQQCache,
+  getQQCache,
+  saveQQUserKey
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/relate.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/relate.js
index 8431551d36ec74e36833faa5e6124df53f9fc569..77791f585d16b80840aec3d3f50dcf4e82ae8bea 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/relate.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/relate.js
@@ -1,164 +1,164 @@
-const {
-  findUser
-} = require('./account')
-const {
-  ERROR
-} = require('../../common/error')
-const {
-  userCollection, dbCmd, USER_IDENTIFIER
-} = require('../../common/constants')
-const {
-  getUserIdentifier
-} = require('../../lib/utils/account')
-
-const {
-  batchFindObjctValue
-} = require('../../common/utils')
-const merge = require('lodash.merge')
-
-/**
- *
- * @param {object} param
- * @param {string} param.uid 用户id
- * @param {string} param.bindAccount 要绑定的三方账户、手机号或邮箱
- */
-async function preBind ({
-  uid,
-  bindAccount,
-  logType
-} = {}) {
-  const {
-    userMatched
-  } = await findUser({
-    userQuery: bindAccount,
-    authorizedApp: this.getUniversalClientInfo().appId
-  })
-  if (userMatched.length > 0) {
-    await this.middleware.uniIdLog({
-      data: {
-        user_id: uid
-      },
-      type: logType,
-      success: false
-    })
-    throw {
-      errCode: ERROR.BIND_CONFLICT
-    }
-  }
-}
-
-async function postBind ({
-  uid,
-  extraData = {},
-  bindAccount,
-  logType
-} = {}) {
-  await userCollection.doc(uid).update(merge(bindAccount, extraData))
-  await this.middleware.uniIdLog({
-    data: {
-      user_id: uid
-    },
-    type: logType
-  })
-  return {
-    errCode: 0
-  }
-}
-
-async function preUnBind ({
-  uid,
-  unBindAccount,
-  logType
-}) {
-  const notUnBind = ['username', 'mobile', 'email']
-  const userIdentifier = getUserIdentifier(unBindAccount)
-  const condition = Object.keys(userIdentifier).reduce((res, key) => {
-    if (userIdentifier[key]) {
-      if (notUnBind.includes(key)) {
-        throw {
-          errCode: ERROR.UNBIND_NOT_SUPPORTED
-        }
-      }
-
-      res.push({
-        [key]: userIdentifier[key]
-      })
-    }
-
-    return res
-  }, [])
-  const currentUnBindAccount = Object.keys(userIdentifier).reduce((res, key) => {
-    if (userIdentifier[key]) {
-      res.push(key)
-    }
-    return res
-  }, [])
-  const { data: users } = await userCollection.where(dbCmd.and(
-    { _id: uid },
-    dbCmd.or(condition)
-  )).get()
-
-  if (users.length <= 0) {
-    await this.middleware.uniIdLog({
-      data: {
-        user_id: uid
-      },
-      type: logType,
-      success: false
-    })
-    throw {
-      errCode: ERROR.UNBIND_FAIL
-    }
-  }
-
-  const [user] = users
-  const otherAccounts = batchFindObjctValue(user, Object.keys(USER_IDENTIFIER).filter(key => !notUnBind.includes(key) && !currentUnBindAccount.includes(key)))
-  let hasOtherAccountBind = false
-
-  for (const key in otherAccounts) {
-    if (otherAccounts[key]) {
-      hasOtherAccountBind = true
-      break
-    }
-  }
-
-  // 如果没有其他第三方登录方式
-  if (!hasOtherAccountBind) {
-    // 存在用户名或者邮箱但是没有设置过没密码就提示设置密码
-    if ((user.username || user.email) && !user.password) {
-      throw {
-        errCode: ERROR.UNBIND_PASSWORD_NOT_EXISTS
-      }
-    }
-    // 账号任何登录方式都没有就优先绑定手机号
-    if (!user.mobile) {
-      throw {
-        errCode: ERROR.UNBIND_MOBILE_NOT_EXISTS
-      }
-    }
-  }
-}
-
-async function postUnBind ({
-  uid,
-  unBindAccount,
-  logType
-}) {
-  await userCollection.doc(uid).update(unBindAccount)
-  await this.middleware.uniIdLog({
-    data: {
-      user_id: uid
-    },
-    type: logType
-  })
-  return {
-    errCode: 0
-  }
-}
-
-module.exports = {
-  preBind,
-  postBind,
-  preUnBind,
-  postUnBind
-}
+const {
+  findUser
+} = require('./account')
+const {
+  ERROR
+} = require('../../common/error')
+const {
+  userCollection, dbCmd, USER_IDENTIFIER
+} = require('../../common/constants')
+const {
+  getUserIdentifier
+} = require('../../lib/utils/account')
+
+const {
+  batchFindObjctValue
+} = require('../../common/utils')
+const merge = require('lodash.merge')
+
+/**
+ *
+ * @param {object} param
+ * @param {string} param.uid 用户id
+ * @param {string} param.bindAccount 要绑定的三方账户、手机号或邮箱
+ */
+async function preBind ({
+  uid,
+  bindAccount,
+  logType
+} = {}) {
+  const {
+    userMatched
+  } = await findUser({
+    userQuery: bindAccount,
+    authorizedApp: this.getUniversalClientInfo().appId
+  })
+  if (userMatched.length > 0) {
+    await this.middleware.uniIdLog({
+      data: {
+        user_id: uid
+      },
+      type: logType,
+      success: false
+    })
+    throw {
+      errCode: ERROR.BIND_CONFLICT
+    }
+  }
+}
+
+async function postBind ({
+  uid,
+  extraData = {},
+  bindAccount,
+  logType
+} = {}) {
+  await userCollection.doc(uid).update(merge(bindAccount, extraData))
+  await this.middleware.uniIdLog({
+    data: {
+      user_id: uid
+    },
+    type: logType
+  })
+  return {
+    errCode: 0
+  }
+}
+
+async function preUnBind ({
+  uid,
+  unBindAccount,
+  logType
+}) {
+  const notUnBind = ['username', 'mobile', 'email']
+  const userIdentifier = getUserIdentifier(unBindAccount)
+  const condition = Object.keys(userIdentifier).reduce((res, key) => {
+    if (userIdentifier[key]) {
+      if (notUnBind.includes(key)) {
+        throw {
+          errCode: ERROR.UNBIND_NOT_SUPPORTED
+        }
+      }
+
+      res.push({
+        [key]: userIdentifier[key]
+      })
+    }
+
+    return res
+  }, [])
+  const currentUnBindAccount = Object.keys(userIdentifier).reduce((res, key) => {
+    if (userIdentifier[key]) {
+      res.push(key)
+    }
+    return res
+  }, [])
+  const { data: users } = await userCollection.where(dbCmd.and(
+    { _id: uid },
+    dbCmd.or(condition)
+  )).get()
+
+  if (users.length <= 0) {
+    await this.middleware.uniIdLog({
+      data: {
+        user_id: uid
+      },
+      type: logType,
+      success: false
+    })
+    throw {
+      errCode: ERROR.UNBIND_FAIL
+    }
+  }
+
+  const [user] = users
+  const otherAccounts = batchFindObjctValue(user, Object.keys(USER_IDENTIFIER).filter(key => !notUnBind.includes(key) && !currentUnBindAccount.includes(key)))
+  let hasOtherAccountBind = false
+
+  for (const key in otherAccounts) {
+    if (otherAccounts[key]) {
+      hasOtherAccountBind = true
+      break
+    }
+  }
+
+  // 如果没有其他第三方登录方式
+  if (!hasOtherAccountBind) {
+    // 存在用户名或者邮箱但是没有设置过没密码就提示设置密码
+    if ((user.username || user.email) && !user.password) {
+      throw {
+        errCode: ERROR.UNBIND_PASSWORD_NOT_EXISTS
+      }
+    }
+    // 账号任何登录方式都没有就优先绑定手机号
+    if (!user.mobile) {
+      throw {
+        errCode: ERROR.UNBIND_MOBILE_NOT_EXISTS
+      }
+    }
+  }
+}
+
+async function postUnBind ({
+  uid,
+  unBindAccount,
+  logType
+}) {
+  await userCollection.doc(uid).update(unBindAccount)
+  await this.middleware.uniIdLog({
+    data: {
+      user_id: uid
+    },
+    type: logType
+  })
+  return {
+    errCode: 0
+  }
+}
+
+module.exports = {
+  preBind,
+  postBind,
+  preUnBind,
+  postUnBind
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/sms.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/sms.js
index 21c70e9c6c49a6aed98f0f5542a7c811e1a2da92..9caecaa2888a2a59ea8dad0cbfb46a895bec0e5a 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/sms.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/sms.js
@@ -1,81 +1,81 @@
-const {
-  setMobileVerifyCode
-} = require('./verify-code')
-const {
-  getVerifyCode
-} = require('../../common/utils')
-
-/**
- * 发送短信
- * @param {object} param
- * @param {string} param.mobile       手机号
- * @param {object} param.code         可选，验证码
- * @param {object} param.scene        短信场景
- * @param {object} param.templateId   可选，短信模板id
- * @returns
- */
-async function sendSmsCode ({
-  mobile,
-  code,
-  scene,
-  templateId
-} = {}) {
-  const requiredParams = [
-    'name',
-    'smsKey',
-    'smsSecret',
-    'codeExpiresIn'
-  ]
-  const smsConfig = (this.config.service && this.config.service.sms) || {}
-  for (let i = 0; i < requiredParams.length; i++) {
-    const key = requiredParams[i]
-    if (!smsConfig[key]) {
-      throw new Error(`Missing config param: service.sms.${key}`)
-    }
-  }
-  if (!code) {
-    code = getVerifyCode()
-  }
-  let action
-  switch (scene) {
-    case 'login-by-sms':
-      action = this.t('login')
-      break
-    default:
-      action = this.t('verify-mobile')
-      break
-  }
-  const sceneConfig = (smsConfig.scene || {})[scene] || {}
-  if (!templateId) {
-    templateId = sceneConfig.templateId
-  }
-  if (!templateId) {
-    throw new Error('"templateId" is required')
-  }
-  const codeExpiresIn = sceneConfig.codeExpiresIn || smsConfig.codeExpiresIn
-  await setMobileVerifyCode.call(this, {
-    mobile,
-    code,
-    expiresIn: codeExpiresIn,
-    scene
-  })
-  await uniCloud.sendSms({
-    smsKey: smsConfig.smsKey,
-    smsSecret: smsConfig.smsSecret,
-    phone: mobile,
-    templateId,
-    data: {
-      name: smsConfig.name,
-      code,
-      action,
-      expMinute: '' + Math.round(codeExpiresIn / 60)
-    }
-  })
-  return {
-    errCode: 0
-  }
-}
-
-module.exports = {
-  sendSmsCode
-}
+const {
+  setMobileVerifyCode
+} = require('./verify-code')
+const {
+  getVerifyCode
+} = require('../../common/utils')
+
+/**
+ * 发送短信
+ * @param {object} param
+ * @param {string} param.mobile       手机号
+ * @param {object} param.code         可选，验证码
+ * @param {object} param.scene        短信场景
+ * @param {object} param.templateId   可选，短信模板id
+ * @returns
+ */
+async function sendSmsCode ({
+  mobile,
+  code,
+  scene,
+  templateId
+} = {}) {
+  const requiredParams = [
+    'name',
+    'smsKey',
+    'smsSecret',
+    'codeExpiresIn'
+  ]
+  const smsConfig = (this.config.service && this.config.service.sms) || {}
+  for (let i = 0; i < requiredParams.length; i++) {
+    const key = requiredParams[i]
+    if (!smsConfig[key]) {
+      throw new Error(`Missing config param: service.sms.${key}`)
+    }
+  }
+  if (!code) {
+    code = getVerifyCode()
+  }
+  let action
+  switch (scene) {
+    case 'login-by-sms':
+      action = this.t('login')
+      break
+    default:
+      action = this.t('verify-mobile')
+      break
+  }
+  const sceneConfig = (smsConfig.scene || {})[scene] || {}
+  if (!templateId) {
+    templateId = sceneConfig.templateId
+  }
+  if (!templateId) {
+    throw new Error('"templateId" is required')
+  }
+  const codeExpiresIn = sceneConfig.codeExpiresIn || smsConfig.codeExpiresIn
+  await setMobileVerifyCode.call(this, {
+    mobile,
+    code,
+    expiresIn: codeExpiresIn,
+    scene
+  })
+  await uniCloud.sendSms({
+    smsKey: smsConfig.smsKey,
+    smsSecret: smsConfig.smsSecret,
+    phone: mobile,
+    templateId,
+    data: {
+      name: smsConfig.name,
+      code,
+      action,
+      expMinute: '' + Math.round(codeExpiresIn / 60)
+    }
+  })
+  return {
+    errCode: 0
+  }
+}
+
+module.exports = {
+  sendSmsCode
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/unified-login.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/unified-login.js
index eac7a515c0d3f0fc514f77382bf9d5b61bf780af..b974e06f06ff6b34ea9a92bfdefec2265c5b106b 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/unified-login.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/unified-login.js
@@ -1,106 +1,106 @@
-const {
-  checkLoginUserRecord,
-  postLogin
-} = require('./login')
-const {
-  postRegister
-} = require('./register')
-const {
-  findUser
-} = require('./account')
-const {
-  ERROR
-} = require('../../common/error')
-
-async function realPreUnifiedLogin (params = {}) {
-  const {
-    user,
-    type
-  } = params
-  const appId = this.getUniversalClientInfo().appId
-  const {
-    total,
-    userMatched
-  } = await findUser({
-    userQuery: user,
-    authorizedApp: appId
-  })
-  if (userMatched.length === 0) {
-    if (type === 'login') {
-      if (total > 0) {
-        throw {
-          errCode: ERROR.ACCOUNT_NOT_EXISTS_IN_CURRENT_APP
-        }
-      }
-      throw {
-        errCode: ERROR.ACCOUNT_NOT_EXISTS
-      }
-    }
-    return {
-      type: 'register',
-      user
-    }
-  } if (userMatched.length === 1) {
-    if (type === 'register') {
-      throw {
-        errCode: ERROR.ACCOUNT_EXISTS
-      }
-    }
-    const userRecord = userMatched[0]
-    checkLoginUserRecord(userRecord)
-    return {
-      type: 'login',
-      user: userRecord
-    }
-  } else if (userMatched.length > 1) {
-    throw {
-      errCode: ERROR.ACCOUNT_CONFLICT
-    }
-  }
-}
-
-async function preUnifiedLogin (params = {}) {
-  try {
-    const result = await realPreUnifiedLogin.call(this, params)
-    return result
-  } catch (error) {
-    await this.middleware.uniIdLog({
-      success: false
-    })
-    throw error
-  }
-}
-
-async function postUnifiedLogin (params = {}) {
-  const {
-    user,
-    extraData = {},
-    isThirdParty = false,
-    type,
-    inviteCode
-  } = params
-  let result
-  if (type === 'login') {
-    result = await postLogin.call(this, {
-      user,
-      extraData,
-      isThirdParty
-    })
-  } else if (type === 'register') {
-    result = await postRegister.call(this, {
-      user,
-      extraData,
-      isThirdParty,
-      inviteCode
-    })
-  }
-  return {
-    ...result,
-    type
-  }
-}
-
-module.exports = {
-  preUnifiedLogin,
-  postUnifiedLogin
-}
+const {
+  checkLoginUserRecord,
+  postLogin
+} = require('./login')
+const {
+  postRegister
+} = require('./register')
+const {
+  findUser
+} = require('./account')
+const {
+  ERROR
+} = require('../../common/error')
+
+async function realPreUnifiedLogin (params = {}) {
+  const {
+    user,
+    type
+  } = params
+  const appId = this.getUniversalClientInfo().appId
+  const {
+    total,
+    userMatched
+  } = await findUser({
+    userQuery: user,
+    authorizedApp: appId
+  })
+  if (userMatched.length === 0) {
+    if (type === 'login') {
+      if (total > 0) {
+        throw {
+          errCode: ERROR.ACCOUNT_NOT_EXISTS_IN_CURRENT_APP
+        }
+      }
+      throw {
+        errCode: ERROR.ACCOUNT_NOT_EXISTS
+      }
+    }
+    return {
+      type: 'register',
+      user
+    }
+  } if (userMatched.length === 1) {
+    if (type === 'register') {
+      throw {
+        errCode: ERROR.ACCOUNT_EXISTS
+      }
+    }
+    const userRecord = userMatched[0]
+    checkLoginUserRecord(userRecord)
+    return {
+      type: 'login',
+      user: userRecord
+    }
+  } else if (userMatched.length > 1) {
+    throw {
+      errCode: ERROR.ACCOUNT_CONFLICT
+    }
+  }
+}
+
+async function preUnifiedLogin (params = {}) {
+  try {
+    const result = await realPreUnifiedLogin.call(this, params)
+    return result
+  } catch (error) {
+    await this.middleware.uniIdLog({
+      success: false
+    })
+    throw error
+  }
+}
+
+async function postUnifiedLogin (params = {}) {
+  const {
+    user,
+    extraData = {},
+    isThirdParty = false,
+    type,
+    inviteCode
+  } = params
+  let result
+  if (type === 'login') {
+    result = await postLogin.call(this, {
+      user,
+      extraData,
+      isThirdParty
+    })
+  } else if (type === 'register') {
+    result = await postRegister.call(this, {
+      user,
+      extraData,
+      isThirdParty,
+      inviteCode
+    })
+  }
+  return {
+    ...result,
+    type
+  }
+}
+
+module.exports = {
+  preUnifiedLogin,
+  postUnifiedLogin
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/univerify.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/univerify.js
index 33c17c00a23f3d6ad2c5f7abeb288ef807d8ae60..8b45b620d722d9f1fc11a8d92186b5577d9bb003 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/univerify.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/univerify.js
@@ -1,27 +1,27 @@
-async function getPhoneNumber ({
-  // eslint-disable-next-line camelcase
-  access_token,
-  openid
-} = {}) {
-  const requiredParams = ['apiKey', 'apiSecret']
-  const univerifyConfig = (this.config.service && this.config.service.univerify) || {}
-  for (let i = 0; i < requiredParams.length; i++) {
-    const key = requiredParams[i]
-    if (!univerifyConfig[key]) {
-      throw new Error(`Missing config param: service.univerify.${key}`)
-    }
-  }
-  return uniCloud.getPhoneNumber({
-    provider: 'univerify',
-    appid: this.getUniversalClientInfo().appId,
-    apiKey: univerifyConfig.apiKey,
-    apiSecret: univerifyConfig.apiSecret,
-    // eslint-disable-next-line camelcase
-    access_token,
-    openid
-  })
-}
-
-module.exports = {
-  getPhoneNumber
-}
+async function getPhoneNumber ({
+  // eslint-disable-next-line camelcase
+  access_token,
+  openid
+} = {}) {
+  const requiredParams = ['apiKey', 'apiSecret']
+  const univerifyConfig = (this.config.service && this.config.service.univerify) || {}
+  for (let i = 0; i < requiredParams.length; i++) {
+    const key = requiredParams[i]
+    if (!univerifyConfig[key]) {
+      throw new Error(`Missing config param: service.univerify.${key}`)
+    }
+  }
+  return uniCloud.getPhoneNumber({
+    provider: 'univerify',
+    appid: this.getUniversalClientInfo().appId,
+    apiKey: univerifyConfig.apiKey,
+    apiSecret: univerifyConfig.apiSecret,
+    // eslint-disable-next-line camelcase
+    access_token,
+    openid
+  })
+}
+
+module.exports = {
+  getPhoneNumber
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/update-user-info.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/update-user-info.js
index ced33b9f5624192ac3aecef5b917c7fb9aa775cc..c2ebb1b4dac7cd4cd39273b478452d2680104ec6 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/update-user-info.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/update-user-info.js
@@ -1,25 +1,25 @@
-const {
-  userCollection
-} = require('../../common/constants')
-const {
-  USER_STATUS
-} = require('../../common/constants')
-async function setUserStatus (uid, status) {
-  const updateData = {
-    status
-  }
-  if (status !== USER_STATUS.NORMAL) {
-    updateData.valid_token_date = Date.now()
-  }
-  await userCollection.doc(uid).update({
-    status
-  })
-  // TODO 此接口尚不完善，例如注销后其他客户端可能存在有效token，支持Redis后此处会补充额外逻辑
-  return {
-    errCode: 0
-  }
-}
-
-module.exports = {
-  setUserStatus
-}
+const {
+  userCollection
+} = require('../../common/constants')
+const {
+  USER_STATUS
+} = require('../../common/constants')
+async function setUserStatus (uid, status) {
+  const updateData = {
+    status
+  }
+  if (status !== USER_STATUS.NORMAL) {
+    updateData.valid_token_date = Date.now()
+  }
+  await userCollection.doc(uid).update({
+    status
+  })
+  // TODO 此接口尚不完善，例如注销后其他客户端可能存在有效token，支持Redis后此处会补充额外逻辑
+  return {
+    errCode: 0
+  }
+}
+
+module.exports = {
+  setUserStatus
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/utils.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/utils.js
index 7d3e0f3668115023247947f26e46a89a65fba31a..f00ca0a05920d6bfa60db11045a337550362ee50 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/utils.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/utils.js
@@ -1,18 +1,18 @@
-let redisEnable = null
-function getRedisEnable() {
-  // 未用到的时候不调用redis接口，节省一些连接数
-  if (redisEnable !== null) {
-    return redisEnable
-  }
-  try {
-    uniCloud.redis()
-    redisEnable = true
-  } catch (error) {
-    redisEnable = false
-  }
-  return redisEnable
-}
-
-module.exports = {
-  getRedisEnable
+let redisEnable = null
+function getRedisEnable() {
+  // 未用到的时候不调用redis接口，节省一些连接数
+  if (redisEnable !== null) {
+    return redisEnable
+  }
+  try {
+    uniCloud.redis()
+    redisEnable = true
+  } catch (error) {
+    redisEnable = false
+  }
+  return redisEnable
+}
+
+module.exports = {
+  getRedisEnable
 }
\ No newline at end of file
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/verify-code.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/verify-code.js
index b11bc026f119cc7a25f04a7de07d490810c66d44..31ba23614cc927b57edcdd633784515e36542394 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/verify-code.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/verify-code.js
@@ -1,152 +1,152 @@
-const {
-  dbCmd,
-  verifyCollection
-} = require('../../common/constants')
-const {
-  ERROR
-} = require('../../common/error')
-const {
-  getVerifyCode
-} = require('../../common/utils')
-
-async function setVerifyCode ({
-  mobile,
-  email,
-  code,
-  expiresIn,
-  scene
-} = {}) {
-  const now = Date.now()
-  const record = {
-    mobile,
-    email,
-    scene,
-    code: code || getVerifyCode(),
-    state: 0,
-    ip: this.getUniversalClientInfo().clientIP,
-    created_date: now,
-    expired_date: now + expiresIn * 1000
-  }
-  await verifyCollection.add(record)
-  return {
-    errCode: 0
-  }
-}
-
-async function setEmailVerifyCode ({
-  email,
-  code,
-  expiresIn,
-  scene
-} = {}) {
-  email = email && email.trim()
-  if (!email) {
-    throw {
-      errCode: ERROR.INVALID_EMAIL
-    }
-  }
-  email = email.toLowerCase()
-  return setVerifyCode.call(this, {
-    email,
-    code,
-    expiresIn,
-    scene
-  })
-}
-
-async function setMobileVerifyCode ({
-  mobile,
-  code,
-  expiresIn,
-  scene
-} = {}) {
-  mobile = mobile && mobile.trim()
-  if (!mobile) {
-    throw {
-      errCode: ERROR.INVALID_MOBILE
-    }
-  }
-  return setVerifyCode.call(this, {
-    mobile,
-    code,
-    expiresIn,
-    scene
-  })
-}
-
-async function verifyEmailCode ({
-  email,
-  code,
-  scene
-} = {}) {
-  email = email && email.trim()
-  if (!email) {
-    throw {
-      errCode: ERROR.INVALID_EMAIL
-    }
-  }
-  email = email.toLowerCase()
-  const {
-    data: codeRecord
-  } = await verifyCollection.where({
-    email,
-    scene,
-    code,
-    state: 0,
-    expired_date: dbCmd.gt(Date.now())
-  }).limit(1).get()
-
-  if (codeRecord.length === 0) {
-    throw {
-      errCode: ERROR.EMAIL_VERIFY_CODE_ERROR
-    }
-  }
-  await verifyCollection.doc(codeRecord[0]._id).update({
-    state: 1
-  })
-  return {
-    errCode: 0
-  }
-}
-
-async function verifyMobileCode ({
-  mobile,
-  code,
-  scene
-} = {}) {
-  mobile = mobile && mobile.trim()
-  if (!mobile) {
-    throw {
-      errCode: ERROR.INVALID_MOBILE
-    }
-  }
-  const {
-    data: codeRecord
-  } = await verifyCollection.where({
-    mobile,
-    scene,
-    code,
-    state: 0,
-    expired_date: dbCmd.gt(Date.now())
-  }).limit(1).get()
-
-  if (codeRecord.length === 0) {
-    throw {
-      errCode: ERROR.MOBILE_VERIFY_CODE_ERROR
-    }
-  }
-
-  await verifyCollection.doc(codeRecord[0]._id).update({
-    state: 1
-  })
-  return {
-    errCode: 0
-  }
-}
-
-module.exports = {
-  verifyEmailCode,
-  verifyMobileCode,
-  setEmailVerifyCode,
-  setMobileVerifyCode
-}
+const {
+  dbCmd,
+  verifyCollection
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
+const {
+  getVerifyCode
+} = require('../../common/utils')
+
+async function setVerifyCode ({
+  mobile,
+  email,
+  code,
+  expiresIn,
+  scene
+} = {}) {
+  const now = Date.now()
+  const record = {
+    mobile,
+    email,
+    scene,
+    code: code || getVerifyCode(),
+    state: 0,
+    ip: this.getUniversalClientInfo().clientIP,
+    created_date: now,
+    expired_date: now + expiresIn * 1000
+  }
+  await verifyCollection.add(record)
+  return {
+    errCode: 0
+  }
+}
+
+async function setEmailVerifyCode ({
+  email,
+  code,
+  expiresIn,
+  scene
+} = {}) {
+  email = email && email.trim()
+  if (!email) {
+    throw {
+      errCode: ERROR.INVALID_EMAIL
+    }
+  }
+  email = email.toLowerCase()
+  return setVerifyCode.call(this, {
+    email,
+    code,
+    expiresIn,
+    scene
+  })
+}
+
+async function setMobileVerifyCode ({
+  mobile,
+  code,
+  expiresIn,
+  scene
+} = {}) {
+  mobile = mobile && mobile.trim()
+  if (!mobile) {
+    throw {
+      errCode: ERROR.INVALID_MOBILE
+    }
+  }
+  return setVerifyCode.call(this, {
+    mobile,
+    code,
+    expiresIn,
+    scene
+  })
+}
+
+async function verifyEmailCode ({
+  email,
+  code,
+  scene
+} = {}) {
+  email = email && email.trim()
+  if (!email) {
+    throw {
+      errCode: ERROR.INVALID_EMAIL
+    }
+  }
+  email = email.toLowerCase()
+  const {
+    data: codeRecord
+  } = await verifyCollection.where({
+    email,
+    scene,
+    code,
+    state: 0,
+    expired_date: dbCmd.gt(Date.now())
+  }).limit(1).get()
+
+  if (codeRecord.length === 0) {
+    throw {
+      errCode: ERROR.EMAIL_VERIFY_CODE_ERROR
+    }
+  }
+  await verifyCollection.doc(codeRecord[0]._id).update({
+    state: 1
+  })
+  return {
+    errCode: 0
+  }
+}
+
+async function verifyMobileCode ({
+  mobile,
+  code,
+  scene
+} = {}) {
+  mobile = mobile && mobile.trim()
+  if (!mobile) {
+    throw {
+      errCode: ERROR.INVALID_MOBILE
+    }
+  }
+  const {
+    data: codeRecord
+  } = await verifyCollection.where({
+    mobile,
+    scene,
+    code,
+    state: 0,
+    expired_date: dbCmd.gt(Date.now())
+  }).limit(1).get()
+
+  if (codeRecord.length === 0) {
+    throw {
+      errCode: ERROR.MOBILE_VERIFY_CODE_ERROR
+    }
+  }
+
+  await verifyCollection.doc(codeRecord[0]._id).update({
+    state: 1
+  })
+  return {
+    errCode: 0
+  }
+}
+
+module.exports = {
+  verifyEmailCode,
+  verifyMobileCode,
+  setEmailVerifyCode,
+  setMobileVerifyCode
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/access-control.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/access-control.js
index e333fe01f2689e67f71e841195f8657e14290c02..6041ffa6aca936c506ae26c142247108d21ea572 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/access-control.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/access-control.js
@@ -1,59 +1,59 @@
-const methodPermission = require('../config/permission')
-const {
-  ERROR
-} = require('../common/error')
-
-function isAccessAllowed (user, setting) {
-  const {
-    role: userRole = [],
-    permission: userPermission = []
-  } = user
-  const {
-    role: settingRole = [],
-    permission: settingPermission = []
-  } = setting
-  if (userRole.includes('admin')) {
-    return
-  }
-  if (
-    settingRole.length > 0 &&
-    settingRole.every(item => !userRole.includes(item))
-  ) {
-    throw {
-      errCode: ERROR.PERMISSION_ERROR
-    }
-  }
-  if (
-    settingPermission.length > 0 &&
-    settingPermission.every(item => !userPermission.includes(item))
-  ) {
-    throw {
-      errCode: ERROR.PERMISSION_ERROR
-    }
-  }
-}
-
-module.exports = async function () {
-  const methodName = this.getMethodName()
-  if (!(methodName in methodPermission)) {
-    return
-  }
-  const {
-    auth,
-    role,
-    permission
-  } = methodPermission[methodName]
-  if (auth || role || permission) {
-    await this.middleware.auth()
-  }
-  if (role && role.length === 0) {
-    throw new Error('[AccessControl]Empty role array is not supported')
-  }
-  if (permission && permission.length === 0) {
-    throw new Error('[AccessControl]Empty permission array is not supported')
-  }
-  return isAccessAllowed(this.authInfo, {
-    role,
-    permission
-  })
-}
+const methodPermission = require('../config/permission')
+const {
+  ERROR
+} = require('../common/error')
+
+function isAccessAllowed (user, setting) {
+  const {
+    role: userRole = [],
+    permission: userPermission = []
+  } = user
+  const {
+    role: settingRole = [],
+    permission: settingPermission = []
+  } = setting
+  if (userRole.includes('admin')) {
+    return
+  }
+  if (
+    settingRole.length > 0 &&
+    settingRole.every(item => !userRole.includes(item))
+  ) {
+    throw {
+      errCode: ERROR.PERMISSION_ERROR
+    }
+  }
+  if (
+    settingPermission.length > 0 &&
+    settingPermission.every(item => !userPermission.includes(item))
+  ) {
+    throw {
+      errCode: ERROR.PERMISSION_ERROR
+    }
+  }
+}
+
+module.exports = async function () {
+  const methodName = this.getMethodName()
+  if (!(methodName in methodPermission)) {
+    return
+  }
+  const {
+    auth,
+    role,
+    permission
+  } = methodPermission[methodName]
+  if (auth || role || permission) {
+    await this.middleware.auth()
+  }
+  if (role && role.length === 0) {
+    throw new Error('[AccessControl]Empty role array is not supported')
+  }
+  if (permission && permission.length === 0) {
+    throw new Error('[AccessControl]Empty permission array is not supported')
+  }
+  return isAccessAllowed(this.authInfo, {
+    role,
+    permission
+  })
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/auth.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/auth.js
index 1915335d60066599de3abd0bbc094c612ff5148b..a111ee3b2e091564cd0d522c1ea7bf8930217e99 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/auth.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/auth.js
@@ -1,17 +1,17 @@
-module.exports = async function () {
-  if (this.authInfo) { // 多次执行auth时如果第一次成功后续不再执行
-    return
-  }
-  const token = this.getUniversalUniIdToken()
-  const payload = await this.uniIdCommon.checkToken(token)
-  if (payload.errCode) {
-    throw payload
-  }
-  this.authInfo = payload
-  if (payload.token) {
-    this.response.newToken = {
-      token: payload.token,
-      tokenExpired: payload.tokenExpired
-    }
-  }
-}
+module.exports = async function () {
+  if (this.authInfo) { // 多次执行auth时如果第一次成功后续不再执行
+    return
+  }
+  const token = this.getUniversalUniIdToken()
+  const payload = await this.uniIdCommon.checkToken(token)
+  if (payload.errCode) {
+    throw payload
+  }
+  this.authInfo = payload
+  if (payload.token) {
+    this.response.newToken = {
+      token: payload.token,
+      tokenExpired: payload.tokenExpired
+    }
+  }
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/index.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/index.js
index 9f7c958ca4b35a1fb219b6acaefb161b9b84ce4e..5be100091761ff3989d2140faf5d8cfa1799887c 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/index.js
@@ -1,8 +1,8 @@
-module.exports = {
-  auth: require('./auth'),
-  uniIdLog: require('./uni-id-log'),
-  validate: require('./validate'),
-  accessControl: require('./access-control'),
-  verifyRequestSign: require('./verify-request-sign'),
-  ...require('./rbac')
-}
+module.exports = {
+  auth: require('./auth'),
+  uniIdLog: require('./uni-id-log'),
+  validate: require('./validate'),
+  accessControl: require('./access-control'),
+  verifyRequestSign: require('./verify-request-sign'),
+  ...require('./rbac')
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/rbac.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/rbac.js
index f42ef8d9fea154c7766279efa4d82454620d9896..32fe0f8097b9e528eb4ad304747cd68a95ebb1ac 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/rbac.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/rbac.js
@@ -1,39 +1,39 @@
-const {
-  ERROR
-} = require('../common/error')
-
-function hasRole (...roleList) {
-  const userRole = this.authInfo.role || []
-  if (userRole.includes('admin')) {
-    return
-  }
-  const isMatch = roleList.every(roleItem => {
-    return userRole.includes(roleItem)
-  })
-  if (!isMatch) {
-    throw {
-      errCode: ERROR.PERMISSION_ERROR
-    }
-  }
-}
-
-function hasPermission (...permissionList) {
-  const userRole = this.authInfo.role || []
-  const userPermission = this.authInfo.permission || []
-  if (userRole.includes('admin')) {
-    return
-  }
-  const isMatch = permissionList.every(permissionItem => {
-    return userPermission.includes(permissionItem)
-  })
-  if (!isMatch) {
-    throw {
-      errCode: ERROR.PERMISSION_ERROR
-    }
-  }
-}
-
-module.exports = {
-  hasRole,
-  hasPermission
-}
+const {
+  ERROR
+} = require('../common/error')
+
+function hasRole (...roleList) {
+  const userRole = this.authInfo.role || []
+  if (userRole.includes('admin')) {
+    return
+  }
+  const isMatch = roleList.every(roleItem => {
+    return userRole.includes(roleItem)
+  })
+  if (!isMatch) {
+    throw {
+      errCode: ERROR.PERMISSION_ERROR
+    }
+  }
+}
+
+function hasPermission (...permissionList) {
+  const userRole = this.authInfo.role || []
+  const userPermission = this.authInfo.permission || []
+  if (userRole.includes('admin')) {
+    return
+  }
+  const isMatch = permissionList.every(permissionItem => {
+    return userPermission.includes(permissionItem)
+  })
+  if (!isMatch) {
+    throw {
+      errCode: ERROR.PERMISSION_ERROR
+    }
+  }
+}
+
+module.exports = {
+  hasRole,
+  hasPermission
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/uni-id-log.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/uni-id-log.js
index ca6927d9820a0d36ccf593bffd64d03dffd02b9f..013f7ae6b0723422c0e66663b910ccbafbc0474b 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/uni-id-log.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/uni-id-log.js
@@ -1,39 +1,39 @@
-const db = uniCloud.database()
-module.exports = async function ({
-  data = {},
-  success = true,
-  type = 'login'
-} = {}) {
-  const now = Date.now()
-  const uniIdLogCollection = db.collection('uni-id-log')
-  const requiredDataKeyList = ['user_id', 'username', 'email', 'mobile']
-  const dataCopy = {}
-  for (let i = 0; i < requiredDataKeyList.length; i++) {
-    const key = requiredDataKeyList[i]
-    if (key in data && typeof data[key] === 'string') {
-      dataCopy[key] = data[key]
-    }
-  }
-  const {
-    appId,
-    clientIP,
-    deviceId,
-    userAgent
-  } = this.getUniversalClientInfo()
-  const logData = {
-    appid: appId,
-    device_id: deviceId,
-    ip: clientIP,
-    type,
-    ua: userAgent,
-    create_date: now,
-    ...dataCopy
-  }
-
-  if (success) {
-    logData.state = 1
-  } else {
-    logData.state = 0
-  }
-  return uniIdLogCollection.add(logData)
-}
+const db = uniCloud.database()
+module.exports = async function ({
+  data = {},
+  success = true,
+  type = 'login'
+} = {}) {
+  const now = Date.now()
+  const uniIdLogCollection = db.collection('uni-id-log')
+  const requiredDataKeyList = ['user_id', 'username', 'email', 'mobile']
+  const dataCopy = {}
+  for (let i = 0; i < requiredDataKeyList.length; i++) {
+    const key = requiredDataKeyList[i]
+    if (key in data && typeof data[key] === 'string') {
+      dataCopy[key] = data[key]
+    }
+  }
+  const {
+    appId,
+    clientIP,
+    deviceId,
+    userAgent
+  } = this.getUniversalClientInfo()
+  const logData = {
+    appid: appId,
+    device_id: deviceId,
+    ip: clientIP,
+    type,
+    ua: userAgent,
+    create_date: now,
+    ...dataCopy
+  }
+
+  if (success) {
+    logData.state = 1
+  } else {
+    logData.state = 0
+  }
+  return uniIdLogCollection.add(logData)
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/validate.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/validate.js
index 52ff04769c0f4498a90111b7cf79313cb4683823..a58e8b473a6801d8dc943cccf30364f536b42872 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/validate.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/validate.js
@@ -1,7 +1,7 @@
-module.exports = function (value = {}, schema = {}) {
-  const validateRes = this.validator.validate(value, schema)
-  if (validateRes) {
-    delete validateRes.schemaKey
-    throw validateRes
-  }
-}
+module.exports = function (value = {}, schema = {}) {
+  const validateRes = this.validator.validate(value, schema)
+  if (validateRes) {
+    delete validateRes.schemaKey
+    throw validateRes
+  }
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/close-account.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/close-account.js
index f1bdf9691024f5d71510c912c45e305f8c8e17db..58fdb9d9930c5b395f9b98f8b88f81b74766d3d5 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/close-account.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/close-account.js
@@ -1,16 +1,16 @@
-const {
-  setUserStatus
-} = require('../../lib/utils/update-user-info')
-const {
-  USER_STATUS
-} = require('../../common/constants')
-
-/**
- * 注销账户
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#close-account
- * @returns
- */
-module.exports = async function () {
-  const { uid } = this.authInfo
-  return setUserStatus(uid, USER_STATUS.CLOSED)
-}
+const {
+  setUserStatus
+} = require('../../lib/utils/update-user-info')
+const {
+  USER_STATUS
+} = require('../../common/constants')
+
+/**
+ * 注销账户
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#close-account
+ * @returns
+ */
+module.exports = async function () {
+  const { uid } = this.authInfo
+  return setUserStatus(uid, USER_STATUS.CLOSED)
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/get-account-info.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/get-account-info.js
index 7b8599a526446a2d55f70d04bed82e9098f71d53..b57fe00875567a68184011905e57de6261f73569 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/get-account-info.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/get-account-info.js
@@ -1,69 +1,69 @@
-const {
-  userCollection
-} = require('../../common/constants')
-const {
-  ERROR
-} = require('../../common/error')
-
-function isUsernameSet (userRecord) {
-  return !!userRecord.username
-}
-function isNicknameSet (userRecord) {
-  return !!userRecord.nickname
-}
-function isPasswordSet (userRecord) {
-  return !!userRecord.password
-}
-function isMobileBound (userRecord) {
-  return !!(userRecord.mobile && userRecord.mobile_confirmed)
-}
-function isEmailBound (userRecord) {
-  return !!(userRecord.email && userRecord.email_confirmed)
-}
-function isWeixinBound (userRecord) {
-  return !!(
-    userRecord.wx_unionid ||
-    Object.keys(userRecord.wx_openid || {}).length
-  )
-}
-function isQQBound (userRecord) {
-  return !!(
-    userRecord.qq_unionid ||
-    Object.keys(userRecord.qq_openid || {}).length
-  )
-}
-function isAlipayBound (userRecord) {
-  return !!userRecord.ali_openid
-}
-function isAppleBound (userRecord) {
-  return !!userRecord.apple_openid
-}
-
-/**
- * 获取账户账户简略信息
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#get-account-info
- */
-module.exports = async function () {
-  const {
-    uid
-  } = this.authInfo
-  const getUserRes = await userCollection.doc(uid).get()
-  const userRecord = getUserRes && getUserRes.data && getUserRes.data[0]
-  if (!userRecord) {
-    throw {
-      errCode: ERROR.ACCOUNT_NOT_EXISTS
-    }
-  }
-  return {
-    errCode: 0,
-    isUsernameSet: isUsernameSet(userRecord),
-    isNicknameSet: isNicknameSet(userRecord),
-    isPasswordSet: isPasswordSet(userRecord),
-    isMobileBound: isMobileBound(userRecord),
-    isEmailBound: isEmailBound(userRecord),
-    isWeixinBound: isWeixinBound(userRecord),
-    isQQBound: isQQBound(userRecord),
-    isAlipayBound: isAlipayBound(userRecord),
-    isAppleBound: isAppleBound(userRecord)
-  }
-}
+const {
+  userCollection
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
+
+function isUsernameSet (userRecord) {
+  return !!userRecord.username
+}
+function isNicknameSet (userRecord) {
+  return !!userRecord.nickname
+}
+function isPasswordSet (userRecord) {
+  return !!userRecord.password
+}
+function isMobileBound (userRecord) {
+  return !!(userRecord.mobile && userRecord.mobile_confirmed)
+}
+function isEmailBound (userRecord) {
+  return !!(userRecord.email && userRecord.email_confirmed)
+}
+function isWeixinBound (userRecord) {
+  return !!(
+    userRecord.wx_unionid ||
+    Object.keys(userRecord.wx_openid || {}).length
+  )
+}
+function isQQBound (userRecord) {
+  return !!(
+    userRecord.qq_unionid ||
+    Object.keys(userRecord.qq_openid || {}).length
+  )
+}
+function isAlipayBound (userRecord) {
+  return !!userRecord.ali_openid
+}
+function isAppleBound (userRecord) {
+  return !!userRecord.apple_openid
+}
+
+/**
+ * 获取账户账户简略信息
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#get-account-info
+ */
+module.exports = async function () {
+  const {
+    uid
+  } = this.authInfo
+  const getUserRes = await userCollection.doc(uid).get()
+  const userRecord = getUserRes && getUserRes.data && getUserRes.data[0]
+  if (!userRecord) {
+    throw {
+      errCode: ERROR.ACCOUNT_NOT_EXISTS
+    }
+  }
+  return {
+    errCode: 0,
+    isUsernameSet: isUsernameSet(userRecord),
+    isNicknameSet: isNicknameSet(userRecord),
+    isPasswordSet: isPasswordSet(userRecord),
+    isMobileBound: isMobileBound(userRecord),
+    isEmailBound: isEmailBound(userRecord),
+    isWeixinBound: isWeixinBound(userRecord),
+    isQQBound: isQQBound(userRecord),
+    isAlipayBound: isAlipayBound(userRecord),
+    isAppleBound: isAppleBound(userRecord)
+  }
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/reset-pwd-by-email.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/reset-pwd-by-email.js
index 20c6219e97d43a82155d475f5e0e257e5c67ade9..eff026af6d0fa38f936fa551b5db31392657cadb 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/reset-pwd-by-email.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/reset-pwd-by-email.js
@@ -1,128 +1,128 @@
-const {
-  ERROR
-} = require('../../common/error')
-const {
-  getNeedCaptcha,
-  verifyCaptcha
-} = require('../../lib/utils/captcha')
-const {
-  verifyEmailCode
-} = require('../../lib/utils/verify-code')
-const {
-  userCollection,
-  EMAIL_SCENE,
-  CAPTCHA_SCENE,
-  LOG_TYPE
-} = require('../../common/constants')
-const {
-  findUser
-} = require('../../lib/utils/account')
-const PasswordUtils = require('../../lib/utils/password')
-
-/**
- * 通过邮箱验证码重置密码
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#reset-pwd-by-email
- * @param {object} params
- * @param {string} params.email   邮箱
- * @param {string} params.code   邮箱验证码
- * @param {string} params.password 密码
- * @param {string} params.captcha  图形验证码
- * @returns {object}
- */
-module.exports = async function (params = {}) {
-  const schema = {
-    email: 'email',
-    code: 'string',
-    password: 'password',
-    captcha: {
-      required: false,
-      type: 'string'
-    }
-  }
-  this.middleware.validate(params, schema)
-  const {
-    email,
-    code,
-    password,
-    captcha
-  } = params
-
-  const needCaptcha = await getNeedCaptcha.call(this, {
-    email,
-    type: LOG_TYPE.RESET_PWD_BY_EMAIL
-  })
-  if (needCaptcha) {
-    await verifyCaptcha.call(this, {
-      captcha,
-      scene: CAPTCHA_SCENE.RESET_PWD_BY_EMAIL
-    })
-  }
-  try {
-    // 验证手机号验证码，验证不通过时写入失败日志
-    await verifyEmailCode({
-      email,
-      code,
-      scene: EMAIL_SCENE.RESET_PWD_BY_EMAIL
-    })
-  } catch (error) {
-    await this.middleware.uniIdLog({
-      data: {
-        email
-      },
-      type: LOG_TYPE.RESET_PWD_BY_EMAIL,
-      success: false
-    })
-    throw error
-  }
-  // 根据手机号查找匹配的用户
-  const {
-    total,
-    userMatched
-  } = await findUser.call(this, {
-    userQuery: {
-      email
-    },
-    authorizedApp: [this.getUniversalClientInfo().appId]
-  })
-  if (userMatched.length === 0) {
-    if (total > 0) {
-      throw {
-        errCode: ERROR.ACCOUNT_NOT_EXISTS_IN_CURRENT_APP
-      }
-    }
-    throw {
-      errCode: ERROR.ACCOUNT_NOT_EXISTS
-    }
-  } else if (userMatched.length > 1) {
-    throw {
-      errCode: ERROR.ACCOUNT_CONFLICT
-    }
-  }
-  const { _id: uid } = userMatched[0]
-  const {
-    passwordHash,
-    version
-  } = new PasswordUtils({
-    clientInfo: this.getUniversalClientInfo(),
-    passwordSecret: this.config.passwordSecret
-  }).generatePasswordHash({
-    password
-  })
-  // 更新用户密码
-  await userCollection.doc(uid).update({
-    password: passwordHash,
-    password_secret_version: version,
-    valid_token_date: Date.now()
-  })
-
-  // 写入成功日志
-  await this.middleware.uniIdLog({
-    data: {
-      email
-    },
-    type: LOG_TYPE.RESET_PWD_BY_SMS
-  })
-  return {
-    errCode: 0
-  }
-}
+const {
+  ERROR
+} = require('../../common/error')
+const {
+  getNeedCaptcha,
+  verifyCaptcha
+} = require('../../lib/utils/captcha')
+const {
+  verifyEmailCode
+} = require('../../lib/utils/verify-code')
+const {
+  userCollection,
+  EMAIL_SCENE,
+  CAPTCHA_SCENE,
+  LOG_TYPE
+} = require('../../common/constants')
+const {
+  findUser
+} = require('../../lib/utils/account')
+const PasswordUtils = require('../../lib/utils/password')
+
+/**
+ * 通过邮箱验证码重置密码
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#reset-pwd-by-email
+ * @param {object} params
+ * @param {string} params.email   邮箱
+ * @param {string} params.code   邮箱验证码
+ * @param {string} params.password 密码
+ * @param {string} params.captcha  图形验证码
+ * @returns {object}
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    email: 'email',
+    code: 'string',
+    password: 'password',
+    captcha: {
+      required: false,
+      type: 'string'
+    }
+  }
+  this.middleware.validate(params, schema)
+  const {
+    email,
+    code,
+    password,
+    captcha
+  } = params
+
+  const needCaptcha = await getNeedCaptcha.call(this, {
+    email,
+    type: LOG_TYPE.RESET_PWD_BY_EMAIL
+  })
+  if (needCaptcha) {
+    await verifyCaptcha.call(this, {
+      captcha,
+      scene: CAPTCHA_SCENE.RESET_PWD_BY_EMAIL
+    })
+  }
+  try {
+    // 验证手机号验证码，验证不通过时写入失败日志
+    await verifyEmailCode({
+      email,
+      code,
+      scene: EMAIL_SCENE.RESET_PWD_BY_EMAIL
+    })
+  } catch (error) {
+    await this.middleware.uniIdLog({
+      data: {
+        email
+      },
+      type: LOG_TYPE.RESET_PWD_BY_EMAIL,
+      success: false
+    })
+    throw error
+  }
+  // 根据手机号查找匹配的用户
+  const {
+    total,
+    userMatched
+  } = await findUser.call(this, {
+    userQuery: {
+      email
+    },
+    authorizedApp: [this.getUniversalClientInfo().appId]
+  })
+  if (userMatched.length === 0) {
+    if (total > 0) {
+      throw {
+        errCode: ERROR.ACCOUNT_NOT_EXISTS_IN_CURRENT_APP
+      }
+    }
+    throw {
+      errCode: ERROR.ACCOUNT_NOT_EXISTS
+    }
+  } else if (userMatched.length > 1) {
+    throw {
+      errCode: ERROR.ACCOUNT_CONFLICT
+    }
+  }
+  const { _id: uid } = userMatched[0]
+  const {
+    passwordHash,
+    version
+  } = new PasswordUtils({
+    clientInfo: this.getUniversalClientInfo(),
+    passwordSecret: this.config.passwordSecret
+  }).generatePasswordHash({
+    password
+  })
+  // 更新用户密码
+  await userCollection.doc(uid).update({
+    password: passwordHash,
+    password_secret_version: version,
+    valid_token_date: Date.now()
+  })
+
+  // 写入成功日志
+  await this.middleware.uniIdLog({
+    data: {
+      email
+    },
+    type: LOG_TYPE.RESET_PWD_BY_SMS
+  })
+  return {
+    errCode: 0
+  }
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/reset-pwd-by-sms.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/reset-pwd-by-sms.js
index bc10dc85fd2490197892e64b7956e297c7c1d258..1e3e5f67e1cbdfc465f5e8eceb40457a62480247 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/reset-pwd-by-sms.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/reset-pwd-by-sms.js
@@ -1,128 +1,128 @@
-const {
-  ERROR
-} = require('../../common/error')
-const {
-  getNeedCaptcha,
-  verifyCaptcha
-} = require('../../lib/utils/captcha')
-const {
-  verifyMobileCode
-} = require('../../lib/utils/verify-code')
-const {
-  userCollection,
-  SMS_SCENE,
-  CAPTCHA_SCENE,
-  LOG_TYPE
-} = require('../../common/constants')
-const {
-  findUser
-} = require('../../lib/utils/account')
-const PasswordUtils = require('../../lib/utils/password')
-
-/**
- * 通过短信验证码重置密码
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#reset-pwd-by-sms
- * @param {object} params
- * @param {string} params.mobile   手机号
- * @param {string} params.mobile   短信验证码
- * @param {string} params.password 密码
- * @param {string} params.captcha  图形验证码
- * @returns {object}
- */
-module.exports = async function (params = {}) {
-  const schema = {
-    mobile: 'mobile',
-    code: 'string',
-    password: 'password',
-    captcha: {
-      required: false,
-      type: 'string'
-    }
-  }
-  this.middleware.validate(params, schema)
-  const {
-    mobile,
-    code,
-    password,
-    captcha
-  } = params
-
-  const needCaptcha = await getNeedCaptcha.call(this, {
-    mobile,
-    type: LOG_TYPE.RESET_PWD_BY_SMS
-  })
-  if (needCaptcha) {
-    await verifyCaptcha.call(this, {
-      captcha,
-      scene: CAPTCHA_SCENE.RESET_PWD_BY_SMS
-    })
-  }
-  try {
-    // 验证手机号验证码，验证不通过时写入失败日志
-    await verifyMobileCode({
-      mobile,
-      code,
-      scene: SMS_SCENE.RESET_PWD_BY_SMS
-    })
-  } catch (error) {
-    await this.middleware.uniIdLog({
-      data: {
-        mobile
-      },
-      type: LOG_TYPE.RESET_PWD_BY_SMS,
-      success: false
-    })
-    throw error
-  }
-  // 根据手机号查找匹配的用户
-  const {
-    total,
-    userMatched
-  } = await findUser.call(this, {
-    userQuery: {
-      mobile
-    },
-    authorizedApp: [this.getUniversalClientInfo().appId]
-  })
-  if (userMatched.length === 0) {
-    if (total > 0) {
-      throw {
-        errCode: ERROR.ACCOUNT_NOT_EXISTS_IN_CURRENT_APP
-      }
-    }
-    throw {
-      errCode: ERROR.ACCOUNT_NOT_EXISTS
-    }
-  } else if (userMatched.length > 1) {
-    throw {
-      errCode: ERROR.ACCOUNT_CONFLICT
-    }
-  }
-  const { _id: uid } = userMatched[0]
-  const {
-    passwordHash,
-    version
-  } = new PasswordUtils({
-    clientInfo: this.getUniversalClientInfo(),
-    passwordSecret: this.config.passwordSecret
-  }).generatePasswordHash({
-    password
-  })
-  // 更新用户密码
-  await userCollection.doc(uid).update({
-    password: passwordHash,
-    password_secret_version: version,
-    valid_token_date: Date.now()
-  })
-
-  // 写入成功日志
-  await this.middleware.uniIdLog({
-    data: {
-      mobile
-    },
-    type: LOG_TYPE.RESET_PWD_BY_SMS
-  })
-  return {
-    errCode: 0
-  }
-}
+const {
+  ERROR
+} = require('../../common/error')
+const {
+  getNeedCaptcha,
+  verifyCaptcha
+} = require('../../lib/utils/captcha')
+const {
+  verifyMobileCode
+} = require('../../lib/utils/verify-code')
+const {
+  userCollection,
+  SMS_SCENE,
+  CAPTCHA_SCENE,
+  LOG_TYPE
+} = require('../../common/constants')
+const {
+  findUser
+} = require('../../lib/utils/account')
+const PasswordUtils = require('../../lib/utils/password')
+
+/**
+ * 通过短信验证码重置密码
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#reset-pwd-by-sms
+ * @param {object} params
+ * @param {string} params.mobile   手机号
+ * @param {string} params.mobile   短信验证码
+ * @param {string} params.password 密码
+ * @param {string} params.captcha  图形验证码
+ * @returns {object}
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    mobile: 'mobile',
+    code: 'string',
+    password: 'password',
+    captcha: {
+      required: false,
+      type: 'string'
+    }
+  }
+  this.middleware.validate(params, schema)
+  const {
+    mobile,
+    code,
+    password,
+    captcha
+  } = params
+
+  const needCaptcha = await getNeedCaptcha.call(this, {
+    mobile,
+    type: LOG_TYPE.RESET_PWD_BY_SMS
+  })
+  if (needCaptcha) {
+    await verifyCaptcha.call(this, {
+      captcha,
+      scene: CAPTCHA_SCENE.RESET_PWD_BY_SMS
+    })
+  }
+  try {
+    // 验证手机号验证码，验证不通过时写入失败日志
+    await verifyMobileCode({
+      mobile,
+      code,
+      scene: SMS_SCENE.RESET_PWD_BY_SMS
+    })
+  } catch (error) {
+    await this.middleware.uniIdLog({
+      data: {
+        mobile
+      },
+      type: LOG_TYPE.RESET_PWD_BY_SMS,
+      success: false
+    })
+    throw error
+  }
+  // 根据手机号查找匹配的用户
+  const {
+    total,
+    userMatched
+  } = await findUser.call(this, {
+    userQuery: {
+      mobile
+    },
+    authorizedApp: [this.getUniversalClientInfo().appId]
+  })
+  if (userMatched.length === 0) {
+    if (total > 0) {
+      throw {
+        errCode: ERROR.ACCOUNT_NOT_EXISTS_IN_CURRENT_APP
+      }
+    }
+    throw {
+      errCode: ERROR.ACCOUNT_NOT_EXISTS
+    }
+  } else if (userMatched.length > 1) {
+    throw {
+      errCode: ERROR.ACCOUNT_CONFLICT
+    }
+  }
+  const { _id: uid } = userMatched[0]
+  const {
+    passwordHash,
+    version
+  } = new PasswordUtils({
+    clientInfo: this.getUniversalClientInfo(),
+    passwordSecret: this.config.passwordSecret
+  }).generatePasswordHash({
+    password
+  })
+  // 更新用户密码
+  await userCollection.doc(uid).update({
+    password: passwordHash,
+    password_secret_version: version,
+    valid_token_date: Date.now()
+  })
+
+  // 写入成功日志
+  await this.middleware.uniIdLog({
+    data: {
+      mobile
+    },
+    type: LOG_TYPE.RESET_PWD_BY_SMS
+  })
+  return {
+    errCode: 0
+  }
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/set-pwd.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/set-pwd.js
index f33c6f4698352780d2e9fdfeb61dd5e3ae910bf2..1b484f3032fe637bc6b0797f9e812bf4e06ee7e3 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/set-pwd.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/set-pwd.js
@@ -1,83 +1,83 @@
-const { userCollection, SMS_SCENE, LOG_TYPE, CAPTCHA_SCENE } = require('../../common/constants')
-const { ERROR } = require('../../common/error')
-const { verifyMobileCode } = require('../../lib/utils/verify-code')
-const PasswordUtils = require('../../lib/utils/password')
-const { getNeedCaptcha, verifyCaptcha } = require('../../lib/utils/captcha')
-
-module.exports = async function (params = {}) {
-  const schema = {
-    password: 'password',
-    code: 'string',
-    captcha: {
-      required: false,
-      type: 'string'
-    }
-  }
-  this.middleware.validate(params, schema)
-
-  const { password, code, captcha } = params
-  const uid = this.authInfo.uid
-  const getUserRes = await userCollection.doc(uid).get()
-  const userRecord = getUserRes.data[0]
-  if (!userRecord) {
-    throw {
-      errCode: ERROR.ACCOUNT_NOT_EXISTS
-    }
-  }
-
-  const needCaptcha = await getNeedCaptcha.call(this, {
-    mobile: userRecord.mobile
-  })
-
-  if (needCaptcha) {
-    await verifyCaptcha.call(this, {
-      captcha,
-      scene: CAPTCHA_SCENE.SET_PWD_BY_SMS
-    })
-  }
-
-  try {
-    // 验证手机号验证码，验证不通过时写入失败日志
-    await verifyMobileCode({
-      mobile: userRecord.mobile,
-      code,
-      scene: SMS_SCENE.SET_PWD_BY_SMS
-    })
-  } catch (error) {
-    await this.middleware.uniIdLog({
-      data: {
-        mobile: userRecord.mobile
-      },
-      type: LOG_TYPE.SET_PWD_BY_SMS,
-      success: false
-    })
-    throw error
-  }
-
-  const {
-    passwordHash,
-    version
-  } = new PasswordUtils({
-    clientInfo: this.getUniversalClientInfo(),
-    passwordSecret: this.config.passwordSecret
-  }).generatePasswordHash({
-    password
-  })
-
-  // 更新用户密码
-  await userCollection.doc(uid).update({
-    password: passwordHash,
-    password_secret_version: version
-  })
-
-  await this.middleware.uniIdLog({
-    data: {
-      mobile: userRecord.mobile
-    },
-    type: LOG_TYPE.SET_PWD_BY_SMS
-  })
-
-  return {
-    errCode: 0
-  }
-}
+const { userCollection, SMS_SCENE, LOG_TYPE, CAPTCHA_SCENE } = require('../../common/constants')
+const { ERROR } = require('../../common/error')
+const { verifyMobileCode } = require('../../lib/utils/verify-code')
+const PasswordUtils = require('../../lib/utils/password')
+const { getNeedCaptcha, verifyCaptcha } = require('../../lib/utils/captcha')
+
+module.exports = async function (params = {}) {
+  const schema = {
+    password: 'password',
+    code: 'string',
+    captcha: {
+      required: false,
+      type: 'string'
+    }
+  }
+  this.middleware.validate(params, schema)
+
+  const { password, code, captcha } = params
+  const uid = this.authInfo.uid
+  const getUserRes = await userCollection.doc(uid).get()
+  const userRecord = getUserRes.data[0]
+  if (!userRecord) {
+    throw {
+      errCode: ERROR.ACCOUNT_NOT_EXISTS
+    }
+  }
+
+  const needCaptcha = await getNeedCaptcha.call(this, {
+    mobile: userRecord.mobile
+  })
+
+  if (needCaptcha) {
+    await verifyCaptcha.call(this, {
+      captcha,
+      scene: CAPTCHA_SCENE.SET_PWD_BY_SMS
+    })
+  }
+
+  try {
+    // 验证手机号验证码，验证不通过时写入失败日志
+    await verifyMobileCode({
+      mobile: userRecord.mobile,
+      code,
+      scene: SMS_SCENE.SET_PWD_BY_SMS
+    })
+  } catch (error) {
+    await this.middleware.uniIdLog({
+      data: {
+        mobile: userRecord.mobile
+      },
+      type: LOG_TYPE.SET_PWD_BY_SMS,
+      success: false
+    })
+    throw error
+  }
+
+  const {
+    passwordHash,
+    version
+  } = new PasswordUtils({
+    clientInfo: this.getUniversalClientInfo(),
+    passwordSecret: this.config.passwordSecret
+  }).generatePasswordHash({
+    password
+  })
+
+  // 更新用户密码
+  await userCollection.doc(uid).update({
+    password: passwordHash,
+    password_secret_version: version
+  })
+
+  await this.middleware.uniIdLog({
+    data: {
+      mobile: userRecord.mobile
+    },
+    type: LOG_TYPE.SET_PWD_BY_SMS
+  })
+
+  return {
+    errCode: 0
+  }
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/update-pwd.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/update-pwd.js
index 97fd1be308b035170a2e05c4f6fc8168eb2a7d86..8a0271847158635ca16205731b795c8d2d71e1ad 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/update-pwd.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/update-pwd.js
@@ -1,69 +1,69 @@
-const {
-  userCollection
-} = require('../../common/constants')
-const {
-  ERROR
-} = require('../../common/error')
-const PasswordUtils = require('../../lib/utils/password')
-/**
- * 更新密码
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#update-pwd
- * @param {object} params
- * @param {string} params.oldPassword 旧密码
- * @param {string} params.newPassword 新密码
- * @returns {object}
- */
-module.exports = async function (params = {}) {
-  const schema = {
-    oldPassword: 'string', // 防止密码规则调整导致旧密码无法更新
-    newPassword: 'password'
-  }
-  this.middleware.validate(params, schema)
-  const uid = this.authInfo.uid
-  const getUserRes = await userCollection.doc(uid).get()
-  const userRecord = getUserRes.data[0]
-  if (!userRecord) {
-    throw {
-      errCode: ERROR.ACCOUNT_NOT_EXISTS
-    }
-  }
-  const {
-    oldPassword,
-    newPassword
-  } = params
-  const passwordUtils = new PasswordUtils({
-    userRecord,
-    clientInfo: this.getUniversalClientInfo(),
-    passwordSecret: this.config.passwordSecret
-  })
-
-  const {
-    success: checkPasswordSuccess
-  } = passwordUtils.checkUserPassword({
-    password: oldPassword,
-    autoRefresh: false
-  })
-
-  if (!checkPasswordSuccess) {
-    throw {
-      errCode: ERROR.PASSWORD_ERROR
-    }
-  }
-
-  const {
-    passwordHash,
-    version
-  } = passwordUtils.generatePasswordHash({
-    password: newPassword
-  })
-
-  await userCollection.doc(uid).update({
-    password: passwordHash,
-    password_secret_version: version,
-    valid_token_date: Date.now() // refreshToken时会校验，如果创建token时间在此时间点之前，则拒绝下发新token，返回token失效错误码
-  })
-  // 执行更新密码操作后客户端应将用户退出重新登录
-  return {
-    errCode: 0
-  }
-}
+const {
+  userCollection
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
+const PasswordUtils = require('../../lib/utils/password')
+/**
+ * 更新密码
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#update-pwd
+ * @param {object} params
+ * @param {string} params.oldPassword 旧密码
+ * @param {string} params.newPassword 新密码
+ * @returns {object}
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    oldPassword: 'string', // 防止密码规则调整导致旧密码无法更新
+    newPassword: 'password'
+  }
+  this.middleware.validate(params, schema)
+  const uid = this.authInfo.uid
+  const getUserRes = await userCollection.doc(uid).get()
+  const userRecord = getUserRes.data[0]
+  if (!userRecord) {
+    throw {
+      errCode: ERROR.ACCOUNT_NOT_EXISTS
+    }
+  }
+  const {
+    oldPassword,
+    newPassword
+  } = params
+  const passwordUtils = new PasswordUtils({
+    userRecord,
+    clientInfo: this.getUniversalClientInfo(),
+    passwordSecret: this.config.passwordSecret
+  })
+
+  const {
+    success: checkPasswordSuccess
+  } = passwordUtils.checkUserPassword({
+    password: oldPassword,
+    autoRefresh: false
+  })
+
+  if (!checkPasswordSuccess) {
+    throw {
+      errCode: ERROR.PASSWORD_ERROR
+    }
+  }
+
+  const {
+    passwordHash,
+    version
+  } = passwordUtils.generatePasswordHash({
+    password: newPassword
+  })
+
+  await userCollection.doc(uid).update({
+    password: passwordHash,
+    password_secret_version: version,
+    valid_token_date: Date.now() // refreshToken时会校验，如果创建token时间在此时间点之前，则拒绝下发新token，返回token失效错误码
+  })
+  // 执行更新密码操作后客户端应将用户退出重新登录
+  return {
+    errCode: 0
+  }
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/admin/index.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/admin/index.js
index c8830f54d386f85177ee549b25af2dc5a5251601..6baff53690413a0b33e5fd8f3783c678d60cf212 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/admin/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/admin/index.js
@@ -1,4 +1,4 @@
-module.exports = {
-  addUser: require('./add-user'),
-  updateUser: require('./update-user')
-}
+module.exports = {
+  addUser: require('./add-user'),
+  updateUser: require('./update-user')
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/admin/update-user.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/admin/update-user.js
index ed2f7b632f633702c35236df010b3417ffed74fa..cb427b1d1d3b5f223808d40905ff517304bab0bb 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/admin/update-user.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/admin/update-user.js
@@ -1,138 +1,138 @@
-const {
-  findUser
-} = require('../../lib/utils/account')
-const {
-  ERROR
-} = require('../../common/error')
-const {
-  userCollection
-} = require('../../common/constants')
-const PasswordUtils = require('../../lib/utils/password')
-
-/**
- * 修改用户
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#update-user
- * @param {Object}  params
- * @param {String}  params.uid            要更新的用户id
- * @param {String}  params.username       用户名
- * @param {String}  params.password       密码
- * @param {String}  params.nickname       昵称
- * @param {Array}   params.authorizedApp  允许登录的AppID列表
- * @param {Array}   params.role           用户角色列表
- * @param {String}  params.mobile         手机号
- * @param {String}  params.email          邮箱
- * @param {Array}   params.tags           用户标签
- * @param {Number}  params.status         用户状态
- * @returns
- */
-module.exports = async function (params = {}) {
-  const schema = {
-    uid: 'string',
-    username: 'username',
-    password: {
-      required: false,
-      type: 'password'
-    },
-    authorizedApp: {
-      required: false,
-      type: 'array<string>'
-    }, // 指定允许登录的app，传空数组或不传时表示可以不可以在任何端登录
-    nickname: {
-      required: false,
-      type: 'nickname'
-    },
-    role: {
-      require: false,
-      type: 'array<string>'
-    },
-    mobile: {
-      required: false,
-      type: 'mobile'
-    },
-    email: {
-      required: false,
-      type: 'email'
-    },
-    tags: {
-      required: false,
-      type: 'array<string>'
-    },
-    status: {
-      required: false,
-      type: 'number'
-    }
-  }
-
-  this.middleware.validate(params, schema)
-
-  const {
-    uid,
-    username,
-    password,
-    authorizedApp,
-    nickname,
-    role,
-    mobile,
-    email,
-    tags,
-    status
-  } = params
-
-  // 更新的用户数据字段
-  const data = {
-    username,
-    dcloud_appid: authorizedApp,
-    nickname,
-    role,
-    mobile,
-    email,
-    tags,
-    status
-  }
-
-  const realData = Object.keys(data).reduce((res, key) => {
-    const item = data[key]
-    if (item !== undefined) {
-      res[key] = item
-    }
-    return res
-  }, {})
-
-  // 更新用户名时验证用户名是否重新
-  if (username) {
-    const {
-      userMatched
-    } = await findUser({
-      userQuery: {
-        username
-      },
-      authorizedApp
-    })
-    if (userMatched.filter(user => user._id !== uid).length) {
-      throw {
-        errCode: ERROR.ACCOUNT_EXISTS
-      }
-    }
-  }
-  if (password) {
-    const passwordUtils = new PasswordUtils({
-      clientInfo: this.getUniversalClientInfo(),
-      passwordSecret: this.config.passwordSecret
-    })
-    const {
-      passwordHash,
-      version
-    } = passwordUtils.generatePasswordHash({
-      password
-    })
-
-    realData.password = passwordHash
-    realData.password_secret_version = version
-  }
-
-  await userCollection.doc(uid).update(realData)
-
-  return {
-    errCode: 0
-  }
-}
+const {
+  findUser
+} = require('../../lib/utils/account')
+const {
+  ERROR
+} = require('../../common/error')
+const {
+  userCollection
+} = require('../../common/constants')
+const PasswordUtils = require('../../lib/utils/password')
+
+/**
+ * 修改用户
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#update-user
+ * @param {Object}  params
+ * @param {String}  params.uid            要更新的用户id
+ * @param {String}  params.username       用户名
+ * @param {String}  params.password       密码
+ * @param {String}  params.nickname       昵称
+ * @param {Array}   params.authorizedApp  允许登录的AppID列表
+ * @param {Array}   params.role           用户角色列表
+ * @param {String}  params.mobile         手机号
+ * @param {String}  params.email          邮箱
+ * @param {Array}   params.tags           用户标签
+ * @param {Number}  params.status         用户状态
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    uid: 'string',
+    username: 'username',
+    password: {
+      required: false,
+      type: 'password'
+    },
+    authorizedApp: {
+      required: false,
+      type: 'array<string>'
+    }, // 指定允许登录的app，传空数组或不传时表示可以不可以在任何端登录
+    nickname: {
+      required: false,
+      type: 'nickname'
+    },
+    role: {
+      require: false,
+      type: 'array<string>'
+    },
+    mobile: {
+      required: false,
+      type: 'mobile'
+    },
+    email: {
+      required: false,
+      type: 'email'
+    },
+    tags: {
+      required: false,
+      type: 'array<string>'
+    },
+    status: {
+      required: false,
+      type: 'number'
+    }
+  }
+
+  this.middleware.validate(params, schema)
+
+  const {
+    uid,
+    username,
+    password,
+    authorizedApp,
+    nickname,
+    role,
+    mobile,
+    email,
+    tags,
+    status
+  } = params
+
+  // 更新的用户数据字段
+  const data = {
+    username,
+    dcloud_appid: authorizedApp,
+    nickname,
+    role,
+    mobile,
+    email,
+    tags,
+    status
+  }
+
+  const realData = Object.keys(data).reduce((res, key) => {
+    const item = data[key]
+    if (item !== undefined) {
+      res[key] = item
+    }
+    return res
+  }, {})
+
+  // 更新用户名时验证用户名是否重新
+  if (username) {
+    const {
+      userMatched
+    } = await findUser({
+      userQuery: {
+        username
+      },
+      authorizedApp
+    })
+    if (userMatched.filter(user => user._id !== uid).length) {
+      throw {
+        errCode: ERROR.ACCOUNT_EXISTS
+      }
+    }
+  }
+  if (password) {
+    const passwordUtils = new PasswordUtils({
+      clientInfo: this.getUniversalClientInfo(),
+      passwordSecret: this.config.passwordSecret
+    })
+    const {
+      passwordHash,
+      version
+    } = passwordUtils.generatePasswordHash({
+      password
+    })
+
+    realData.password = passwordHash
+    realData.password_secret_version = version
+  }
+
+  await userCollection.doc(uid).update(realData)
+
+  return {
+    errCode: 0
+  }
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/dev/get-supported-login-type.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/dev/get-supported-login-type.js
index 476e23427b81752a94c19602ecb41dde16bc689b..7d235fed9ca3dbee0a7a55bdf94b2d3b3a1cde21 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/dev/get-supported-login-type.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/dev/get-supported-login-type.js
@@ -1,71 +1,71 @@
-function isMobileCodeSupported () {
-  const config = this.config
-  return !!(config.service && config.service.sms && config.service.sms.smsKey)
-}
-
-function isUniverifySupport () {
-  const config = this.config
-  return !!(config.service && config.service.univerify && config.service.univerify.apiKey)
-}
-
-function isWeixinSupported () {
-  this.configUtils.getOauthConfig({
-    provider: 'weixin'
-  })
-  return true
-}
-
-function isQQSupported () {
-  this.configUtils.getOauthConfig({
-    provider: 'qq'
-  })
-  return true
-}
-
-function isAppleSupported () {
-  this.configUtils.getOauthConfig({
-    provider: 'apple'
-  })
-  return true
-}
-
-function isAlipaySupported () {
-  this.configUtils.getOauthConfig({
-    provider: 'alipay'
-  })
-  return true
-}
-
-const loginTypeTester = {
-  'mobile-code': isMobileCodeSupported,
-  univerify: isUniverifySupport,
-  weixin: isWeixinSupported,
-  qq: isQQSupported,
-  apple: isAppleSupported,
-  alipay: isAlipaySupported
-}
-
-/**
- * 获取支持的登录方式
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#get-supported-login-type
- * @returns
- */
-module.exports = async function () {
-  const supportedLoginType = [
-    'username-password',
-    'mobile-password',
-    'email-password'
-  ]
-  for (const type in loginTypeTester) {
-    try {
-      if (loginTypeTester[type].call(this)) {
-        supportedLoginType.push(type)
-      }
-    } catch (error) { }
-  }
-  return {
-    errCode: 0,
-    errMsg: '',
-    supportedLoginType
-  }
-}
+function isMobileCodeSupported () {
+  const config = this.config
+  return !!(config.service && config.service.sms && config.service.sms.smsKey)
+}
+
+function isUniverifySupport () {
+  const config = this.config
+  return !!(config.service && config.service.univerify && config.service.univerify.apiKey)
+}
+
+function isWeixinSupported () {
+  this.configUtils.getOauthConfig({
+    provider: 'weixin'
+  })
+  return true
+}
+
+function isQQSupported () {
+  this.configUtils.getOauthConfig({
+    provider: 'qq'
+  })
+  return true
+}
+
+function isAppleSupported () {
+  this.configUtils.getOauthConfig({
+    provider: 'apple'
+  })
+  return true
+}
+
+function isAlipaySupported () {
+  this.configUtils.getOauthConfig({
+    provider: 'alipay'
+  })
+  return true
+}
+
+const loginTypeTester = {
+  'mobile-code': isMobileCodeSupported,
+  univerify: isUniverifySupport,
+  weixin: isWeixinSupported,
+  qq: isQQSupported,
+  apple: isAppleSupported,
+  alipay: isAlipaySupported
+}
+
+/**
+ * 获取支持的登录方式
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#get-supported-login-type
+ * @returns
+ */
+module.exports = async function () {
+  const supportedLoginType = [
+    'username-password',
+    'mobile-password',
+    'email-password'
+  ]
+  for (const type in loginTypeTester) {
+    try {
+      if (loginTypeTester[type].call(this)) {
+        supportedLoginType.push(type)
+      }
+    } catch (error) { }
+  }
+  return {
+    errCode: 0,
+    errMsg: '',
+    supportedLoginType
+  }
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/dev/index.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/dev/index.js
index e22f9f2cb4624998e8e5c0a9d98d9a501ee6dacd..d6c28ccfc752a5b2099b4eb97009b875b46718c9 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/dev/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/dev/index.js
@@ -1,3 +1,3 @@
-module.exports = {
-  getSupportedLoginType: require('./get-supported-login-type')
-}
+module.exports = {
+  getSupportedLoginType: require('./get-supported-login-type')
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/external/index.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/external/index.js
index 6fa597f5cf1265dc7b9e209593de51e79abe3aa0..423bf35af96576655df3e0680b34d257e475a658 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/external/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/external/index.js
@@ -1,5 +1,5 @@
-module.exports = {
-  externalRegister: require('./register'),
-  externalLogin: require('./login'),
-  updateUserInfoByExternal: require('./update-user-info')
-}
+module.exports = {
+  externalRegister: require('./register'),
+  externalLogin: require('./login'),
+  updateUserInfoByExternal: require('./update-user-info')
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/external/login.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/external/login.js
index af13013b7027bf13c1cba05aecfab1b1c6a4db17..5d3a1788882536fdbca62328920ee18f3da16589 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/external/login.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/external/login.js
@@ -1,68 +1,68 @@
-const { preLogin, postLogin } = require('../../lib/utils/login')
-const { EXTERNAL_DIRECT_CONNECT_PROVIDER } = require('../../common/constants')
-const { ERROR } = require('../../common/error')
-
-/**
- * 外部用户登录
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#external-login
- * @param {object} params
- * @param {string} params.uid  uni-id体系用户id
- * @param {string} params.externalUid   业务系统的用户id
- * @returns {object}
- */
-module.exports = async function (params = {}) {
-  const schema = {
-    uid: {
-      required: false,
-      type: 'string'
-    },
-    externalUid: {
-      required: false,
-      type: 'string'
-    }
-  }
-
-  this.middleware.validate(params, schema)
-
-  const {
-    uid,
-    externalUid
-  } = params
-
-  if (!uid && !externalUid) {
-    throw {
-      errCode: ERROR.PARAM_REQUIRED,
-      errMsgValue: {
-        param: 'uid or externalUid'
-      }
-    }
-  }
-
-  let query
-  if (uid) {
-    query = {
-      _id: uid
-    }
-  } else {
-    query = {
-      identities: {
-        provider: EXTERNAL_DIRECT_CONNECT_PROVIDER,
-        uid: externalUid
-      }
-    }
-  }
-
-  const user = await preLogin.call(this, {
-    user: query
-  })
-
-  const result = await postLogin.call(this, {
-    user
-  })
-
-  return {
-    errCode: result.errCode,
-    newToken: result.newToken,
-    uid: result.uid
-  }
-}
+const { preLogin, postLogin } = require('../../lib/utils/login')
+const { EXTERNAL_DIRECT_CONNECT_PROVIDER } = require('../../common/constants')
+const { ERROR } = require('../../common/error')
+
+/**
+ * 外部用户登录
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#external-login
+ * @param {object} params
+ * @param {string} params.uid  uni-id体系用户id
+ * @param {string} params.externalUid   业务系统的用户id
+ * @returns {object}
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    uid: {
+      required: false,
+      type: 'string'
+    },
+    externalUid: {
+      required: false,
+      type: 'string'
+    }
+  }
+
+  this.middleware.validate(params, schema)
+
+  const {
+    uid,
+    externalUid
+  } = params
+
+  if (!uid && !externalUid) {
+    throw {
+      errCode: ERROR.PARAM_REQUIRED,
+      errMsgValue: {
+        param: 'uid or externalUid'
+      }
+    }
+  }
+
+  let query
+  if (uid) {
+    query = {
+      _id: uid
+    }
+  } else {
+    query = {
+      identities: {
+        provider: EXTERNAL_DIRECT_CONNECT_PROVIDER,
+        uid: externalUid
+      }
+    }
+  }
+
+  const user = await preLogin.call(this, {
+    user: query
+  })
+
+  const result = await postLogin.call(this, {
+    user
+  })
+
+  return {
+    errCode: result.errCode,
+    newToken: result.newToken,
+    uid: result.uid
+  }
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/external/update-user-info.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/external/update-user-info.js
index a91fe9f46f56228dda2e75f473a85d93ee4449d6..db30e02270cbe12d0916ebc7c39d9105b9f93135 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/external/update-user-info.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/external/update-user-info.js
@@ -1,208 +1,208 @@
-const url = require('url')
-const { userCollection, EXTERNAL_DIRECT_CONNECT_PROVIDER } = require('../../common/constants')
-const { ERROR } = require('../../common/error')
-const { findUser } = require('../../lib/utils/account')
-const PasswordUtils = require('../../lib/utils/password')
-
-/**
- * 使用 uid 或 externalUid 获取用户信息
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#external-update-userinfo
- * @param {object} params
- * @param {string} params.uid   uni-id体系的用户id
- * @param {string} params.externalUid   业务系统的用户id
- * @param {string} params.nickname  昵称
- * @param {string} params.gender  性别
- * @param {string} params.avatar  头像
- * @returns {object}
- */
-module.exports = async function (params = {}) {
-  const schema = {
-    uid: {
-      required: false,
-      type: 'string'
-    },
-    externalUid: {
-      required: false,
-      type: 'string'
-    },
-    username: {
-      required: false,
-      type: 'string'
-    },
-    password: {
-      required: false,
-      type: 'password'
-    },
-    authorizedApp: {
-      required: false,
-      type: 'array<string>'
-    }, // 指定允许登录的app，传空数组或不传时表示可以不可以在任何端登录
-    nickname: {
-      required: false,
-      type: 'nickname'
-    },
-    role: {
-      require: false,
-      type: 'array<string>'
-    },
-    mobile: {
-      required: false,
-      type: 'mobile'
-    },
-    email: {
-      required: false,
-      type: 'email'
-    },
-    tags: {
-      required: false,
-      type: 'array<string>'
-    },
-    status: {
-      required: false,
-      type: 'number'
-    },
-    gender: {
-      required: false,
-      type: 'number'
-    },
-    avatar: {
-      required: false,
-      type: 'string'
-    }
-  }
-
-  this.middleware.validate(params, schema)
-
-  const {
-    uid,
-    externalUid,
-    username,
-    password,
-    authorizedApp,
-    nickname,
-    role,
-    mobile,
-    email,
-    tags,
-    status,
-    avatar,
-    gender
-  } = params
-
-  if (!uid && !externalUid) {
-    throw {
-      errCode: ERROR.PARAM_REQUIRED,
-      errMsgValue: {
-        param: 'uid or externalUid'
-      }
-    }
-  }
-
-  let query
-  if (uid) {
-    query = {
-      _id: uid
-    }
-  } else {
-    query = {
-      identities: {
-        provider: EXTERNAL_DIRECT_CONNECT_PROVIDER,
-        uid: externalUid
-      }
-    }
-  }
-
-  const users = await userCollection.where(query).get()
-  const user = users.data && users.data[0]
-  if (!user) {
-    throw {
-      errCode: ERROR.ACCOUNT_NOT_EXISTS
-    }
-  }
-
-  // 更新的用户数据字段
-  const data = {
-    username,
-    dcloud_appid: authorizedApp,
-    nickname,
-    role,
-    mobile,
-    email,
-    tags,
-    status,
-    avatar,
-    gender
-  }
-
-  const realData = Object.keys(data).reduce((res, key) => {
-    const item = data[key]
-    if (item !== undefined) {
-      res[key] = item
-    }
-    return res
-  }, {})
-
-  // 更新用户名时验证用户名是否重新
-  if (username) {
-    const {
-      userMatched
-    } = await findUser({
-      userQuery: {
-        username
-      },
-      authorizedApp
-    })
-    if (userMatched.filter(user => user._id !== uid).length) {
-      throw {
-        errCode: ERROR.ACCOUNT_EXISTS
-      }
-    }
-  }
-  if (password) {
-    const passwordUtils = new PasswordUtils({
-      clientInfo: this.getUniversalClientInfo(),
-      passwordSecret: this.config.passwordSecret
-    })
-    const {
-      passwordHash,
-      version
-    } = passwordUtils.generatePasswordHash({
-      password
-    })
-
-    realData.password = passwordHash
-    realData.password_secret_version = version
-  }
-
-  if (avatar) {
-    // eslint-disable-next-line n/no-deprecated-api
-    const avatarPath = url.parse(avatar).pathname
-    const extName = avatarPath.indexOf('.') > -1 ? avatarPath.split('.').pop() : ''
-
-    realData.avatar_file = {
-      name: avatarPath,
-      extname: extName,
-      url: avatar
-    }
-  }
-
-  if (user.identities.length) {
-    const identity = user.identities.find(item => item.provider === EXTERNAL_DIRECT_CONNECT_PROVIDER)
-
-    if (identity) {
-      identity.userInfo = {
-        avatar,
-        gender,
-        nickname
-      }
-    }
-
-    realData.identities = user.identities
-  }
-
-  await userCollection.where(query).update(realData)
-
-  return {
-    errCode: 0
-  }
-}
+const url = require('url')
+const { userCollection, EXTERNAL_DIRECT_CONNECT_PROVIDER } = require('../../common/constants')
+const { ERROR } = require('../../common/error')
+const { findUser } = require('../../lib/utils/account')
+const PasswordUtils = require('../../lib/utils/password')
+
+/**
+ * 使用 uid 或 externalUid 获取用户信息
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#external-update-userinfo
+ * @param {object} params
+ * @param {string} params.uid   uni-id体系的用户id
+ * @param {string} params.externalUid   业务系统的用户id
+ * @param {string} params.nickname  昵称
+ * @param {string} params.gender  性别
+ * @param {string} params.avatar  头像
+ * @returns {object}
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    uid: {
+      required: false,
+      type: 'string'
+    },
+    externalUid: {
+      required: false,
+      type: 'string'
+    },
+    username: {
+      required: false,
+      type: 'string'
+    },
+    password: {
+      required: false,
+      type: 'password'
+    },
+    authorizedApp: {
+      required: false,
+      type: 'array<string>'
+    }, // 指定允许登录的app，传空数组或不传时表示可以不可以在任何端登录
+    nickname: {
+      required: false,
+      type: 'nickname'
+    },
+    role: {
+      require: false,
+      type: 'array<string>'
+    },
+    mobile: {
+      required: false,
+      type: 'mobile'
+    },
+    email: {
+      required: false,
+      type: 'email'
+    },
+    tags: {
+      required: false,
+      type: 'array<string>'
+    },
+    status: {
+      required: false,
+      type: 'number'
+    },
+    gender: {
+      required: false,
+      type: 'number'
+    },
+    avatar: {
+      required: false,
+      type: 'string'
+    }
+  }
+
+  this.middleware.validate(params, schema)
+
+  const {
+    uid,
+    externalUid,
+    username,
+    password,
+    authorizedApp,
+    nickname,
+    role,
+    mobile,
+    email,
+    tags,
+    status,
+    avatar,
+    gender
+  } = params
+
+  if (!uid && !externalUid) {
+    throw {
+      errCode: ERROR.PARAM_REQUIRED,
+      errMsgValue: {
+        param: 'uid or externalUid'
+      }
+    }
+  }
+
+  let query
+  if (uid) {
+    query = {
+      _id: uid
+    }
+  } else {
+    query = {
+      identities: {
+        provider: EXTERNAL_DIRECT_CONNECT_PROVIDER,
+        uid: externalUid
+      }
+    }
+  }
+
+  const users = await userCollection.where(query).get()
+  const user = users.data && users.data[0]
+  if (!user) {
+    throw {
+      errCode: ERROR.ACCOUNT_NOT_EXISTS
+    }
+  }
+
+  // 更新的用户数据字段
+  const data = {
+    username,
+    dcloud_appid: authorizedApp,
+    nickname,
+    role,
+    mobile,
+    email,
+    tags,
+    status,
+    avatar,
+    gender
+  }
+
+  const realData = Object.keys(data).reduce((res, key) => {
+    const item = data[key]
+    if (item !== undefined) {
+      res[key] = item
+    }
+    return res
+  }, {})
+
+  // 更新用户名时验证用户名是否重新
+  if (username) {
+    const {
+      userMatched
+    } = await findUser({
+      userQuery: {
+        username
+      },
+      authorizedApp
+    })
+    if (userMatched.filter(user => user._id !== uid).length) {
+      throw {
+        errCode: ERROR.ACCOUNT_EXISTS
+      }
+    }
+  }
+  if (password) {
+    const passwordUtils = new PasswordUtils({
+      clientInfo: this.getUniversalClientInfo(),
+      passwordSecret: this.config.passwordSecret
+    })
+    const {
+      passwordHash,
+      version
+    } = passwordUtils.generatePasswordHash({
+      password
+    })
+
+    realData.password = passwordHash
+    realData.password_secret_version = version
+  }
+
+  if (avatar) {
+    // eslint-disable-next-line n/no-deprecated-api
+    const avatarPath = url.parse(avatar).pathname
+    const extName = avatarPath.indexOf('.') > -1 ? avatarPath.split('.').pop() : ''
+
+    realData.avatar_file = {
+      name: avatarPath,
+      extname: extName,
+      url: avatar
+    }
+  }
+
+  if (user.identities.length) {
+    const identity = user.identities.find(item => item.provider === EXTERNAL_DIRECT_CONNECT_PROVIDER)
+
+    if (identity) {
+      identity.userInfo = {
+        avatar,
+        gender,
+        nickname
+      }
+    }
+
+    realData.identities = user.identities
+  }
+
+  await userCollection.where(query).update(realData)
+
+  return {
+    errCode: 0
+  }
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/fission/accept-invite.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/fission/accept-invite.js
index 2461e061785728ae1cbb39e2d34ddb440be2eeff..c1d3ba97947924306c7f41a63240ea326c77855d 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/fission/accept-invite.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/fission/accept-invite.js
@@ -1,25 +1,25 @@
-const {
-  acceptInvite
-} = require('../../lib/utils/fission')
-
-/**
- * 接受邀请
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#accept-invite
- * @param {Object} params
- * @param {String} params.inviteCode  邀请码
- * @returns
- */
-module.exports = async function (params = {}) {
-  const schema = {
-    inviteCode: 'string'
-  }
-  this.middleware.validate(params, schema)
-  const {
-    inviteCode
-  } = params
-  const uid = this.authInfo.uid
-  return acceptInvite({
-    uid,
-    inviteCode
-  })
-}
+const {
+  acceptInvite
+} = require('../../lib/utils/fission')
+
+/**
+ * 接受邀请
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#accept-invite
+ * @param {Object} params
+ * @param {String} params.inviteCode  邀请码
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    inviteCode: 'string'
+  }
+  this.middleware.validate(params, schema)
+  const {
+    inviteCode
+  } = params
+  const uid = this.authInfo.uid
+  return acceptInvite({
+    uid,
+    inviteCode
+  })
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/fission/get-invited-user.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/fission/get-invited-user.js
index 93d46719ca702b115db3e92f7c6c6fe27afad658..d232977d22eb2bde4b4d621930075069cc5157db 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/fission/get-invited-user.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/fission/get-invited-user.js
@@ -1,80 +1,80 @@
-const {
-  userCollection
-} = require('../../common/constants')
-const {
-  coverMobile
-} = require('../../common/utils')
-
-/**
- * 获取受邀用户
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#get-invited-user
- * @param {Object} params
- * @param {Number} params.level       获取受邀用户的级数，1表示直接邀请的用户
- * @param {Number} params.limit       返回数据大小
- * @param {Number} params.offset      返回数据偏移
- * @param {Boolean} params.needTotal  是否需要返回总数
- * @returns
- */
-module.exports = async function (params = {}) {
-  const schema = {
-    level: 'number',
-    limit: {
-      required: false,
-      type: 'number'
-    },
-    offset: {
-      required: false,
-      type: 'number'
-    },
-    needTotal: {
-      required: false,
-      type: 'boolean'
-    }
-  }
-  this.middleware.validate(params, schema)
-  const {
-    level,
-    limit = 20,
-    offset = 0,
-    needTotal = false
-  } = params
-  const uid = this.authInfo.uid
-  const query = {
-    [`inviter_uid.${level - 1}`]: uid
-  }
-  const getUserRes = await userCollection.where(query)
-    .field({
-      _id: true,
-      avatar: true,
-      avatar_file: true,
-      username: true,
-      nickname: true,
-      mobile: true,
-      invite_time: true
-    })
-    .orderBy('invite_time', 'desc')
-    .skip(offset)
-    .limit(limit)
-    .get()
-
-  const invitedUser = getUserRes.data.map(item => {
-    return {
-      uid: item._id,
-      username: item.username,
-      nickname: item.nickname,
-      mobile: coverMobile(item.mobile),
-      inviteTime: item.invite_time,
-      avatar: item.avatar,
-      avatarFile: item.avatar_file
-    }
-  })
-  const result = {
-    errCode: 0,
-    invitedUser
-  }
-  if (needTotal) {
-    const getTotalRes = await userCollection.where(query).count()
-    result.total = getTotalRes.total
-  }
-  return result
-}
+const {
+  userCollection
+} = require('../../common/constants')
+const {
+  coverMobile
+} = require('../../common/utils')
+
+/**
+ * 获取受邀用户
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#get-invited-user
+ * @param {Object} params
+ * @param {Number} params.level       获取受邀用户的级数，1表示直接邀请的用户
+ * @param {Number} params.limit       返回数据大小
+ * @param {Number} params.offset      返回数据偏移
+ * @param {Boolean} params.needTotal  是否需要返回总数
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    level: 'number',
+    limit: {
+      required: false,
+      type: 'number'
+    },
+    offset: {
+      required: false,
+      type: 'number'
+    },
+    needTotal: {
+      required: false,
+      type: 'boolean'
+    }
+  }
+  this.middleware.validate(params, schema)
+  const {
+    level,
+    limit = 20,
+    offset = 0,
+    needTotal = false
+  } = params
+  const uid = this.authInfo.uid
+  const query = {
+    [`inviter_uid.${level - 1}`]: uid
+  }
+  const getUserRes = await userCollection.where(query)
+    .field({
+      _id: true,
+      avatar: true,
+      avatar_file: true,
+      username: true,
+      nickname: true,
+      mobile: true,
+      invite_time: true
+    })
+    .orderBy('invite_time', 'desc')
+    .skip(offset)
+    .limit(limit)
+    .get()
+
+  const invitedUser = getUserRes.data.map(item => {
+    return {
+      uid: item._id,
+      username: item.username,
+      nickname: item.nickname,
+      mobile: coverMobile(item.mobile),
+      inviteTime: item.invite_time,
+      avatar: item.avatar,
+      avatarFile: item.avatar_file
+    }
+  })
+  const result = {
+    errCode: 0,
+    invitedUser
+  }
+  if (needTotal) {
+    const getTotalRes = await userCollection.where(query).count()
+    result.total = getTotalRes.total
+  }
+  return result
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/fission/index.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/fission/index.js
index 4a9bee11743e422d1be4cecda7ccc0cab6788e74..dcca9a34e10c8da7685e5330f167d7f88e0e57cd 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/fission/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/fission/index.js
@@ -1,4 +1,4 @@
-module.exports = {
-  acceptInvite: require('./accept-invite'),
-  getInvitedUser: require('./get-invited-user')
-}
+module.exports = {
+  acceptInvite: require('./accept-invite'),
+  getInvitedUser: require('./get-invited-user')
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/index.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/index.js
index f65f58b51ca8da2885ba414938898740c6913953..7fbd964477f8e4621045f5f30590e65c69e6672c 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/index.js
@@ -1,20 +1,20 @@
-module.exports = {
-  login: require('./login'),
-  loginBySms: require('./login-by-sms'),
-  loginByUniverify: require('./login-by-univerify'),
-  loginByWeixin: require('./login-by-weixin'),
-  loginByAlipay: require('./login-by-alipay'),
-  loginByQQ: require('./login-by-qq'),
-  loginByApple: require('./login-by-apple'),
-  loginByBaidu: require('./login-by-baidu'),
-  loginByDingtalk: require('./login-by-dingtalk'),
-  loginByToutiao: require('./login-by-toutiao'),
-  loginByDouyin: require('./login-by-douyin'),
-  loginByWeibo: require('./login-by-weibo'),
-  loginByTaobao: require('./login-by-taobao'),
-  loginByEmailLink: require('./login-by-email-link'),
-  loginByEmailCode: require('./login-by-email-code'),
-  loginByFacebook: require('./login-by-facebook'),
-  loginByGoogle: require('./login-by-google'),
-  loginByWeixinMobile: require('./login-by-weixin-mobile')
-}
+module.exports = {
+  login: require('./login'),
+  loginBySms: require('./login-by-sms'),
+  loginByUniverify: require('./login-by-univerify'),
+  loginByWeixin: require('./login-by-weixin'),
+  loginByAlipay: require('./login-by-alipay'),
+  loginByQQ: require('./login-by-qq'),
+  loginByApple: require('./login-by-apple'),
+  loginByBaidu: require('./login-by-baidu'),
+  loginByDingtalk: require('./login-by-dingtalk'),
+  loginByToutiao: require('./login-by-toutiao'),
+  loginByDouyin: require('./login-by-douyin'),
+  loginByWeibo: require('./login-by-weibo'),
+  loginByTaobao: require('./login-by-taobao'),
+  loginByEmailLink: require('./login-by-email-link'),
+  loginByEmailCode: require('./login-by-email-code'),
+  loginByFacebook: require('./login-by-facebook'),
+  loginByGoogle: require('./login-by-google'),
+  loginByWeixinMobile: require('./login-by-weixin-mobile')
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-alipay.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-alipay.js
index d5d463147a1bb805d12c13e38e621169d7b948a9..4611b0cb7a9536e30c26060a5157b12d03b7c242 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-alipay.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-alipay.js
@@ -1,70 +1,70 @@
-const {
-  initAlipay
-} = require('../../lib/third-party/index')
-const {
-  ERROR
-} = require('../../common/error')
-const {
-  preUnifiedLogin,
-  postUnifiedLogin
-} = require('../../lib/utils/unified-login')
-const {
-  LOG_TYPE
-} = require('../../common/constants')
-
-/**
- * 支付宝登录
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-alipay
- * @param {Object} params
- * @param {String} params.code        支付宝小程序客户端登录返回的code
- * @param {String} params.inviteCode  邀请码
- * @returns
- */
-module.exports = async function (params = {}) {
-  const schema = {
-    code: 'string',
-    inviteCode: {
-      type: 'string',
-      required: false
-    }
-  }
-  this.middleware.validate(params, schema)
-  const {
-    code,
-    inviteCode
-  } = params
-  const alipayApi = initAlipay.call(this)
-  let getAlipayAccountResult
-  try {
-    getAlipayAccountResult = await alipayApi.code2Session(code)
-  } catch (error) {
-    console.error(error)
-    await this.middleware.uniIdLog({
-      success: false,
-      type: LOG_TYPE.LOGIN
-    })
-    throw {
-      errCode: ERROR.GET_THIRD_PARTY_ACCOUNT_FAILED
-    }
-  }
-
-  const {
-    openid
-  } = getAlipayAccountResult
-
-  const {
-    type,
-    user
-  } = await preUnifiedLogin.call(this, {
-    user: {
-      ali_openid: openid
-    }
-  })
-  return postUnifiedLogin.call(this, {
-    user,
-    extraData: {},
-    isThirdParty: true,
-    type,
-    inviteCode
-  })
-}
+const {
+  initAlipay
+} = require('../../lib/third-party/index')
+const {
+  ERROR
+} = require('../../common/error')
+const {
+  preUnifiedLogin,
+  postUnifiedLogin
+} = require('../../lib/utils/unified-login')
+const {
+  LOG_TYPE
+} = require('../../common/constants')
+
+/**
+ * 支付宝登录
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-alipay
+ * @param {Object} params
+ * @param {String} params.code        支付宝小程序客户端登录返回的code
+ * @param {String} params.inviteCode  邀请码
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    code: 'string',
+    inviteCode: {
+      type: 'string',
+      required: false
+    }
+  }
+  this.middleware.validate(params, schema)
+  const {
+    code,
+    inviteCode
+  } = params
+  const alipayApi = initAlipay.call(this)
+  let getAlipayAccountResult
+  try {
+    getAlipayAccountResult = await alipayApi.code2Session(code)
+  } catch (error) {
+    console.error(error)
+    await this.middleware.uniIdLog({
+      success: false,
+      type: LOG_TYPE.LOGIN
+    })
+    throw {
+      errCode: ERROR.GET_THIRD_PARTY_ACCOUNT_FAILED
+    }
+  }
+
+  const {
+    openid
+  } = getAlipayAccountResult
+
+  const {
+    type,
+    user
+  } = await preUnifiedLogin.call(this, {
+    user: {
+      ali_openid: openid
+    }
+  })
+  return postUnifiedLogin.call(this, {
+    user,
+    extraData: {},
+    isThirdParty: true,
+    type,
+    inviteCode
+  })
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-apple.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-apple.js
index 5f39e62348c673c870b0a4da10a68f544d7c82fa..5a1e2fefa6548b5cc9c074ba77eb935d1fcbefcf 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-apple.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-apple.js
@@ -1,77 +1,77 @@
-const {
-  initApple
-} = require('../../lib/third-party/index')
-const {
-  ERROR
-} = require('../../common/error')
-const {
-  preUnifiedLogin,
-  postUnifiedLogin
-} = require('../../lib/utils/unified-login')
-const {
-  LOG_TYPE
-} = require('../../common/constants')
-
-/**
- * 苹果登录
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-apple
- * @param {Object} params
- * @param {String} params.identityToken 苹果登录返回的identityToken
- * @param {String} params.nickname      用户昵称
- * @param {String} params.inviteCode    邀请码
- * @returns
- */
-module.exports = async function (params = {}) {
-  const schema = {
-    identityToken: 'string',
-    nickname: {
-      required: false,
-      type: 'nickname'
-    },
-    inviteCode: {
-      required: false,
-      type: 'string'
-    }
-  }
-  this.middleware.validate(params, schema)
-  const {
-    identityToken,
-    nickname,
-    inviteCode
-  } = params
-  const appleApi = initApple.call(this)
-  let verifyResult
-  try {
-    verifyResult = await appleApi.verifyIdentityToken(identityToken)
-  } catch (error) {
-    console.error(error)
-    await this.middleware.uniIdLog({
-      success: false,
-      type: LOG_TYPE.LOGIN
-    })
-    throw {
-      errCode: ERROR.GET_THIRD_PARTY_ACCOUNT_FAILED
-    }
-  }
-  const {
-    openid
-  } = verifyResult
-
-  const {
-    type,
-    user
-  } = await preUnifiedLogin.call(this, {
-    user: {
-      apple_openid: openid
-    }
-  })
-  return postUnifiedLogin.call(this, {
-    user,
-    extraData: {
-      nickname
-    },
-    isThirdParty: true,
-    type,
-    inviteCode
-  })
-}
+const {
+  initApple
+} = require('../../lib/third-party/index')
+const {
+  ERROR
+} = require('../../common/error')
+const {
+  preUnifiedLogin,
+  postUnifiedLogin
+} = require('../../lib/utils/unified-login')
+const {
+  LOG_TYPE
+} = require('../../common/constants')
+
+/**
+ * 苹果登录
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-apple
+ * @param {Object} params
+ * @param {String} params.identityToken 苹果登录返回的identityToken
+ * @param {String} params.nickname      用户昵称
+ * @param {String} params.inviteCode    邀请码
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    identityToken: 'string',
+    nickname: {
+      required: false,
+      type: 'nickname'
+    },
+    inviteCode: {
+      required: false,
+      type: 'string'
+    }
+  }
+  this.middleware.validate(params, schema)
+  const {
+    identityToken,
+    nickname,
+    inviteCode
+  } = params
+  const appleApi = initApple.call(this)
+  let verifyResult
+  try {
+    verifyResult = await appleApi.verifyIdentityToken(identityToken)
+  } catch (error) {
+    console.error(error)
+    await this.middleware.uniIdLog({
+      success: false,
+      type: LOG_TYPE.LOGIN
+    })
+    throw {
+      errCode: ERROR.GET_THIRD_PARTY_ACCOUNT_FAILED
+    }
+  }
+  const {
+    openid
+  } = verifyResult
+
+  const {
+    type,
+    user
+  } = await preUnifiedLogin.call(this, {
+    user: {
+      apple_openid: openid
+    }
+  })
+  return postUnifiedLogin.call(this, {
+    user,
+    extraData: {
+      nickname
+    },
+    isThirdParty: true,
+    type,
+    inviteCode
+  })
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-baidu.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-baidu.js
index 856449dcaefd02dcc40934fec3fbfec8e8cb6a68..9d4b453993e8f2cf98f45b55d8aafe3be392c308 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-baidu.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-baidu.js
@@ -1,9 +1,9 @@
-/**
- * 百度登录
- * @param {Object} params
- * @returns
- */
-module.exports = async function (params = {}) {
-  // 此接口暂未实现，欢迎向我们提交pr
-  throw new Error('api[loginByBaidu] is not yet implemented')
-}
+/**
+ * 百度登录
+ * @param {Object} params
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  // 此接口暂未实现，欢迎向我们提交pr
+  throw new Error('api[loginByBaidu] is not yet implemented')
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-dingtalk.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-dingtalk.js
index afe1f016fdf70f0d2e4de01358d6b49294dda3c4..22c2f8b620a589ac772c290f62b9652d83f7691f 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-dingtalk.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-dingtalk.js
@@ -1,9 +1,9 @@
-/**
- * 钉钉登录
- * @param {Object} params
- * @returns
- */
-module.exports = async function (params = {}) {
-  // 此接口暂未实现，欢迎向我们提交pr
-  throw new Error('api[loginByDingtalk] is not yet implemented')
-}
+/**
+ * 钉钉登录
+ * @param {Object} params
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  // 此接口暂未实现，欢迎向我们提交pr
+  throw new Error('api[loginByDingtalk] is not yet implemented')
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-douyin.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-douyin.js
index 8cd4ab563115eb9b07d85d5f79d185c2ff2ee081..cecf581a652a22e70e1ffc52dfba006c1efb5aa9 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-douyin.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-douyin.js
@@ -1,9 +1,9 @@
-/**
- * 抖音登录
- * @param {Object} params
- * @returns
- */
-module.exports = async function (params = {}) {
-  // 此接口暂未实现，欢迎向我们提交pr
-  throw new Error('api[loginByDouyin] is not yet implemented')
-}
+/**
+ * 抖音登录
+ * @param {Object} params
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  // 此接口暂未实现，欢迎向我们提交pr
+  throw new Error('api[loginByDouyin] is not yet implemented')
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-email-code.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-email-code.js
index c3af08f0c677ce8214a006aa4fa7a51a6a9909a6..1f3c3a663ba073bcd52647ddd3639a014624504e 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-email-code.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-email-code.js
@@ -1,9 +1,9 @@
-/**
- * 邮箱验证码登录
- * @param {Object} params
- * @returns
- */
-module.exports = async function (params = {}) {
-  // 此接口暂未实现，欢迎向我们提交pr
-  throw new Error('api[loginByEmailCode] is not yet implemented')
-}
+/**
+ * 邮箱验证码登录
+ * @param {Object} params
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  // 此接口暂未实现，欢迎向我们提交pr
+  throw new Error('api[loginByEmailCode] is not yet implemented')
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-email-link.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-email-link.js
index 0ebbf3acef93d4265e094e35cf49c6fbf1a7538e..a8f9e6ffd3c77d41d00ee2e4274f67bd8c2d7056 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-email-link.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-email-link.js
@@ -1,9 +1,9 @@
-/**
- * 邮箱点击链接登录
- * @param {Object} params
- * @returns
- */
-module.exports = async function (params = {}) {
-  // 此接口暂未实现，欢迎向我们提交pr
-  throw new Error('api[loginByEmailLink] is not yet implemented')
-}
+/**
+ * 邮箱点击链接登录
+ * @param {Object} params
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  // 此接口暂未实现，欢迎向我们提交pr
+  throw new Error('api[loginByEmailLink] is not yet implemented')
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-facebook.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-facebook.js
index 5c93bd4d242d579923ceed479a1f6bf51e54dc24..1a5eab894faee54904f8f6b4aa9aee5aeab58d66 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-facebook.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-facebook.js
@@ -1,9 +1,9 @@
-/**
- * Facebook登录
- * @param {Object} params
- * @returns
- */
-module.exports = async function (params = {}) {
-  // 此接口暂未实现，欢迎向我们提交pr
-  throw new Error('api[loginByFacebook] is not yet implemented')
-}
+/**
+ * Facebook登录
+ * @param {Object} params
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  // 此接口暂未实现，欢迎向我们提交pr
+  throw new Error('api[loginByFacebook] is not yet implemented')
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-google.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-google.js
index 8054ece6a4aeb94c85d37d9df7c4bc0aac4a93cc..c12efe3e2385952edf45429ae30c42047f0b40f9 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-google.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-google.js
@@ -1,9 +1,9 @@
-/**
- * Google登录
- * @param {Object} params
- * @returns
- */
-module.exports = async function (params = {}) {
-  // 此接口暂未实现，欢迎向我们提交pr
-  throw new Error('api[loginByGoogle] is not yet implemented')
-}
+/**
+ * Google登录
+ * @param {Object} params
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  // 此接口暂未实现，欢迎向我们提交pr
+  throw new Error('api[loginByGoogle] is not yet implemented')
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-qq.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-qq.js
index 1eaa7ba999cd4db71f9ee7592348c1b5a9d9d0cc..7d2f588187d7b14a62ae569dfb4096df399c3fdd 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-qq.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-qq.js
@@ -119,29 +119,27 @@ module.exports = async function (params = {}) {
       accessToken,
       openid
     })
-    if (avatar) {
-      // eslint-disable-next-line n/no-deprecated-api
-      const extName = url.parse(avatar).pathname.split('.').pop()
-      const cloudPath = `user/avatar/${openid.slice(-8) + Date.now()}-avatar.${extName}`
-      const getAvatarRes = await uniCloud.httpclient.request(avatar)
-      if (getAvatarRes.status >= 400) {
-        throw {
-          errCode: ERROR.GET_THIRD_PARTY_USER_INFO_FAILED
-        }
-      }
-      const {
-        fileID
-      } = await uniCloud.uploadFile({
-        cloudPath,
-        fileContent: getAvatarRes.data
-      })
-      extraData.avatar_file = {
-        name: cloudPath,
-        extname: extName,
-        url: fileID
+    // eslint-disable-next-line n/no-deprecated-api
+    const extName = url.parse(avatar).pathname.split('.').pop()
+    const cloudPath = `user/avatar/${openid.slice(-8) + Date.now()}-avatar.${extName}`
+    const getAvatarRes = await uniCloud.httpclient.request(avatar)
+    if (getAvatarRes.status >= 400) {
+      throw {
+        errCode: ERROR.GET_THIRD_PARTY_USER_INFO_FAILED
       }
     }
+    const {
+      fileID
+    } = await uniCloud.uploadFile({
+      cloudPath,
+      fileContent: getAvatarRes.data
+    })
     extraData.nickname = nickname
+    extraData.avatar_file = {
+      name: cloudPath,
+      extname: extName,
+      url: fileID
+    }
   }
   await saveQQUserKey.call(this, {
     openid,
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-sms.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-sms.js
index 915e9b6d2d41c4d18817abf96430c87b5b068e92..8f9aeaf997d0be7026033bca8961aeb41062be4c 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-sms.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-sms.js
@@ -1,99 +1,99 @@
-const {
-  getNeedCaptcha,
-  verifyCaptcha
-} = require('../../lib/utils/captcha')
-const {
-  verifyMobileCode
-} = require('../../lib/utils/verify-code')
-const {
-  preUnifiedLogin,
-  postUnifiedLogin
-} = require('../../lib/utils/unified-login')
-const {
-  CAPTCHA_SCENE,
-  SMS_SCENE,
-  LOG_TYPE
-} = require('../../common/constants')
-
-/**
- * 短信验证码登录
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-sms
- * @param {Object} params
- * @param {String} params.mobile      手机号
- * @param {String} params.code        短信验证码
- * @param {String} params.captcha     图形验证码
- * @param {String} params.inviteCode  邀请码
- * @returns
- */
-module.exports = async function (params = {}) {
-  const schema = {
-    mobile: 'mobile',
-    code: 'string',
-    captcha: {
-      required: false,
-      type: 'string'
-    },
-    inviteCode: {
-      required: false,
-      type: 'string'
-    }
-  }
-  this.middleware.validate(params, schema)
-  const {
-    mobile,
-    code,
-    captcha,
-    inviteCode
-  } = params
-
-  const needCaptcha = await getNeedCaptcha.call(this, {
-    mobile
-  })
-
-  if (needCaptcha) {
-    await verifyCaptcha.call(this, {
-      captcha,
-      scene: CAPTCHA_SCENE.LOGIN_BY_SMS
-    })
-  }
-
-  try {
-    await verifyMobileCode({
-      mobile,
-      code,
-      scene: SMS_SCENE.LOGIN_BY_SMS
-    })
-  } catch (error) {
-    console.log(error, {
-      mobile,
-      code,
-      type: SMS_SCENE.LOGIN_BY_SMS
-    })
-    await this.middleware.uniIdLog({
-      success: false,
-      data: {
-        mobile
-      },
-      type: LOG_TYPE.LOGIN
-    })
-    throw error
-  }
-
-  const {
-    type,
-    user
-  } = await preUnifiedLogin.call(this, {
-    user: {
-      mobile
-    }
-  })
-  return postUnifiedLogin.call(this, {
-    user,
-    extraData: {
-      mobile_confirmed: 1
-    },
-    isThirdParty: false,
-    type,
-    inviteCode
-  })
-}
+const {
+  getNeedCaptcha,
+  verifyCaptcha
+} = require('../../lib/utils/captcha')
+const {
+  verifyMobileCode
+} = require('../../lib/utils/verify-code')
+const {
+  preUnifiedLogin,
+  postUnifiedLogin
+} = require('../../lib/utils/unified-login')
+const {
+  CAPTCHA_SCENE,
+  SMS_SCENE,
+  LOG_TYPE
+} = require('../../common/constants')
+
+/**
+ * 短信验证码登录
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-sms
+ * @param {Object} params
+ * @param {String} params.mobile      手机号
+ * @param {String} params.code        短信验证码
+ * @param {String} params.captcha     图形验证码
+ * @param {String} params.inviteCode  邀请码
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    mobile: 'mobile',
+    code: 'string',
+    captcha: {
+      required: false,
+      type: 'string'
+    },
+    inviteCode: {
+      required: false,
+      type: 'string'
+    }
+  }
+  this.middleware.validate(params, schema)
+  const {
+    mobile,
+    code,
+    captcha,
+    inviteCode
+  } = params
+
+  const needCaptcha = await getNeedCaptcha.call(this, {
+    mobile
+  })
+
+  if (needCaptcha) {
+    await verifyCaptcha.call(this, {
+      captcha,
+      scene: CAPTCHA_SCENE.LOGIN_BY_SMS
+    })
+  }
+
+  try {
+    await verifyMobileCode({
+      mobile,
+      code,
+      scene: SMS_SCENE.LOGIN_BY_SMS
+    })
+  } catch (error) {
+    console.log(error, {
+      mobile,
+      code,
+      type: SMS_SCENE.LOGIN_BY_SMS
+    })
+    await this.middleware.uniIdLog({
+      success: false,
+      data: {
+        mobile
+      },
+      type: LOG_TYPE.LOGIN
+    })
+    throw error
+  }
+
+  const {
+    type,
+    user
+  } = await preUnifiedLogin.call(this, {
+    user: {
+      mobile
+    }
+  })
+  return postUnifiedLogin.call(this, {
+    user,
+    extraData: {
+      mobile_confirmed: 1
+    },
+    isThirdParty: false,
+    type,
+    inviteCode
+  })
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-taobao.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-taobao.js
index 6a6d5994e0bc9952c09fcf5274a92082ddca370c..8234fa072fcffaacd2d6b32c1517e3f67f828b0d 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-taobao.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-taobao.js
@@ -1,9 +1,9 @@
-/**
- * 淘宝登录
- * @param {Object} params
- * @returns
- */
-module.exports = async function (params = {}) {
-  // 此接口暂未实现，欢迎向我们提交pr
-  throw new Error('api[loginByTaobao] is not yet implemented')
-}
+/**
+ * 淘宝登录
+ * @param {Object} params
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  // 此接口暂未实现，欢迎向我们提交pr
+  throw new Error('api[loginByTaobao] is not yet implemented')
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-toutiao.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-toutiao.js
index 133aadbaad31f2a5ba411c7afb5f82f7fc2c00f1..11fda9b404989b7567722f7e98bf0faf38bddbd5 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-toutiao.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-toutiao.js
@@ -1,9 +1,9 @@
-/**
- * 头条登录
- * @param {Object} params
- * @returns
- */
-module.exports = async function (params = {}) {
-  // 此接口暂未实现，欢迎向我们提交pr
-  throw new Error('api[loginByToutiao] is not yet implemented')
-}
+/**
+ * 头条登录
+ * @param {Object} params
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  // 此接口暂未实现，欢迎向我们提交pr
+  throw new Error('api[loginByToutiao] is not yet implemented')
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-univerify.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-univerify.js
index 53e681c68636dcc4e8f5abeb9f00f9ef0ffab73e..05199b0ae2a364302840bdddf8e0654d0ef2dac3 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-univerify.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-univerify.js
@@ -1,69 +1,69 @@
-const {
-  getPhoneNumber
-} = require('../../lib/utils/univerify')
-const {
-  preUnifiedLogin,
-  postUnifiedLogin
-} = require('../../lib/utils/unified-login')
-const {
-  LOG_TYPE
-} = require('../../common/constants')
-
-/**
- * App端一键登录
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-univerify
- * @param {Object} params
- * @param {String} params.access_token  APP端一键登录返回的access_token
- * @param {String} params.openid        APP端一键登录返回的openid
- * @param {String} params.inviteCode    邀请码
- * @returns
- */
-module.exports = async function (params = {}) {
-  const schema = {
-    access_token: 'string',
-    openid: 'string',
-    inviteCode: {
-      required: false,
-      type: 'string'
-    }
-  }
-  this.middleware.validate(params, schema)
-  const {
-    // eslint-disable-next-line camelcase
-    access_token,
-    openid,
-    inviteCode
-  } = params
-
-  let mobile
-  try {
-    const phoneInfo = await getPhoneNumber.call(this, {
-      // eslint-disable-next-line camelcase
-      access_token,
-      openid
-    })
-    mobile = phoneInfo.phoneNumber
-  } catch (error) {
-    await this.middleware.uniIdLog({
-      success: false,
-      type: LOG_TYPE.LOGIN
-    })
-    throw error
-  }
-  const {
-    user,
-    type
-  } = await preUnifiedLogin.call(this, {
-    user: {
-      mobile
-    }
-  })
-  return postUnifiedLogin.call(this, {
-    user,
-    extraData: {
-      mobile_confirmed: 1
-    },
-    type,
-    inviteCode
-  })
-}
+const {
+  getPhoneNumber
+} = require('../../lib/utils/univerify')
+const {
+  preUnifiedLogin,
+  postUnifiedLogin
+} = require('../../lib/utils/unified-login')
+const {
+  LOG_TYPE
+} = require('../../common/constants')
+
+/**
+ * App端一键登录
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-univerify
+ * @param {Object} params
+ * @param {String} params.access_token  APP端一键登录返回的access_token
+ * @param {String} params.openid        APP端一键登录返回的openid
+ * @param {String} params.inviteCode    邀请码
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    access_token: 'string',
+    openid: 'string',
+    inviteCode: {
+      required: false,
+      type: 'string'
+    }
+  }
+  this.middleware.validate(params, schema)
+  const {
+    // eslint-disable-next-line camelcase
+    access_token,
+    openid,
+    inviteCode
+  } = params
+
+  let mobile
+  try {
+    const phoneInfo = await getPhoneNumber.call(this, {
+      // eslint-disable-next-line camelcase
+      access_token,
+      openid
+    })
+    mobile = phoneInfo.phoneNumber
+  } catch (error) {
+    await this.middleware.uniIdLog({
+      success: false,
+      type: LOG_TYPE.LOGIN
+    })
+    throw error
+  }
+  const {
+    user,
+    type
+  } = await preUnifiedLogin.call(this, {
+    user: {
+      mobile
+    }
+  })
+  return postUnifiedLogin.call(this, {
+    user,
+    extraData: {
+      mobile_confirmed: 1
+    },
+    type,
+    inviteCode
+  })
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-weibo.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-weibo.js
index 496cdb4b262e60ad861b64f207f3e3ac8a377102..b12a17f2abede705641f7ed01026b5813cc45b44 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-weibo.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-weibo.js
@@ -1,9 +1,9 @@
-/**
- * 微博登录
- * @param {Object} params
- * @returns
- */
-module.exports = async function (params = {}) {
-  // 此接口暂未实现，欢迎向我们提交pr
-  throw new Error('api[loginByWeibo] is not yet implemented')
-}
+/**
+ * 微博登录
+ * @param {Object} params
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  // 此接口暂未实现，欢迎向我们提交pr
+  throw new Error('api[loginByWeibo] is not yet implemented')
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-weixin-mobile.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-weixin-mobile.js
index c27c2b21a4489e2463c6a6ea24c954e5b619afe9..1b6e5150dede949621d27742d24b9d8ac609385c 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-weixin-mobile.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-weixin-mobile.js
@@ -1,106 +1,106 @@
-const {
-  initWeixin
-} = require('../../lib/third-party/index')
-const {
-  getWeixinAccessToken
-} = require('../../lib/utils/weixin')
-const {
-  ERROR
-} = require('../../common/error')
-const {
-  preUnifiedLogin,
-  postUnifiedLogin
-} = require('../../lib/utils/unified-login')
-const {
-  LOG_TYPE
-} = require('../../common/constants')
-const {
-  preBind,
-  postBind
-} = require('../../lib/utils/relate')
-
-/**
- * 微信授权手机号登录
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-weixin-mobile
- * @param {Object} params
- * @param {String} params.phoneCode 微信手机号返回的code
- * @param {String} params.inviteCode 邀请码
- * @returns
- */
-module.exports = async function (params = {}) {
-  const schema = {
-    phoneCode: 'string',
-    inviteCode: {
-      type: 'string',
-      required: false
-    }
-  }
-
-  this.middleware.validate(params, schema)
-
-  const { phoneCode, inviteCode } = params
-
-  const weixinApi = initWeixin.call(this)
-  let mobile
-
-  try {
-    const accessToken = await getWeixinAccessToken.call(this)
-    const mobileRes = await weixinApi.getPhoneNumber(accessToken, phoneCode)
-    mobile = mobileRes.purePhoneNumber
-  } catch (error) {
-    console.error(error)
-    await this.middleware.uniIdLog({
-      success: false,
-      type: LOG_TYPE.LOGIN
-    })
-    throw {
-      errCode: ERROR.GET_THIRD_PARTY_ACCOUNT_FAILED
-    }
-  }
-
-  const { type, user } = await preUnifiedLogin.call(this, {
-    user: {
-      mobile
-    }
-  })
-
-  let extraData = {
-    mobile_confirmed: 1
-  }
-
-  if (type === 'login') {
-    // 绑定手机号
-    if (!user.mobile_confirmed) {
-      const bindAccount = {
-        mobile
-      }
-      await preBind.call(this, {
-        uid: user._id,
-        bindAccount,
-        logType: LOG_TYPE.BIND_MOBILE
-      })
-      await postBind.call(this, {
-        uid: user._id,
-        bindAccount,
-        extraData: {
-          mobile_confirmed: 1
-        },
-        logType: LOG_TYPE.BIND_MOBILE
-      })
-      extraData = {
-        ...extraData,
-        ...bindAccount
-      }
-    }
-  }
-
-  return postUnifiedLogin.call(this, {
-    user,
-    extraData: {
-      ...extraData
-    },
-    isThirdParty: false,
-    type,
-    inviteCode
-  })
-}
+const {
+  initWeixin
+} = require('../../lib/third-party/index')
+const {
+  getWeixinAccessToken
+} = require('../../lib/utils/weixin')
+const {
+  ERROR
+} = require('../../common/error')
+const {
+  preUnifiedLogin,
+  postUnifiedLogin
+} = require('../../lib/utils/unified-login')
+const {
+  LOG_TYPE
+} = require('../../common/constants')
+const {
+  preBind,
+  postBind
+} = require('../../lib/utils/relate')
+
+/**
+ * 微信授权手机号登录
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-weixin-mobile
+ * @param {Object} params
+ * @param {String} params.phoneCode 微信手机号返回的code
+ * @param {String} params.inviteCode 邀请码
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    phoneCode: 'string',
+    inviteCode: {
+      type: 'string',
+      required: false
+    }
+  }
+
+  this.middleware.validate(params, schema)
+
+  const { phoneCode, inviteCode } = params
+
+  const weixinApi = initWeixin.call(this)
+  let mobile
+
+  try {
+    const accessToken = await getWeixinAccessToken.call(this)
+    const mobileRes = await weixinApi.getPhoneNumber(accessToken, phoneCode)
+    mobile = mobileRes.purePhoneNumber
+  } catch (error) {
+    console.error(error)
+    await this.middleware.uniIdLog({
+      success: false,
+      type: LOG_TYPE.LOGIN
+    })
+    throw {
+      errCode: ERROR.GET_THIRD_PARTY_ACCOUNT_FAILED
+    }
+  }
+
+  const { type, user } = await preUnifiedLogin.call(this, {
+    user: {
+      mobile
+    }
+  })
+
+  let extraData = {
+    mobile_confirmed: 1
+  }
+
+  if (type === 'login') {
+    // 绑定手机号
+    if (!user.mobile_confirmed) {
+      const bindAccount = {
+        mobile
+      }
+      await preBind.call(this, {
+        uid: user._id,
+        bindAccount,
+        logType: LOG_TYPE.BIND_MOBILE
+      })
+      await postBind.call(this, {
+        uid: user._id,
+        bindAccount,
+        extraData: {
+          mobile_confirmed: 1
+        },
+        logType: LOG_TYPE.BIND_MOBILE
+      })
+      extraData = {
+        ...extraData,
+        ...bindAccount
+      }
+    }
+  }
+
+  return postUnifiedLogin.call(this, {
+    user,
+    extraData: {
+      ...extraData
+    },
+    isThirdParty: false,
+    type,
+    inviteCode
+  })
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login.js
index 97e9cfea7ec33c546196fd03cf03464179954a50..8419ee8b0e85bc873c94284ceff6e3238c4f1b1b 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login.js
@@ -1,94 +1,94 @@
-const {
-  preLoginWithPassword,
-  postLogin
-} = require('../../lib/utils/login')
-const {
-  getNeedCaptcha,
-  verifyCaptcha
-} = require('../../lib/utils/captcha')
-const {
-  CAPTCHA_SCENE
-} = require('../../common/constants')
-const {
-  ERROR
-} = require('../../common/error')
-
-/**
- * 用户名密码登录
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login
- * @param {Object} params
- * @param {String} params.username  用户名
- * @param {String} params.mobile    手机号
- * @param {String} params.email     邮箱
- * @param {String} params.password  密码
- * @param {String} params.captcha   图形验证码
- * @returns
- */
-module.exports = async function (params = {}) {
-  const schema = {
-    username: {
-      required: false,
-      type: 'username'
-    },
-    mobile: {
-      required: false,
-      type: 'mobile'
-    },
-    email: {
-      required: false,
-      type: 'email'
-    },
-    password: 'password',
-    captcha: {
-      required: false,
-      type: 'string'
-    }
-  }
-  this.middleware.validate(params, schema)
-  const {
-    username,
-    mobile,
-    email,
-    password,
-    captcha
-  } = params
-  if (!username && !mobile && !email) {
-    throw {
-      errCode: ERROR.INVALID_USERNAME
-    }
-  } else if (
-    (username && email) ||
-    (username && mobile) ||
-    (email && mobile)
-  ) {
-    throw {
-      errCode: ERROR.INVALID_PARAM
-    }
-  }
-  const needCaptcha = await getNeedCaptcha.call(this, {
-    username,
-    mobile,
-    email
-  })
-  if (needCaptcha) {
-    await verifyCaptcha.call(this, {
-      captcha,
-      scene: CAPTCHA_SCENE.LOGIN_BY_PWD
-    })
-  }
-  const {
-    user,
-    extraData
-  } = await preLoginWithPassword.call(this, {
-    user: {
-      username,
-      mobile,
-      email
-    },
-    password
-  })
-  return postLogin.call(this, {
-    user,
-    extraData
-  })
-}
+const {
+  preLoginWithPassword,
+  postLogin
+} = require('../../lib/utils/login')
+const {
+  getNeedCaptcha,
+  verifyCaptcha
+} = require('../../lib/utils/captcha')
+const {
+  CAPTCHA_SCENE
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
+
+/**
+ * 用户名密码登录
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login
+ * @param {Object} params
+ * @param {String} params.username  用户名
+ * @param {String} params.mobile    手机号
+ * @param {String} params.email     邮箱
+ * @param {String} params.password  密码
+ * @param {String} params.captcha   图形验证码
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    username: {
+      required: false,
+      type: 'username'
+    },
+    mobile: {
+      required: false,
+      type: 'mobile'
+    },
+    email: {
+      required: false,
+      type: 'email'
+    },
+    password: 'password',
+    captcha: {
+      required: false,
+      type: 'string'
+    }
+  }
+  this.middleware.validate(params, schema)
+  const {
+    username,
+    mobile,
+    email,
+    password,
+    captcha
+  } = params
+  if (!username && !mobile && !email) {
+    throw {
+      errCode: ERROR.INVALID_USERNAME
+    }
+  } else if (
+    (username && email) ||
+    (username && mobile) ||
+    (email && mobile)
+  ) {
+    throw {
+      errCode: ERROR.INVALID_PARAM
+    }
+  }
+  const needCaptcha = await getNeedCaptcha.call(this, {
+    username,
+    mobile,
+    email
+  })
+  if (needCaptcha) {
+    await verifyCaptcha.call(this, {
+      captcha,
+      scene: CAPTCHA_SCENE.LOGIN_BY_PWD
+    })
+  }
+  const {
+    user,
+    extraData
+  } = await preLoginWithPassword.call(this, {
+    user: {
+      username,
+      mobile,
+      email
+    },
+    password
+  })
+  return postLogin.call(this, {
+    user,
+    extraData
+  })
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/logout/index.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/logout/index.js
index 544be2b715a7beb3b51e15e028b5231a6016b3be..897cc1c6e2e37f83faa9fbbe0b06373c0352f4c5 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/logout/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/logout/index.js
@@ -1,3 +1,3 @@
-module.exports = {
-  logout: require('./logout')
-}
+module.exports = {
+  logout: require('./logout')
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/logout/logout.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/logout/logout.js
index 7d491c61d3d3702a7370354ac4f8de217d9f1223..f11b4374e3e190ab78e7183748fd60fc61851e65 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/logout/logout.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/logout/logout.js
@@ -1,15 +1,15 @@
-const {
-  logout
-} = require('../../lib/utils/logout')
-
-/**
- * 用户退出登录
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#logout
- * @returns
- */
-module.exports = async function () {
-  await logout.call(this)
-  return {
-    errCode: 0
-  }
-}
+const {
+  logout
+} = require('../../lib/utils/logout')
+
+/**
+ * 用户退出登录
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#logout
+ * @returns
+ */
+module.exports = async function () {
+  await logout.call(this)
+  return {
+    errCode: 0
+  }
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/authorize-app-login.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/authorize-app-login.js
index 8f8a167b1720f7e981e2fd955f647521c53253d0..c6861381fe706b6c5f36f6cf1642da29238e18f0 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/authorize-app-login.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/authorize-app-login.js
@@ -1,37 +1,37 @@
-const {
-  isAuthorizeApproved
-} = require('./utils')
-const {
-  dbCmd,
-  userCollection
-} = require('../../common/constants')
-
-/**
- * 授权用户登录应用
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#authorize-app-login
- * @param {Object} params
- * @param {String} params.uid   用户id
- * @param {String} params.appId 授权的应用的AppId
- * @returns
- */
-module.exports = async function (params = {}) {
-  const schema = {
-    uid: 'string',
-    appId: 'string'
-  }
-  this.middleware.validate(params, schema)
-  const {
-    uid,
-    appId
-  } = params
-  await isAuthorizeApproved({
-    uid,
-    appIdList: [appId]
-  })
-  await userCollection.doc(uid).update({
-    dcloud_appid: dbCmd.push(appId)
-  })
-  return {
-    errCode: 0
-  }
-}
+const {
+  isAuthorizeApproved
+} = require('./utils')
+const {
+  dbCmd,
+  userCollection
+} = require('../../common/constants')
+
+/**
+ * 授权用户登录应用
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#authorize-app-login
+ * @param {Object} params
+ * @param {String} params.uid   用户id
+ * @param {String} params.appId 授权的应用的AppId
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    uid: 'string',
+    appId: 'string'
+  }
+  this.middleware.validate(params, schema)
+  const {
+    uid,
+    appId
+  } = params
+  await isAuthorizeApproved({
+    uid,
+    appIdList: [appId]
+  })
+  await userCollection.doc(uid).update({
+    dcloud_appid: dbCmd.push(appId)
+  })
+  return {
+    errCode: 0
+  }
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/index.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/index.js
index ce9cc7b07ae9c8300b8a25e6eb14ba49e89af56b..ee4dd44bdb84f1b4dae704800b2223dfca77a1c4 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/index.js
@@ -1,5 +1,5 @@
-module.exports = {
-  authorizeAppLogin: require('./authorize-app-login'),
-  removeAuthorizedApp: require('./remove-authorized-app'),
-  setAuthorizedApp: require('./set-authorized-app')
-}
+module.exports = {
+  authorizeAppLogin: require('./authorize-app-login'),
+  removeAuthorizedApp: require('./remove-authorized-app'),
+  setAuthorizedApp: require('./set-authorized-app')
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/remove-authorized-app.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/remove-authorized-app.js
index df82184fa2c9e26c5db32910ca2110a0cb81eab0..4fa69dc647ec9ecdaeb7e6e785b9a3df9b658262 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/remove-authorized-app.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/remove-authorized-app.js
@@ -1,30 +1,30 @@
-const {
-  dbCmd,
-  userCollection
-} = require('../../common/constants')
-
-/**
- * 移除用户登录授权
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#remove-authorized-app
- * @param {Object} params
- * @param {String} params.uid   用户id
- * @param {String} params.appId 取消授权的应用的AppId
- * @returns
- */
-module.exports = async function (params = {}) {
-  const schema = {
-    uid: 'string',
-    appId: 'string'
-  }
-  this.middleware.validate(params, schema)
-  const {
-    uid,
-    appId
-  } = params
-  await userCollection.doc(uid).update({
-    dcloud_appid: dbCmd.pull(appId)
-  })
-  return {
-    errCode: 0
-  }
-}
+const {
+  dbCmd,
+  userCollection
+} = require('../../common/constants')
+
+/**
+ * 移除用户登录授权
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#remove-authorized-app
+ * @param {Object} params
+ * @param {String} params.uid   用户id
+ * @param {String} params.appId 取消授权的应用的AppId
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    uid: 'string',
+    appId: 'string'
+  }
+  this.middleware.validate(params, schema)
+  const {
+    uid,
+    appId
+  } = params
+  await userCollection.doc(uid).update({
+    dcloud_appid: dbCmd.pull(appId)
+  })
+  return {
+    errCode: 0
+  }
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/set-authorized-app.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/set-authorized-app.js
index a438ef998052f3d1b66ebe5a3792ad194625ce71..774ececf1f0eaf1957e69c6d7372f9f8bc30859b 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/set-authorized-app.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/set-authorized-app.js
@@ -1,36 +1,36 @@
-const {
-  isAuthorizeApproved
-} = require('./utils')
-const {
-  userCollection
-} = require('../../common/constants')
-
-/**
- * 设置用户允许登录的应用列表
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#set-authorized-app
- * @param {Object} params
- * @param {String} params.uid       用户id
- * @param {Array} params.appIdList 允许登录的应用AppId列表
- * @returns
- */
-module.exports = async function (params = {}) {
-  const schema = {
-    uid: 'string',
-    appIdList: 'array<string>'
-  }
-  this.middleware.validate(params, schema)
-  const {
-    uid,
-    appIdList
-  } = params
-  await isAuthorizeApproved({
-    uid,
-    appIdList
-  })
-  await userCollection.doc(uid).update({
-    dcloud_appid: appIdList
-  })
-  return {
-    errCode: 0
-  }
-}
+const {
+  isAuthorizeApproved
+} = require('./utils')
+const {
+  userCollection
+} = require('../../common/constants')
+
+/**
+ * 设置用户允许登录的应用列表
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#set-authorized-app
+ * @param {Object} params
+ * @param {String} params.uid       用户id
+ * @param {Array} params.appIdList 允许登录的应用AppId列表
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    uid: 'string',
+    appIdList: 'array<string>'
+  }
+  this.middleware.validate(params, schema)
+  const {
+    uid,
+    appIdList
+  } = params
+  await isAuthorizeApproved({
+    uid,
+    appIdList
+  })
+  await userCollection.doc(uid).update({
+    dcloud_appid: appIdList
+  })
+  return {
+    errCode: 0
+  }
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/utils.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/utils.js
index 4ee4e26991e72bfb26bca11aa3ca99e96bf2765f..bfd1a047560530e1320ba9699b87186c47c43732 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/utils.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/utils.js
@@ -1,38 +1,38 @@
-const {
-  userCollection
-} = require('../../common/constants')
-const {
-  ERROR
-} = require('../../common/error')
-const {
-  findUser
-} = require('../../lib/utils/account')
-
-async function isAuthorizeApproved ({
-  uid,
-  appIdList
-} = {}) {
-  const getUserRes = await userCollection.doc(uid).get()
-  const userRecord = getUserRes.data[0]
-  if (!userRecord) {
-    throw {
-      errCode: ERROR.ACCOUNT_NOT_EXISTS
-    }
-  }
-  const {
-    userMatched
-  } = await findUser({
-    userQuery: userRecord,
-    authorizedApp: appIdList
-  })
-
-  if (userMatched.some(item => item._id !== uid)) {
-    throw {
-      errCode: ERROR.ACCOUNT_CONFLICT
-    }
-  }
-}
-
-module.exports = {
-  isAuthorizeApproved
-}
+const {
+  userCollection
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
+const {
+  findUser
+} = require('../../lib/utils/account')
+
+async function isAuthorizeApproved ({
+  uid,
+  appIdList
+} = {}) {
+  const getUserRes = await userCollection.doc(uid).get()
+  const userRecord = getUserRes.data[0]
+  if (!userRecord) {
+    throw {
+      errCode: ERROR.ACCOUNT_NOT_EXISTS
+    }
+  }
+  const {
+    userMatched
+  } = await findUser({
+    userQuery: userRecord,
+    authorizedApp: appIdList
+  })
+
+  if (userMatched.some(item => item._id !== uid)) {
+    throw {
+      errCode: ERROR.ACCOUNT_CONFLICT
+    }
+  }
+}
+
+module.exports = {
+  isAuthorizeApproved
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/register/index.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/register/index.js
index 64ff603cd9e0a0b8878006775cacc8be452dd22d..319210fa18f94ae614ae1967c516f25d65e2c1f4 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/register/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/register/index.js
@@ -1,5 +1,5 @@
-module.exports = {
-  registerUser: require('./register-user'),
-  registerAdmin: require('./register-admin'),
-  registerUserByEmail: require('./register-user-by-email')
-}
+module.exports = {
+  registerUser: require('./register-user'),
+  registerAdmin: require('./register-admin'),
+  registerUserByEmail: require('./register-user-by-email')
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/register/register-admin.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/register/register-admin.js
index 5e122abf93c4da2e0fd115370f3c2cee8375d2ea..564ec147a8fc896aaa63b34f5dca4c09733f4f62 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/register/register-admin.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/register/register-admin.js
@@ -1,72 +1,72 @@
-const {
-  userCollection
-} = require('../../common/constants')
-const {
-  ERROR
-} = require('../../common/error')
-const {
-  preRegisterWithPassword,
-  postRegister
-} = require('../../lib/utils/register')
-
-/**
- * 注册管理员
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#register-admin
- * @param {Object} params
- * @param {String} params.username   用户名
- * @param {String} params.password   密码
- * @param {String} params.nickname   昵称
- * @returns
- */
-module.exports = async function (params = {}) {
-  const schema = {
-    username: 'username',
-    password: 'password',
-    nickname: {
-      type: 'nickname',
-      required: false
-    }
-  }
-  this.middleware.validate(params, schema)
-  const {
-    username,
-    password,
-    nickname
-  } = params
-  const getAdminRes = await userCollection.where({
-    role: 'admin'
-  }).limit(1).get()
-  if (getAdminRes.data.length > 0) {
-    const [admin] = getAdminRes.data
-    const appId = this.getUniversalClientInfo().appId
-
-    if (!admin.dcloud_appid || (admin.dcloud_appid && admin.dcloud_appid.includes(appId))) {
-      return {
-        errCode: ERROR.ADMIN_EXISTS,
-        errMsg: this.t('uni-id-admin-exists')
-      }
-    } else {
-      return {
-        errCode: ERROR.ADMIN_EXISTS,
-        errMsg: this.t('uni-id-admin-exist-in-other-apps')
-      }
-    }
-  }
-  const {
-    user,
-    extraData
-  } = await preRegisterWithPassword.call(this, {
-    user: {
-      username
-    },
-    password
-  })
-  return postRegister.call(this, {
-    user,
-    extraData: {
-      ...extraData,
-      nickname,
-      role: ['admin']
-    }
-  })
-}
+const {
+  userCollection
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
+const {
+  preRegisterWithPassword,
+  postRegister
+} = require('../../lib/utils/register')
+
+/**
+ * 注册管理员
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#register-admin
+ * @param {Object} params
+ * @param {String} params.username   用户名
+ * @param {String} params.password   密码
+ * @param {String} params.nickname   昵称
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    username: 'username',
+    password: 'password',
+    nickname: {
+      type: 'nickname',
+      required: false
+    }
+  }
+  this.middleware.validate(params, schema)
+  const {
+    username,
+    password,
+    nickname
+  } = params
+  const getAdminRes = await userCollection.where({
+    role: 'admin'
+  }).limit(1).get()
+  if (getAdminRes.data.length > 0) {
+    const [admin] = getAdminRes.data
+    const appId = this.getUniversalClientInfo().appId
+
+    if (!admin.dcloud_appid || (admin.dcloud_appid && admin.dcloud_appid.includes(appId))) {
+      return {
+        errCode: ERROR.ADMIN_EXISTS,
+        errMsg: this.t('uni-id-admin-exists')
+      }
+    } else {
+      return {
+        errCode: ERROR.ADMIN_EXISTS,
+        errMsg: this.t('uni-id-admin-exist-in-other-apps')
+      }
+    }
+  }
+  const {
+    user,
+    extraData
+  } = await preRegisterWithPassword.call(this, {
+    user: {
+      username
+    },
+    password
+  })
+  return postRegister.call(this, {
+    user,
+    extraData: {
+      ...extraData,
+      nickname,
+      role: ['admin']
+    }
+  })
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/register/register-user-by-email.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/register/register-user-by-email.js
index b52c1d2513c28617e144edb34121c26b7270f5f8..f5a54c53993c47789444cd35aec3daac9b1991d3 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/register/register-user-by-email.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/register/register-user-by-email.js
@@ -1,87 +1,87 @@
-const {
-  postRegister,
-  preRegisterWithPassword
-} = require('../../lib/utils/register')
-const {
-  verifyCaptcha
-} = require('../../lib/utils/captcha')
-const {
-  CAPTCHA_SCENE,
-  EMAIL_SCENE,
-  LOG_TYPE
-} = require('../../common/constants')
-const {
-  verifyEmailCode
-} = require('../../lib/utils/verify-code')
-
-/**
- * 通过邮箱+验证码注册普通用户
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#register-user-by-email
- * @param {Object} params
- * @param {String} params.email    邮箱
- * @param {String} params.password      密码
- * @param {String} params.nickname    昵称
- * @param {String} params.code  邮箱验证码
- * @param {String} params.inviteCode  邀请码
- * @returns
- */
-module.exports = async function (params = {}) {
-  const schema = {
-    email: 'email',
-    password: 'password',
-    nickname: {
-      required: false,
-      type: 'nickname'
-    },
-	code: 'string',
-    inviteCode: {
-      required: false,
-      type: 'string'
-    }
-  }
-  this.middleware.validate(params, schema)
-  const {
-    email,
-    password,
-    nickname,
-    code,
-	inviteCode
-  } = params
-  
-  try {
-    // 验证邮箱验证码，验证不通过时写入失败日志
-    await verifyEmailCode({
-      email,
-      code,
-      scene: EMAIL_SCENE.REGISTER
-    })
-  } catch (error) {
-    await this.middleware.uniIdLog({
-      data: {
-        email
-      },
-      type: LOG_TYPE.REGISTER,
-      success: false
-    })
-    throw error
-  }
-  
-  const {
-    user,
-    extraData
-  } = await preRegisterWithPassword.call(this, {
-    user: {
-      email
-    },
-    password
-  })
-  return postRegister.call(this, {
-    user,
-    extraData: {
-      ...extraData,
-      nickname,
-	  email_confirmed: 1
-    },
-    inviteCode
-  })
-}
+const {
+  postRegister,
+  preRegisterWithPassword
+} = require('../../lib/utils/register')
+const {
+  verifyCaptcha
+} = require('../../lib/utils/captcha')
+const {
+  CAPTCHA_SCENE,
+  EMAIL_SCENE,
+  LOG_TYPE
+} = require('../../common/constants')
+const {
+  verifyEmailCode
+} = require('../../lib/utils/verify-code')
+
+/**
+ * 通过邮箱+验证码注册普通用户
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#register-user-by-email
+ * @param {Object} params
+ * @param {String} params.email    邮箱
+ * @param {String} params.password      密码
+ * @param {String} params.nickname    昵称
+ * @param {String} params.code  邮箱验证码
+ * @param {String} params.inviteCode  邀请码
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    email: 'email',
+    password: 'password',
+    nickname: {
+      required: false,
+      type: 'nickname'
+    },
+	code: 'string',
+    inviteCode: {
+      required: false,
+      type: 'string'
+    }
+  }
+  this.middleware.validate(params, schema)
+  const {
+    email,
+    password,
+    nickname,
+    code,
+	inviteCode
+  } = params
+  
+  try {
+    // 验证邮箱验证码，验证不通过时写入失败日志
+    await verifyEmailCode({
+      email,
+      code,
+      scene: EMAIL_SCENE.REGISTER
+    })
+  } catch (error) {
+    await this.middleware.uniIdLog({
+      data: {
+        email
+      },
+      type: LOG_TYPE.REGISTER,
+      success: false
+    })
+    throw error
+  }
+  
+  const {
+    user,
+    extraData
+  } = await preRegisterWithPassword.call(this, {
+    user: {
+      email
+    },
+    password
+  })
+  return postRegister.call(this, {
+    user,
+    extraData: {
+      ...extraData,
+      nickname,
+	  email_confirmed: 1
+    },
+    inviteCode
+  })
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/register/register-user.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/register/register-user.js
index 130dece3f013010f98dd74a596377264a7137754..510d7683af513dd2c08c670fff799dad734a4d12 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/register/register-user.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/register/register-user.js
@@ -1,68 +1,68 @@
-const {
-  postRegister,
-  preRegisterWithPassword
-} = require('../../lib/utils/register')
-const {
-  verifyCaptcha
-} = require('../../lib/utils/captcha')
-const {
-  CAPTCHA_SCENE
-} = require('../../common/constants')
-
-/**
- * 注册普通用户
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#register-user
- * @param {Object} params
- * @param {String} params.username    用户名
- * @param {String} params.password    密码
- * @param {String} params.captcha     图形验证码
- * @param {String} params.nickname    昵称
- * @param {String} params.inviteCode  邀请码
- * @returns
- */
-module.exports = async function (params = {}) {
-  const schema = {
-    username: 'username',
-    password: 'password',
-    captcha: 'string',
-    nickname: {
-      required: false,
-      type: 'nickname'
-    },
-    inviteCode: {
-      required: false,
-      type: 'string'
-    }
-  }
-  this.middleware.validate(params, schema)
-  const {
-    username,
-    password,
-    nickname,
-    captcha,
-    inviteCode
-  } = params
-
-  await verifyCaptcha.call(this, {
-    captcha,
-    scene: CAPTCHA_SCENE.REGISTER
-  })
-
-  const {
-    user,
-    extraData
-  } = await preRegisterWithPassword.call(this, {
-    user: {
-      username
-    },
-    password
-  })
-  return postRegister.call(this, {
-    user,
-    extraData: {
-      ...extraData,
-      nickname
-    },
-    inviteCode
-  })
-}
+const {
+  postRegister,
+  preRegisterWithPassword
+} = require('../../lib/utils/register')
+const {
+  verifyCaptcha
+} = require('../../lib/utils/captcha')
+const {
+  CAPTCHA_SCENE
+} = require('../../common/constants')
+
+/**
+ * 注册普通用户
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#register-user
+ * @param {Object} params
+ * @param {String} params.username    用户名
+ * @param {String} params.password    密码
+ * @param {String} params.captcha     图形验证码
+ * @param {String} params.nickname    昵称
+ * @param {String} params.inviteCode  邀请码
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    username: 'username',
+    password: 'password',
+    captcha: 'string',
+    nickname: {
+      required: false,
+      type: 'nickname'
+    },
+    inviteCode: {
+      required: false,
+      type: 'string'
+    }
+  }
+  this.middleware.validate(params, schema)
+  const {
+    username,
+    password,
+    nickname,
+    captcha,
+    inviteCode
+  } = params
+
+  await verifyCaptcha.call(this, {
+    captcha,
+    scene: CAPTCHA_SCENE.REGISTER
+  })
+
+  const {
+    user,
+    extraData
+  } = await preRegisterWithPassword.call(this, {
+    user: {
+      username
+    },
+    password
+  })
+  return postRegister.call(this, {
+    user,
+    extraData: {
+      ...extraData,
+      nickname
+    },
+    inviteCode
+  })
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-alipay.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-alipay.js
index bdb451b3a48845d744e1c6d14117ffcbf3510c3a..76e12477368e8467510752f4bddb09340f320c00 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-alipay.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-alipay.js
@@ -1,63 +1,63 @@
-const {
-  preBind,
-  postBind
-} = require('../../lib/utils/relate')
-const {
-  LOG_TYPE
-} = require('../../common/constants')
-const {
-  ERROR
-} = require('../../common/error')
-const {
-  initAlipay
-} = require('../../lib/third-party/index')
-
-/**
- * 绑定支付宝账号
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#bind-alipay
- * @param {Object} params
- * @param {String} params.code  支付宝小程序登录返回的code参数
- * @returns
- */
-module.exports = async function (params = {}) {
-  const schema = {
-    code: 'string'
-  }
-  this.middleware.validate(params, schema)
-  const uid = this.authInfo.uid
-  const {
-    code
-  } = params
-  const alipayApi = initAlipay.call(this)
-  let getAlipayAccountResult
-  try {
-    getAlipayAccountResult = await alipayApi().code2Session(code)
-  } catch (error) {
-    await this.middleware.uniIdLog({
-      success: false,
-      type: LOG_TYPE.BIND_ALIPAY
-    })
-    throw {
-      errCode: ERROR.GET_THIRD_PARTY_ACCOUNT_FAILED
-    }
-  }
-
-  const {
-    openid
-  } = getAlipayAccountResult
-
-  const bindAccount = {
-    ali_openid: openid
-  }
-  await preBind.call(this, {
-    uid,
-    bindAccount,
-    logType: LOG_TYPE.BIND_APPLE
-  })
-  return postBind.call(this, {
-    uid,
-    bindAccount,
-    extraData: {},
-    logType: LOG_TYPE.BIND_APPLE
-  })
-}
+const {
+  preBind,
+  postBind
+} = require('../../lib/utils/relate')
+const {
+  LOG_TYPE
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
+const {
+  initAlipay
+} = require('../../lib/third-party/index')
+
+/**
+ * 绑定支付宝账号
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#bind-alipay
+ * @param {Object} params
+ * @param {String} params.code  支付宝小程序登录返回的code参数
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    code: 'string'
+  }
+  this.middleware.validate(params, schema)
+  const uid = this.authInfo.uid
+  const {
+    code
+  } = params
+  const alipayApi = initAlipay.call(this)
+  let getAlipayAccountResult
+  try {
+    getAlipayAccountResult = await alipayApi().code2Session(code)
+  } catch (error) {
+    await this.middleware.uniIdLog({
+      success: false,
+      type: LOG_TYPE.BIND_ALIPAY
+    })
+    throw {
+      errCode: ERROR.GET_THIRD_PARTY_ACCOUNT_FAILED
+    }
+  }
+
+  const {
+    openid
+  } = getAlipayAccountResult
+
+  const bindAccount = {
+    ali_openid: openid
+  }
+  await preBind.call(this, {
+    uid,
+    bindAccount,
+    logType: LOG_TYPE.BIND_APPLE
+  })
+  return postBind.call(this, {
+    uid,
+    bindAccount,
+    extraData: {},
+    logType: LOG_TYPE.BIND_APPLE
+  })
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-apple.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-apple.js
index eb87f8b7efe75e9ce85ad4890039702ad882639f..b87ac80428c4fab262fe9750f0970758fb0308fa 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-apple.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-apple.js
@@ -1,62 +1,62 @@
-const {
-  preBind,
-  postBind
-} = require('../../lib/utils/relate')
-const {
-  LOG_TYPE
-} = require('../../common/constants')
-const {
-  ERROR
-} = require('../../common/error')
-const {
-  initApple
-} = require('../../lib/third-party/index')
-
-/**
- * 绑定苹果账号
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#bind-apple
- * @param {Object} params
- * @param {String} params.identityToken 苹果登录返回identityToken
- * @returns
- */
-module.exports = async function (params = {}) {
-  const schema = {
-    identityToken: 'string'
-  }
-  this.middleware.validate(params, schema)
-  const uid = this.authInfo.uid
-  const {
-    identityToken
-  } = params
-  const appleApi = initApple.call(this)
-  let verifyResult
-  try {
-    verifyResult = await appleApi.verifyIdentityToken(identityToken)
-  } catch (error) {
-    await this.middleware.uniIdLog({
-      success: false,
-      type: LOG_TYPE.BIND_APPLE
-    })
-    throw {
-      errCode: ERROR.GET_THIRD_PARTY_ACCOUNT_FAILED
-    }
-  }
-  const {
-    openid
-  } = verifyResult
-
-  const bindAccount = {
-    apple_openid: openid
-  }
-  await preBind.call(this, {
-    uid,
-    bindAccount,
-    logType: LOG_TYPE.BIND_APPLE
-  })
-  return postBind.call(this, {
-    uid,
-    bindAccount,
-    extraData: {},
-    logType: LOG_TYPE.BIND_APPLE
-  })
-}
+const {
+  preBind,
+  postBind
+} = require('../../lib/utils/relate')
+const {
+  LOG_TYPE
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
+const {
+  initApple
+} = require('../../lib/third-party/index')
+
+/**
+ * 绑定苹果账号
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#bind-apple
+ * @param {Object} params
+ * @param {String} params.identityToken 苹果登录返回identityToken
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    identityToken: 'string'
+  }
+  this.middleware.validate(params, schema)
+  const uid = this.authInfo.uid
+  const {
+    identityToken
+  } = params
+  const appleApi = initApple.call(this)
+  let verifyResult
+  try {
+    verifyResult = await appleApi.verifyIdentityToken(identityToken)
+  } catch (error) {
+    await this.middleware.uniIdLog({
+      success: false,
+      type: LOG_TYPE.BIND_APPLE
+    })
+    throw {
+      errCode: ERROR.GET_THIRD_PARTY_ACCOUNT_FAILED
+    }
+  }
+  const {
+    openid
+  } = verifyResult
+
+  const bindAccount = {
+    apple_openid: openid
+  }
+  await preBind.call(this, {
+    uid,
+    bindAccount,
+    logType: LOG_TYPE.BIND_APPLE
+  })
+  return postBind.call(this, {
+    uid,
+    bindAccount,
+    extraData: {},
+    logType: LOG_TYPE.BIND_APPLE
+  })
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-mobile-by-mp-weixin.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-mobile-by-mp-weixin.js
index f4c2bd01ce1a0325a5d0f48ec1612f583c5348d9..2e9a9915e48a3bee964f7831015597189b374210 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-mobile-by-mp-weixin.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-mobile-by-mp-weixin.js
@@ -1,104 +1,104 @@
-const {
-  preBind,
-  postBind
-} = require('../../lib/utils/relate')
-const {
-  LOG_TYPE
-} = require('../../common/constants')
-const {
-  decryptWeixinData,
-  getWeixinCache, getWeixinAccessToken
-} = require('../../lib/utils/weixin')
-const { initWeixin } = require('../../lib/third-party')
-const { ERROR } = require('../../common/error')
-
-/**
- * 通过微信绑定手机号
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#bind-mobile-by-mp-weixin
- * @param {Object} params
- * @param {String} params.encryptedData   微信获取手机号返回的加密信息
- * @param {String} params.iv              微信获取手机号返回的初始向量
- * @param {String} params.code            微信获取手机号返回的code
- * @returns
- */
-module.exports = async function (params = {}) {
-  /**
-   * 微信小程序的规则是客户端应先使用checkSession接口检测上次获取的sessionKey是否仍有效
-   * 如果有效则直接使用上次存储的sessionKey即可
-   * 如果无效应重新调用login接口再次刷新sessionKey
-   * 因此此接口不应直接使用客户端login获取的code，只能使用缓存的sessionKey
-   */
-  const schema = {
-    encryptedData: {
-      required: false,
-      type: 'string'
-    },
-    iv: {
-      required: false,
-      type: 'string'
-    },
-    code: {
-      required: false,
-      type: 'string'
-    }
-  }
-  const {
-    encryptedData,
-    iv,
-    code
-  } = params
-  this.middleware.validate(params, schema)
-
-  if ((!encryptedData && !iv) && !code) {
-    return {
-      errCode: ERROR.INVALID_PARAM
-    }
-  }
-
-  const uid = this.authInfo.uid
-
-  let mobile
-  if (code) {
-    // 区分客户端类型 小程序还是App
-    const accessToken = await getWeixinAccessToken.call(this)
-    const weixinApi = initWeixin.call(this)
-    const res = await weixinApi.getPhoneNumber(accessToken, code)
-
-    mobile = res.purePhoneNumber
-  } else {
-    const sessionKey = await getWeixinCache.call(this, {
-      uid,
-      key: 'session_key'
-    })
-    if (!sessionKey) {
-      throw new Error('Session key not found')
-    }
-    const res = decryptWeixinData.call(this, {
-      encryptedData,
-      sessionKey,
-      iv
-    })
-
-    mobile = res.purePhoneNumber
-  }
-
-  const bindAccount = {
-    mobile
-  }
-  await preBind.call(this, {
-    uid,
-    bindAccount,
-    logType: LOG_TYPE.BIND_MOBILE
-  })
-  await postBind.call(this, {
-    uid,
-    bindAccount,
-    extraData: {
-      mobile_confirmed: 1
-    },
-    logType: LOG_TYPE.BIND_MOBILE
-  })
-  return {
-    errCode: 0
-  }
-}
+const {
+  preBind,
+  postBind
+} = require('../../lib/utils/relate')
+const {
+  LOG_TYPE
+} = require('../../common/constants')
+const {
+  decryptWeixinData,
+  getWeixinCache, getWeixinAccessToken
+} = require('../../lib/utils/weixin')
+const { initWeixin } = require('../../lib/third-party')
+const { ERROR } = require('../../common/error')
+
+/**
+ * 通过微信绑定手机号
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#bind-mobile-by-mp-weixin
+ * @param {Object} params
+ * @param {String} params.encryptedData   微信获取手机号返回的加密信息
+ * @param {String} params.iv              微信获取手机号返回的初始向量
+ * @param {String} params.code            微信获取手机号返回的code
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  /**
+   * 微信小程序的规则是客户端应先使用checkSession接口检测上次获取的sessionKey是否仍有效
+   * 如果有效则直接使用上次存储的sessionKey即可
+   * 如果无效应重新调用login接口再次刷新sessionKey
+   * 因此此接口不应直接使用客户端login获取的code，只能使用缓存的sessionKey
+   */
+  const schema = {
+    encryptedData: {
+      required: false,
+      type: 'string'
+    },
+    iv: {
+      required: false,
+      type: 'string'
+    },
+    code: {
+      required: false,
+      type: 'string'
+    }
+  }
+  const {
+    encryptedData,
+    iv,
+    code
+  } = params
+  this.middleware.validate(params, schema)
+
+  if ((!encryptedData && !iv) && !code) {
+    return {
+      errCode: ERROR.INVALID_PARAM
+    }
+  }
+
+  const uid = this.authInfo.uid
+
+  let mobile
+  if (code) {
+    // 区分客户端类型 小程序还是App
+    const accessToken = await getWeixinAccessToken.call(this)
+    const weixinApi = initWeixin.call(this)
+    const res = await weixinApi.getPhoneNumber(accessToken, code)
+
+    mobile = res.purePhoneNumber
+  } else {
+    const sessionKey = await getWeixinCache.call(this, {
+      uid,
+      key: 'session_key'
+    })
+    if (!sessionKey) {
+      throw new Error('Session key not found')
+    }
+    const res = decryptWeixinData.call(this, {
+      encryptedData,
+      sessionKey,
+      iv
+    })
+
+    mobile = res.purePhoneNumber
+  }
+
+  const bindAccount = {
+    mobile
+  }
+  await preBind.call(this, {
+    uid,
+    bindAccount,
+    logType: LOG_TYPE.BIND_MOBILE
+  })
+  await postBind.call(this, {
+    uid,
+    bindAccount,
+    extraData: {
+      mobile_confirmed: 1
+    },
+    logType: LOG_TYPE.BIND_MOBILE
+  })
+  return {
+    errCode: 0
+  }
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-mobile-by-sms.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-mobile-by-sms.js
index 1640c2de930ac27ed01972ee04705af1231f1c8e..2275b054161365cb150f72bd672e09195da2d72e 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-mobile-by-sms.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-mobile-by-sms.js
@@ -1,92 +1,92 @@
-const {
-  getNeedCaptcha,
-  verifyCaptcha
-} = require('../../lib/utils/captcha')
-const {
-  LOG_TYPE,
-  SMS_SCENE,
-  CAPTCHA_SCENE
-} = require('../../common/constants')
-const {
-  verifyMobileCode
-} = require('../../lib/utils/verify-code')
-const {
-  preBind,
-  postBind
-} = require('../../lib/utils/relate')
-
-/**
- * 通过短信验证码绑定手机号
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#bind-mobile-by-sms
- * @param {Object} params
- * @param {String} params.mobile    手机号
- * @param {String} params.code      短信验证码
- * @param {String} params.captcha   图形验证码
- * @returns
- */
-module.exports = async function (params = {}) {
-  const schema = {
-    mobile: 'mobile',
-    code: 'string',
-    captcha: {
-      type: 'string',
-      required: false
-    }
-  }
-  const {
-    mobile,
-    code,
-    captcha
-  } = params
-  this.middleware.validate(params, schema)
-  const uid = this.authInfo.uid
-
-  // 判断是否需要验证码
-  const needCaptcha = await getNeedCaptcha.call(this, {
-    uid,
-    type: LOG_TYPE.BIND_MOBILE
-  })
-  if (needCaptcha) {
-    await verifyCaptcha.call(this, {
-      captcha,
-      scene: CAPTCHA_SCENE.BIND_MOBILE_BY_SMS
-    })
-  }
-
-  try {
-    // 验证手机号验证码，验证不通过时写入失败日志
-    await verifyMobileCode({
-      mobile,
-      code,
-      scene: SMS_SCENE.BIND_MOBILE_BY_SMS
-    })
-  } catch (error) {
-    await this.middleware.uniIdLog({
-      data: {
-        user_id: uid
-      },
-      type: LOG_TYPE.BIND_MOBILE,
-      success: false
-    })
-    throw error
-  }
-  const bindAccount = {
-    mobile
-  }
-  await preBind.call(this, {
-    uid,
-    bindAccount,
-    logType: LOG_TYPE.BIND_MOBILE
-  })
-  await postBind.call(this, {
-    uid,
-    bindAccount,
-    extraData: {
-      mobile_confirmed: 1
-    },
-    logType: LOG_TYPE.BIND_MOBILE
-  })
-  return {
-    errCode: 0
-  }
-}
+const {
+  getNeedCaptcha,
+  verifyCaptcha
+} = require('../../lib/utils/captcha')
+const {
+  LOG_TYPE,
+  SMS_SCENE,
+  CAPTCHA_SCENE
+} = require('../../common/constants')
+const {
+  verifyMobileCode
+} = require('../../lib/utils/verify-code')
+const {
+  preBind,
+  postBind
+} = require('../../lib/utils/relate')
+
+/**
+ * 通过短信验证码绑定手机号
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#bind-mobile-by-sms
+ * @param {Object} params
+ * @param {String} params.mobile    手机号
+ * @param {String} params.code      短信验证码
+ * @param {String} params.captcha   图形验证码
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    mobile: 'mobile',
+    code: 'string',
+    captcha: {
+      type: 'string',
+      required: false
+    }
+  }
+  const {
+    mobile,
+    code,
+    captcha
+  } = params
+  this.middleware.validate(params, schema)
+  const uid = this.authInfo.uid
+
+  // 判断是否需要验证码
+  const needCaptcha = await getNeedCaptcha.call(this, {
+    uid,
+    type: LOG_TYPE.BIND_MOBILE
+  })
+  if (needCaptcha) {
+    await verifyCaptcha.call(this, {
+      captcha,
+      scene: CAPTCHA_SCENE.BIND_MOBILE_BY_SMS
+    })
+  }
+
+  try {
+    // 验证手机号验证码，验证不通过时写入失败日志
+    await verifyMobileCode({
+      mobile,
+      code,
+      scene: SMS_SCENE.BIND_MOBILE_BY_SMS
+    })
+  } catch (error) {
+    await this.middleware.uniIdLog({
+      data: {
+        user_id: uid
+      },
+      type: LOG_TYPE.BIND_MOBILE,
+      success: false
+    })
+    throw error
+  }
+  const bindAccount = {
+    mobile
+  }
+  await preBind.call(this, {
+    uid,
+    bindAccount,
+    logType: LOG_TYPE.BIND_MOBILE
+  })
+  await postBind.call(this, {
+    uid,
+    bindAccount,
+    extraData: {
+      mobile_confirmed: 1
+    },
+    logType: LOG_TYPE.BIND_MOBILE
+  })
+  return {
+    errCode: 0
+  }
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-mobile-by-univerify.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-mobile-by-univerify.js
index 2970c61cedc73f2a73c402c49db44e1e284d72d3..b38d1bc818aea79df271ad12e5f02b0bd7cc9c52 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-mobile-by-univerify.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-mobile-by-univerify.js
@@ -1,70 +1,70 @@
-const {
-  getPhoneNumber
-} = require('../../lib/utils/univerify')
-const {
-  LOG_TYPE
-} = require('../../common/constants')
-const {
-  preBind,
-  postBind
-} = require('../../lib/utils/relate')
-
-/**
- * 通过一键登录绑定手机号
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#bind-mobile-by-univerify
- * @param {Object} params
- * @param {String} params.openid        APP端一键登录返回的openid
- * @param {String} params.access_token  APP端一键登录返回的access_token
- * @returns
- */
-module.exports = async function (params = {}) {
-  const schema = {
-    openid: 'string',
-    access_token: 'string'
-  }
-  const {
-    openid,
-    // eslint-disable-next-line camelcase
-    access_token
-  } = params
-  this.middleware.validate(params, schema)
-  const uid = this.authInfo.uid
-  let mobile
-  try {
-    const phoneInfo = await getPhoneNumber.call(this, {
-      // eslint-disable-next-line camelcase
-      access_token,
-      openid
-    })
-    mobile = phoneInfo.phoneNumber
-  } catch (error) {
-    await this.middleware.uniIdLog({
-      success: false,
-      data: {
-        user_id: uid
-      },
-      type: LOG_TYPE.BIND_MOBILE
-    })
-    throw error
-  }
-
-  const bindAccount = {
-    mobile
-  }
-  await preBind.call(this, {
-    uid,
-    bindAccount,
-    logType: LOG_TYPE.BIND_MOBILE
-  })
-  await postBind.call(this, {
-    uid,
-    bindAccount,
-    extraData: {
-      mobile_confirmed: 1
-    },
-    logType: LOG_TYPE.BIND_MOBILE
-  })
-  return {
-    errCode: 0
-  }
-}
+const {
+  getPhoneNumber
+} = require('../../lib/utils/univerify')
+const {
+  LOG_TYPE
+} = require('../../common/constants')
+const {
+  preBind,
+  postBind
+} = require('../../lib/utils/relate')
+
+/**
+ * 通过一键登录绑定手机号
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#bind-mobile-by-univerify
+ * @param {Object} params
+ * @param {String} params.openid        APP端一键登录返回的openid
+ * @param {String} params.access_token  APP端一键登录返回的access_token
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    openid: 'string',
+    access_token: 'string'
+  }
+  const {
+    openid,
+    // eslint-disable-next-line camelcase
+    access_token
+  } = params
+  this.middleware.validate(params, schema)
+  const uid = this.authInfo.uid
+  let mobile
+  try {
+    const phoneInfo = await getPhoneNumber.call(this, {
+      // eslint-disable-next-line camelcase
+      access_token,
+      openid
+    })
+    mobile = phoneInfo.phoneNumber
+  } catch (error) {
+    await this.middleware.uniIdLog({
+      success: false,
+      data: {
+        user_id: uid
+      },
+      type: LOG_TYPE.BIND_MOBILE
+    })
+    throw error
+  }
+
+  const bindAccount = {
+    mobile
+  }
+  await preBind.call(this, {
+    uid,
+    bindAccount,
+    logType: LOG_TYPE.BIND_MOBILE
+  })
+  await postBind.call(this, {
+    uid,
+    bindAccount,
+    extraData: {
+      mobile_confirmed: 1
+    },
+    logType: LOG_TYPE.BIND_MOBILE
+  })
+  return {
+    errCode: 0
+  }
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-qq.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-qq.js
index 574f917c582428a3f0df63e6a9e05727b44bb68f..2ae771ddf7ed89522348cf66746efe5e28f59148 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-qq.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-qq.js
@@ -1,110 +1,110 @@
-const {
-  preBind,
-  postBind
-} = require('../../lib/utils/relate')
-const {
-  LOG_TYPE
-} = require('../../common/constants')
-const {
-  ERROR
-} = require('../../common/error')
-const {
-  initQQ
-} = require('../../lib/third-party/index')
-const {
-  generateQQCache,
-  getQQPlatform,
-  saveQQUserKey
-} = require('../../lib/utils/qq')
-
-/**
- * 绑定QQ
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#bind-qq
- * @param {Object} params
- * @param {String} params.code          小程序端QQ登录返回的code
- * @param {String} params.accessToken   APP端QQ登录返回的accessToken
- * @param {String} params.accessTokenExpired    accessToken过期时间，由App端QQ登录返回的expires_in参数计算而来，单位：毫秒
- * @returns
- */
-module.exports = async function (params = {}) {
-  const schema = {
-    code: {
-      type: 'string',
-      required: false
-    },
-    accessToken: {
-      type: 'string',
-      required: false
-    },
-    accessTokenExpired: {
-      type: 'number',
-      required: false
-    }
-  }
-  this.middleware.validate(params, schema)
-  const uid = this.authInfo.uid
-  const {
-    code,
-    accessToken,
-    accessTokenExpired
-  } = params
-  const qqPlatform = getQQPlatform.call(this)
-  const appId = this.getUniversalClientInfo().appId
-  const qqApi = initQQ.call(this)
-  const clientPlatform = this.clientPlatform
-  const apiName = clientPlatform === 'mp-qq' ? 'code2Session' : 'getOpenidByToken'
-  let getQQAccountResult
-  try {
-    getQQAccountResult = await qqApi[apiName]({
-      code,
-      accessToken
-    })
-  } catch (error) {
-    await this.middleware.uniIdLog({
-      success: false,
-      type: LOG_TYPE.BIND_QQ
-    })
-    throw {
-      errCode: ERROR.GET_THIRD_PARTY_ACCOUNT_FAILED
-    }
-  }
-
-  const {
-    openid,
-    unionid,
-    // 保存下面四个字段
-    sessionKey // 微信小程序用户sessionKey
-  } = getQQAccountResult
-
-  const bindAccount = {
-    qq_openid: {
-      [qqPlatform]: openid
-    },
-    qq_unionid: unionid
-  }
-  await preBind.call(this, {
-    uid,
-    bindAccount,
-    logType: LOG_TYPE.BIND_QQ
-  })
-  await saveQQUserKey.call(this, {
-    openid,
-    sessionKey,
-    accessToken,
-    accessTokenExpired
-  })
-  return postBind.call(this, {
-    uid,
-    bindAccount,
-    extraData: {
-      qq_openid: {
-        [`${qqPlatform}_${appId}`]: openid
-      },
-      ...generateQQCache.call(this, {
-        openid,
-        sessionKey
-      })
-    },
-    logType: LOG_TYPE.BIND_QQ
-  })
-}
+const {
+  preBind,
+  postBind
+} = require('../../lib/utils/relate')
+const {
+  LOG_TYPE
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
+const {
+  initQQ
+} = require('../../lib/third-party/index')
+const {
+  generateQQCache,
+  getQQPlatform,
+  saveQQUserKey
+} = require('../../lib/utils/qq')
+
+/**
+ * 绑定QQ
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#bind-qq
+ * @param {Object} params
+ * @param {String} params.code          小程序端QQ登录返回的code
+ * @param {String} params.accessToken   APP端QQ登录返回的accessToken
+ * @param {String} params.accessTokenExpired    accessToken过期时间，由App端QQ登录返回的expires_in参数计算而来，单位：毫秒
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    code: {
+      type: 'string',
+      required: false
+    },
+    accessToken: {
+      type: 'string',
+      required: false
+    },
+    accessTokenExpired: {
+      type: 'number',
+      required: false
+    }
+  }
+  this.middleware.validate(params, schema)
+  const uid = this.authInfo.uid
+  const {
+    code,
+    accessToken,
+    accessTokenExpired
+  } = params
+  const qqPlatform = getQQPlatform.call(this)
+  const appId = this.getUniversalClientInfo().appId
+  const qqApi = initQQ.call(this)
+  const clientPlatform = this.clientPlatform
+  const apiName = clientPlatform === 'mp-qq' ? 'code2Session' : 'getOpenidByToken'
+  let getQQAccountResult
+  try {
+    getQQAccountResult = await qqApi[apiName]({
+      code,
+      accessToken
+    })
+  } catch (error) {
+    await this.middleware.uniIdLog({
+      success: false,
+      type: LOG_TYPE.BIND_QQ
+    })
+    throw {
+      errCode: ERROR.GET_THIRD_PARTY_ACCOUNT_FAILED
+    }
+  }
+
+  const {
+    openid,
+    unionid,
+    // 保存下面四个字段
+    sessionKey // 微信小程序用户sessionKey
+  } = getQQAccountResult
+
+  const bindAccount = {
+    qq_openid: {
+      [qqPlatform]: openid
+    },
+    qq_unionid: unionid
+  }
+  await preBind.call(this, {
+    uid,
+    bindAccount,
+    logType: LOG_TYPE.BIND_QQ
+  })
+  await saveQQUserKey.call(this, {
+    openid,
+    sessionKey,
+    accessToken,
+    accessTokenExpired
+  })
+  return postBind.call(this, {
+    uid,
+    bindAccount,
+    extraData: {
+      qq_openid: {
+        [`${qqPlatform}_${appId}`]: openid
+      },
+      ...generateQQCache.call(this, {
+        openid,
+        sessionKey
+      })
+    },
+    logType: LOG_TYPE.BIND_QQ
+  })
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-weixin.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-weixin.js
index d64947817e08b46dac4222d3290f85645ba4a5f9..def541a8725335558228020127471029b5150b41 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-weixin.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-weixin.js
@@ -1,100 +1,100 @@
-const {
-  preBind,
-  postBind
-} = require('../../lib/utils/relate')
-const {
-  LOG_TYPE
-} = require('../../common/constants')
-const {
-  generateWeixinCache,
-  saveWeixinUserKey,
-  getWeixinPlatform
-} = require('../../lib/utils/weixin')
-const {
-  initWeixin
-} = require('../../lib/third-party/index')
-const {
-  ERROR
-} = require('../../common/error')
-
-/**
- * 绑定微信
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#bind-weixin
- * @param {Object} params
- * @param {String} params.code  微信登录返回的code
- * @returns
- */
-module.exports = async function (params = {}) {
-  const schema = {
-    code: 'string'
-  }
-  this.middleware.validate(params, schema)
-  const uid = this.authInfo.uid
-  const {
-    code
-  } = params
-  const weixinPlatform = getWeixinPlatform.call(this)
-  const appId = this.getUniversalClientInfo().appId
-
-  const weixinApi = initWeixin.call(this)
-  const clientPlatform = this.clientPlatform
-  const apiName = clientPlatform === 'mp-weixin' ? 'code2Session' : 'getOauthAccessToken'
-  let getWeixinAccountResult
-  try {
-    getWeixinAccountResult = await weixinApi[apiName](code)
-  } catch (error) {
-    await this.middleware.uniIdLog({
-      success: false,
-      type: LOG_TYPE.BIND_WEIXIN
-    })
-    throw {
-      errCode: ERROR.GET_THIRD_PARTY_ACCOUNT_FAILED
-    }
-  }
-
-  const {
-    openid,
-    unionid,
-    // 保存下面四个字段
-    sessionKey, // 微信小程序用户sessionKey
-    accessToken, // App端微信用户accessToken
-    refreshToken, // App端微信用户refreshToken
-    expired: accessTokenExpired // App端微信用户accessToken过期时间
-  } = getWeixinAccountResult
-
-  const bindAccount = {
-    wx_openid: {
-      [weixinPlatform]: openid
-    },
-    wx_unionid: unionid
-  }
-  await preBind.call(this, {
-    uid,
-    bindAccount,
-    logType: LOG_TYPE.BIND_WEIXIN
-  })
-  await saveWeixinUserKey.call(this, {
-    openid,
-    sessionKey,
-    accessToken,
-    refreshToken,
-    accessTokenExpired
-  })
-  return postBind.call(this, {
-    uid,
-    bindAccount,
-    extraData: {
-      wx_openid: {
-        [`${weixinPlatform}_${appId}`]: openid
-      },
-      ...generateWeixinCache.call(this, {
-        openid,
-        sessionKey, // 微信小程序用户sessionKey
-        accessToken, // App端微信用户accessToken
-        refreshToken, // App端微信用户refreshToken
-        accessTokenExpired // App端微信用户accessToken过期时间
-      })
-    },
-    logType: LOG_TYPE.BIND_WEIXIN
-  })
-}
+const {
+  preBind,
+  postBind
+} = require('../../lib/utils/relate')
+const {
+  LOG_TYPE
+} = require('../../common/constants')
+const {
+  generateWeixinCache,
+  saveWeixinUserKey,
+  getWeixinPlatform
+} = require('../../lib/utils/weixin')
+const {
+  initWeixin
+} = require('../../lib/third-party/index')
+const {
+  ERROR
+} = require('../../common/error')
+
+/**
+ * 绑定微信
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#bind-weixin
+ * @param {Object} params
+ * @param {String} params.code  微信登录返回的code
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    code: 'string'
+  }
+  this.middleware.validate(params, schema)
+  const uid = this.authInfo.uid
+  const {
+    code
+  } = params
+  const weixinPlatform = getWeixinPlatform.call(this)
+  const appId = this.getUniversalClientInfo().appId
+
+  const weixinApi = initWeixin.call(this)
+  const clientPlatform = this.clientPlatform
+  const apiName = clientPlatform === 'mp-weixin' ? 'code2Session' : 'getOauthAccessToken'
+  let getWeixinAccountResult
+  try {
+    getWeixinAccountResult = await weixinApi[apiName](code)
+  } catch (error) {
+    await this.middleware.uniIdLog({
+      success: false,
+      type: LOG_TYPE.BIND_WEIXIN
+    })
+    throw {
+      errCode: ERROR.GET_THIRD_PARTY_ACCOUNT_FAILED
+    }
+  }
+
+  const {
+    openid,
+    unionid,
+    // 保存下面四个字段
+    sessionKey, // 微信小程序用户sessionKey
+    accessToken, // App端微信用户accessToken
+    refreshToken, // App端微信用户refreshToken
+    expired: accessTokenExpired // App端微信用户accessToken过期时间
+  } = getWeixinAccountResult
+
+  const bindAccount = {
+    wx_openid: {
+      [weixinPlatform]: openid
+    },
+    wx_unionid: unionid
+  }
+  await preBind.call(this, {
+    uid,
+    bindAccount,
+    logType: LOG_TYPE.BIND_WEIXIN
+  })
+  await saveWeixinUserKey.call(this, {
+    openid,
+    sessionKey,
+    accessToken,
+    refreshToken,
+    accessTokenExpired
+  })
+  return postBind.call(this, {
+    uid,
+    bindAccount,
+    extraData: {
+      wx_openid: {
+        [`${weixinPlatform}_${appId}`]: openid
+      },
+      ...generateWeixinCache.call(this, {
+        openid,
+        sessionKey, // 微信小程序用户sessionKey
+        accessToken, // App端微信用户accessToken
+        refreshToken, // App端微信用户refreshToken
+        accessTokenExpired // App端微信用户accessToken过期时间
+      })
+    },
+    logType: LOG_TYPE.BIND_WEIXIN
+  })
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/index.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/index.js
index 4d99c02cfb0af805c36db470a36b7dd771e58029..a587e76f2904d99e3068add8cd838837b74e99df 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/index.js
@@ -1,13 +1,13 @@
-module.exports = {
-  bindMobileBySms: require('./bind-mobile-by-sms'),
-  bindMobileByUniverify: require('./bind-mobile-by-univerify'),
-  bindMobileByMpWeixin: require('./bind-mobile-by-mp-weixin'),
-  bindAlipay: require('./bind-alipay'),
-  bindApple: require('./bind-apple'),
-  bindQQ: require('./bind-qq'),
-  bindWeixin: require('./bind-weixin'),
-  unbindWeixin: require('./unbind-weixin'),
-  unbindAlipay: require('./unbind-alipay'),
-  unbindQQ: require('./unbind-qq'),
-  unbindApple: require('./unbind-apple')
-}
+module.exports = {
+  bindMobileBySms: require('./bind-mobile-by-sms'),
+  bindMobileByUniverify: require('./bind-mobile-by-univerify'),
+  bindMobileByMpWeixin: require('./bind-mobile-by-mp-weixin'),
+  bindAlipay: require('./bind-alipay'),
+  bindApple: require('./bind-apple'),
+  bindQQ: require('./bind-qq'),
+  bindWeixin: require('./bind-weixin'),
+  unbindWeixin: require('./unbind-weixin'),
+  unbindAlipay: require('./unbind-alipay'),
+  unbindQQ: require('./unbind-qq'),
+  unbindApple: require('./unbind-apple')
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/unbind-alipay.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/unbind-alipay.js
index 67bb43bd05830342854d59f95fd821042f11d332..db7b1a64041d3752bb7fdd754e407b6022423670 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/unbind-alipay.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/unbind-alipay.js
@@ -1,32 +1,32 @@
-const {
-  preUnBind,
-  postUnBind
-} = require('../../lib/utils/relate')
-const {
-  LOG_TYPE, dbCmd
-} = require('../../common/constants')
-
-/**
- * 解绑支付宝
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#unbind-alipay
- * @returns
- */
-module.exports = async function () {
-  const { uid } = this.authInfo
-
-  await preUnBind.call(this, {
-    uid,
-    unBindAccount: {
-      ali_openid: dbCmd.exists(true)
-    },
-    logType: LOG_TYPE.UNBIND_ALIPAY
-  })
-
-  return await postUnBind.call(this, {
-    uid,
-    unBindAccount: {
-      ali_openid: dbCmd.remove()
-    },
-    logType: LOG_TYPE.UNBIND_ALIPAY
-  })
-}
+const {
+  preUnBind,
+  postUnBind
+} = require('../../lib/utils/relate')
+const {
+  LOG_TYPE, dbCmd
+} = require('../../common/constants')
+
+/**
+ * 解绑支付宝
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#unbind-alipay
+ * @returns
+ */
+module.exports = async function () {
+  const { uid } = this.authInfo
+
+  await preUnBind.call(this, {
+    uid,
+    unBindAccount: {
+      ali_openid: dbCmd.exists(true)
+    },
+    logType: LOG_TYPE.UNBIND_ALIPAY
+  })
+
+  return await postUnBind.call(this, {
+    uid,
+    unBindAccount: {
+      ali_openid: dbCmd.remove()
+    },
+    logType: LOG_TYPE.UNBIND_ALIPAY
+  })
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/unbind-apple.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/unbind-apple.js
index 111c1bf645d48b1fa8af00ac950eb15697bce82d..c966e3f6862ad295ce83e4aa4d8518267bf7766e 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/unbind-apple.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/unbind-apple.js
@@ -1,32 +1,32 @@
-const {
-  preUnBind,
-  postUnBind
-} = require('../../lib/utils/relate')
-const {
-  LOG_TYPE, dbCmd
-} = require('../../common/constants')
-
-/**
- * 解绑apple
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#unbind-apple
- * @returns
- */
-module.exports = async function () {
-  const { uid } = this.authInfo
-
-  await preUnBind.call(this, {
-    uid,
-    unBindAccount: {
-      apple_openid: dbCmd.exists(true)
-    },
-    logType: LOG_TYPE.UNBIND_APPLE
-  })
-
-  return await postUnBind.call(this, {
-    uid,
-    unBindAccount: {
-      apple_openid: dbCmd.remove()
-    },
-    logType: LOG_TYPE.UNBIND_APPLE
-  })
-}
+const {
+  preUnBind,
+  postUnBind
+} = require('../../lib/utils/relate')
+const {
+  LOG_TYPE, dbCmd
+} = require('../../common/constants')
+
+/**
+ * 解绑apple
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#unbind-apple
+ * @returns
+ */
+module.exports = async function () {
+  const { uid } = this.authInfo
+
+  await preUnBind.call(this, {
+    uid,
+    unBindAccount: {
+      apple_openid: dbCmd.exists(true)
+    },
+    logType: LOG_TYPE.UNBIND_APPLE
+  })
+
+  return await postUnBind.call(this, {
+    uid,
+    unBindAccount: {
+      apple_openid: dbCmd.remove()
+    },
+    logType: LOG_TYPE.UNBIND_APPLE
+  })
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/utils/index.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/utils/index.js
index 0ec67a57687aef5db7c35ccdce61f4027eeb4db8..314d458415a1f7a3938d5621583de10c5f399b12 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/utils/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/utils/index.js
@@ -1,5 +1,5 @@
-module.exports = {
-  refreshToken: require('./refresh-token'),
-  setPushCid: require('./set-push-cid'),
-  secureNetworkHandshakeByWeixin: require('./secure-network-handshake-by-weixin')
-}
+module.exports = {
+  refreshToken: require('./refresh-token'),
+  setPushCid: require('./set-push-cid'),
+  secureNetworkHandshakeByWeixin: require('./secure-network-handshake-by-weixin')
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/utils/secure-network-handshake-by-weixin.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/utils/secure-network-handshake-by-weixin.js
index 82ea0b3762cd6459309ad794b87058feb16b2b71..5b9c4afda6964e46f4aa1b6648a570d23c8fef4d 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/utils/secure-network-handshake-by-weixin.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/utils/secure-network-handshake-by-weixin.js
@@ -1,73 +1,73 @@
-const {
-  ERROR
-} = require('../../common/error')
-const {
-  initWeixin
-} = require('../../lib/third-party/index')
-const {
-  saveWeixinUserKey,
-  saveSecureNetworkCache
-} = require('../../lib/utils/weixin')
-const loginByWeixin = require('../login/login-by-weixin')
-/**
- * 微信安全网络握手
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#set-push-cid
- * @param {object} params
- * @param {string} params.code                微信登录返回的code
- * @param {boolean} params.callLoginByWeixin  是否同时调用一次微信登录
- * @returns
- */
-module.exports = async function (params = {}) {
-  const schema = {
-    code: 'string',
-    callLoginByWeixin: {
-      type: 'boolean',
-      required: false
-    }
-  }
-  this.middleware.validate(params, schema)
-  let platform = this.clientPlatform
-  if (platform !== 'mp-weixin') {
-    throw new Error(`[secureNetworkHandshake] platform ${platform} is not supported`)
-  }
-  const {
-    code,
-    callLoginByWeixin = false
-  } = params
-  if (callLoginByWeixin) {
-    return loginByWeixin.call(this, { 
-      code,
-      secureNetworkCache: true
-    })
-  }
-  
-  const weixinApi = initWeixin.call(this)
-  let getWeixinAccountResult
-  try {
-    getWeixinAccountResult = await weixinApi.code2Session(code)
-  } catch (error) {
-    console.error(error)
-    throw {
-      errCode: ERROR.GET_THIRD_PARTY_ACCOUNT_FAILED
-    }
-  }
-  const {
-    openid,
-    unionid,
-    sessionKey // 微信小程序用户sessionKey
-  } = getWeixinAccountResult
-  await saveSecureNetworkCache.call(this, {
-    code,
-    openid,
-    unionid,
-    sessionKey
-  })
-  await saveWeixinUserKey.call(this, {
-    openid,
-    sessionKey
-  })
-  
-  return {
-    errCode: 0
-  }
-}
+const {
+  ERROR
+} = require('../../common/error')
+const {
+  initWeixin
+} = require('../../lib/third-party/index')
+const {
+  saveWeixinUserKey,
+  saveSecureNetworkCache
+} = require('../../lib/utils/weixin')
+const loginByWeixin = require('../login/login-by-weixin')
+/**
+ * 微信安全网络握手
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#set-push-cid
+ * @param {object} params
+ * @param {string} params.code                微信登录返回的code
+ * @param {boolean} params.callLoginByWeixin  是否同时调用一次微信登录
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    code: 'string',
+    callLoginByWeixin: {
+      type: 'boolean',
+      required: false
+    }
+  }
+  this.middleware.validate(params, schema)
+  let platform = this.clientPlatform
+  if (platform !== 'mp-weixin') {
+    throw new Error(`[secureNetworkHandshake] platform ${platform} is not supported`)
+  }
+  const {
+    code,
+    callLoginByWeixin = false
+  } = params
+  if (callLoginByWeixin) {
+    return loginByWeixin.call(this, { 
+      code,
+      secureNetworkCache: true
+    })
+  }
+  
+  const weixinApi = initWeixin.call(this)
+  let getWeixinAccountResult
+  try {
+    getWeixinAccountResult = await weixinApi.code2Session(code)
+  } catch (error) {
+    console.error(error)
+    throw {
+      errCode: ERROR.GET_THIRD_PARTY_ACCOUNT_FAILED
+    }
+  }
+  const {
+    openid,
+    unionid,
+    sessionKey // 微信小程序用户sessionKey
+  } = getWeixinAccountResult
+  await saveSecureNetworkCache.call(this, {
+    code,
+    openid,
+    unionid,
+    sessionKey
+  })
+  await saveWeixinUserKey.call(this, {
+    openid,
+    sessionKey
+  })
+  
+  return {
+    errCode: 0
+  }
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/index.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/index.js
index fba352403d93b49e23eca46a5bc22545843267f7..297dc2bb3ec7680ad19bb0dd0a318207be83b0e6 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/index.js
@@ -1,7 +1,7 @@
-module.exports = {
-  createCaptcha: require('./create-captcha'),
-  refreshCaptcha: require('./refresh-captcha'),
-  sendSmsCode: require('./send-sms-code'),
-  sendEmailLink: require('./send-email-link'),
-  sendEmailCode: require('./send-email-code')
-}
+module.exports = {
+  createCaptcha: require('./create-captcha'),
+  refreshCaptcha: require('./refresh-captcha'),
+  sendSmsCode: require('./send-sms-code'),
+  sendEmailLink: require('./send-email-link'),
+  sendEmailCode: require('./send-email-code')
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/send-email-code.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/send-email-code.js
index 1a6304dace921fe3ce296c41b26f0bb031771997..361b22fd568234e03929b6dbb9978ed296f8c68e 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/send-email-code.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/send-email-code.js
@@ -1,60 +1,60 @@
-const {
-  verifyCaptcha
-} = require('../../lib/utils/captcha')
-const {
-  EMAIL_SCENE
-} = require('../../common/constants')
-const {
-  ERROR
-} = require('../../common/error')
-/**
- * 发送邮箱验证码，可用于登录、注册、绑定邮箱、修改密码等操作
- * @tutorial
- * @param {Object} params
- * @param {String} params.email     邮箱
- * @param {String} params.captcha   图形验证码
- * @param {String} params.scene     使用场景
- * @returns
- */
-module.exports = async function (params = {}) {
-  const schema = {
-    email: 'email',
-    captcha: 'string',
-    scene: 'string'
-  }
-  this.middleware.validate(params, schema)
-
-  const {
-    email,
-    captcha,
-    scene
-  } = params
-
-  if (!(Object.values(EMAIL_SCENE).includes(scene))) {
-    throw {
-      errCode: ERROR.INVALID_PARAM
-    }
-  }
-
-  await verifyCaptcha.call(this, {
-    scene: 'send-email-code',
-    captcha
-  })
-
-  // -- 测试代码
-  await require('../../lib/utils/verify-code')
-    .setEmailVerifyCode.call(this, {
-      email,
-      code: '123456',
-      expiresIn: 180,
-      scene
-    })
-  return {
-    errCode: 'uni-id-invalid-mail-template',
-    errMsg: `已启动测试模式，直接使用：123456作为邮箱验证码即可。\n如果是正式项目，需自行实现发送邮件的相关功能`
-  }
-  // -- 测试代码
-
-
-  //发送邮件--需自行实现
-}
+const {
+  verifyCaptcha
+} = require('../../lib/utils/captcha')
+const {
+  EMAIL_SCENE
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
+/**
+ * 发送邮箱验证码，可用于登录、注册、绑定邮箱、修改密码等操作
+ * @tutorial
+ * @param {Object} params
+ * @param {String} params.email     邮箱
+ * @param {String} params.captcha   图形验证码
+ * @param {String} params.scene     使用场景
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    email: 'email',
+    captcha: 'string',
+    scene: 'string'
+  }
+  this.middleware.validate(params, schema)
+
+  const {
+    email,
+    captcha,
+    scene
+  } = params
+
+  if (!(Object.values(EMAIL_SCENE).includes(scene))) {
+    throw {
+      errCode: ERROR.INVALID_PARAM
+    }
+  }
+
+  await verifyCaptcha.call(this, {
+    scene: 'send-email-code',
+    captcha
+  })
+
+  // -- 测试代码
+  await require('../../lib/utils/verify-code')
+    .setEmailVerifyCode.call(this, {
+      email,
+      code: '123456',
+      expiresIn: 180,
+      scene
+    })
+  return {
+    errCode: 'uni-id-invalid-mail-template',
+    errMsg: `已启动测试模式，直接使用：123456作为邮箱验证码即可。\n如果是正式项目，需自行实现发送邮件的相关功能`
+  }
+  // -- 测试代码
+
+
+  //发送邮件--需自行实现
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/send-email-link.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/send-email-link.js
index f643434a436ac4b6041bf901e7144aff5bc63bc8..d48ac068f9eaab7ded3e14f90cfc95c1005e4c21 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/send-email-link.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/send-email-link.js
@@ -1,12 +1,12 @@
-/**
- * 发送邮箱链接，可用于登录、注册、绑定邮箱、修改密码等操作
- * @tutorial
- * @param {Object} params
- * @param {String} params.email     邮箱
- * @param {String} params.scene     使用场景
- * @returns
- */
-module.exports = async function (params = {}) {
-  // 此接口暂未实现，欢迎向我们提交pr
-  throw new Error('api[sendEmailLink] is not yet implemented')
-}
+/**
+ * 发送邮箱链接，可用于登录、注册、绑定邮箱、修改密码等操作
+ * @tutorial
+ * @param {Object} params
+ * @param {String} params.email     邮箱
+ * @param {String} params.scene     使用场景
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  // 此接口暂未实现，欢迎向我们提交pr
+  throw new Error('api[sendEmailLink] is not yet implemented')
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/send-sms-code.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/send-sms-code.js
index b392e7eadd30d53c4393c296c95f918d5cf5c822..b549a1fd2a7aa65d19c7bac936326107505f41c7 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/send-sms-code.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/send-sms-code.js
@@ -1,71 +1,71 @@
-const {
-  sendSmsCode
-} = require('../../lib/utils/sms')
-const {
-  verifyCaptcha
-} = require('../../lib/utils/captcha')
-const {
-  SMS_SCENE
-} = require('../../common/constants')
-const {
-  ERROR
-} = require('../../common/error')
-
-/**
- * 发送短信验证码
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#send-sms-code
- * @param {Object} params
- * @param {String} params.mobile    手机号
- * @param {String} params.captcha   图形验证码
- * @param {String} params.scene     短信验证码使用场景
- * @returns
- */
-module.exports = async function (params = {}) {
-  const schema = {
-    mobile: 'mobile',
-    captcha: 'string',
-    scene: 'string'
-  }
-  this.middleware.validate(params, schema)
-  const {
-    mobile,
-    captcha,
-    scene
-  } = params
-  if (!(Object.values(SMS_SCENE).includes(scene))) {
-    throw {
-      errCode: ERROR.INVALID_PARAM
-    }
-  }
-  await verifyCaptcha.call(this, {
-    scene: 'send-sms-code',
-    captcha
-  })
-
-  // -- 测试代码
-  const {
-    templateId
-  } = (this.config.service &&
-    this.config.service.sms &&
-    this.config.service.sms.scene &&
-    this.config.service.sms.scene[scene]) || {}
-  if (!templateId) {
-    await require('../../lib/utils/verify-code')
-      .setMobileVerifyCode.call(this, {
-        mobile: params.mobile,
-        code: '123456',
-        expiresIn: 180,
-        scene
-      })
-    return {
-      errCode: 'uni-id-invalid-sms-template-id',
-      errMsg: `未找到scene=${scene},的短信模版templateId。\n已启动测试模式，直接使用：123456作为短信验证码即可。\n如果是正式项目，请在路径：/common/uni-config-center/uni-id/config.json中service->sms中配置密钥等信息\n更多详情：https://uniapp.dcloud.io/uniCloud/uni-id.html#config`
-    }
-  }
-  // -- 测试代码
-
-  return sendSmsCode.call(this, {
-    mobile,
-    scene
-  })
-}
+const {
+  sendSmsCode
+} = require('../../lib/utils/sms')
+const {
+  verifyCaptcha
+} = require('../../lib/utils/captcha')
+const {
+  SMS_SCENE
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
+
+/**
+ * 发送短信验证码
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#send-sms-code
+ * @param {Object} params
+ * @param {String} params.mobile    手机号
+ * @param {String} params.captcha   图形验证码
+ * @param {String} params.scene     短信验证码使用场景
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    mobile: 'mobile',
+    captcha: 'string',
+    scene: 'string'
+  }
+  this.middleware.validate(params, schema)
+  const {
+    mobile,
+    captcha,
+    scene
+  } = params
+  if (!(Object.values(SMS_SCENE).includes(scene))) {
+    throw {
+      errCode: ERROR.INVALID_PARAM
+    }
+  }
+  await verifyCaptcha.call(this, {
+    scene: 'send-sms-code',
+    captcha
+  })
+
+  // -- 测试代码
+  const {
+    templateId
+  } = (this.config.service &&
+    this.config.service.sms &&
+    this.config.service.sms.scene &&
+    this.config.service.sms.scene[scene]) || {}
+  if (!templateId) {
+    await require('../../lib/utils/verify-code')
+      .setMobileVerifyCode.call(this, {
+        mobile: params.mobile,
+        code: '123456',
+        expiresIn: 180,
+        scene
+      })
+    return {
+      errCode: 'uni-id-invalid-sms-template-id',
+      errMsg: `未找到scene=${scene},的短信模版templateId。\n已启动测试模式，直接使用：123456作为短信验证码即可。\n如果是正式项目，请在路径：/common/uni-config-center/uni-id/config.json中service->sms中配置密钥等信息\n更多详情：https://uniapp.dcloud.io/uniCloud/uni-id.html#config`
+    }
+  }
+  // -- 测试代码
+
+  return sendSmsCode.call(this, {
+    mobile,
+    scene
+  })
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/package.json b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/package.json
index 9500288806c38ec1706804726ad252b76eb94224..ce00c1f3339e1f7b95d7bf7ba6476bdc841c8f64 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/package.json
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uni-id-co",
-  "version": "1.1.15",
+  "version": "1.1.10",
   "description": "",
   "main": "index.js",
   "keywords": [],
@@ -18,5 +18,15 @@
     "uni-cloud-redis": {},
     "uni-cloud-sms": {},
     "uni-cloud-verify": {}
+  },
+  "cloudfunction-config": {
+    "keepRunningAfterReturn": false
+  },
+  "devDependencies": {
+    "eslint": "^8.18.0",
+    "eslint-config-standard": "^17.0.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-n": "^15.2.3",
+    "eslint-plugin-promise": "^6.0.0"
   }
 }
diff --git a/uni_modules/uni-id-pages/uniCloud/database/opendb-device.schema.json b/uni_modules/uni-id-pages/uniCloud/database/opendb-device.schema.json
index c3591cc1f135350f01944d73c6451178a617605f..163e7c1445f8b082143b686279d2c880cd41c434 100644
--- a/uni_modules/uni-id-pages/uniCloud/database/opendb-device.schema.json
+++ b/uni_modules/uni-id-pages/uniCloud/database/opendb-device.schema.json
@@ -1,142 +1,142 @@
-{
-	"bsonType": "object",
-	"required": [],
-	"permission": {
-		"read": false,
-		"create": true,
-		"update": false,
-		"delete": false
-	},
-	"properties": {
-		"_id": {
-			"description": "ID，系统自动生成"
-		},
-		"appid": {
-			"bsonType": "string",
-			"description": "DCloud appid"
-		},
-		"device_id": {
-			"bsonType": "string",
-			"description": "设备唯一标识"
-		},
-		"vendor": {
-			"bsonType": "string",
-			"description": "设备厂商"
-		},
-		"push_clientid": {
-			"bsonType": "string",
-			"description": "推送设备客户端标识"
-		},
-		"imei": {
-			"bsonType": "string",
-			"description": "国际移动设备识别码IMEI(International Mobile Equipment Identity)"
-		},
-		"oaid": {
-			"bsonType": "string",
-			"description": "移动智能设备标识公共服务平台提供的匿名设备标识符(OAID)"
-		},
-		"idfa": {
-			"bsonType": "string",
-			"description": "iOS平台配置应用使用广告标识(IDFA)"
-		},
-		"imsi": {
-			"bsonType": "string",
-			"description": "国际移动用户识别码(International Mobile Subscriber Identification Number)"
-		},
-		"model": {
-			"bsonType": "string",
-			"description": "设备型号"
-		},
-		"platform": {
-			"bsonType": "string",
-			"description": "平台类型"
-		},
-		"uni_platform": {
-			"bsonType": "string",
-			"description": "uni-app 运行平台，与条件编译平台相同。"
-		},
-		"os_name": {
-			"bsonType": "string",
-			"description": "ios|android|windows|mac|linux "
-		},
-		"os_version": {
-			"bsonType": "string",
-			"description": "操作系统版本号 "
-		},
-		"os_language": {
-			"bsonType": "string",
-			"description": "操作系统语言 "
-		},
-		"os_theme": {
-			"bsonType": "string",
-			"description": "操作系统主题 light|dark"
-		},
-		"pixel_ratio": {
-			"bsonType": "string",
-			"description": "设备像素比 "
-		},
-		"network_model": {
-			"bsonType": "string",
-			"description": "设备网络型号wifi\/3G\/4G\/"
-		},
-		"window_width": {
-			"bsonType": "string",
-			"description": "设备窗口宽度 "
-		},
-		"window_height": {
-			"bsonType": "string",
-			"description": "设备窗口高度"
-		},
-		"screen_width": {
-			"bsonType": "string",
-			"description": "设备屏幕宽度"
-		},
-		"screen_height": {
-			"bsonType": "string",
-			"description": "设备屏幕高度"
-		},
-		"rom_name": {
-			"bsonType": "string",
-			"description": "rom 名称"
-		},
-		"rom_version": {
-			"bsonType": "string",
-			"description": "rom 版本"
-		},
-		"location_latitude": {
-			"bsonType": "double",
-			"description": "纬度"
-		},
-		"location_longitude": {
-			"bsonType": "double",
-			"description": "经度"
-		},
-		"location_country": {
-			"bsonType": "string",
-			"description": "国家"
-		},
-		"location_province": {
-			"bsonType": "string",
-			"description": "省份"
-		},
-		"location_city": {
-			"bsonType": "string",
-			"description": "城市"
-		},
-		"create_date": {
-			"bsonType": "timestamp",
-			"description": "创建时间",
-			"forceDefaultValue": {
-				"$env": "now"
-			}
-		},
-		"last_update_date": {
-			"bsonType": "timestamp",
-			"description": "最后一次修改时间",
-			"forceDefaultValue": {
-				"$env": "now"
-			}
-		}
-	},
-	"version": "0.0.1"
+{
+	"bsonType": "object",
+	"required": [],
+	"permission": {
+		"read": false,
+		"create": true,
+		"update": false,
+		"delete": false
+	},
+	"properties": {
+		"_id": {
+			"description": "ID，系统自动生成"
+		},
+		"appid": {
+			"bsonType": "string",
+			"description": "DCloud appid"
+		},
+		"device_id": {
+			"bsonType": "string",
+			"description": "设备唯一标识"
+		},
+		"vendor": {
+			"bsonType": "string",
+			"description": "设备厂商"
+		},
+		"push_clientid": {
+			"bsonType": "string",
+			"description": "推送设备客户端标识"
+		},
+		"imei": {
+			"bsonType": "string",
+			"description": "国际移动设备识别码IMEI(International Mobile Equipment Identity)"
+		},
+		"oaid": {
+			"bsonType": "string",
+			"description": "移动智能设备标识公共服务平台提供的匿名设备标识符(OAID)"
+		},
+		"idfa": {
+			"bsonType": "string",
+			"description": "iOS平台配置应用使用广告标识(IDFA)"
+		},
+		"imsi": {
+			"bsonType": "string",
+			"description": "国际移动用户识别码(International Mobile Subscriber Identification Number)"
+		},
+		"model": {
+			"bsonType": "string",
+			"description": "设备型号"
+		},
+		"platform": {
+			"bsonType": "string",
+			"description": "平台类型"
+		},
+		"uni_platform": {
+			"bsonType": "string",
+			"description": "uni-app 运行平台，与条件编译平台相同。"
+		},
+		"os_name": {
+			"bsonType": "string",
+			"description": "ios|android|windows|mac|linux "
+		},
+		"os_version": {
+			"bsonType": "string",
+			"description": "操作系统版本号 "
+		},
+		"os_language": {
+			"bsonType": "string",
+			"description": "操作系统语言 "
+		},
+		"os_theme": {
+			"bsonType": "string",
+			"description": "操作系统主题 light|dark"
+		},
+		"pixel_ratio": {
+			"bsonType": "string",
+			"description": "设备像素比 "
+		},
+		"network_model": {
+			"bsonType": "string",
+			"description": "设备网络型号wifi\/3G\/4G\/"
+		},
+		"window_width": {
+			"bsonType": "string",
+			"description": "设备窗口宽度 "
+		},
+		"window_height": {
+			"bsonType": "string",
+			"description": "设备窗口高度"
+		},
+		"screen_width": {
+			"bsonType": "string",
+			"description": "设备屏幕宽度"
+		},
+		"screen_height": {
+			"bsonType": "string",
+			"description": "设备屏幕高度"
+		},
+		"rom_name": {
+			"bsonType": "string",
+			"description": "rom 名称"
+		},
+		"rom_version": {
+			"bsonType": "string",
+			"description": "rom 版本"
+		},
+		"location_latitude": {
+			"bsonType": "double",
+			"description": "纬度"
+		},
+		"location_longitude": {
+			"bsonType": "double",
+			"description": "经度"
+		},
+		"location_country": {
+			"bsonType": "string",
+			"description": "国家"
+		},
+		"location_province": {
+			"bsonType": "string",
+			"description": "省份"
+		},
+		"location_city": {
+			"bsonType": "string",
+			"description": "城市"
+		},
+		"create_date": {
+			"bsonType": "timestamp",
+			"description": "创建时间",
+			"forceDefaultValue": {
+				"$env": "now"
+			}
+		},
+		"last_update_date": {
+			"bsonType": "timestamp",
+			"description": "最后一次修改时间",
+			"forceDefaultValue": {
+				"$env": "now"
+			}
+		}
+	},
+	"version": "0.0.1"
 }
\ No newline at end of file
diff --git a/uni_modules/uni-id-pages/uniCloud/database/uni-id-device.schema.json b/uni_modules/uni-id-pages/uniCloud/database/uni-id-device.schema.json
index 4981d75215fc48da914738bca125aedbe0aefac8..356a6e23957b5b580a1d0a27811250ec7f12ba3c 100644
--- a/uni_modules/uni-id-pages/uniCloud/database/uni-id-device.schema.json
+++ b/uni_modules/uni-id-pages/uniCloud/database/uni-id-device.schema.json
@@ -1,83 +1,83 @@
-{
-	"bsonType": "object",
-	"required": [
-		"user_id"
-	],
-	"properties": {
-		"_id": {
-			"description": "ID，系统自动生成"
-		},
-		"user_id": {
-			"bsonType": "string",
-			"description": "用户id，参考uni-id-users表"
-		},
-		"ua": {
-			"bsonType": "string",
-			"description": "userAgent"
-		},
-		"uuid": {
-			"bsonType": "string",
-			"description": "设备唯一标识(需要加密存储)"
-		},
-		"os_name": {
-			"bsonType": "string",
-			"description": "ios|android|windows|mac|linux "
-		},
-		"os_version": {
-			"bsonType": "string",
-			"description": "操作系统版本号 "
-		},
-		"os_language": {
-			"bsonType": "string",
-			"description": "操作系统语言 "
-		},
-		"os_theme": {
-			"bsonType": "string",
-			"description": "操作系统主题 light|dark"
-		},
-		"vendor": {
-			"bsonType": "string",
-			"description": "设备厂商"
-		},
-		"push_clientid": {
-			"bsonType": "string",
-			"description": "推送设备客户端标识"
-		},
-		"imei": {
-			"bsonType": "string",
-			"description": "国际移动设备识别码IMEI(International Mobile Equipment Identity)"
-		},
-		"oaid": {
-			"bsonType": "string",
-			"description": "移动智能设备标识公共服务平台提供的匿名设备标识符(OAID)"
-		},
-		"idfa": {
-			"bsonType": "string",
-			"description": "iOS平台配置应用使用广告标识(IDFA)"
-		},
-		"model": {
-			"bsonType": "string",
-			"description": "设备型号"
-		},
-		"platform": {
-			"bsonType": "string",
-			"description": "平台类型"
-		},
-		"create_date": {
-			"bsonType": "timestamp",
-			"description": "创建时间",
-			"forceDefaultValue": {
-				"$env": "now"
-			}
-		},
-		"last_active_date": {
-			"bsonType": "timestamp",
-			"description": "最后登录时间"
-		},
-		"last_active_ip": {
-			"bsonType": "string",
-			"description": "最后登录IP"
-		}
-	},
-	"version": "0.0.1"
+{
+	"bsonType": "object",
+	"required": [
+		"user_id"
+	],
+	"properties": {
+		"_id": {
+			"description": "ID，系统自动生成"
+		},
+		"user_id": {
+			"bsonType": "string",
+			"description": "用户id，参考uni-id-users表"
+		},
+		"ua": {
+			"bsonType": "string",
+			"description": "userAgent"
+		},
+		"uuid": {
+			"bsonType": "string",
+			"description": "设备唯一标识(需要加密存储)"
+		},
+		"os_name": {
+			"bsonType": "string",
+			"description": "ios|android|windows|mac|linux "
+		},
+		"os_version": {
+			"bsonType": "string",
+			"description": "操作系统版本号 "
+		},
+		"os_language": {
+			"bsonType": "string",
+			"description": "操作系统语言 "
+		},
+		"os_theme": {
+			"bsonType": "string",
+			"description": "操作系统主题 light|dark"
+		},
+		"vendor": {
+			"bsonType": "string",
+			"description": "设备厂商"
+		},
+		"push_clientid": {
+			"bsonType": "string",
+			"description": "推送设备客户端标识"
+		},
+		"imei": {
+			"bsonType": "string",
+			"description": "国际移动设备识别码IMEI(International Mobile Equipment Identity)"
+		},
+		"oaid": {
+			"bsonType": "string",
+			"description": "移动智能设备标识公共服务平台提供的匿名设备标识符(OAID)"
+		},
+		"idfa": {
+			"bsonType": "string",
+			"description": "iOS平台配置应用使用广告标识(IDFA)"
+		},
+		"model": {
+			"bsonType": "string",
+			"description": "设备型号"
+		},
+		"platform": {
+			"bsonType": "string",
+			"description": "平台类型"
+		},
+		"create_date": {
+			"bsonType": "timestamp",
+			"description": "创建时间",
+			"forceDefaultValue": {
+				"$env": "now"
+			}
+		},
+		"last_active_date": {
+			"bsonType": "timestamp",
+			"description": "最后登录时间"
+		},
+		"last_active_ip": {
+			"bsonType": "string",
+			"description": "最后登录IP"
+		}
+	},
+	"version": "0.0.1"
 }
\ No newline at end of file
diff --git a/uni_modules/uni-id-pages/uniCloud/database/uni-id-log.schema.json b/uni_modules/uni-id-pages/uniCloud/database/uni-id-log.schema.json
index ff4f7973239e6aaa467c3278f96462312ca2d71c..1b3dc611da9055165b1837c0f68c8c2fe9eac0e7 100644
--- a/uni_modules/uni-id-pages/uniCloud/database/uni-id-log.schema.json
+++ b/uni_modules/uni-id-pages/uniCloud/database/uni-id-log.schema.json
@@ -1,71 +1,71 @@
-{
-	"bsonType": "object",
-	"required": ["user_id"],
-	"permission": {
-		"read": "'READ_UNI_ID_LOG' in auth.permission"
-	},
-	"properties": {
-		"_id": {
-			"description": "ID，系统自动生成"
-		},
-		"create_date": {
-			"bsonType": "timestamp",
-			"description": "创建时间",
-			"forceDefaultValue": {
-				"$env": "now"
-			}
-		},
-		"device_uuid": {
-			"bsonType": "string",
-			"description": "设备唯一标识"
-		},
-		"ip": {
-			"bsonType": "string",
-			"description": "ip地址"
-		},
-		"state": {
-			"bsonType": "int",
-			"description": "结果：0 失败、1 成功"
-		},
-		"type": {
-			"bsonType": "string",
-			"description": "操作类型",
-			"enum": [
-				"logout",
-				"login",
-				"register",
-				"reset-pwd",
-				"bind-mobile",
-				"bind-weixin",
-				"bind-qq",
-				"bind-apple",
-				"bind-alipay"
-			]
-		},
-		"ua": {
-			"bsonType": "string",
-			"description": "userAgent"
-		},
-		"user_id": {
-			"bsonType": "string",
-			"foreignKey": "uni-id-users._id",
-			"description": "用户id，参考uni-id-users表"
-		},
-		"username": {
-			"bsonType": "string",
-			"description": "用户名"
-		},
-		"email": {
-			"bsonType": "string",
-			"description": "邮箱"
-		},
-		"mobile": {
-			"bsonType": "string",
-			"description": "手机号"
-		},
-		"appid": {
-			"bsonType": "string",
-			"description": "客户端DCloud AppId"
-		}
-	}
-}
+{
+	"bsonType": "object",
+	"required": ["user_id"],
+	"permission": {
+		"read": "'READ_UNI_ID_LOG' in auth.permission"
+	},
+	"properties": {
+		"_id": {
+			"description": "ID，系统自动生成"
+		},
+		"create_date": {
+			"bsonType": "timestamp",
+			"description": "创建时间",
+			"forceDefaultValue": {
+				"$env": "now"
+			}
+		},
+		"device_uuid": {
+			"bsonType": "string",
+			"description": "设备唯一标识"
+		},
+		"ip": {
+			"bsonType": "string",
+			"description": "ip地址"
+		},
+		"state": {
+			"bsonType": "int",
+			"description": "结果：0 失败、1 成功"
+		},
+		"type": {
+			"bsonType": "string",
+			"description": "操作类型",
+			"enum": [
+				"logout",
+				"login",
+				"register",
+				"reset-pwd",
+				"bind-mobile",
+				"bind-weixin",
+				"bind-qq",
+				"bind-apple",
+				"bind-alipay"
+			]
+		},
+		"ua": {
+			"bsonType": "string",
+			"description": "userAgent"
+		},
+		"user_id": {
+			"bsonType": "string",
+			"foreignKey": "uni-id-users._id",
+			"description": "用户id，参考uni-id-users表"
+		},
+		"username": {
+			"bsonType": "string",
+			"description": "用户名"
+		},
+		"email": {
+			"bsonType": "string",
+			"description": "邮箱"
+		},
+		"mobile": {
+			"bsonType": "string",
+			"description": "手机号"
+		},
+		"appid": {
+			"bsonType": "string",
+			"description": "客户端DCloud AppId"
+		}
+	}
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/database/uni-id-permissions.schema.json b/uni_modules/uni-id-pages/uniCloud/database/uni-id-permissions.schema.json
index 25209cbae804642e5065a89148d90de550965666..0178d2568d702e5c156fe32992bc45b6c22a9fbb 100644
--- a/uni_modules/uni-id-pages/uniCloud/database/uni-id-permissions.schema.json
+++ b/uni_modules/uni-id-pages/uniCloud/database/uni-id-permissions.schema.json
@@ -1,52 +1,52 @@
-{
-	"bsonType": "object",
-	"required": ["permission_id", "permission_name"],
-	"permission": {
-		"read": "'READ_UNI_ID_PERMISSIONS' in auth.permission",
-		"create": "'CREATE_UNI_ID_PERMISSIONS' in auth.permission",
-		"update": "'UPDATE_UNI_ID_PERMISSIONS' in auth.permission",
-		"delete": "'DELETE_UNI_ID_PERMISSIONS' in auth.permission"
-	},
-	"properties": {
-		"_id": {
-			"description": "存储文档 ID，系统自动生成"
-		},
-		"comment": {
-			"bsonType": "string",
-			"component": {
-				"name": "textarea"
-			},
-			"description": "备注",
-			"label": "备注",
-			"title": "备注",
-			"trim": "both"
-		},
-		"create_date": {
-			"bsonType": "timestamp",
-			"description": "创建时间",
-			"forceDefaultValue": {
-				"$env": "now"
-			}
-		},
-		"permission_id": {
-			"bsonType": "string",
-			"component": {
-				"name": "input"
-			},
-			"description": "权限唯一标识，不可修改，不允许重复",
-			"label": "权限标识",
-			"title": "权限ID",
-			"trim": "both"
-		},
-		"permission_name": {
-			"bsonType": "string",
-			"component": {
-				"name": "input"
-			},
-			"description": "权限名称",
-			"label": "权限名称",
-			"title": "权限名称",
-			"trim": "both"
-		}
-	}
-}
+{
+	"bsonType": "object",
+	"required": ["permission_id", "permission_name"],
+	"permission": {
+		"read": "'READ_UNI_ID_PERMISSIONS' in auth.permission",
+		"create": "'CREATE_UNI_ID_PERMISSIONS' in auth.permission",
+		"update": "'UPDATE_UNI_ID_PERMISSIONS' in auth.permission",
+		"delete": "'DELETE_UNI_ID_PERMISSIONS' in auth.permission"
+	},
+	"properties": {
+		"_id": {
+			"description": "存储文档 ID，系统自动生成"
+		},
+		"comment": {
+			"bsonType": "string",
+			"component": {
+				"name": "textarea"
+			},
+			"description": "备注",
+			"label": "备注",
+			"title": "备注",
+			"trim": "both"
+		},
+		"create_date": {
+			"bsonType": "timestamp",
+			"description": "创建时间",
+			"forceDefaultValue": {
+				"$env": "now"
+			}
+		},
+		"permission_id": {
+			"bsonType": "string",
+			"component": {
+				"name": "input"
+			},
+			"description": "权限唯一标识，不可修改，不允许重复",
+			"label": "权限标识",
+			"title": "权限ID",
+			"trim": "both"
+		},
+		"permission_name": {
+			"bsonType": "string",
+			"component": {
+				"name": "input"
+			},
+			"description": "权限名称",
+			"label": "权限名称",
+			"title": "权限名称",
+			"trim": "both"
+		}
+	}
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/database/uni-id-roles.schema.json b/uni_modules/uni-id-pages/uniCloud/database/uni-id-roles.schema.json
index e2fe3220ccdd6e695ebb70909c2595c1f3242a0a..b9289c81e103afc465c3f0598bd742ef55b0e9b4 100644
--- a/uni_modules/uni-id-pages/uniCloud/database/uni-id-roles.schema.json
+++ b/uni_modules/uni-id-pages/uniCloud/database/uni-id-roles.schema.json
@@ -1,50 +1,50 @@
-{
-	"bsonType": "object",
-	"required": ["role_id", "role_name"],
-	"permission": {
-		"read": "'READ_UNI_ID_ROLES' in auth.permission",
-		"create": "'CREATE_UNI_ID_ROLES' in auth.permission",
-		"update": "'UPDATE_UNI_ID_ROLES' in auth.permission",
-		"delete": "'DELETE_UNI_ID_ROLES' in auth.permission"
-	},
-	"properties": {
-		"_id": {
-			"description": "存储文档 ID，系统自动生成"
-		},
-		"comment": {
-			"title": "备注",
-			"bsonType": "string",
-			"description": "备注",
-			"trim": "both"
-		},
-		"create_date": {
-			"bsonType": "timestamp",
-			"description": "创建时间",
-			"forceDefaultValue": {
-				"$env": "now"
-			}
-		},
-		"permission": {
-			"title": "权限",
-			"bsonType": "array",
-			"foreignKey": "uni-id-permissions.permission_id",
-			"description": "角色拥有的权限列表",
-			"enum": {
-				"collection": "uni-id-permissions",
-				"field": "permission_name as text, permission_id as value"
-			}
-		},
-		"role_id": {
-			"title": "唯一ID",
-			"bsonType": "string",
-			"description": "角色唯一标识，不可修改，不允许重复",
-			"trim": "both"
-		},
-		"role_name": {
-			"title": "名称",
-			"bsonType": "string",
-			"description": "角色名称",
-			"trim": "both"
-		}
-	}
-}
+{
+	"bsonType": "object",
+	"required": ["role_id", "role_name"],
+	"permission": {
+		"read": "'READ_UNI_ID_ROLES' in auth.permission",
+		"create": "'CREATE_UNI_ID_ROLES' in auth.permission",
+		"update": "'UPDATE_UNI_ID_ROLES' in auth.permission",
+		"delete": "'DELETE_UNI_ID_ROLES' in auth.permission"
+	},
+	"properties": {
+		"_id": {
+			"description": "存储文档 ID，系统自动生成"
+		},
+		"comment": {
+			"title": "备注",
+			"bsonType": "string",
+			"description": "备注",
+			"trim": "both"
+		},
+		"create_date": {
+			"bsonType": "timestamp",
+			"description": "创建时间",
+			"forceDefaultValue": {
+				"$env": "now"
+			}
+		},
+		"permission": {
+			"title": "权限",
+			"bsonType": "array",
+			"foreignKey": "uni-id-permissions.permission_id",
+			"description": "角色拥有的权限列表",
+			"enum": {
+				"collection": "uni-id-permissions",
+				"field": "permission_name as text, permission_id as value"
+			}
+		},
+		"role_id": {
+			"title": "唯一ID",
+			"bsonType": "string",
+			"description": "角色唯一标识，不可修改，不允许重复",
+			"trim": "both"
+		},
+		"role_name": {
+			"title": "名称",
+			"bsonType": "string",
+			"description": "角色名称",
+			"trim": "both"
+		}
+	}
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/database/uni-id-users.schema.json b/uni_modules/uni-id-pages/uniCloud/database/uni-id-users.schema.json
index b5aea024617cdcc5117b45171ff7f7c75324b4a6..e30b7d297f34f31c121b6ed5ea3899a3f0d76838 100644
--- a/uni_modules/uni-id-pages/uniCloud/database/uni-id-users.schema.json
+++ b/uni_modules/uni-id-pages/uniCloud/database/uni-id-users.schema.json
@@ -1,473 +1,473 @@
-{
-	"bsonType": "object",
-	"permission": {
-		"read": true,
-		"create": "'CREATE_UNI_ID_USERS' in auth.permission",
-		"update": "doc._id == auth.uid || 'UPDATE_UNI_ID_USERS' in auth.permission",
-		"delete": "'DELETE_UNI_ID_USERS' in auth.permission"
-	},
-	"properties": {
-		"_id": {
-			"description": "存储文档 ID（用户 ID），系统自动生成"
-		},
-		"ali_openid": {
-			"bsonType": "string",
-			"description": "支付宝平台openid",
-			"permission": {
-				"read": "'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"apple_openid": {
-			"bsonType": "string",
-			"description": "苹果登录openid",
-			"permission": {
-				"read": "'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"avatar": {
-			"bsonType": "string",
-			"description": "头像地址",
-			"title": "头像地址",
-			"trim": "both",
-			"permission": {
-				"read": true,
-				"write": "doc._id == auth.uid || 'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"avatar_file": {
-			"bsonType": "file",
-			"description": "用file类型方便使用uni-file-picker组件",
-			"title": "头像文件",
-			"permission": {
-				"read": true,
-				"write": "doc._id == auth.uid || 'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"comment": {
-			"bsonType": "string",
-			"description": "备注",
-			"title": "备注",
-			"trim": "both",
-			"permission": {
-				"read": "'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"dcloud_appid": {
-			"bsonType": "array",
-			"description": "允许登录的客户端的appid列表",
-			"foreignKey": "opendb-app-list.appid",
-			"permission": {
-				"read": "'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"department_id": {
-			"bsonType": "array",
-			"description": "部门ID",
-			"enum": {
-				"collection": "opendb-department",
-				"field": "_id as value, name as text",
-				"orderby": "name asc"
-			},
-			"enumType": "tree",
-			"title": "部门",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"email": {
-			"bsonType": "string",
-			"description": "邮箱地址",
-			"format": "email",
-			"title": "邮箱",
-			"trim": "both",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"email_confirmed": {
-			"bsonType": "int",
-			"defaultValue": 0,
-			"description": "邮箱验证状态：0 未验证 1 已验证",
-			"enum": [{
-					"text": "未验证",
-					"value": 0
-				},
-				{
-					"text": "已验证",
-					"value": 1
-				}
-			],
-			"title": "邮箱验证状态",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"gender": {
-			"bsonType": "int",
-			"defaultValue": 0,
-			"description": "用户性别：0 未知 1 男性 2 女性",
-			"enum": [{
-					"text": "未知",
-					"value": 0
-				},
-				{
-					"text": "男",
-					"value": 1
-				},
-				{
-					"text": "女",
-					"value": 2
-				}
-			],
-			"title": "性别",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"invite_time": {
-			"bsonType": "timestamp",
-			"description": "受邀时间",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"inviter_uid": {
-			"bsonType": "array",
-			"description": "用户全部上级邀请者",
-			"trim": "both",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"last_login_date": {
-			"bsonType": "timestamp",
-			"description": "最后登录时间",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"last_login_ip": {
-			"bsonType": "string",
-			"description": "最后登录时 IP 地址",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"mobile": {
-			"bsonType": "string",
-			"description": "手机号码",
-			"pattern": "^\\+?[0-9-]{3,20}$",
-			"title": "手机号码",
-			"trim": "both",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"mobile_confirmed": {
-			"bsonType": "int",
-			"defaultValue": 0,
-			"description": "手机号验证状态：0 未验证 1 已验证",
-			"enum": [{
-					"text": "未验证",
-					"value": 0
-				},
-				{
-					"text": "已验证",
-					"value": 1
-				}
-			],
-			"title": "手机号验证状态",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"my_invite_code": {
-			"bsonType": "string",
-			"description": "用户自身邀请码",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"nickname": {
-			"bsonType": "string",
-			"description": "用户昵称",
-			"title": "昵称",
-			"trim": "both",
-			"permission": {
-				"read": true,
-				"write": "doc._id == auth.uid || 'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"password": {
-			"bsonType": "password",
-			"description": "密码，加密存储",
-			"title": "密码",
-			"trim": "both"
-		},
-		"password_secret_version": {
-			"bsonType": "int",
-			"description": "密码使用的passwordSecret版本",
-			"title": "passwordSecret",
-			"permission": {
-				"read": false,
-				"write": false
-			}
-		},
-		"realname_auth": {
-			"bsonType": "object",
-			"description": "实名认证信息",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			},
-			"properties": {
-				"auth_date": {
-					"bsonType": "timestamp",
-					"description": "认证通过时间"
-				},
-				"auth_status": {
-					"bsonType": "int",
-					"description": "认证状态：0 未认证 1 等待认证 2 认证通过 3 认证失败",
-					"maximum": 3,
-					"minimum": 0
-				},
-				"contact_email": {
-					"bsonType": "string",
-					"description": "联系人邮箱"
-				},
-				"contact_mobile": {
-					"bsonType": "string",
-					"description": "联系人手机号码"
-				},
-				"contact_person": {
-					"bsonType": "string",
-					"description": "联系人姓名"
-				},
-				"id_card_back": {
-					"bsonType": "string",
-					"description": "身份证反面照 URL"
-				},
-				"id_card_front": {
-					"bsonType": "string",
-					"description": "身份证正面照 URL"
-				},
-				"identity": {
-					"bsonType": "string",
-					"description": "身份证号码/营业执照号码"
-				},
-				"in_hand": {
-					"bsonType": "string",
-					"description": "手持身份证照片 URL"
-				},
-				"license": {
-					"bsonType": "string",
-					"description": "营业执照 URL"
-				},
-				"real_name": {
-					"bsonType": "string",
-					"description": "真实姓名/企业名称"
-				},
-				"type": {
-					"bsonType": "int",
-					"description": "用户类型：0 个人用户 1 企业用户",
-					"maximum": 1,
-					"minimum": 0
-				}
-			},
-			"required": [
-				"type",
-				"auth_status"
-			]
-		},
-		"register_date": {
-			"bsonType": "timestamp",
-			"description": "注册时间",
-			"forceDefaultValue": {
-				"$env": "now"
-			},
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"register_ip": {
-			"bsonType": "string",
-			"description": "注册时 IP 地址",
-			"forceDefaultValue": {
-				"$env": "clientIP"
-			},
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"role": {
-			"bsonType": "array",
-			"description": "用户角色",
-			"enum": {
-				"collection": "uni-id-roles",
-				"field": "role_id as value, role_name as text"
-			},
-			"foreignKey": "uni-id-roles.role_id",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			},
-			"title": "角色"
-		},
-		"tags":{
-			"bsonType": "array",
-			"description": "用户标签",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			},
-			"title": "标签"
-		},
-		"score": {
-			"bsonType": "int",
-			"description": "用户积分，积分变更记录可参考：uni-id-scores表定义",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"status": {
-			"bsonType": "int",
-			"defaultValue": 0,
-			"description": "用户状态：0 正常 1 禁用 2 审核中 3 审核拒绝",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			},
-			"enum": [{
-					"text": "正常",
-					"value": 0
-				},
-				{
-					"text": "禁用",
-					"value": 1
-				},
-				{
-					"text": "审核中",
-					"value": 2
-				},
-				{
-					"text": "审核拒绝",
-					"value": 3
-				}
-			],
-			"title": "用户状态"
-		},
-		"token": {
-			"bsonType": "array",
-			"description": "用户token",
-			"permission": {
-				"read": false,
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"username": {
-			"bsonType": "string",
-			"description": "用户名，不允许重复",
-			"title": "用户名",
-			"trim": "both",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"wx_openid": {
-			"bsonType": "object",
-			"description": "微信各个平台openid",
-			"properties": {
-				"app": {
-					"bsonType": "string",
-					"description": "app平台微信openid"
-				},
-				"mp": {
-					"bsonType": "string",
-					"description": "微信小程序平台openid"
-				},
-				"h5": {
-					"bsonType": "string",
-					"description": "微信公众号登录openid"
-				},
-				"web": {
-					"bsonType": "string",
-					"description": "PC页面扫码登录openid"
-				}
-			},
-			"permission": {
-				"read": "'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"wx_unionid": {
-			"bsonType": "string",
-			"description": "微信unionid",
-			"permission": {
-				"read": "'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"qq_openid": {
-			"bsonType": "object",
-			"description": "QQ各个平台openid",
-			"properties": {
-				"app": {
-					"bsonType": "string",
-					"description": "app平台QQ openid"
-				},
-				"mp": {
-					"bsonType": "string",
-					"description": "QQ小程序平台openid"
-				}
-			},
-			"permission": {
-				"read": "'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"qq_unionid": {
-			"bsonType": "string",
-			"description": "QQ unionid",
-			"permission": {
-				"read": "'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"third_party": {
-			"bsonType": "object",
-			"description": "三方平台凭证",
-			"permission": {
-				"read": false,
-				"write": false
-			}
-		},
-		"identities": {
-			"bsonType": "array",
-			"description": "三方平台身份信息；一个对象代表一个身份，参数支持: provider 身份源, userInfo 三方用户信息, openid 三方openid, unionid 三方unionid, uid 三方uid",
-			"permission": {
-				"read": "'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		}
-	},
-	"required": []
-}
+{
+	"bsonType": "object",
+	"permission": {
+		"read": true,
+		"create": "'CREATE_UNI_ID_USERS' in auth.permission",
+		"update": "doc._id == auth.uid || 'UPDATE_UNI_ID_USERS' in auth.permission",
+		"delete": "'DELETE_UNI_ID_USERS' in auth.permission"
+	},
+	"properties": {
+		"_id": {
+			"description": "存储文档 ID（用户 ID），系统自动生成"
+		},
+		"ali_openid": {
+			"bsonType": "string",
+			"description": "支付宝平台openid",
+			"permission": {
+				"read": "'READ_UNI_ID_USERS' in auth.permission",
+				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			}
+		},
+		"apple_openid": {
+			"bsonType": "string",
+			"description": "苹果登录openid",
+			"permission": {
+				"read": "'READ_UNI_ID_USERS' in auth.permission",
+				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			}
+		},
+		"avatar": {
+			"bsonType": "string",
+			"description": "头像地址",
+			"title": "头像地址",
+			"trim": "both",
+			"permission": {
+				"read": true,
+				"write": "doc._id == auth.uid || 'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			}
+		},
+		"avatar_file": {
+			"bsonType": "file",
+			"description": "用file类型方便使用uni-file-picker组件",
+			"title": "头像文件",
+			"permission": {
+				"read": true,
+				"write": "doc._id == auth.uid || 'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			}
+		},
+		"comment": {
+			"bsonType": "string",
+			"description": "备注",
+			"title": "备注",
+			"trim": "both",
+			"permission": {
+				"read": "'READ_UNI_ID_USERS' in auth.permission",
+				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			}
+		},
+		"dcloud_appid": {
+			"bsonType": "array",
+			"description": "允许登录的客户端的appid列表",
+			"foreignKey": "opendb-app-list.appid",
+			"permission": {
+				"read": "'READ_UNI_ID_USERS' in auth.permission",
+				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			}
+		},
+		"department_id": {
+			"bsonType": "array",
+			"description": "部门ID",
+			"enum": {
+				"collection": "opendb-department",
+				"field": "_id as value, name as text",
+				"orderby": "name asc"
+			},
+			"enumType": "tree",
+			"title": "部门",
+			"permission": {
+				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			}
+		},
+		"email": {
+			"bsonType": "string",
+			"description": "邮箱地址",
+			"format": "email",
+			"title": "邮箱",
+			"trim": "both",
+			"permission": {
+				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			}
+		},
+		"email_confirmed": {
+			"bsonType": "int",
+			"defaultValue": 0,
+			"description": "邮箱验证状态：0 未验证 1 已验证",
+			"enum": [{
+					"text": "未验证",
+					"value": 0
+				},
+				{
+					"text": "已验证",
+					"value": 1
+				}
+			],
+			"title": "邮箱验证状态",
+			"permission": {
+				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			}
+		},
+		"gender": {
+			"bsonType": "int",
+			"defaultValue": 0,
+			"description": "用户性别：0 未知 1 男性 2 女性",
+			"enum": [{
+					"text": "未知",
+					"value": 0
+				},
+				{
+					"text": "男",
+					"value": 1
+				},
+				{
+					"text": "女",
+					"value": 2
+				}
+			],
+			"title": "性别",
+			"permission": {
+				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			}
+		},
+		"invite_time": {
+			"bsonType": "timestamp",
+			"description": "受邀时间",
+			"permission": {
+				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			}
+		},
+		"inviter_uid": {
+			"bsonType": "array",
+			"description": "用户全部上级邀请者",
+			"trim": "both",
+			"permission": {
+				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			}
+		},
+		"last_login_date": {
+			"bsonType": "timestamp",
+			"description": "最后登录时间",
+			"permission": {
+				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			}
+		},
+		"last_login_ip": {
+			"bsonType": "string",
+			"description": "最后登录时 IP 地址",
+			"permission": {
+				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			}
+		},
+		"mobile": {
+			"bsonType": "string",
+			"description": "手机号码",
+			"pattern": "^\\+?[0-9-]{3,20}$",
+			"title": "手机号码",
+			"trim": "both",
+			"permission": {
+				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			}
+		},
+		"mobile_confirmed": {
+			"bsonType": "int",
+			"defaultValue": 0,
+			"description": "手机号验证状态：0 未验证 1 已验证",
+			"enum": [{
+					"text": "未验证",
+					"value": 0
+				},
+				{
+					"text": "已验证",
+					"value": 1
+				}
+			],
+			"title": "手机号验证状态",
+			"permission": {
+				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			}
+		},
+		"my_invite_code": {
+			"bsonType": "string",
+			"description": "用户自身邀请码",
+			"permission": {
+				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			}
+		},
+		"nickname": {
+			"bsonType": "string",
+			"description": "用户昵称",
+			"title": "昵称",
+			"trim": "both",
+			"permission": {
+				"read": true,
+				"write": "doc._id == auth.uid || 'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			}
+		},
+		"password": {
+			"bsonType": "password",
+			"description": "密码，加密存储",
+			"title": "密码",
+			"trim": "both"
+		},
+		"password_secret_version": {
+			"bsonType": "int",
+			"description": "密码使用的passwordSecret版本",
+			"title": "passwordSecret",
+			"permission": {
+				"read": false,
+				"write": false
+			}
+		},
+		"realname_auth": {
+			"bsonType": "object",
+			"description": "实名认证信息",
+			"permission": {
+				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			},
+			"properties": {
+				"auth_date": {
+					"bsonType": "timestamp",
+					"description": "认证通过时间"
+				},
+				"auth_status": {
+					"bsonType": "int",
+					"description": "认证状态：0 未认证 1 等待认证 2 认证通过 3 认证失败",
+					"maximum": 3,
+					"minimum": 0
+				},
+				"contact_email": {
+					"bsonType": "string",
+					"description": "联系人邮箱"
+				},
+				"contact_mobile": {
+					"bsonType": "string",
+					"description": "联系人手机号码"
+				},
+				"contact_person": {
+					"bsonType": "string",
+					"description": "联系人姓名"
+				},
+				"id_card_back": {
+					"bsonType": "string",
+					"description": "身份证反面照 URL"
+				},
+				"id_card_front": {
+					"bsonType": "string",
+					"description": "身份证正面照 URL"
+				},
+				"identity": {
+					"bsonType": "string",
+					"description": "身份证号码/营业执照号码"
+				},
+				"in_hand": {
+					"bsonType": "string",
+					"description": "手持身份证照片 URL"
+				},
+				"license": {
+					"bsonType": "string",
+					"description": "营业执照 URL"
+				},
+				"real_name": {
+					"bsonType": "string",
+					"description": "真实姓名/企业名称"
+				},
+				"type": {
+					"bsonType": "int",
+					"description": "用户类型：0 个人用户 1 企业用户",
+					"maximum": 1,
+					"minimum": 0
+				}
+			},
+			"required": [
+				"type",
+				"auth_status"
+			]
+		},
+		"register_date": {
+			"bsonType": "timestamp",
+			"description": "注册时间",
+			"forceDefaultValue": {
+				"$env": "now"
+			},
+			"permission": {
+				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			}
+		},
+		"register_ip": {
+			"bsonType": "string",
+			"description": "注册时 IP 地址",
+			"forceDefaultValue": {
+				"$env": "clientIP"
+			},
+			"permission": {
+				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			}
+		},
+		"role": {
+			"bsonType": "array",
+			"description": "用户角色",
+			"enum": {
+				"collection": "uni-id-roles",
+				"field": "role_id as value, role_name as text"
+			},
+			"foreignKey": "uni-id-roles.role_id",
+			"permission": {
+				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			},
+			"title": "角色"
+		},
+		"tags":{
+			"bsonType": "array",
+			"description": "用户标签",
+			"permission": {
+				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			},
+			"title": "标签"
+		},
+		"score": {
+			"bsonType": "int",
+			"description": "用户积分，积分变更记录可参考：uni-id-scores表定义",
+			"permission": {
+				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			}
+		},
+		"status": {
+			"bsonType": "int",
+			"defaultValue": 0,
+			"description": "用户状态：0 正常 1 禁用 2 审核中 3 审核拒绝",
+			"permission": {
+				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			},
+			"enum": [{
+					"text": "正常",
+					"value": 0
+				},
+				{
+					"text": "禁用",
+					"value": 1
+				},
+				{
+					"text": "审核中",
+					"value": 2
+				},
+				{
+					"text": "审核拒绝",
+					"value": 3
+				}
+			],
+			"title": "用户状态"
+		},
+		"token": {
+			"bsonType": "array",
+			"description": "用户token",
+			"permission": {
+				"read": false,
+				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			}
+		},
+		"username": {
+			"bsonType": "string",
+			"description": "用户名，不允许重复",
+			"title": "用户名",
+			"trim": "both",
+			"permission": {
+				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			}
+		},
+		"wx_openid": {
+			"bsonType": "object",
+			"description": "微信各个平台openid",
+			"properties": {
+				"app": {
+					"bsonType": "string",
+					"description": "app平台微信openid"
+				},
+				"mp": {
+					"bsonType": "string",
+					"description": "微信小程序平台openid"
+				},
+				"h5": {
+					"bsonType": "string",
+					"description": "微信公众号登录openid"
+				},
+				"web": {
+					"bsonType": "string",
+					"description": "PC页面扫码登录openid"
+				}
+			},
+			"permission": {
+				"read": "'READ_UNI_ID_USERS' in auth.permission",
+				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			}
+		},
+		"wx_unionid": {
+			"bsonType": "string",
+			"description": "微信unionid",
+			"permission": {
+				"read": "'READ_UNI_ID_USERS' in auth.permission",
+				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			}
+		},
+		"qq_openid": {
+			"bsonType": "object",
+			"description": "QQ各个平台openid",
+			"properties": {
+				"app": {
+					"bsonType": "string",
+					"description": "app平台QQ openid"
+				},
+				"mp": {
+					"bsonType": "string",
+					"description": "QQ小程序平台openid"
+				}
+			},
+			"permission": {
+				"read": "'READ_UNI_ID_USERS' in auth.permission",
+				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			}
+		},
+		"qq_unionid": {
+			"bsonType": "string",
+			"description": "QQ unionid",
+			"permission": {
+				"read": "'READ_UNI_ID_USERS' in auth.permission",
+				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			}
+		},
+		"third_party": {
+			"bsonType": "object",
+			"description": "三方平台凭证",
+			"permission": {
+				"read": false,
+				"write": false
+			}
+		},
+		"identities": {
+			"bsonType": "array",
+			"description": "三方平台身份信息；一个对象代表一个身份，参数支持: provider 身份源, userInfo 三方用户信息, openid 三方openid, unionid 三方unionid, uid 三方uid",
+			"permission": {
+				"read": "'READ_UNI_ID_USERS' in auth.permission",
+				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			}
+		}
+	},
+	"required": []
+}
diff --git a/uni_modules/uni-id/package.json b/uni_modules/uni-id/package.json
deleted file mode 100644
index fedf4a46797127be9b077ee90b326920635dfe93..0000000000000000000000000000000000000000
--- a/uni_modules/uni-id/package.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  "id": "uni-id",
-  "displayName": "uni-id",
-  "version": "3.3.29",
-  "description": "简单、统一、可扩展的用户中心",
-  "keywords": [
-    "uniid",
-    "uni-id",
-    "用户管理",
-    "用户中心",
-    "短信验证码"
-],
-  "repository": "https://gitee.com/dcloud/uni-id.git",
-  "engines": {
-    "HBuilderX": "^3.1.0"
-  },
-  "dcloudext": {
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
-    },
-    "contact": {
-      "qq": ""
-    },
-    "declaration": {
-      "ads": "无",
-      "data": "无",
-      "permissions": "无"
-    },
-    "npmurl": "",
-    "type": "unicloud-template-function"
-  },
-  "uni_modules": {
-    "dependencies": ["uni-config-center", "uni-open-bridge-common"],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "y",
-        "aliyun": "y"
-      },
-      "client": {
-        "App": {
-          "app-vue": "u",
-          "app-nvue": "u"
-        },
-        "H5-mobile": {
-          "Safari": "u",
-          "Android Browser": "u",
-          "微信浏览器(Android)": "u",
-          "QQ浏览器(Android)": "u"
-        },
-        "H5-pc": {
-          "Chrome": "u",
-          "IE": "u",
-          "Edge": "u",
-          "Firefox": "u",
-          "Safari": "u"
-        },
-        "小程序": {
-          "微信": "u",
-          "阿里": "u",
-          "百度": "u",
-          "字节跳动": "u",
-          "QQ": "u",
-          "钉钉": "u",
-          "快手": "u",
-          "飞书": "u",
-          "京东": "u"
-        },
-        "快应用": {
-          "华为": "u",
-          "联盟": "u"
-        },
-        "Vue": {
-          "vue2": "y",
-          "vue3": "u"
-        }
-      }
-    }
-  }
-}
diff --git a/uni_modules/uni-id/readme.md b/uni_modules/uni-id/readme.md
deleted file mode 100644
index 6890121312059daf2c483575567c3569cd3af93a..0000000000000000000000000000000000000000
--- a/uni_modules/uni-id/readme.md
+++ /dev/null
@@ -1,33 +0,0 @@
-**文档已移至[uni-id文档](https://uniapp.dcloud.net.cn/uniCloud/uni-id)**
-
-> 一般uni-id升级大版本时为不兼容更新，从低版本迁移到高版本请参考：[uni-id迁移指南](https://uniapp.dcloud.net.cn/uniCloud/uni-id?id=migration)
-
-## 重要升级说明
-
-**uni-id 3.x版本，搭配的uniCloud admin版本需大于1.2.10。**
-
-### 缓存角色权限
-
-自`uni-id 3.0.0`起，支持在token内缓存用户的角色权限，默认开启此功能，各登录接口的needPermission参数不再生效。如需关闭请在config内配置`"removePermissionAndRoleFromToken": true`。
-
-为什么要缓存角色权限？要知道云数据库是按照读写次数来收取费用的，并且读写数据库会拖慢接口响应速度。未配置`"removePermissionAndRoleFromToken": true`的情况下，可以在调用checkToken接口时不查询数据库获取用户角色权限。
-
-详细checkToken流程如下：
-
-![](https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/ed45d350-5a4d-11eb-b997-9918a5dda011.jpg)
-
-可以看出，旧版token（removePermissionAndRoleFromToken为true时生成的）在checkToken时如需返回权限需要进行两次数据库查询。新版token不需要查库即可返回权限信息。
-
-**注意**
-
-- 由于角色权限缓存在token内，可能会存在权限已经更新但是用户token未过期之前依然是旧版角色权限的情况。可以调短一些token过期时间来减少这种情况的影响。
-- admin角色token内不包含permission，如需自行判断用户是否有某个权限，要注意admin角色需要额外判断一下，写法如下
-  ```js
-  const {
-    role,
-    permission
-  } = await uniID.checkToken(event.uniIdToken)
-  if(role.includes('admin') || permission.includes('your permission id')) {
-    // 当前角色拥有'your permission id'对应的权限
-  }
-  ```
\ No newline at end of file
diff --git a/uni_modules/uni-id/uni-id.zip b/uni_modules/uni-id/uni-id.zip
deleted file mode 100644
index 82cc8993cfc7015540062cc4cab7eec438694899..0000000000000000000000000000000000000000
Binary files a/uni_modules/uni-id/uni-id.zip and /dev/null differ
diff --git a/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/LICENSE.md b/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/LICENSE.md
deleted file mode 100644
index 29f81d812f3e768fa89638d1f72920dbfd1413a8..0000000000000000000000000000000000000000
--- a/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/LICENSE.md
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/index.js b/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/index.js
deleted file mode 100644
index 5375d304cdb03fc0482986ee2afc148ead90038f..0000000000000000000000000000000000000000
--- a/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/index.js
+++ /dev/null
@@ -1 +0,0 @@
-"use strict";function e(e){return e&&"object"==typeof e&&"default"in e?e.default:e}var t=e(require("crypto")),r=e(require("buffer")),n=e(require("stream")),i=e(require("util"));const o={PARAM_ERROR:{errCode:"param-error"},PARAM_REQUIRED:{errCode:"param-required"},USER_NOT_EXIST:{errCode:"user-not-exist"},ROLE_NOT_EXIST:{errCode:"role-not-exist"},PERMISSION_NOT_EXIST:{errCode:"permission-not-exist"},MULTI_USER_MATCHED:{errCode:"multi-user-matched"},USER_INFO_ERROR:{errCode:"user-info-error"},USER_ACCOUNT_CONFLICT:{errCode:"user-account-conflict"},USER_ACCOUNT_CLOSED:{errCode:"user-account-closed"},ACCOUNT_EXISTS:{errCode:"account-exists"},ACCOUNT_NOT_EXISTS:{errCode:"account-not-exists"},ACCOUNT_BOUND:{errCode:"account-bound"},UNBIND_FAILED:{errCode:"unbind-failed"},INVALID_INVITE_CODE:{errCode:"invalid-invite-code"},SET_INVITE_CODE_FAILED:{errCode:"set-invite-code-failed"},GET_THIRD_PARTY_ACCOUNT_FAILED:{errCode:"get-third-party-account-failed"},GET_THIRD_PARTY_USER_INFO_FAILED:{errCode:"get-third-party-user-info-failed"}},s={0:{errCode:0,errMsg:""},10001:{errCode:"account-banned"},10002:o.USER_NOT_EXIST,10003:o.MULTI_USER_MATCHED,10004:o.USER_INFO_ERROR,10005:o.USER_ACCOUNT_CONFLICT,10006:o.USER_ACCOUNT_CLOSED,10102:{errCode:"password-error"},10103:{errCode:"password-error-exceed-limit"},10201:o.ACCOUNT_EXISTS,10202:o.ACCOUNT_NOT_EXISTS,10203:o.INVALID_INVITE_CODE,10301:o.ACCOUNT_EXISTS,10302:o.ACCOUNT_NOT_EXISTS,10401:o.GET_THIRD_PARTY_ACCOUNT_FAILED,10402:o.ACCOUNT_EXISTS,10403:o.ACCOUNT_NOT_EXISTS,10501:o.GET_THIRD_PARTY_ACCOUNT_FAILED,10502:o.ACCOUNT_EXISTS,10503:o.ACCOUNT_NOT_EXISTS,10601:o.ACCOUNT_EXISTS,10602:o.ACCOUNT_NOT_EXISTS,10701:o.GET_THIRD_PARTY_ACCOUNT_FAILED,10702:o.GET_THIRD_PARTY_ACCOUNT_FAILED,10703:o.ACCOUNT_EXISTS,10704:o.ACCOUNT_NOT_EXISTS,10705:o.GET_THIRD_PARTY_ACCOUNT_FAILED,10706:o.GET_THIRD_PARTY_ACCOUNT_FAILED,10801:o.GET_THIRD_PARTY_ACCOUNT_FAILED,10802:o.ACCOUNT_EXISTS,10803:o.ACCOUNT_NOT_EXISTS,20101:o.PARAM_REQUIRED,20102:o.ACCOUNT_EXISTS,30101:o.PARAM_REQUIRED,30201:{errCode:"check-device-feature-failed"},30202:{errCode:"token-not-exist"},30203:{errCode:"token-expired"},30204:{errCode:"check-token-failed"},40201:o.USER_NOT_EXIST,40202:{errCode:"invalid-old-password"},50101:o.PARAM_REQUIRED,50102:o.PARAM_ERROR,50201:o.PARAM_REQUIRED,50203:o.PARAM_ERROR,50202:{errCode:"invalid-verify-code"},50301:{errCode:"send-sms-code-failed"},60101:o.ACCOUNT_BOUND,60201:o.ACCOUNT_BOUND,60301:o.GET_THIRD_PARTY_ACCOUNT_FAILED,60302:o.ACCOUNT_BOUND,60401:o.GET_THIRD_PARTY_ACCOUNT_FAILED,60402:o.ACCOUNT_BOUND,60501:o.GET_THIRD_PARTY_ACCOUNT_FAILED,60502:o.ACCOUNT_BOUND,70101:o.UNBIND_FAILED,70201:o.UNBIND_FAILED,70301:o.UNBIND_FAILED,70401:o.UNBIND_FAILED,70501:o.UNBIND_FAILED,80301:o.USER_NOT_EXIST,80401:o.SET_INVITE_CODE_FAILED,80402:o.SET_INVITE_CODE_FAILED,80501:o.INVALID_INVITE_CODE,80502:o.USER_NOT_EXIST,80503:{errCode:"modify-invite-code-is-not-allowed"},80601:o.GET_THIRD_PARTY_ACCOUNT_FAILED,80602:o.GET_THIRD_PARTY_ACCOUNT_FAILED,80701:o.GET_THIRD_PARTY_ACCOUNT_FAILED,80702:o.GET_THIRD_PARTY_ACCOUNT_FAILED,80801:{errCode:"decrypt-weixin-data-failed"},80802:{errCode:"decrypt-weixin-data-failed"},80803:{errCode:"invalid-weixin-appid"},80804:o.PARAM_REQUIRED,80805:o.PARAM_REQUIRED,80806:o.PARAM_REQUIRED,80901:o.GET_THIRD_PARTY_USER_INFO_FAILED,90001:{errCode:"database-operation-failed"},90002:o.PARAM_REQUIRED,90003:o.PARAM_ERROR,90004:o.USER_NOT_EXIST,90005:o.ROLE_NOT_EXIST,90006:o.PERMISSION_NOT_EXIST};class a extends Error{constructor(e){super(e.message),this.errMsg=e.message||"",Object.defineProperties(this,{message:{get(){return`errCode: ${e.code||""} | errMsg: `+this.errMsg},set(e){this.errMsg=e}}})}}const c=Object.prototype.toString,u=Object.prototype.hasOwnProperty;function d(e,t){return u.call(e,t)}function p(e){return"[object Object]"===c.call(e)}function l(e){return"function"==typeof e}function f(e){return!!e&&("object"==typeof e||"function"==typeof e)&&"function"==typeof e.then}function m(e){return Object.prototype.toString.call(e).slice(8,-1).toLowerCase()}const h=/_(\w)/g,g=/[A-Z]/g;function y(e){return e.replace(h,(e,t)=>t?t.toUpperCase():"")}function w(e){return e.replace(g,e=>"_"+e.toLowerCase())}function v(e,t){let r,n;switch(t){case"snake2camel":n=y,r=h;break;case"camel2snake":n=w,r=g}for(const i in e)if(d(e,i)&&r.test(i)){const r=n(i);e[r]=e[i],delete e[i],p(e[r])?e[r]=v(e[r],t):Array.isArray(e[r])&&(e[r]=e[r].map(e=>v(e,t)))}return e}function _(e){return v(e,"snake2camel")}function b(e){return v(e,"camel2snake")}function T(e){return function(e,t="-"){e=e||new Date;const r=[];return r.push(e.getFullYear()),r.push(("00"+(e.getMonth()+1)).substr(-2)),r.push(("00"+e.getDate()).substr(-2)),r.join(t)}(e=e||new Date)+" "+function(e,t=":"){e=e||new Date;const r=[];return r.push(("00"+e.getHours()).substr(-2)),r.push(("00"+e.getMinutes()).substr(-2)),r.push(("00"+e.getSeconds()).substr(-2)),r.join(t)}(e)}function E(){"development"===process.env.NODE_ENV&&console.log(...arguments)}function C(e=6){let t="";for(let r=0;r<e;r++)t+=Math.floor(10*Math.random());return t}function A(e){return Array.from(new Set(e))}function x(e={},t){if(!t||!e)return e;const r=["_pre","_purify","_post"];t._pre&&(e=t._pre(e));let n={shouldDelete:new Set([])};if(t._purify){const e=t._purify;for(const t in e)e[t]=new Set(e[t]);n=Object.assign(n,e)}if(p(t))for(const i in t){const o=t[i];l(o)&&-1===r.indexOf(i)?e[i]=o(e):"string"==typeof o&&-1===r.indexOf(i)&&(e[i]=e[o],n.shouldDelete.add(o))}else l(t)&&(e=t(e));if(n.shouldDelete)for(const t of n.shouldDelete)delete e[t];return t._post&&(e=t._post(e)),e}function I(e,t){const r=new e(t);return new Proxy(r,{get:function(e,t){if("function"==typeof e[t]&&0!==t.indexOf("_")&&e._protocols&&e._protocols[t]){const r=e._protocols[t];return async function(n){n=x(n,r.args);let i=await e[t](n);return i=x(i,r.returnValue),i}}return e[t]}})}function S(e){if(p(e))if(0===e.code)e.errCode=e.code,e.message=e.errMsg=e.msg,delete e.messageValues;else if(d(s,e.code)){const t=s[e.code];e.errCode="uni-id-"+t.errCode,e.errMsg=this.t(t.errCode,e.messageValues||{})||e.msg,e.message=e.msg=e.errMsg,delete e.messageValues}else e.code&&console.warn(`error code not found, error code: ${e.code}, please contact us`)}var k={"zh-Hans":{alipay:"支付宝",wechat:"微信",user:"用户","user-id":"用户ID","dcloud-appid":"应用Appid","dcloud-appid-list":"应用列表",account:"账号",username:"用户名",email:"邮箱",mobile:"手机号",sms:"短信","wechat-openid":"微信openid","wechat-account":"微信账号","alipay-account":"支付宝账号","qq-openid":"QQ openid","qq-account":"QQ账号","apple-account":"苹果账号",password:"密码","verify-code":"验证码","verify-code-type":"验证码类型","user-unique-param":"用户名、邮箱或手机号","role-id":"角色ID","permission-id":"权限ID",login:"登录","verify-mobile":"验证手机","context-param-required":"context内缺少{param}，请使用uniID.createInstance传入客户端信息","config-param-require":"uni-id的配置内缺少{param}","uni-verify-config-required":"请在config.json中配置service.univerify下一键登录相关参数","login-with-invite-type-required":"强制使用邀请码注册时，需指明type为register还是login","type-array-required":"{param}应为数组形式","query-field-warning":"检测到当前使用queryField匹配多字段进行登录操作，需要注意：uni-id并未限制用户名不能是手机号或邮箱，需要开发者自行限制。否则可能出现用户输入abc@xx.com会同时匹配到邮箱为此值的用户和用户名为此值的用户，导致登录失败","add-role-admin-is-not-allowed":"不可新增roleID为admin的角色","password-secret-type-error":"config内passwordSecret类型错误，只可设置string类型和array类型","token-expires-config-warning":"tokenExpiresIn不可小于或等于tokenExpiresThreshold","type-function-required":"{param}应为function类型","dev-warning":"当前正在使用uniID.dev属性，注意此属性仅可用于开发调试","config-file-invalid":"请确保公用模块uni-id对应的配置文件（common/uni-config-center/uni-id/config.json）格式正确（不可包含注释）","config-file-not-found":"请在common/uni-config-center/uni-id/config.json内添加uni-id相关配置信息","hx-version-warning":"当前使用的HBuilderX版本过低，请升级HBuilderX到最新版本","account-banned":"账号已禁用","user-not-exist":"用户不存在","multi-user-matched":"匹配到多个账号","user-info-error":"用户信息不正确","user-account-conflict":"用户账号冲突","user-account-closed":"此账号已注销","password-error":"密码错误","password-error-exceed-limit":"密码错误次数过多，请稍后再试","account-exists":"此账号已注册","account-not-exists":"此账号尚未注册","invalid-invite-code":"邀请码无效","get-third-party-account-failed":"获取{account}失败","get-third-party-user-info-failed":"获取用户信息失败","param-required":"{param}不可为空","check-device-feature-failed":"设备特征校验未通过","token-not-exist":"登录状态无效，云端已不包含此token","token-expired":"token已过期","check-token-failed":"token校验未通过","invalid-old-password":"旧密码错误","param-error":"{param}参数错误，{reason}","invalid-verify-code":"{type}验证码错误或已失效","send-sms-code-failed":"短信验证码发送失败","account-bound":"此账号已被绑定","unbind-failed":"解绑失败","set-invite-code-failed":"邀请码设置失败","modify-invite-code-is-not-allowed":"邀请码不可修改","decrypt-weixin-data-failed":"解密失败","invalid-weixin-appid":"appid不匹配","database-operation-failed":"数据库读写异常","role-not-exist":"角色不存在","permission-not-exist":"权限不存在","context-required":"uni-id无法获取context.{key}，请使用uniID.createInstance方法传入","limit-client-platform":"当前客户端平台不支持此接口"},en:{alipay:"alipay",wechat:"wechat",user:"user","user-id":"user id","dcloud-appid":"DCloud appid","dcloud-appid-list":"DCloud appid list",account:"account",username:"username",email:"email",mobile:"phone number",sms:"sms","wechat-openid":"wechat openid","wechat-account":"wechat account","alipay-account":"alipay account","qq-openid":"QQ openid","qq-account":"QQ account","apple-account":"apple account",password:"password","verify-code":"verify code","verify-code-type":"verify code type","user-unique-param":"username, email or mobile phone number","role-id":"role id","permission-id":"permission id",login:"login","verify-mobile":"verify mobile phone number","context-param-required":"You should pass {param} in context using uniID.createInstance","config-param-require":"{param} is required in uni-id's config","uni-verify-config-required":"Univerify config required: service.univerify","login-with-invite-type-required":"Parameter type is required when forceInviteCode set to true","type-array-required":"Type of {param} must be array","query-field-warning":"You are using multi query field to login, be aware that uni-id will not check username's fromat, eg: abc@xx.com is a valid username for uni-id. You should check username in your code.","add-role-admin-is-not-allowed":'Add role with an id of "admin" is not allowed',"password-secret-type-error":'"passwordSecret" in config must be string or array',"token-expires-config-warning":'"tokenExpiresIn" must be greater than "tokenExpiresThreshold"',"type-function-required":"{param} must be a function","dev-warning":"warning: uniID.dev is only for development","config-file-invalid":"Invalid config file (common/uni-config-center/uni-id/config.json), please note that comment is not allowed","config-file-not-found":"Config file (common/uni-config-center/uni-id/config.json) not found","hx-version-warning":"The HBuilderX you are using is too old, please upgrade to the latest version of HBuilderX","account-banned":"Account is banned","user-not-exist":"User does not exist","multi-user-matched":"Multiple users are matched","user-info-error":"User info error","user-account-conflict":"User account conflict","user-account-closed":"User account has been closed","password-error":"The password is incorrect","password-error-exceed-limit":"The number of password errors exceeded the limit","account-exists":"Account exists","account-not-exists":"Account does not exists","invalid-invite-code":"Invalid invite code","get-third-party-account-failed":"Get {account} failed","get-third-party-user-info-failed":"Get user info failed","param-required":"{param} is required","check-device-feature-failed":"Check device feature failed","token-not-exist":"The login status is invalid, token does not exist","token-expired":"The login status is invalid, token has expired","check-token-failed":"Check token failed","invalid-old-password":"Invalid old password","param-error":"{param} error, {reason}","invalid-verify-code":"Invalid {type} verify code","send-sms-code-failed":"Send sms code failed","account-bound":"Account has been bound","unbind-failed":"Unbind failed","set-invite-code-failed":"Set invite code failed","modify-invite-code-is-not-allowed":"Modifying the invitation code is prohibited","decrypt-weixin-data-failed":"Decrypt weixin data failed","invalid-weixin-appid":"Invalid weixin appid","database-operation-failed":"Database operation failed","role-not-exist":"Role does not exist","permission-not-exist":"Permission does not exist","context-required":'"context.{key}" is required, you should pass context using uniID.createInstance',"limit-client-platform":"Unsupported client platform"}};const O=uniCloud.database(),P=O.collection("uni-id-users"),R=O.collection("opendb-verify-codes"),j=O.collection("uni-id-roles"),D=O.collection("uni-id-permissions"),q={username:"username",mobile:"mobile",email:"email",wx_unionid:"wechat-account","wx_openid.app-plus":"wechat-account","wx_openid.app":"wechat-account","wx_openid.mp-weixin":"wechat-account",qq_unionid:"qq-account","qq_openid.app-plus":"qq-account","qq_openid.app":"qq-account","qq_openid.mp-weixin":"qq-account",ali_openid:"alipay-account",apple_openid:"alipay-account"},N=90002,U=90003,L=90004,V=90005,M=0,B=1,F=4;async function $({uid:e,status:t}={}){return e?(await P.doc(e).update({status:t,status_update_date:Date.now()}),{code:0}):{code:N,messageValues:{param:this.t("user-id")}}}async function H({name:e,url:t,data:r,options:n,defaultOptions:i}){let o={};const s=b(Object.assign({},r));s&&s.access_token&&delete s.access_token;try{n=Object.assign({},i,n,{data:s}),o=await uniCloud.httpclient.request(t,n)}catch(t){return function(e,t){throw new a({code:t.code||-2,message:t.message||e+" fail"})}(e,t)}let c=o.data;const u=o.headers["content-type"];if(!Buffer.isBuffer(c)||0!==u.indexOf("text/plain")&&0!==u.indexOf("application/json"))Buffer.isBuffer(c)&&(c={buffer:c,contentType:u});else try{c=JSON.parse(c.toString())}catch(e){c=c.toString()}return _(function(e,t){if(t.errcode)throw new a({code:t.errcode||-2,message:t.errmsg||e+" fail"});return delete t.errcode,delete t.errmsg,{...t,errMsg:e+" ok",errCode:0}}(e,c||{errCode:-2,errMsg:"Request failed"}))}function K(e,t){let r="";if(t&&t.accessToken){r=`${e.indexOf("?")>-1?"&":"?"}access_token=${t.accessToken}`}return`${e}${r}`}class G{constructor(e){this.options=Object.assign({baseUrl:"https://api.weixin.qq.com",timeout:5e3},e)}async _requestWxOpenapi({name:e,url:t,data:r,options:n}){const i={method:"GET",dataType:"json",dataAsQueryString:!0,timeout:this.options.timeout};return await H({name:"auth."+e,url:`${this.options.baseUrl}${K(t,r)}`,data:r,options:n,defaultOptions:i})}async code2Session(e){return await this._requestWxOpenapi({name:"code2Session",url:"/sns/jscode2session",data:{grant_type:"authorization_code",appid:this.options.appId,secret:this.options.secret,js_code:e}})}async getOauthAccessToken(e){const t=await this._requestWxOpenapi({name:"getOauthAccessToken",url:"/sns/oauth2/access_token",data:{grant_type:"authorization_code",appid:this.options.appId,secret:this.options.secret,code:e}});return t.expiresIn&&(t.expired=Date.now()+1e3*t.expiresIn),t}async getUserInfo({accessToken:e,openid:t}={}){const{nickname:r,headimgurl:n}=await this._requestWxOpenapi({name:"getUserInfo",url:"/sns/userinfo",data:{accessToken:e,openid:t,appid:this.options.appId,secret:this.options.secret,scope:"snsapi_userinfo"}});return{nickname:r,avatar:n}}}async function Q({name:e,url:t,data:r,options:n,defaultOptions:i}){let o;n=Object.assign({},i,n,{data:b(Object.assign({},r))});try{o=await uniCloud.httpclient.request(t,n)}catch(t){return function(e,t){throw new a({code:t.code||-2,message:t.message||e+" fail"})}(e,t)}let s=o.data;const c=o.headers["content-type"];if(!Buffer.isBuffer(s)||0!==c.indexOf("text/plain")&&0!==c.indexOf("application/json"))Buffer.isBuffer(s)&&(s={buffer:s,contentType:c});else try{s=JSON.parse(s.toString())}catch(e){s=s.toString()}return _(function(e,t){if(t.ret||t.error){const r=t.ret||t.error||t.errcode||-2,n=t.msg||t.error_description||t.errmsg||e+" fail";throw new a({code:r,message:n})}return delete t.ret,delete t.msg,delete t.error,delete t.error_description,delete t.errcode,delete t.errmsg,{...t,errMsg:e+" ok",errCode:0}}(e,s||{errCode:-2,errMsg:"Request failed"}))}class X{constructor(e){this.options=Object.assign({baseUrl:"https://graph.qq.com",timeout:5e3},e)}async _requestQQOpenapi({name:e,url:t,data:r,options:n}){const i={method:"GET",dataType:"json",dataAsQueryString:!0,timeout:this.options.timeout};var o,s;return await Q({name:"auth."+e,url:(o=this.options.baseUrl,s=t,/^https?:/.test(s)?s:o+s),data:r,options:n,defaultOptions:i})}async getOpenidByToken({accessToken:e}={}){const t=await this._requestQQOpenapi({name:"getOpenidByToken",url:"/oauth2.0/me",data:{accessToken:e,unionid:1,fmt:"json"}});if(t.clientId!==this.options.appId)throw new a({code:"APPID_NOT_MATCH",message:"appid not match"});return{openid:t.openid,unionid:t.unionid}}async code2Session({code:e}={}){return await this._requestQQOpenapi({name:"getOpenidByToken",url:"https://api.q.qq.com/sns/jscode2session",data:{grant_type:"authorization_code",appid:this.options.appId,secret:this.options.secret,js_code:e}})}}const Y={RSA:"RSA-SHA1",RSA2:"RSA-SHA256"};var z={code2Session:{returnValue:{openid:"userId"}}};class W extends class{constructor(e={}){if(!e.appId)throw new Error("appId required");if(!e.privateKey)throw new Error("privateKey required");const t={gateway:"https://openapi.alipay.com/gateway.do",timeout:5e3,charset:"utf-8",version:"1.0",signType:"RSA2",timeOffset:-(new Date).getTimezoneOffset()/60,keyType:"PKCS8"};e.sandbox&&(e.gateway="https://openapi.alipaydev.com/gateway.do"),this.options=Object.assign({},t,e);const r="PKCS8"===this.options.keyType?"PRIVATE KEY":"RSA PRIVATE KEY";this.options.privateKey=this._formatKey(this.options.privateKey,r),this.options.alipayPublicKey&&(this.options.alipayPublicKey=this._formatKey(this.options.alipayPublicKey,"PUBLIC KEY"))}_formatKey(e,t){return`-----BEGIN ${t}-----\n${e}\n-----END ${t}-----`}_formatUrl(e,t){let r=e;const n=["app_id","method","format","charset","sign_type","sign","timestamp","version","notify_url","return_url","auth_token","app_auth_token"];for(const e in t)if(n.indexOf(e)>-1){const n=encodeURIComponent(t[e]);r=`${r}${r.includes("?")?"&":"?"}${e}=${n}`,delete t[e]}return{execParams:t,url:r}}_getSign(e,r){const n=r.bizContent||null;delete r.bizContent;const i=Object.assign({method:e,appId:this.options.appId,charset:this.options.charset,version:this.options.version,signType:this.options.signType,timestamp:T((o=this.options.timeOffset,new Date(Date.now()+6e4*((new Date).getTimezoneOffset()+60*(o||0)))))},r);var o;n&&(i.bizContent=JSON.stringify(b(n)));const s=b(i),a=Object.keys(s).sort().map(e=>{let t=s[e];return"[object String]"!==Array.prototype.toString.call(t)&&(t=JSON.stringify(t)),`${e}=${t}`}).join("&"),c=t.createSign(Y[this.options.signType]).update(a,"utf8").sign(this.options.privateKey,"base64");return Object.assign(s,{sign:c})}async _exec(e,t={},r={}){const n=this._getSign(e,t),{url:i,execParams:o}=this._formatUrl(this.options.gateway,n),{status:s,data:a}=await uniCloud.httpclient.request(i,{method:"POST",data:o,dataType:"text",timeout:this.options.timeout});if(200!==s)throw new Error("request fail");const c=JSON.parse(a),u=e.replace(/\./g,"_")+"_response",d=c[u],p=c.error_response;if(d){if(!r.validateSign||this._checkResponseSign(a,u)){if(!d.code||"10000"===d.code){return{errCode:0,errMsg:d.msg||"",..._(d)}}const e=d.sub_code?`${d.sub_code} ${d.sub_msg}`:""+(d.msg||"unkonwn error");throw new Error(e)}throw new Error("check sign error")}if(p)throw new Error(p.sub_msg||p.msg||"request fail");throw new Error("request fail")}_checkResponseSign(e,r){if(!this.options.alipayPublicKey||""===this.options.alipayPublicKey)return console.warn("options.alipayPublicKey is empty"),!0;if(!e)return!1;const n=this._getSignStr(e,r),i=JSON.parse(e).sign,o=t.createVerify(Y[this.options.signType]);return o.update(n,"utf8"),o.verify(this.options.alipayPublicKey,i,"base64")}_getSignStr(e,t){let r=e.trim();const n=e.indexOf(t+'"'),i=e.lastIndexOf('"sign"');return r=r.substr(n+t.length+1),r=r.substr(0,i),r=r.replace(/^[^{]*{/g,"{"),r=r.replace(/\}([^}]*)$/g,"}"),r}}{constructor(e){super(e),this._protocols=z}async code2Session(e){return await this._exec("alipay.system.oauth.token",{grantType:"authorization_code",code:e})}}function J(e){var t=e[0];return t<"0"||t>"7"?"00"+e:e}function Z(e){var t=e.toString(16);return t.length%2?"0"+t:t}function ee(e){if(e<=127)return Z(e);var t=Z(e);return Z(128+t.length/2)+t}function te(e,t){return e(t={exports:{}},t.exports),t.exports}var re=te((function(e,t){var n=r.Buffer;function i(e,t){for(var r in e)t[r]=e[r]}function o(e,t,r){return n(e,t,r)}n.from&&n.alloc&&n.allocUnsafe&&n.allocUnsafeSlow?e.exports=r:(i(r,t),t.Buffer=o),o.prototype=Object.create(n.prototype),i(n,o),o.from=function(e,t,r){if("number"==typeof e)throw new TypeError("Argument must not be a number");return n(e,t,r)},o.alloc=function(e,t,r){if("number"!=typeof e)throw new TypeError("Argument must be a number");var i=n(e);return void 0!==t?"string"==typeof r?i.fill(t,r):i.fill(t):i.fill(0),i},o.allocUnsafe=function(e){if("number"!=typeof e)throw new TypeError("Argument must be a number");return n(e)},o.allocUnsafeSlow=function(e){if("number"!=typeof e)throw new TypeError("Argument must be a number");return r.SlowBuffer(e)}})),ne=(re.Buffer,re.Buffer);function ie(e){if(this.buffer=null,this.writable=!0,this.readable=!0,!e)return this.buffer=ne.alloc(0),this;if("function"==typeof e.pipe)return this.buffer=ne.alloc(0),e.pipe(this),this;if(e.length||"object"==typeof e)return this.buffer=e,this.writable=!1,process.nextTick(function(){this.emit("end",e),this.readable=!1,this.emit("close")}.bind(this)),this;throw new TypeError("Unexpected data type ("+typeof e+")")}i.inherits(ie,n),ie.prototype.write=function(e){this.buffer=ne.concat([this.buffer,ne.from(e)]),this.emit("data",e)},ie.prototype.end=function(e){e&&this.write(e),this.emit("end",e),this.emit("close"),this.writable=!1,this.readable=!1};var oe=ie,se=r.Buffer,ae=r.SlowBuffer,ce=ue;function ue(e,t){if(!se.isBuffer(e)||!se.isBuffer(t))return!1;if(e.length!==t.length)return!1;for(var r=0,n=0;n<e.length;n++)r|=e[n]^t[n];return 0===r}ue.install=function(){se.prototype.equal=ae.prototype.equal=function(e){return ue(this,e)}};var de=se.prototype.equal,pe=ae.prototype.equal;function le(e){return(e/8|0)+(e%8==0?0:1)}ue.restore=function(){se.prototype.equal=de,ae.prototype.equal=pe};var fe={ES256:le(256),ES384:le(384),ES512:le(521)};var me=function(e){var t=fe[e];if(t)return t;throw new Error('Unknown algorithm "'+e+'"')},he=re.Buffer;function ge(e){if(he.isBuffer(e))return e;if("string"==typeof e)return he.from(e,"base64");throw new TypeError("ECDSA signature must be a Base64 string or a Buffer")}function ye(e,t,r){for(var n=0;t+n<r&&0===e[t+n];)++n;return e[t+n]>=128&&--n,n}var we={derToJose:function(e,t){e=ge(e);var r=me(t),n=r+1,i=e.length,o=0;if(48!==e[o++])throw new Error('Could not find expected "seq"');var s=e[o++];if(129===s&&(s=e[o++]),i-o<s)throw new Error('"seq" specified length of "'+s+'", only "'+(i-o)+'" remaining');if(2!==e[o++])throw new Error('Could not find expected "int" for "r"');var a=e[o++];if(i-o-2<a)throw new Error('"r" specified length of "'+a+'", only "'+(i-o-2)+'" available');if(n<a)throw new Error('"r" specified length of "'+a+'", max of "'+n+'" is acceptable');var c=o;if(o+=a,2!==e[o++])throw new Error('Could not find expected "int" for "s"');var u=e[o++];if(i-o!==u)throw new Error('"s" specified length of "'+u+'", expected "'+(i-o)+'"');if(n<u)throw new Error('"s" specified length of "'+u+'", max of "'+n+'" is acceptable');var d=o;if((o+=u)!==i)throw new Error('Expected to consume entire buffer, but "'+(i-o)+'" bytes remain');var p=r-a,l=r-u,f=he.allocUnsafe(p+a+l+u);for(o=0;o<p;++o)f[o]=0;e.copy(f,o,c+Math.max(-p,0),c+a);for(var m=o=r;o<m+l;++o)f[o]=0;return e.copy(f,o,d+Math.max(-l,0),d+u),f=(f=f.toString("base64")).replace(/=/g,"").replace(/\+/g,"-").replace(/\//g,"_")},joseToDer:function(e,t){e=ge(e);var r=me(t),n=e.length;if(n!==2*r)throw new TypeError('"'+t+'" signatures must be "'+2*r+'" bytes, saw "'+n+'"');var i=ye(e,0,r),o=ye(e,r,e.length),s=r-i,a=r-o,c=2+s+1+1+a,u=c<128,d=he.allocUnsafe((u?2:3)+c),p=0;return d[p++]=48,u?d[p++]=c:(d[p++]=129,d[p++]=255&c),d[p++]=2,d[p++]=s,i<0?(d[p++]=0,p+=e.copy(d,p,0,r)):p+=e.copy(d,p,i,r),d[p++]=2,d[p++]=a,o<0?(d[p++]=0,e.copy(d,p,r)):e.copy(d,p,r+o),d}},ve=re.Buffer,_e="secret must be a string or buffer",be="key must be a string or a buffer",Te="function"==typeof t.createPublicKey;function Ee(e){if(!ve.isBuffer(e)&&"string"!=typeof e){if(!Te)throw Ie(be);if("object"!=typeof e)throw Ie(be);if("string"!=typeof e.type)throw Ie(be);if("string"!=typeof e.asymmetricKeyType)throw Ie(be);if("function"!=typeof e.export)throw Ie(be)}}function Ce(e){if(!ve.isBuffer(e)&&"string"!=typeof e&&"object"!=typeof e)throw Ie("key must be a string, a buffer or an object")}function Ae(e){return e.replace(/=/g,"").replace(/\+/g,"-").replace(/\//g,"_")}function xe(e){var t=4-(e=e.toString()).length%4;if(4!==t)for(var r=0;r<t;++r)e+="=";return e.replace(/\-/g,"+").replace(/_/g,"/")}function Ie(e){var t=[].slice.call(arguments,1),r=i.format.bind(i,e).apply(null,t);return new TypeError(r)}function Se(e){var t;return t=e,ve.isBuffer(t)||"string"==typeof t||(e=JSON.stringify(e)),e}function ke(e){return function(r,n){!function(e){if(!ve.isBuffer(e)){if("string"==typeof e)return e;if(!Te)throw Ie(_e);if("object"!=typeof e)throw Ie(_e);if("secret"!==e.type)throw Ie(_e);if("function"!=typeof e.export)throw Ie(_e)}}(n),r=Se(r);var i=t.createHmac("sha"+e,n);return Ae((i.update(r),i.digest("base64")))}}function Oe(e){return function(t,r,n){var i=ke(e)(t,n);return ce(ve.from(r),ve.from(i))}}function Pe(e){return function(r,n){Ce(n),r=Se(r);var i=t.createSign("RSA-SHA"+e);return Ae((i.update(r),i.sign(n,"base64")))}}function Re(e){return function(r,n,i){Ee(i),r=Se(r),n=xe(n);var o=t.createVerify("RSA-SHA"+e);return o.update(r),o.verify(i,n,"base64")}}function je(e){return function(r,n){Ce(n),r=Se(r);var i=t.createSign("RSA-SHA"+e);return Ae((i.update(r),i.sign({key:n,padding:t.constants.RSA_PKCS1_PSS_PADDING,saltLength:t.constants.RSA_PSS_SALTLEN_DIGEST},"base64")))}}function De(e){return function(r,n,i){Ee(i),r=Se(r),n=xe(n);var o=t.createVerify("RSA-SHA"+e);return o.update(r),o.verify({key:i,padding:t.constants.RSA_PKCS1_PSS_PADDING,saltLength:t.constants.RSA_PSS_SALTLEN_DIGEST},n,"base64")}}function qe(e){var t=Pe(e);return function(){var r=t.apply(null,arguments);return r=we.derToJose(r,"ES"+e)}}function Ne(e){var t=Re(e);return function(r,n,i){return n=we.joseToDer(n,"ES"+e).toString("base64"),t(r,n,i)}}function Ue(){return function(){return""}}function Le(){return function(e,t){return""===t}}Te&&(be+=" or a KeyObject",_e+="or a KeyObject");var Ve=function(e){var t={hs:ke,rs:Pe,ps:je,es:qe,none:Ue},r={hs:Oe,rs:Re,ps:De,es:Ne,none:Le},n=e.match(/^(RS|PS|ES|HS)(256|384|512)$|^(none)$/i);if(!n)throw Ie('"%s" is not a valid algorithm.\n  Supported algorithms are:\n  "HS256", "HS384", "HS512", "RS256", "RS384", "RS512", "PS256", "PS384", "PS512", "ES256", "ES384", "ES512" and "none".',e);var i=(n[1]||n[3]).toLowerCase(),o=n[2];return{sign:t[i](o),verify:r[i](o)}},Me=r.Buffer,Be=function(e){return"string"==typeof e?e:"number"==typeof e||Me.isBuffer(e)?e.toString():JSON.stringify(e)},Fe=re.Buffer;function $e(e,t){return Fe.from(e,t).toString("base64").replace(/=/g,"").replace(/\+/g,"-").replace(/\//g,"_")}function He(e){var t=e.header,r=e.payload,n=e.secret||e.privateKey,o=e.encoding,s=Ve(t.alg),a=function(e,t,r){r=r||"utf8";var n=$e(Be(e),"binary"),o=$e(Be(t),r);return i.format("%s.%s",n,o)}(t,r,o),c=s.sign(a,n);return i.format("%s.%s",a,c)}function Ke(e){var t=e.secret||e.privateKey||e.key,r=new oe(t);this.readable=!0,this.header=e.header,this.encoding=e.encoding,this.secret=this.privateKey=this.key=r,this.payload=new oe(e.payload),this.secret.once("close",function(){!this.payload.writable&&this.readable&&this.sign()}.bind(this)),this.payload.once("close",function(){!this.secret.writable&&this.readable&&this.sign()}.bind(this))}i.inherits(Ke,n),Ke.prototype.sign=function(){try{var e=He({header:this.header,payload:this.payload.buffer,secret:this.secret.buffer,encoding:this.encoding});return this.emit("done",e),this.emit("data",e),this.emit("end"),this.readable=!1,e}catch(e){this.readable=!1,this.emit("error",e),this.emit("close")}},Ke.sign=He;var Ge=Ke,Qe=re.Buffer,Xe=/^[a-zA-Z0-9\-_]+?\.[a-zA-Z0-9\-_]+?\.([a-zA-Z0-9\-_]+)?$/;function Ye(e){if(function(e){return"[object Object]"===Object.prototype.toString.call(e)}(e))return e;try{return JSON.parse(e)}catch(e){return}}function ze(e){var t=e.split(".",1)[0];return Ye(Qe.from(t,"base64").toString("binary"))}function We(e){return e.split(".")[2]}function Je(e){return Xe.test(e)&&!!ze(e)}function Ze(e,t,r){if(!t){var n=new Error("Missing algorithm parameter for jws.verify");throw n.code="MISSING_ALGORITHM",n}var i=We(e=Be(e)),o=function(e){return e.split(".",2).join(".")}(e);return Ve(t).verify(o,i,r)}function et(e,t){if(t=t||{},!Je(e=Be(e)))return null;var r=ze(e);if(!r)return null;var n=function(e,t){t=t||"utf8";var r=e.split(".")[1];return Qe.from(r,"base64").toString(t)}(e);return("JWT"===r.typ||t.json)&&(n=JSON.parse(n,t.encoding)),{header:r,payload:n,signature:We(e)}}function tt(e){var t=(e=e||{}).secret||e.publicKey||e.key,r=new oe(t);this.readable=!0,this.algorithm=e.algorithm,this.encoding=e.encoding,this.secret=this.publicKey=this.key=r,this.signature=new oe(e.signature),this.secret.once("close",function(){!this.signature.writable&&this.readable&&this.verify()}.bind(this)),this.signature.once("close",function(){!this.secret.writable&&this.readable&&this.verify()}.bind(this))}i.inherits(tt,n),tt.prototype.verify=function(){try{var e=Ze(this.signature.buffer,this.algorithm,this.key.buffer),t=et(this.signature.buffer,this.encoding);return this.emit("done",e,t),this.emit("data",e),this.emit("end"),this.readable=!1,e}catch(e){this.readable=!1,this.emit("error",e),this.emit("close")}},tt.decode=et,tt.isValid=Je,tt.verify=Ze;var rt=tt,nt={ALGORITHMS:["HS256","HS384","HS512","RS256","RS384","RS512","PS256","PS384","PS512","ES256","ES384","ES512"],sign:Ge.sign,verify:rt.verify,decode:rt.decode,isValid:rt.isValid,createSign:function(e){return new Ge(e)},createVerify:function(e){return new rt(e)}},it=function(e,t){t=t||{};var r=nt.decode(e,t);if(!r)return null;var n=r.payload;if("string"==typeof n)try{var i=JSON.parse(n);null!==i&&"object"==typeof i&&(n=i)}catch(e){}return!0===t.complete?{header:r.header,payload:n,signature:r.signature}:n},ot=function(e,t){Error.call(this,e),Error.captureStackTrace&&Error.captureStackTrace(this,this.constructor),this.name="JsonWebTokenError",this.message=e,t&&(this.inner=t)};(ot.prototype=Object.create(Error.prototype)).constructor=ot;var st=ot,at=function(e,t){st.call(this,e),this.name="NotBeforeError",this.date=t};(at.prototype=Object.create(st.prototype)).constructor=at;var ct=at,ut=function(e,t){st.call(this,e),this.name="TokenExpiredError",this.expiredAt=t};(ut.prototype=Object.create(st.prototype)).constructor=ut;var dt=ut,pt=1e3,lt=60*pt,ft=60*lt,mt=24*ft,ht=function(e,t){t=t||{};var r=typeof e;if("string"===r&&e.length>0)return function(e){if((e=String(e)).length>100)return;var t=/^(-?(?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|weeks?|w|years?|yrs?|y)?$/i.exec(e);if(!t)return;var r=parseFloat(t[1]);switch((t[2]||"ms").toLowerCase()){case"years":case"year":case"yrs":case"yr":case"y":return 315576e5*r;case"weeks":case"week":case"w":return 6048e5*r;case"days":case"day":case"d":return r*mt;case"hours":case"hour":case"hrs":case"hr":case"h":return r*ft;case"minutes":case"minute":case"mins":case"min":case"m":return r*lt;case"seconds":case"second":case"secs":case"sec":case"s":return r*pt;case"milliseconds":case"millisecond":case"msecs":case"msec":case"ms":return r;default:return}}(e);if("number"===r&&isFinite(e))return t.long?function(e){var t=Math.abs(e);if(t>=mt)return gt(e,t,mt,"day");if(t>=ft)return gt(e,t,ft,"hour");if(t>=lt)return gt(e,t,lt,"minute");if(t>=pt)return gt(e,t,pt,"second");return e+" ms"}(e):function(e){var t=Math.abs(e);if(t>=mt)return Math.round(e/mt)+"d";if(t>=ft)return Math.round(e/ft)+"h";if(t>=lt)return Math.round(e/lt)+"m";if(t>=pt)return Math.round(e/pt)+"s";return e+"ms"}(e);throw new Error("val is not a non-empty string or a valid number. val="+JSON.stringify(e))};function gt(e,t,r,n){var i=t>=1.5*r;return Math.round(e/r)+" "+n+(i?"s":"")}var yt=function(e,t){var r=t||Math.floor(Date.now()/1e3);if("string"==typeof e){var n=ht(e);if(void 0===n)return;return Math.floor(r+n/1e3)}return"number"==typeof e?r+e:void 0},wt=te((function(e,t){var r;t=e.exports=G,r="object"==typeof process&&process.env&&process.env.NODE_DEBUG&&/\bsemver\b/i.test(process.env.NODE_DEBUG)?function(){var e=Array.prototype.slice.call(arguments,0);e.unshift("SEMVER"),console.log.apply(console,e)}:function(){},t.SEMVER_SPEC_VERSION="2.0.0";var n=Number.MAX_SAFE_INTEGER||9007199254740991,i=t.re=[],o=t.src=[],s=0,a=s++;o[a]="0|[1-9]\\d*";var c=s++;o[c]="[0-9]+";var u=s++;o[u]="\\d*[a-zA-Z-][a-zA-Z0-9-]*";var d=s++;o[d]="("+o[a]+")\\.("+o[a]+")\\.("+o[a]+")";var p=s++;o[p]="("+o[c]+")\\.("+o[c]+")\\.("+o[c]+")";var l=s++;o[l]="(?:"+o[a]+"|"+o[u]+")";var f=s++;o[f]="(?:"+o[c]+"|"+o[u]+")";var m=s++;o[m]="(?:-("+o[l]+"(?:\\."+o[l]+")*))";var h=s++;o[h]="(?:-?("+o[f]+"(?:\\."+o[f]+")*))";var g=s++;o[g]="[0-9A-Za-z-]+";var y=s++;o[y]="(?:\\+("+o[g]+"(?:\\."+o[g]+")*))";var w=s++,v="v?"+o[d]+o[m]+"?"+o[y]+"?";o[w]="^"+v+"$";var _="[v=\\s]*"+o[p]+o[h]+"?"+o[y]+"?",b=s++;o[b]="^"+_+"$";var T=s++;o[T]="((?:<|>)?=?)";var E=s++;o[E]=o[c]+"|x|X|\\*";var C=s++;o[C]=o[a]+"|x|X|\\*";var A=s++;o[A]="[v=\\s]*("+o[C]+")(?:\\.("+o[C]+")(?:\\.("+o[C]+")(?:"+o[m]+")?"+o[y]+"?)?)?";var x=s++;o[x]="[v=\\s]*("+o[E]+")(?:\\.("+o[E]+")(?:\\.("+o[E]+")(?:"+o[h]+")?"+o[y]+"?)?)?";var I=s++;o[I]="^"+o[T]+"\\s*"+o[A]+"$";var S=s++;o[S]="^"+o[T]+"\\s*"+o[x]+"$";var k=s++;o[k]="(?:^|[^\\d])(\\d{1,16})(?:\\.(\\d{1,16}))?(?:\\.(\\d{1,16}))?(?:$|[^\\d])";var O=s++;o[O]="(?:~>?)";var P=s++;o[P]="(\\s*)"+o[O]+"\\s+",i[P]=new RegExp(o[P],"g");var R=s++;o[R]="^"+o[O]+o[A]+"$";var j=s++;o[j]="^"+o[O]+o[x]+"$";var D=s++;o[D]="(?:\\^)";var q=s++;o[q]="(\\s*)"+o[D]+"\\s+",i[q]=new RegExp(o[q],"g");var N=s++;o[N]="^"+o[D]+o[A]+"$";var U=s++;o[U]="^"+o[D]+o[x]+"$";var L=s++;o[L]="^"+o[T]+"\\s*("+_+")$|^$";var V=s++;o[V]="^"+o[T]+"\\s*("+v+")$|^$";var M=s++;o[M]="(\\s*)"+o[T]+"\\s*("+_+"|"+o[A]+")",i[M]=new RegExp(o[M],"g");var B=s++;o[B]="^\\s*("+o[A]+")\\s+-\\s+("+o[A]+")\\s*$";var F=s++;o[F]="^\\s*("+o[x]+")\\s+-\\s+("+o[x]+")\\s*$";var $=s++;o[$]="(<|>)?=?\\s*\\*";for(var H=0;H<35;H++)r(H,o[H]),i[H]||(i[H]=new RegExp(o[H]));function K(e,t){if(t&&"object"==typeof t||(t={loose:!!t,includePrerelease:!1}),e instanceof G)return e;if("string"!=typeof e)return null;if(e.length>256)return null;if(!(t.loose?i[b]:i[w]).test(e))return null;try{return new G(e,t)}catch(e){return null}}function G(e,t){if(t&&"object"==typeof t||(t={loose:!!t,includePrerelease:!1}),e instanceof G){if(e.loose===t.loose)return e;e=e.version}else if("string"!=typeof e)throw new TypeError("Invalid Version: "+e);if(e.length>256)throw new TypeError("version is longer than 256 characters");if(!(this instanceof G))return new G(e,t);r("SemVer",e,t),this.options=t,this.loose=!!t.loose;var o=e.trim().match(t.loose?i[b]:i[w]);if(!o)throw new TypeError("Invalid Version: "+e);if(this.raw=e,this.major=+o[1],this.minor=+o[2],this.patch=+o[3],this.major>n||this.major<0)throw new TypeError("Invalid major version");if(this.minor>n||this.minor<0)throw new TypeError("Invalid minor version");if(this.patch>n||this.patch<0)throw new TypeError("Invalid patch version");o[4]?this.prerelease=o[4].split(".").map((function(e){if(/^[0-9]+$/.test(e)){var t=+e;if(t>=0&&t<n)return t}return e})):this.prerelease=[],this.build=o[5]?o[5].split("."):[],this.format()}t.parse=K,t.valid=function(e,t){var r=K(e,t);return r?r.version:null},t.clean=function(e,t){var r=K(e.trim().replace(/^[=v]+/,""),t);return r?r.version:null},t.SemVer=G,G.prototype.format=function(){return this.version=this.major+"."+this.minor+"."+this.patch,this.prerelease.length&&(this.version+="-"+this.prerelease.join(".")),this.version},G.prototype.toString=function(){return this.version},G.prototype.compare=function(e){return r("SemVer.compare",this.version,this.options,e),e instanceof G||(e=new G(e,this.options)),this.compareMain(e)||this.comparePre(e)},G.prototype.compareMain=function(e){return e instanceof G||(e=new G(e,this.options)),X(this.major,e.major)||X(this.minor,e.minor)||X(this.patch,e.patch)},G.prototype.comparePre=function(e){if(e instanceof G||(e=new G(e,this.options)),this.prerelease.length&&!e.prerelease.length)return-1;if(!this.prerelease.length&&e.prerelease.length)return 1;if(!this.prerelease.length&&!e.prerelease.length)return 0;var t=0;do{var n=this.prerelease[t],i=e.prerelease[t];if(r("prerelease compare",t,n,i),void 0===n&&void 0===i)return 0;if(void 0===i)return 1;if(void 0===n)return-1;if(n!==i)return X(n,i)}while(++t)},G.prototype.inc=function(e,t){switch(e){case"premajor":this.prerelease.length=0,this.patch=0,this.minor=0,this.major++,this.inc("pre",t);break;case"preminor":this.prerelease.length=0,this.patch=0,this.minor++,this.inc("pre",t);break;case"prepatch":this.prerelease.length=0,this.inc("patch",t),this.inc("pre",t);break;case"prerelease":0===this.prerelease.length&&this.inc("patch",t),this.inc("pre",t);break;case"major":0===this.minor&&0===this.patch&&0!==this.prerelease.length||this.major++,this.minor=0,this.patch=0,this.prerelease=[];break;case"minor":0===this.patch&&0!==this.prerelease.length||this.minor++,this.patch=0,this.prerelease=[];break;case"patch":0===this.prerelease.length&&this.patch++,this.prerelease=[];break;case"pre":if(0===this.prerelease.length)this.prerelease=[0];else{for(var r=this.prerelease.length;--r>=0;)"number"==typeof this.prerelease[r]&&(this.prerelease[r]++,r=-2);-1===r&&this.prerelease.push(0)}t&&(this.prerelease[0]===t?isNaN(this.prerelease[1])&&(this.prerelease=[t,0]):this.prerelease=[t,0]);break;default:throw new Error("invalid increment argument: "+e)}return this.format(),this.raw=this.version,this},t.inc=function(e,t,r,n){"string"==typeof r&&(n=r,r=void 0);try{return new G(e,r).inc(t,n).version}catch(e){return null}},t.diff=function(e,t){if(J(e,t))return null;var r=K(e),n=K(t),i="";if(r.prerelease.length||n.prerelease.length){i="pre";var o="prerelease"}for(var s in r)if(("major"===s||"minor"===s||"patch"===s)&&r[s]!==n[s])return i+s;return o},t.compareIdentifiers=X;var Q=/^[0-9]+$/;function X(e,t){var r=Q.test(e),n=Q.test(t);return r&&n&&(e=+e,t=+t),e===t?0:r&&!n?-1:n&&!r?1:e<t?-1:1}function Y(e,t,r){return new G(e,r).compare(new G(t,r))}function z(e,t,r){return Y(e,t,r)>0}function W(e,t,r){return Y(e,t,r)<0}function J(e,t,r){return 0===Y(e,t,r)}function Z(e,t,r){return 0!==Y(e,t,r)}function ee(e,t,r){return Y(e,t,r)>=0}function te(e,t,r){return Y(e,t,r)<=0}function re(e,t,r,n){switch(t){case"===":return"object"==typeof e&&(e=e.version),"object"==typeof r&&(r=r.version),e===r;case"!==":return"object"==typeof e&&(e=e.version),"object"==typeof r&&(r=r.version),e!==r;case"":case"=":case"==":return J(e,r,n);case"!=":return Z(e,r,n);case">":return z(e,r,n);case">=":return ee(e,r,n);case"<":return W(e,r,n);case"<=":return te(e,r,n);default:throw new TypeError("Invalid operator: "+t)}}function ne(e,t){if(t&&"object"==typeof t||(t={loose:!!t,includePrerelease:!1}),e instanceof ne){if(e.loose===!!t.loose)return e;e=e.value}if(!(this instanceof ne))return new ne(e,t);r("comparator",e,t),this.options=t,this.loose=!!t.loose,this.parse(e),this.semver===ie?this.value="":this.value=this.operator+this.semver.version,r("comp",this)}t.rcompareIdentifiers=function(e,t){return X(t,e)},t.major=function(e,t){return new G(e,t).major},t.minor=function(e,t){return new G(e,t).minor},t.patch=function(e,t){return new G(e,t).patch},t.compare=Y,t.compareLoose=function(e,t){return Y(e,t,!0)},t.rcompare=function(e,t,r){return Y(t,e,r)},t.sort=function(e,r){return e.sort((function(e,n){return t.compare(e,n,r)}))},t.rsort=function(e,r){return e.sort((function(e,n){return t.rcompare(e,n,r)}))},t.gt=z,t.lt=W,t.eq=J,t.neq=Z,t.gte=ee,t.lte=te,t.cmp=re,t.Comparator=ne;var ie={};function oe(e,t){if(t&&"object"==typeof t||(t={loose:!!t,includePrerelease:!1}),e instanceof oe)return e.loose===!!t.loose&&e.includePrerelease===!!t.includePrerelease?e:new oe(e.raw,t);if(e instanceof ne)return new oe(e.value,t);if(!(this instanceof oe))return new oe(e,t);if(this.options=t,this.loose=!!t.loose,this.includePrerelease=!!t.includePrerelease,this.raw=e,this.set=e.split(/\s*\|\|\s*/).map((function(e){return this.parseRange(e.trim())}),this).filter((function(e){return e.length})),!this.set.length)throw new TypeError("Invalid SemVer Range: "+e);this.format()}function se(e){return!e||"x"===e.toLowerCase()||"*"===e}function ae(e,t,r,n,i,o,s,a,c,u,d,p,l){return((t=se(r)?"":se(n)?">="+r+".0.0":se(i)?">="+r+"."+n+".0":">="+t)+" "+(a=se(c)?"":se(u)?"<"+(+c+1)+".0.0":se(d)?"<"+c+"."+(+u+1)+".0":p?"<="+c+"."+u+"."+d+"-"+p:"<="+a)).trim()}function ce(e,t,n){for(var i=0;i<e.length;i++)if(!e[i].test(t))return!1;if(t.prerelease.length&&!n.includePrerelease){for(i=0;i<e.length;i++)if(r(e[i].semver),e[i].semver!==ie&&e[i].semver.prerelease.length>0){var o=e[i].semver;if(o.major===t.major&&o.minor===t.minor&&o.patch===t.patch)return!0}return!1}return!0}function ue(e,t,r){try{t=new oe(t,r)}catch(e){return!1}return t.test(e)}function de(e,t,r,n){var i,o,s,a,c;switch(e=new G(e,n),t=new oe(t,n),r){case">":i=z,o=te,s=W,a=">",c=">=";break;case"<":i=W,o=ee,s=z,a="<",c="<=";break;default:throw new TypeError('Must provide a hilo val of "<" or ">"')}if(ue(e,t,n))return!1;for(var u=0;u<t.set.length;++u){var d=t.set[u],p=null,l=null;if(d.forEach((function(e){e.semver===ie&&(e=new ne(">=0.0.0")),p=p||e,l=l||e,i(e.semver,p.semver,n)?p=e:s(e.semver,l.semver,n)&&(l=e)})),p.operator===a||p.operator===c)return!1;if((!l.operator||l.operator===a)&&o(e,l.semver))return!1;if(l.operator===c&&s(e,l.semver))return!1}return!0}ne.prototype.parse=function(e){var t=this.options.loose?i[L]:i[V],r=e.match(t);if(!r)throw new TypeError("Invalid comparator: "+e);this.operator=r[1],"="===this.operator&&(this.operator=""),r[2]?this.semver=new G(r[2],this.options.loose):this.semver=ie},ne.prototype.toString=function(){return this.value},ne.prototype.test=function(e){return r("Comparator.test",e,this.options.loose),this.semver===ie||("string"==typeof e&&(e=new G(e,this.options)),re(e,this.operator,this.semver,this.options))},ne.prototype.intersects=function(e,t){if(!(e instanceof ne))throw new TypeError("a Comparator is required");var r;if(t&&"object"==typeof t||(t={loose:!!t,includePrerelease:!1}),""===this.operator)return r=new oe(e.value,t),ue(this.value,r,t);if(""===e.operator)return r=new oe(this.value,t),ue(e.semver,r,t);var n=!(">="!==this.operator&&">"!==this.operator||">="!==e.operator&&">"!==e.operator),i=!("<="!==this.operator&&"<"!==this.operator||"<="!==e.operator&&"<"!==e.operator),o=this.semver.version===e.semver.version,s=!(">="!==this.operator&&"<="!==this.operator||">="!==e.operator&&"<="!==e.operator),a=re(this.semver,"<",e.semver,t)&&(">="===this.operator||">"===this.operator)&&("<="===e.operator||"<"===e.operator),c=re(this.semver,">",e.semver,t)&&("<="===this.operator||"<"===this.operator)&&(">="===e.operator||">"===e.operator);return n||i||o&&s||a||c},t.Range=oe,oe.prototype.format=function(){return this.range=this.set.map((function(e){return e.join(" ").trim()})).join("||").trim(),this.range},oe.prototype.toString=function(){return this.range},oe.prototype.parseRange=function(e){var t=this.options.loose;e=e.trim();var n=t?i[F]:i[B];e=e.replace(n,ae),r("hyphen replace",e),e=e.replace(i[M],"$1$2$3"),r("comparator trim",e,i[M]),e=(e=(e=e.replace(i[P],"$1~")).replace(i[q],"$1^")).split(/\s+/).join(" ");var o=t?i[L]:i[V],s=e.split(" ").map((function(e){return function(e,t){return r("comp",e,t),e=function(e,t){return e.trim().split(/\s+/).map((function(e){return function(e,t){r("caret",e,t);var n=t.loose?i[U]:i[N];return e.replace(n,(function(t,n,i,o,s){var a;return r("caret",e,t,n,i,o,s),se(n)?a="":se(i)?a=">="+n+".0.0 <"+(+n+1)+".0.0":se(o)?a="0"===n?">="+n+"."+i+".0 <"+n+"."+(+i+1)+".0":">="+n+"."+i+".0 <"+(+n+1)+".0.0":s?(r("replaceCaret pr",s),a="0"===n?"0"===i?">="+n+"."+i+"."+o+"-"+s+" <"+n+"."+i+"."+(+o+1):">="+n+"."+i+"."+o+"-"+s+" <"+n+"."+(+i+1)+".0":">="+n+"."+i+"."+o+"-"+s+" <"+(+n+1)+".0.0"):(r("no pr"),a="0"===n?"0"===i?">="+n+"."+i+"."+o+" <"+n+"."+i+"."+(+o+1):">="+n+"."+i+"."+o+" <"+n+"."+(+i+1)+".0":">="+n+"."+i+"."+o+" <"+(+n+1)+".0.0"),r("caret return",a),a}))}(e,t)})).join(" ")}(e,t),r("caret",e),e=function(e,t){return e.trim().split(/\s+/).map((function(e){return function(e,t){var n=t.loose?i[j]:i[R];return e.replace(n,(function(t,n,i,o,s){var a;return r("tilde",e,t,n,i,o,s),se(n)?a="":se(i)?a=">="+n+".0.0 <"+(+n+1)+".0.0":se(o)?a=">="+n+"."+i+".0 <"+n+"."+(+i+1)+".0":s?(r("replaceTilde pr",s),a=">="+n+"."+i+"."+o+"-"+s+" <"+n+"."+(+i+1)+".0"):a=">="+n+"."+i+"."+o+" <"+n+"."+(+i+1)+".0",r("tilde return",a),a}))}(e,t)})).join(" ")}(e,t),r("tildes",e),e=function(e,t){return r("replaceXRanges",e,t),e.split(/\s+/).map((function(e){return function(e,t){e=e.trim();var n=t.loose?i[S]:i[I];return e.replace(n,(function(t,n,i,o,s,a){r("xRange",e,t,n,i,o,s,a);var c=se(i),u=c||se(o),d=u||se(s);return"="===n&&d&&(n=""),c?t=">"===n||"<"===n?"<0.0.0":"*":n&&d?(u&&(o=0),s=0,">"===n?(n=">=",u?(i=+i+1,o=0,s=0):(o=+o+1,s=0)):"<="===n&&(n="<",u?i=+i+1:o=+o+1),t=n+i+"."+o+"."+s):u?t=">="+i+".0.0 <"+(+i+1)+".0.0":d&&(t=">="+i+"."+o+".0 <"+i+"."+(+o+1)+".0"),r("xRange return",t),t}))}(e,t)})).join(" ")}(e,t),r("xrange",e),e=function(e,t){return r("replaceStars",e,t),e.trim().replace(i[$],"")}(e,t),r("stars",e),e}(e,this.options)}),this).join(" ").split(/\s+/);return this.options.loose&&(s=s.filter((function(e){return!!e.match(o)}))),s=s.map((function(e){return new ne(e,this.options)}),this)},oe.prototype.intersects=function(e,t){if(!(e instanceof oe))throw new TypeError("a Range is required");return this.set.some((function(r){return r.every((function(r){return e.set.some((function(e){return e.every((function(e){return r.intersects(e,t)}))}))}))}))},t.toComparators=function(e,t){return new oe(e,t).set.map((function(e){return e.map((function(e){return e.value})).join(" ").trim().split(" ")}))},oe.prototype.test=function(e){if(!e)return!1;"string"==typeof e&&(e=new G(e,this.options));for(var t=0;t<this.set.length;t++)if(ce(this.set[t],e,this.options))return!0;return!1},t.satisfies=ue,t.maxSatisfying=function(e,t,r){var n=null,i=null;try{var o=new oe(t,r)}catch(e){return null}return e.forEach((function(e){o.test(e)&&(n&&-1!==i.compare(e)||(i=new G(n=e,r)))})),n},t.minSatisfying=function(e,t,r){var n=null,i=null;try{var o=new oe(t,r)}catch(e){return null}return e.forEach((function(e){o.test(e)&&(n&&1!==i.compare(e)||(i=new G(n=e,r)))})),n},t.minVersion=function(e,t){e=new oe(e,t);var r=new G("0.0.0");if(e.test(r))return r;if(r=new G("0.0.0-0"),e.test(r))return r;r=null;for(var n=0;n<e.set.length;++n){e.set[n].forEach((function(e){var t=new G(e.semver.version);switch(e.operator){case">":0===t.prerelease.length?t.patch++:t.prerelease.push(0),t.raw=t.format();case"":case">=":r&&!z(r,t)||(r=t);break;case"<":case"<=":break;default:throw new Error("Unexpected operation: "+e.operator)}}))}if(r&&e.test(r))return r;return null},t.validRange=function(e,t){try{return new oe(e,t).range||"*"}catch(e){return null}},t.ltr=function(e,t,r){return de(e,t,"<",r)},t.gtr=function(e,t,r){return de(e,t,">",r)},t.outside=de,t.prerelease=function(e,t){var r=K(e,t);return r&&r.prerelease.length?r.prerelease:null},t.intersects=function(e,t,r){return e=new oe(e,r),t=new oe(t,r),e.intersects(t)},t.coerce=function(e){if(e instanceof G)return e;if("string"!=typeof e)return null;var t=e.match(i[k]);if(null==t)return null;return K(t[1]+"."+(t[2]||"0")+"."+(t[3]||"0"))}})),vt=(wt.SEMVER_SPEC_VERSION,wt.re,wt.src,wt.parse,wt.valid,wt.clean,wt.SemVer,wt.inc,wt.diff,wt.compareIdentifiers,wt.rcompareIdentifiers,wt.major,wt.minor,wt.patch,wt.compare,wt.compareLoose,wt.rcompare,wt.sort,wt.rsort,wt.gt,wt.lt,wt.eq,wt.neq,wt.gte,wt.lte,wt.cmp,wt.Comparator,wt.Range,wt.toComparators,wt.satisfies,wt.maxSatisfying,wt.minSatisfying,wt.minVersion,wt.validRange,wt.ltr,wt.gtr,wt.outside,wt.prerelease,wt.intersects,wt.coerce,wt.satisfies(process.version,"^6.12.0 || >=8.0.0")),_t=["RS256","RS384","RS512","ES256","ES384","ES512"],bt=["RS256","RS384","RS512"],Tt=["HS256","HS384","HS512"];vt&&(_t.splice(3,0,"PS256","PS384","PS512"),bt.splice(3,0,"PS256","PS384","PS512"));var Et=/^\s+|\s+$/g,Ct=/^[-+]0x[0-9a-f]+$/i,At=/^0b[01]+$/i,xt=/^0o[0-7]+$/i,It=/^(?:0|[1-9]\d*)$/,St=parseInt;function kt(e){return e!=e}function Ot(e,t){return function(e,t){for(var r=-1,n=e?e.length:0,i=Array(n);++r<n;)i[r]=t(e[r],r,e);return i}(t,(function(t){return e[t]}))}var Pt,Rt,jt=Object.prototype,Dt=jt.hasOwnProperty,qt=jt.toString,Nt=jt.propertyIsEnumerable,Ut=(Pt=Object.keys,Rt=Object,function(e){return Pt(Rt(e))}),Lt=Math.max;function Vt(e,t){var r=Ft(e)||function(e){return function(e){return Kt(e)&&$t(e)}(e)&&Dt.call(e,"callee")&&(!Nt.call(e,"callee")||"[object Arguments]"==qt.call(e))}(e)?function(e,t){for(var r=-1,n=Array(e);++r<e;)n[r]=t(r);return n}(e.length,String):[],n=r.length,i=!!n;for(var o in e)!t&&!Dt.call(e,o)||i&&("length"==o||Bt(o,n))||r.push(o);return r}function Mt(e){if(r=(t=e)&&t.constructor,n="function"==typeof r&&r.prototype||jt,t!==n)return Ut(e);var t,r,n,i=[];for(var o in Object(e))Dt.call(e,o)&&"constructor"!=o&&i.push(o);return i}function Bt(e,t){return!!(t=null==t?9007199254740991:t)&&("number"==typeof e||It.test(e))&&e>-1&&e%1==0&&e<t}var Ft=Array.isArray;function $t(e){return null!=e&&function(e){return"number"==typeof e&&e>-1&&e%1==0&&e<=9007199254740991}(e.length)&&!function(e){var t=Ht(e)?qt.call(e):"";return"[object Function]"==t||"[object GeneratorFunction]"==t}(e)}function Ht(e){var t=typeof e;return!!e&&("object"==t||"function"==t)}function Kt(e){return!!e&&"object"==typeof e}var Gt=function(e,t,r,n){var i;e=$t(e)?e:(i=e)?Ot(i,function(e){return $t(e)?Vt(e):Mt(e)}(i)):[],r=r&&!n?function(e){var t=function(e){if(!e)return 0===e?e:0;if((e=function(e){if("number"==typeof e)return e;if(function(e){return"symbol"==typeof e||Kt(e)&&"[object Symbol]"==qt.call(e)}(e))return NaN;if(Ht(e)){var t="function"==typeof e.valueOf?e.valueOf():e;e=Ht(t)?t+"":t}if("string"!=typeof e)return 0===e?e:+e;e=e.replace(Et,"");var r=At.test(e);return r||xt.test(e)?St(e.slice(2),r?2:8):Ct.test(e)?NaN:+e}(e))===1/0||e===-1/0){return 17976931348623157e292*(e<0?-1:1)}return e==e?e:0}(e),r=t%1;return t==t?r?t-r:t:0}(r):0;var o=e.length;return r<0&&(r=Lt(o+r,0)),function(e){return"string"==typeof e||!Ft(e)&&Kt(e)&&"[object String]"==qt.call(e)}(e)?r<=o&&e.indexOf(t,r)>-1:!!o&&function(e,t,r){if(t!=t)return function(e,t,r,n){for(var i=e.length,o=r+(n?1:-1);n?o--:++o<i;)if(t(e[o],o,e))return o;return-1}(e,kt,r);for(var n=r-1,i=e.length;++n<i;)if(e[n]===t)return n;return-1}(e,t,r)>-1},Qt=Object.prototype.toString;var Xt=function(e){return!0===e||!1===e||function(e){return!!e&&"object"==typeof e}(e)&&"[object Boolean]"==Qt.call(e)},Yt=/^\s+|\s+$/g,zt=/^[-+]0x[0-9a-f]+$/i,Wt=/^0b[01]+$/i,Jt=/^0o[0-7]+$/i,Zt=parseInt,er=Object.prototype.toString;function tr(e){var t=typeof e;return!!e&&("object"==t||"function"==t)}var rr=function(e){return"number"==typeof e&&e==function(e){var t=function(e){if(!e)return 0===e?e:0;if((e=function(e){if("number"==typeof e)return e;if(function(e){return"symbol"==typeof e||function(e){return!!e&&"object"==typeof e}(e)&&"[object Symbol]"==er.call(e)}(e))return NaN;if(tr(e)){var t="function"==typeof e.valueOf?e.valueOf():e;e=tr(t)?t+"":t}if("string"!=typeof e)return 0===e?e:+e;e=e.replace(Yt,"");var r=Wt.test(e);return r||Jt.test(e)?Zt(e.slice(2),r?2:8):zt.test(e)?NaN:+e}(e))===1/0||e===-1/0){return 17976931348623157e292*(e<0?-1:1)}return e==e?e:0}(e),r=t%1;return t==t?r?t-r:t:0}(e)},nr=Object.prototype.toString;var ir=function(e){return"number"==typeof e||function(e){return!!e&&"object"==typeof e}(e)&&"[object Number]"==nr.call(e)};var or=Function.prototype,sr=Object.prototype,ar=or.toString,cr=sr.hasOwnProperty,ur=ar.call(Object),dr=sr.toString,pr=function(e,t){return function(r){return e(t(r))}}(Object.getPrototypeOf,Object);var lr=function(e){if(!function(e){return!!e&&"object"==typeof e}(e)||"[object Object]"!=dr.call(e)||function(e){var t=!1;if(null!=e&&"function"!=typeof e.toString)try{t=!!(e+"")}catch(e){}return t}(e))return!1;var t=pr(e);if(null===t)return!0;var r=cr.call(t,"constructor")&&t.constructor;return"function"==typeof r&&r instanceof r&&ar.call(r)==ur},fr=Object.prototype.toString,mr=Array.isArray;var hr=function(e){return"string"==typeof e||!mr(e)&&function(e){return!!e&&"object"==typeof e}(e)&&"[object String]"==fr.call(e)},gr=/^\s+|\s+$/g,yr=/^[-+]0x[0-9a-f]+$/i,wr=/^0b[01]+$/i,vr=/^0o[0-7]+$/i,_r=parseInt,br=Object.prototype.toString;function Tr(e,t){var r;if("function"!=typeof t)throw new TypeError("Expected a function");return e=function(e){var t=function(e){if(!e)return 0===e?e:0;if((e=function(e){if("number"==typeof e)return e;if(function(e){return"symbol"==typeof e||function(e){return!!e&&"object"==typeof e}(e)&&"[object Symbol]"==br.call(e)}(e))return NaN;if(Er(e)){var t="function"==typeof e.valueOf?e.valueOf():e;e=Er(t)?t+"":t}if("string"!=typeof e)return 0===e?e:+e;e=e.replace(gr,"");var r=wr.test(e);return r||vr.test(e)?_r(e.slice(2),r?2:8):yr.test(e)?NaN:+e}(e))===1/0||e===-1/0){return 17976931348623157e292*(e<0?-1:1)}return e==e?e:0}(e),r=t%1;return t==t?r?t-r:t:0}(e),function(){return--e>0&&(r=t.apply(this,arguments)),e<=1&&(t=void 0),r}}function Er(e){var t=typeof e;return!!e&&("object"==t||"function"==t)}var Cr=function(e){return Tr(2,e)},Ar=["RS256","RS384","RS512","ES256","ES384","ES512","HS256","HS384","HS512","none"];vt&&Ar.splice(3,0,"PS256","PS384","PS512");var xr={expiresIn:{isValid:function(e){return rr(e)||hr(e)&&e},message:'"expiresIn" should be a number of seconds or string representing a timespan'},notBefore:{isValid:function(e){return rr(e)||hr(e)&&e},message:'"notBefore" should be a number of seconds or string representing a timespan'},audience:{isValid:function(e){return hr(e)||Array.isArray(e)},message:'"audience" must be a string or array'},algorithm:{isValid:Gt.bind(null,Ar),message:'"algorithm" must be a valid string enum value'},header:{isValid:lr,message:'"header" must be an object'},encoding:{isValid:hr,message:'"encoding" must be a string'},issuer:{isValid:hr,message:'"issuer" must be a string'},subject:{isValid:hr,message:'"subject" must be a string'},jwtid:{isValid:hr,message:'"jwtid" must be a string'},noTimestamp:{isValid:Xt,message:'"noTimestamp" must be a boolean'},keyid:{isValid:hr,message:'"keyid" must be a string'},mutatePayload:{isValid:Xt,message:'"mutatePayload" must be a boolean'}},Ir={iat:{isValid:ir,message:'"iat" should be a number of seconds'},exp:{isValid:ir,message:'"exp" should be a number of seconds'},nbf:{isValid:ir,message:'"nbf" should be a number of seconds'}};function Sr(e,t,r,n){if(!lr(r))throw new Error('Expected "'+n+'" to be a plain object.');Object.keys(r).forEach((function(i){var o=e[i];if(o){if(!o.isValid(r[i]))throw new Error(o.message)}else if(!t)throw new Error('"'+i+'" is not allowed in "'+n+'"')}))}var kr={audience:"aud",issuer:"iss",subject:"sub",jwtid:"jti"},Or=["expiresIn","notBefore","noTimestamp","audience","issuer","subject","jwtid"],Pr=function(e,t,r,n){var i;if("function"!=typeof r||n||(n=r,r={}),r||(r={}),r=Object.assign({},r),i=n||function(e,t){if(e)throw e;return t},r.clockTimestamp&&"number"!=typeof r.clockTimestamp)return i(new st("clockTimestamp must be a number"));if(void 0!==r.nonce&&("string"!=typeof r.nonce||""===r.nonce.trim()))return i(new st("nonce must be a non-empty string"));var o=r.clockTimestamp||Math.floor(Date.now()/1e3);if(!e)return i(new st("jwt must be provided"));if("string"!=typeof e)return i(new st("jwt must be a string"));var s,a=e.split(".");if(3!==a.length)return i(new st("jwt malformed"));try{s=it(e,{complete:!0})}catch(e){return i(e)}if(!s)return i(new st("invalid token"));var c,u=s.header;if("function"==typeof t){if(!n)return i(new st("verify must be called asynchronous if secret or public key is provided as a callback"));c=t}else c=function(e,r){return r(null,t)};return c(u,(function(t,n){if(t)return i(new st("error in secret or public key callback: "+t.message));var c,d=""!==a[2].trim();if(!d&&n)return i(new st("jwt signature is required"));if(d&&!n)return i(new st("secret or public key must be provided"));if(d||r.algorithms||(r.algorithms=["none"]),r.algorithms||(r.algorithms=~n.toString().indexOf("BEGIN CERTIFICATE")||~n.toString().indexOf("BEGIN PUBLIC KEY")?_t:~n.toString().indexOf("BEGIN RSA PUBLIC KEY")?bt:Tt),!~r.algorithms.indexOf(s.header.alg))return i(new st("invalid algorithm"));try{c=nt.verify(e,s.header.alg,n)}catch(e){return i(e)}if(!c)return i(new st("invalid signature"));var p=s.payload;if(void 0!==p.nbf&&!r.ignoreNotBefore){if("number"!=typeof p.nbf)return i(new st("invalid nbf value"));if(p.nbf>o+(r.clockTolerance||0))return i(new ct("jwt not active",new Date(1e3*p.nbf)))}if(void 0!==p.exp&&!r.ignoreExpiration){if("number"!=typeof p.exp)return i(new st("invalid exp value"));if(o>=p.exp+(r.clockTolerance||0))return i(new dt("jwt expired",new Date(1e3*p.exp)))}if(r.audience){var l=Array.isArray(r.audience)?r.audience:[r.audience];if(!(Array.isArray(p.aud)?p.aud:[p.aud]).some((function(e){return l.some((function(t){return t instanceof RegExp?t.test(e):t===e}))})))return i(new st("jwt audience invalid. expected: "+l.join(" or ")))}if(r.issuer&&("string"==typeof r.issuer&&p.iss!==r.issuer||Array.isArray(r.issuer)&&-1===r.issuer.indexOf(p.iss)))return i(new st("jwt issuer invalid. expected: "+r.issuer));if(r.subject&&p.sub!==r.subject)return i(new st("jwt subject invalid. expected: "+r.subject));if(r.jwtid&&p.jti!==r.jwtid)return i(new st("jwt jwtid invalid. expected: "+r.jwtid));if(r.nonce&&p.nonce!==r.nonce)return i(new st("jwt nonce invalid. expected: "+r.nonce));if(r.maxAge){if("number"!=typeof p.iat)return i(new st("iat required when maxAge is specified"));var f=yt(r.maxAge,p.iat);if(void 0===f)return i(new st('"maxAge" should be a number of seconds or string representing a timespan eg: "1d", "20h", 60'));if(o>=f+(r.clockTolerance||0))return i(new dt("maxAge exceeded",new Date(1e3*f)))}if(!0===r.complete){var m=s.signature;return i(null,{header:u,payload:p,signature:m})}return i(null,p)}))},Rr=function(e,t,r,n){"function"==typeof r?(n=r,r={}):r=r||{};var i="object"==typeof e&&!Buffer.isBuffer(e),o=Object.assign({alg:r.algorithm||"HS256",typ:i?"JWT":void 0,kid:r.keyid},r.header);function s(e){if(n)return n(e);throw e}if(!t&&"none"!==r.algorithm)return s(new Error("secretOrPrivateKey must have a value"));if(void 0===e)return s(new Error("payload is required"));if(i){try{!function(e){Sr(Ir,!0,e,"payload")}(e)}catch(e){return s(e)}r.mutatePayload||(e=Object.assign({},e))}else{var a=Or.filter((function(e){return void 0!==r[e]}));if(a.length>0)return s(new Error("invalid "+a.join(",")+" option for "+typeof e+" payload"))}if(void 0!==e.exp&&void 0!==r.expiresIn)return s(new Error('Bad "options.expiresIn" option the payload already has an "exp" property.'));if(void 0!==e.nbf&&void 0!==r.notBefore)return s(new Error('Bad "options.notBefore" option the payload already has an "nbf" property.'));try{!function(e){Sr(xr,!1,e,"options")}(r)}catch(e){return s(e)}var c=e.iat||Math.floor(Date.now()/1e3);if(r.noTimestamp?delete e.iat:i&&(e.iat=c),void 0!==r.notBefore){try{e.nbf=yt(r.notBefore,c)}catch(e){return s(e)}if(void 0===e.nbf)return s(new Error('"notBefore" should be a number of seconds or string representing a timespan eg: "1d", "20h", 60'))}if(void 0!==r.expiresIn&&"object"==typeof e){try{e.exp=yt(r.expiresIn,c)}catch(e){return s(e)}if(void 0===e.exp)return s(new Error('"expiresIn" should be a number of seconds or string representing a timespan eg: "1d", "20h", 60'))}Object.keys(kr).forEach((function(t){var n=kr[t];if(void 0!==r[t]){if(void 0!==e[n])return s(new Error('Bad "options.'+t+'" option. The payload already has an "'+n+'" property.'));e[n]=r[t]}}));var u=r.encoding||"utf8";if("function"!=typeof n)return nt.sign({header:o,payload:e,secret:t,encoding:u});n=n&&Cr(n),nt.createSign({header:o,privateKey:t,payload:e,encoding:u}).once("error",n).once("done",(function(e){n(null,e)}))};let jr=[];class Dr{constructor(e){this.options=Object.assign({baseUrl:"https://appleid.apple.com",timeout:1e4},e)}async _fetch(e,t){const{baseUrl:r}=this.options;return uniCloud.httpclient.request(r+e,t)}async verifyIdentityToken(e){const t=e.split(".")[0],{kid:r}=JSON.parse(Buffer.from(t,"base64").toString());if(!jr.length)try{jr=await this.getAuthKeys()}catch(e){return{code:10705,msg:e.message}}const n=this.getUsedKey(jr,r);if(!Object.keys(n).length&&!this.fetched)try{jr=await this.getAuthKeys()}catch(e){return{code:10705,msg:e.message}}let i=null;try{i=Pr(e,function(e,t){var r=Buffer.from(e,"base64"),n=Buffer.from(t,"base64"),i=r.toString("hex"),o=n.toString("hex");i=J(i),o=J(o);var s=i.length/2,a=o.length/2,c=ee(s),u=ee(a),d="30"+ee(s+a+c.length/2+u.length/2+2)+"02"+c+i+"02"+u+o;return"-----BEGIN RSA PUBLIC KEY-----\n"+Buffer.from(d,"hex").toString("base64").match(/.{1,64}/g).join("\n")+"\n-----END RSA PUBLIC KEY-----\n"}(n.n,n.e),{algorithms:n.alg})}catch(e){return{code:10705,msg:e.message}}return{code:0,msg:i}}async getAuthKeys(){const{status:e,data:t}=await this._fetch("/auth/keys",{method:"GET",dataType:"json",timeout:this.options.timeout});if(200!==e)throw new Error("request https://appleid.apple.com/auth/keys fail");return t.keys}getUsedKey(e,t){let r={};for(let n=0;n<e.length;n++){const i=e[n];if(i.kid===t){r=i;break}}return r}}var qr=function(e={}){return e.appId=e.appid,e.secret=e.appsecret,I(G,e)},Nr=function(e={}){return e.appId=e.appid,e.secret=e.appsecret,I(X,e)},Ur=function(e={}){return e.appId=e.appid,I(W,e)},Lr=function(e={}){return I(Dr,e)};function Vr(e=6){const t=["2","3","4","5","6","7","8","9","A","B","C","D","E","F","G","H","J","K","L","M","N","P","Q","R","S","T","U","V","W","X","Y","Z"];let r="";for(let n=0;n<e;n++)r+=t[Math.floor(Math.random()*t.length)];return r}const Mr=O.command;async function Br({uid:e,dcloudAppidList:t}={}){if(!e)return{code:N,messageValues:{param:this.t("user-id")}};if(!t||0===t.length||t.some(e=>void 0===e))return{code:N,messageValues:{param:this.t("dcloud-appid")}};const r=await P.doc(e).get(),n=r&&r.data&&r.data[0];if(!n)return{code:10002};const i=Object.keys(q).reduce((e,t)=>{const r=t,i=function(e,t){return t.split(".").reduce((e,t)=>e&&e[t],e)}(n,t);return i&&e.push({[r]:i}),e},[]);let o;const s={dcloud_appid:Mr.in(t),_id:Mr.neq(n._id)},a={dcloud_appid:Mr.exists(!1),_id:Mr.neq(n._id)};switch(i.length){case 0:return{code:10004};case 1:o=Mr.or([Mr.and([i[0],s]),Mr.and([i[0],a])]);break;default:o=Mr.or([Mr.and([Mr.or(i),s]),Mr.and([Mr.or(i),a])])}const c=await P.where(o).limit(1).get();return c&&c.data&&c.data[0]?{code:10005}:{code:0}}const Fr=uniCloud.database().command;const $r=uniCloud.database();const Hr=uniCloud.database().command;const Kr=uniCloud.database();const Gr=uniCloud.database();async function Qr(e){const t=["apiKey","apiSecret"];for(let r=0,n=t.length;r<n;r++){const n=t[r];if(!e[n])throw new Error(this.t("config-param-requred",{param:"service.univerify."+n}))}if(!e.openid||!e.access_token)throw new Error(this.t("config-param-requred",{param:"openid, access_token"}));return function(e,t){const r={0:"",4e3:"缺失参数",4001:"apiKey不存在",4002:"sign校验不通过",4003:"appid不存在",4004:"应用未开通一键登录服务",4005:"应用开通的一键登录服务正在审核中",4006:"服务空间不在白名单中",4100:"账户余额不足",5e3:"获取手机号失败，请稍后重试(或其他未知错误)"};return{...e,msg:r[e.code]?"[getPhoneNumber] 获取手机号: "+r[e.code]:e.errMsg}}(await uniCloud.getPhoneNumber({provider:"univerify",...e}))}const Xr=uniCloud.database();const Yr=uniCloud.database();const zr=uniCloud.database();const Wr=uniCloud.database().command;const Jr=uniCloud.database();const Zr=uniCloud.database();const en=uniCloud.database();const tn=uniCloud.database();const rn=uniCloud.database();const nn=uniCloud.database();const on=uniCloud.database();const sn={"mobile-code":function(e){return!!(e.service&&e.service.sms&&e.service.sms.smsKey)},univerify:function(e){return!!(e.service&&e.service.univerify&&e.service.univerify.apiKey)},weixin:function(e){return!!(e.oauth&&e.oauth.weixin&&e.oauth.weixin.appsecret)},qq:function(e){return!!(e.oauth&&e.oauth.qq&&e.oauth.qq.appsecret)},apple:function(e){return!!(e.oauth&&e.oauth.apple&&e.oauth.apple.bundleId)},alipay:function(e){return!!(e.oauth&&e.oauth.alipay&&e.oauth.alipay.privateKey)}};const an=uniCloud.database();var cn=Object.freeze({__proto__:null,addUser:async function({username:e,nickname:t,password:r,mobile:n,email:i,role:o=[],authorizedApp:s=[]}={}){const a=O.command,c=[];if(!e&&!n&&!i)throw new Error("username, mobile or email required");let u;if(e&&c.push({username:e}),n&&c.push({mobile:n,mobile_confirmed:1}),i&&c.push({email:i,email_confirmed:1}),s.length>0){u=a.and(a.or(c),a.or({dcloud_appid:a.in(s)},{dcloud_appid:a.exists(!1)}));if((await P.where(u).limit(1).get()).data.length>0)return{code:10201,messageValues:{type:this.t("username")}}}const d={role:o,nickname:t,dcloud_appid:s,register_date:Date.now()};if(e&&(d.username=e),r){const{passwordHash:e,version:t}=this.encryptPwd(r);d.password=e,t&&(d.password_secret_version=t)}return n&&(d.mobile=n,d.mobile_confirmed=1),i&&(d.email=i,d.email_confirmed=1),{code:0,uid:(await P.add(d)).id}},getUserInfo:async function({uid:e,field:t}){if(!e)return{code:N,messageValues:{param:this.t("user-id")}};let r;if(t&&t.length){const n={};for(let e=0;e<t.length;e++)n[t[e]]=!0;r=await P.doc(e).field(n).get()}else r=await P.doc(e).get();return 0===r.data.length?{code:80301}:{code:0,msg:"",userInfo:r.data[0]}},getUserInfoByToken:async function(e){const t=this._verifyToken(e);return t.code||(delete t.iat,delete t.exp),t},resetPwd:async function({uid:e,password:t}){const{passwordHash:r,version:n}=this.encryptPwd(t),i={password:r,token:[]};return n&&(i.password_secret_version=n),E("upRes",await P.doc(e).update(i)),{code:0,msg:""}},resetPwdBySms:async function({mobile:e,code:t,password:r}){const n=await this.verifyCode({mobile:e,code:t,type:"reset-pwd"});if(0!==n.code)return n;const i=(await P.where({mobile:e}).get()).data.filter(e=>void 0===e.dcloud_appid||e.dcloud_appid.includes(this.context.APPID));if(0===i.length)return{code:10002};if(i.length>1)return{code:10005};const o=i[0]._id;return this.resetPwd({uid:o,password:r})},setAvatar:async function(e){return await P.doc(e.uid).update({avatar:e.avatar}),{code:0,msg:""}},updatePwd:async function(e){const t=await P.doc(e.uid).get();if(t&&t.data&&t.data.length>0){if(0===this._checkPwd(t.data[0],e.oldPassword).code){const{passwordHash:r,version:n}=this.encryptPwd(e.newPassword),i={password:r,token:[]};n&&(i.password_secret_version=n);return E("upRes",await P.doc(t.data[0]._id).update(i)),{code:0,msg:""}}return{code:40202}}return{code:40201}},updateUser:async function(e){const t=e.uid;if(!t)return{code:N,messageValues:{param:this.t("user-id")}};delete e.uid;const{username:r,email:n}=e,{usernameToLowerCase:i,emailToLowerCase:o}=this._getConfig();let s=r&&r.trim(),a=n&&n.trim();return s&&(i&&(s=s.toLowerCase()),e.username=s),a&&(o&&(a=a.toLowerCase()),e.email=a),E("update -> upRes",await P.doc(t).update(e)),{code:0,msg:""}},banAccount:async function({uid:e}={}){return $.call(this,{uid:e,status:B})},unbanAccount:async function({uid:e}={}){return $.call(this,{uid:e,status:M})},closeAccount:async function({uid:e}={}){return $.call(this,{uid:e,status:F})},openAccount:async function({uid:e}={}){return $.call(this,{uid:e,status:M})},_getAlipayApi:function(){const e=this.context.PLATFORM,t=this._getConfig();if(!t.oauth||!t.oauth.alipay)throw new Error(this.t("config-param-require",{param:e+".alipay"}));return["appid","privateKey"].forEach(r=>{if(!t.oauth.alipay[r])throw new Error(this.t("config-param-require",{param:`${e}.alipay.${r}`}))}),Ur({...t.oauth.alipay})},_getValidInviteCode:async function({inviteCode:e}){let t,r=10;e?(r=1,t=e):t=Vr();let n=!1;try{for(;r>0&&!n;){r--;if(0===(await P.where({my_invite_code:t}).get()).data.length){n=!0;break}t=Vr()}t=Vr()}catch(e){}return n?{code:0,inviteCode:t}:e?{code:80401}:{code:80402}},_addUser:async function(e,{needPermission:t,autoSetDcloudAppid:r=!0}={}){const n=this._getConfig(),i={...e,dcloud_appid:r?[this.context.APPID]:[],register_date:Date.now()},o=(await P.add(i)).id;let s;if(n.removePermissionAndRoleFromToken)s=await this.createToken({uid:o,needPermission:t});else{const t=e.role||[];let r;r=0===t.length||t.includes("admin")?[]:await this._getPermissionListByRoleList(t),s=await this.createToken({uid:o,role:t,permission:r})}const{token:a,tokenExpired:c}=s;return await P.doc(o).update({token:[a]}),{token:a,tokenExpired:c,uid:o,type:"register",userInfo:Object.assign({},i,{token:[a]})}},_loginExec:async function(e,t={}){if(e.status===B)return{code:10001};if(e.status===F)return{code:10006};const r=this._getConfig();let n=e.token||[];"string"==typeof n&&(n=[n]);const i=this._getExpiredToken(n);let o;if(n=n.filter(e=>-1===i.indexOf(e)),r.removePermissionAndRoleFromToken){const r=t.needPermission;o=await this.createToken({uid:e._id,needPermission:r})}else{const t=e.role||[];let r;r=0===t.length||t.includes("admin")?[]:await this._getPermissionListByRoleList(t),o=await this.createToken({uid:e._id,role:t,permission:r})}const{token:s,tokenExpired:a}=o;n.push(s),e.token=n;const c={last_login_date:Date.now(),last_login_ip:this.context.CLIENTIP,token:n,...t.extraData};await P.doc(e._id).update(c);const u=Object.assign({},e,c);return{code:0,msg:"",token:s,uid:u._id,username:u.username,type:"login",userInfo:u,tokenExpired:a}},_registerExec:async function(e,{needPermission:t,autoSetDcloudAppid:r=!0}={}){const{my_invite_code:n}=e;if(this._getConfig().autoSetInviteCode||n){const t=await this._getValidInviteCode({inviteCode:n});if(t.code)return t;e.my_invite_code=t.inviteCode}const{PLATFORM:i,appId:o,appid:s,APPID:a,uniPlatform:c,appName:u,appVersion:d,appVersionCode:p,channel:l,clientIP:f,CLIENTIP:m,OS:h,osName:g}=this.context;return e.register_env={appid:o||s||a||"",uni_platform:c||i||"",os_name:g||h||"",app_name:u||"",app_version:d||"",app_version_code:p||"",channel:l?l+"":"",client_ip:f||m||""},{code:0,msg:"",...await this._addUser(e,{needPermission:t,autoSetDcloudAppid:r})}},_getWeixinApi:function(){const e=this.context.PLATFORM,t=this._getConfig();if(!t.oauth||!t.oauth.weixin)throw new Error(this.t("config-param-require",{param:e+".weixin"}));return["appid","appsecret"].forEach(r=>{if(!t.oauth.weixin[r])throw new Error(this.t("config-param-require",{param:`${e}.weixin.${r}`}))}),qr({...t.oauth.weixin})},_getQQApi:function(){const e=this.context.PLATFORM,t=this._getConfig();if(!t.oauth||!t.oauth.qq)throw new Error(this.t("config-param-require",{param:e+".qq"}));return["appid","appsecret"].forEach(r=>{if(!t.oauth.qq[r])throw new Error(this.t("config-param-require",{param:`${e}.qq.${r}`}))}),Nr({...t.oauth.qq})},_getMatchedUser:function(e,t){if(0===e.length)return{code:10002};let r;const n={},i={};for(let r=e.length-1;r>=0;r--){const o=e[r];for(let s=0;s<t.length;s++){const{field:a,value:c,fallbackValue:u}=t[s];c&&o[a]===c?(n[a]=o,e.splice(r,1)):u&&o[a]===u&&(n[a]||(n[a]=o),i[a]=!0,e.splice(r,1))}}const o=Object.keys(n);let s;switch(o.length){case 0:r=e[0],e.splice(0,1);break;case 1:s=o[0],r=n[s];break;default:return{code:10003,messageValues:{target:"用户"}}}return e.length>0?{code:10003,messageValues:{target:"用户"}}:{code:0,msg:"",userMatched:r,fieldMatched:s,isFallbackValueMatched:!!s&&i[s]}},_getCurrentAppUser:function(e){const t=this.context.APPID;return e.filter(e=>void 0===e.dcloud_appid||null===e.dcloud_appid||e.dcloud_appid.indexOf(t)>-1||e.dcloud_appid.indexOf(null)>-1)},_checkLoginUserList:function(e){if(e&&1!==e.length)return e[0].status===F?{code:10006}:{code:10005}},setAuthorizedAppLogin:async function({uid:e,dcloudAppidList:t}={}){if("array"!==m(t))return{code:U,messageValues:{param:"dcloudAppidList",reason:this.t("type-array-required",{param:this.t("dcloud-appid-list")})}};if(t&&0!==t.length){const r=await Br.bind(this)({uid:e,dcloudAppidList:t});if(r.code)return r}return await P.doc(e).update({dcloud_appid:Mr.set(t)}),{code:0}},authorizeAppLogin:async function({uid:e,dcloudAppid:t}={}){const r=await Br.bind(this)({uid:e,dcloudAppidList:[t]});return r.code?r:(await P.doc(e).update({dcloud_appid:Mr.push(t)}),{code:0})},forbidAppLogin:async function({uid:e,dcloudAppid:t}={}){return e?(await P.doc(e).update({dcloud_appid:Mr.pull(t)}),{code:0}):{code:N,messageValues:{param:this.t("user-id")}}},acceptInvite:async function({uid:e,inviteCode:t}){const r=await P.where({_id:Fr.neq(e),inviter_uid:Fr.not(Fr.all([e])),my_invite_code:t}).get();if(1!==r.data.length)return{code:80501,msg:"邀请码无效"};const n=[r.data[0]._id].concat(r.data[0].inviter_uid||[]),i=await P.doc(e).field({my_invite_code:!0,inviter_uid:!0}).get();if(0===i.data.length)return{code:80502};if(i.data[0].inviter_uid&&i.data[0].inviter_uid.length>0)return{code:80503,msg:"邀请码不可修改"};const o=Date.now();return await P.doc(e).update({inviter_uid:n,invite_time:o}),await P.where({inviter_uid:e}).update({inviter_uid:Fr.push(n)}),{code:0,msg:""}},getInvitedUser:async function({uid:e,level:t=1,limit:r=20,offset:n=0,needTotal:i=!1}){const o={code:0,msg:"",invitedUser:(await P.where({["inviter_uid."+(t-1)]:e}).field({_id:!0,username:!0,mobile:!0,invite_time:!0}).orderBy("invite_time","desc").skip(n).limit(r).get()).data};if(i){const r=await P.where({["inviter_uid."+(t-1)]:e}).count();o.total=r.total}return o},setUserInviteCode:async function({uid:e,myInviteCode:t}){const r=await this._getValidInviteCode({inviteCode:t});return r.code?r:(await P.doc(e).update({my_invite_code:r.inviteCode}),{code:0,msg:"",myInviteCode:r.inviteCode})},loginByAlipay:async function(e){"string"==typeof e&&(e={code:e});const{needPermission:t,code:r,myInviteCode:n,role:i,type:o}=e,{openid:s}=await this._getAlipayApi().code2Session(r);if(!s)return{code:10501,messageValues:{account:this.t("alipay-account")}};let a=await P.where({ali_openid:s}).get();if(a=this._getCurrentAppUser(a.data),a&&a.length>0){if("register"===o)return{code:10502,messageValues:{type:this.t("alipay-account")}};if(1!==a.length)return{code:10005};const e=a[0],r=await this._loginExec(e,{needPermission:t});if(0!==r.code)return r;const{userInfo:n}=r;return{...r,openid:s,mobileConfirmed:1===n.mobile_confirmed,emailConfirmed:1===n.email_confirmed}}{if("login"===o)return{code:10503,messageValues:{type:this.t("alipay-account")}};const e={ali_openid:s};e.my_invite_code=n,e.role=i;const r=await this._registerExec(e,{needPermission:t});return 0!==r.code?r:{...r,openid:s,mobileConfirmed:!1,emailConfirmed:!1}}},loginByEmail:async function(e){let{email:t,code:r,password:n,myInviteCode:i,type:o,needPermission:s,role:a}=e||{};if(t=t&&t.trim(),!t)return{code:N,messageValues:{param:"邮箱"}};const{emailToLowerCase:c}=this._getConfig();let u=t;c&&(u=t.toLowerCase());const d=await this.verifyCode({email:u,code:r,type:o||"login"});if(0!==d.code)return d;let p={email:t,email_confirmed:1};const l={field:"email",value:t},f=$r.command;u!==t&&(p=f.or(p,{email:u,email_confirmed:1}),l.fallbackValue=u);let m=await P.where(p).get();if(m=this._getCurrentAppUser(m.data),m&&m.length>0){if("register"===o)return{code:10301,messageValues:{type:"邮箱"}};const e=this._getMatchedUser(m,[l]);if(e.code)return e;const{userMatched:t}=e,r=await this._loginExec(t,{needPermission:s});return 0!==r.code?r:{...r,email:u}}{if("login"===o)return{code:10302,messageValues:{type:"邮箱"}};const e={email:u,email_confirmed:1},t=n&&n.trim();if(t){const{passwordHash:r,version:n}=this.encryptPwd(t);e.password=r,n&&(e.password_secret_version=n)}e.my_invite_code=i,e.role=a;const r=await this._registerExec(e,{needPermission:s});return 0!==r.code?r:{...r,email:u}}},loginBySms:async function({mobile:e,code:t,password:r,inviteCode:n,myInviteCode:i,type:o,needPermission:s,role:a}){if(!(e=e&&e.trim()))return{code:N,messageValues:{param:this.t("mobile")}};const c=this._getConfig();if(c.forceInviteCode&&!o)throw new Error(this.t("login-with-invite-type-required"));const u=await this.verifyCode({mobile:e,code:t,type:o||"login"});if(0!==u.code)return u;const d={mobile:e,mobile_confirmed:1};let p=await P.where(d).get();if(p=this._getCurrentAppUser(p.data),p&&p.length>0){if("register"===o)return{code:10201,messageValues:{type:this.t("mobile")}};if(1!==p.length)return{code:10005};const t=p[0],r=await this._loginExec(t,{needPermission:s});return 0!==r.code?r:{...r,mobile:e}}{const t=Date.now();if("login"===o)return{code:10202,messageValues:{type:this.t("mobile")}};const u={mobile:e,mobile_confirmed:1,register_ip:this.context.CLIENTIP,register_date:t},d=r&&r.trim();if(d){const{passwordHash:e,version:t}=this.encryptPwd(d);u.password=e,t&&(u.password_secret_version=t)}if(n){const e=await P.where({my_invite_code:n}).get();if(1!==e.data.length)return{code:10203};u.inviter_uid=[e.data[0]._id].concat(e.data[0].inviter_uid||[]),u.invite_time=t}else if(c.forceInviteCode)return{code:10203};u.my_invite_code=i,u.role=a;const p=await this._registerExec(u,{needPermission:s});return 0!==p.code?p:{...p,mobile:e}}},loginByWeixin:async function(e){"string"==typeof e&&(e={code:e});const{needPermission:t,platform:r,code:n,myInviteCode:i,role:o,type:s}=e,a=r||this.context.PLATFORM,c=function({clientPlatform:e,userAgent:t}={}){switch(e){case"app":case"app-plus":return"app";case"mp-weixin":return"mp";case"h5":case"web":return t.indexOf("MicroMessenger")>-1?"h5":"web";default:throw new Error("Unsupported weixin platform")}}({clientPlatform:a,userAgent:this.context.CLIENTUA}),u="mp-weixin"===a,{openid:d,unionid:p,sessionKey:l,accessToken:f,refreshToken:m,expired:h}=await this._getWeixinApi()[u?"code2Session":"getOauthAccessToken"](n);if(!d)return{code:10401,messageValues:{account:"微信openid"}};const g={dcloudAppid:this.context.APPID,openid:d,platform:"weixin-"+c},y=require("uni-open-bridge-common");let w;u?(w={sessionKey:l},await y.setSessionKey(g,{session_key:l},2592e3)):(w={accessToken:f,refreshToken:m,accessTokenExpired:h},await y.setUserAccessToken(g,{access_token:f,refresh_token:m,access_token_expired:h},2592e3));const v=Kr.command,_=[{wx_openid:{[a]:d}}];p&&_.push({wx_unionid:p});let b=await P.where(v.or(..._)).get();if(b=this._getCurrentAppUser(b.data),b&&b.length>0){if("register"===s)return{code:10402,messageValues:{type:this.t("wechat-account")}};if(1!==b.length)return{code:10005};const e=b[0],r={wx_openid:{[a]:d}};p&&(r.wx_unionid=p);const n=await this._loginExec(e,{needPermission:t,extraData:r});if(0!==n.code)return n;const{userInfo:i}=n;return{...n,openid:d,unionid:p,...w,mobileConfirmed:1===i.mobile_confirmed,emailConfirmed:1===i.email_confirmed}}{if("login"===s)return{code:10403,messageValues:{type:this.t("wechat-account")}};const e={wx_openid:{[a]:d},wx_unionid:p};e.my_invite_code=i,e.role=o;const r=await this._registerExec(e,{needPermission:t});return 0!==r.code?r:{...r,openid:d,unionid:p,...w,mobileConfirmed:!1,emailConfirmed:!1}}},loginByQQ:async function({code:e,accessToken:t,accessTokenExpired:r,myInviteCode:n,needPermission:i,role:o,type:s}={}){const a=this.context.PLATFORM,c="mp-qq"===a,{openid:u,unionid:d,sessionKey:p}=await this._getQQApi()[c?"code2Session":"getOpenidByToken"]({code:e,accessToken:t});if(!u)return{code:10801,messageValues:{account:"qq openid"}};const l=function({clientPlatform:e}={}){switch(e){case"app":case"app-plus":return"app";case"mp-qq":return"mp";default:throw new Error("Unsupported qq platform")}}({clientPlatform:a}),f={dcloudAppid:this.context.APPID,openid:u,platform:"qq-"+l},m=require("uni-open-bridge-common");let h;c?(h={sessionKey:p},await m.setSessionKey(f,{session_key:p},2592e3)):(h={accessToken:t,accessTokenExpired:r},await m.setUserAccessToken(f,{access_token:t,access_token_expired:r},r?Math.floor((r-Date.now())/1e3):2592e3));const g=Gr.command,y=[{qq_openid:{[a]:u}}];d&&y.push({qq_unionid:d});let w=await P.where(g.or(...y)).get();if(w=this._getCurrentAppUser(w.data),w&&w.length>0){if("register"===s)return{code:10802,messageValues:{type:this.t("qq-account")}};if(1!==w.length)return{code:10005};const e=w[0],t={qq_openid:{[a]:u}};d&&(t.qq_unionid=d);const r=await this._loginExec(e,{needPermission:i,extraData:t});if(0!==r.code)return r;const{userInfo:n}=r;return{...r,openid:u,unionid:d,...h,mobileConfirmed:1===n.mobile_confirmed,emailConfirmed:1===n.email_confirmed}}{if("login"===s)return{code:10803,messageValues:{type:this.t("qq-account")}};const e={qq_openid:{[a]:u},qq_unionid:d};e.my_invite_code=n,e.role=o;const t=await this._registerExec(e);return 0!==t.code?t:{...t,openid:u,unionid:d,...h,mobileConfirmed:!1,emailConfirmed:!1}}},loginByUniverify:async function({openid:e,access_token:t,password:r,inviteCode:n,myInviteCode:i,type:o,needPermission:s,role:a}){const c=this._getConfig(),u=c&&c.service&&c.service.univerify;if(!u)throw new Error(this.t("uni-verify-config-required"));if(c.forceInviteCode&&!o)throw new Error(this.t("login-with-invite-type-required"));const d=await Qr.bind(this)({...u,openid:e,access_token:t});if(0!==d.code)return d;const p=String(d.phoneNumber);let l=await P.where({mobile:p,mobile_confirmed:1}).get();if(l=this._getCurrentAppUser(l.data),l&&l.length>0){if("register"===o)return{code:10601,messageValues:{type:this.t("mobile")}};if(1!==l.length)return{code:10005};const e=l[0],t=await this._loginExec(e,{needPermission:s});return 0!==t.code?t:{...t,mobile:p}}if("login"===o)return{code:10602,messageValues:{type:this.t("mobile")}};const f=Date.now(),m={mobile:p,my_invite_code:i,mobile_confirmed:1,role:a},h=r&&r.trim();if(h){const{passwordHash:e,version:t}=this.encryptPwd(h);m.password=e,t&&(m.password_secret_version=t)}if(n){let e=await P.where({my_invite_code:n}).get();if(1!==e.data.length)return{code:10203};e=e.data[0],m.inviter_uid=[e._id].concat(e.inviter_uid||[]),m.invite_time=f}else if(c.forceInviteCode)return{code:10203};m.my_invite_code=i;const g=await this._registerExec(m,{needPermission:s});return 0!==g.code?g:{...g,mobile:p}},loginByApple:async function({nickName:e,fullName:t,identityToken:r,myInviteCode:n,type:i,needPermission:o,role:s}){const a=this._getConfig(),c=a&&a.oauth&&a.oauth.apple,u=c&&c.bundleId;if(!u)throw new Error(this.t("config-param-require",{param:"(app || app-plus).apple.bundleId"}));if(!r)return{code:N,messageValues:{param:"identityToken"}};t=e||(t&&Object.keys(t).length>0?t.familyName+t.givenName:"");const{code:d,msg:p}=await Lr().verifyIdentityToken(r);if(0!==d)return{code:d,msg:p,messageValues:{account:this.t("apple-account")}};const{iss:l,sub:f,aud:m,email:h}=p;if("https://appleid.apple.com"!==l)return{code:10706,messageValues:{account:this.t("apple-account")}};if(!f)return{code:10701,messageValues:{account:this.t("apple-account")}};if(u!==m)return{code:10702,messageValues:{account:this.t("apple-account")}};const g=t||"User-"+(h?h.split("@")[0]:Math.random().toString(32).slice(2));let y=await P.where({apple_openid:f}).get();if(y=this._getCurrentAppUser(y.data),y&&y.length>0){if("register"===i)return{code:10703,messageValues:{type:this.t("apple-account")}};if(1!==y.length)return{code:10005};const e=y[0],t=await this._loginExec(e,{needPermission:o});return 0!==t.code?t:{...t,openid:f}}if("login"===i)return{code:10704,messageValues:{type:this.t("apple-account")}};const w={nickname:g,apple_openid:f,my_invite_code:n,role:s},v=await this._registerExec(w,{needPermission:o});return 0!==v.code?v:{...v,openid:f}},login:async function({username:e,password:t,queryField:r=[],needPermission:n}){const i=Xr.command,o=[];r&&r.length||(r=["username"]),r.length>1&&console.warn(this.t("query-field-warning"));const{usernameToLowerCase:s,emailToLowerCase:a,passwordErrorLimit:c,passwordErrorRetryTime:u}=this._getConfig(),d={email:{email_confirmed:1},mobile:{mobile_confirmed:1}},p={},l=e&&e.trim();if(!l)return{code:N,messageValues:{param:this.t("username")}};s&&(p.username=l.toLowerCase()),a&&(p.email=l.toLowerCase());const f=[];r.forEach(t=>{o.push({[t]:e,...d[t]});const r={field:t,value:e};"username"===t&&p.username!==e?(o.push({[t]:p.username,...d[t]}),r.fallbackValue=p.username):"email"===t&&p.email!==e&&(o.push({[t]:p.email,...d[t]}),r.fallbackValue=p.email),f.push(r)});let m=await P.where(i.or(...o)).get();m=this._getCurrentAppUser(m.data);const h=this.context.CLIENTIP,g=this._getMatchedUser(m,f);if(g.code)return g;const{userMatched:y}=g;let w=y.login_ip_limit||[];w=w.filter(e=>e.last_error_time>Date.now()-1e3*u);let v=w.find(e=>e.ip===h);if(v&&v.error_times>=c)return{code:10103};const _=t&&t.trim();if(!_)return{code:N,messageValues:{param:"密码"}};const b=this._checkPwd(y,_);if(0===b.code){const e=w.indexOf(v);e>-1&&w.splice(e,1);const t={login_ip_limit:w},{passwordHash:r,passwordVersion:i}=b;r&&i&&(t.password=r,t.password_secret_version=i);const o=await this._loginExec(y,{needPermission:n,extraData:t});return o.code,o}return v?(v.error_times++,v.last_error_time=Date.now()):(v={ip:h,error_times:1,last_error_time:Date.now()},w.push(v)),await P.doc(y._id).update({login_ip_limit:w}),{code:10102,msg:"密码错误"}},register:async function(e){const t=[],r=[{name:"username",desc:this.t("username")},{name:"email",desc:this.t("email"),extraCond:{email_confirmed:1}},{name:"mobile",desc:this.t("mobile"),extraCond:{mobile_confirmed:1}}],{usernameToLowerCase:n,emailToLowerCase:i}=this._getConfig();r.forEach(r=>{const o=r.name;let s=e[o]&&e[o].trim();s?(("username"===r.name&&n||"email"===r.name&&i)&&(s=s.toLowerCase()),e[o]=s,t.push({[o]:s,...r.extraCond})):delete e[o]});const{username:o,email:s,mobile:a,myInviteCode:c,needPermission:u,autoSetDcloudAppid:d=!0}=e;if("needPermission"in e&&delete e.needPermission,"autoSetDcloudAppid"in e&&delete e.autoSetDcloudAppid,0===t.length)return{code:20101,messageValues:{param:this.t("user-unique-param")}};const p=Yr.command;let l=await P.where(p.or(...t)).get();if(l=this._getCurrentAppUser(l.data),l&&l.length>0){const t=l[0];if(t.status===F)return{code:10006};for(let n=0;n<r.length;n++){const i=r[n];let o=!0;if(i.extraCond&&(o=Object.keys(i.extraCond).every(e=>t[e]===i.extraCond[e])),t[i.name]===e[i.name]&&o)return{code:20102,messageValues:{type:i.desc}}}}const f=e.password&&e.password.trim();if(!f)return{code:N,messageValues:{param:this.t("password")}};const{passwordHash:m,version:h}=this.encryptPwd(f);e.password=m,h&&(e.password_secret_version=h),e.my_invite_code=c,delete e.myInviteCode;const g=await this._registerExec(e,{needPermission:u,autoSetDcloudAppid:d});return 0!==g.code?g:{...g,username:o,email:s,mobile:a}},logout:async function(e){const t=await this.checkToken(e);if(t.code)return t;const r=zr.command;return await P.doc(t.uid).update({token:r.pull(e)}),{code:0,msg:""}},getRoleByUid:async function({uid:e}){if(!e)return{code:N,messageValues:{param:this.t("user-id")}};const t=await P.doc(e).get();return 0===t.data.length?{code:L}:{code:0,msg:"",role:t.data[0].role||[]}},getPermissionByRole:async function({roleID:e}){if(!e)return{code:N,messageValues:{param:"roleID"}};if("admin"===e){return{code:0,msg:"",permission:(await D.limit(1e3).get()).data.map(e=>e.permission_id)}}const t=await j.where({role_id:e}).get();return 0===t.data.length?{code:V}:{code:0,msg:"",permission:t.data[0].permission||[]}},getPermissionByUid:async function({uid:e}={}){const t=await P.aggregate().match({_id:e}).project({role:!0}).unwind("$role").lookup({from:"uni-id-roles",localField:"role",foreignField:"role_id",as:"roleDetail"}).unwind("$roleDetail").replaceRoot({newRoot:"$roleDetail"}).end(),r=[],n=[];return t.data.forEach(e=>{n.push(e.role_id),r.push(...e.permission)}),{code:0,msg:"",role:n,permission:A(r)}},bindRole:async function({uid:e,roleList:t,reset:r=!1}){const n={};return"string"==typeof t&&(t=[t]),n.role=r?t:Wr.push(t),await P.doc(e).update(n),{code:0,msg:""}},bindPermission:async function({roleID:e,permissionList:t,reset:r=!1}){const n={};return"string"==typeof t&&(t=[t]),n.permission=r?t:Wr.push(t),await j.where({role_id:e}).update(n),{code:0,msg:""}},unbindRole:async function({uid:e,roleList:t}){return"string"==typeof t&&(t=[t]),await P.doc(e).update({role:Wr.pull(Wr.in(t))}),{code:0,msg:""}},unbindPermission:async function({roleID:e,permissionList:t}){return"string"==typeof t&&(t=[t]),await j.where({role_id:e}).update({permission:Wr.pull(Wr.in(t))}),{code:0,msg:""}},addRole:async function({roleID:e,roleName:t,comment:r,permission:n=[]}){return e?"admin"===e?{code:U,messageValues:{param:"roleID",reason:this.t("add-role-admin-is-not-allowed")}}:(await j.add({role_id:e,role_name:t,comment:r,permission:n,create_date:Date.now()}),{code:0,msg:""}):{code:N,messageValues:{param:this.t("role-id")}}},addPermission:async function({permissionID:e,permissionName:t,comment:r}){return e?(await D.add({permission_id:e,permission_name:t,comment:r,create_date:Date.now()}),{code:0,msg:""}):{code:N,messageValues:{param:this.t("permission-id")}}},getRoleList:async function({limit:e=20,offset:t=0,needTotal:r=!0}){const n={code:0,msg:"",roleList:(await j.skip(t).limit(e).get()).data};if(r){const{total:e}=await j.where({_id:Wr.exists(!0)}).count();n.total=e}return n},getRoleInfo:async function(e){const t=await j.where({role_id:e}).get();return 0===t.data.length?{code:V}:{code:0,...t.data[0]}},updateRole:async function({roleID:e,roleName:t,comment:r,permission:n}){return e?(await j.where({role_id:e}).update({role_name:t,comment:r,permission:n}),{code:0,msg:""}):{code:N,messageValues:{param:this.t("role-id")}}},deleteRole:async function({roleID:e}){const t=m(e);if("string"===t)e=[e];else if("array"!==t)throw new Error("typeof roleID must be array or string");return await j.where({role_id:Wr.in(e)}).remove(),await P.where({role:Wr.elemMatch(Wr.in(e))}).update({role:Wr.pullAll(e)}),{code:0,msg:""}},getPermissionList:async function({limit:e=20,offset:t=0,needTotal:r=!0}){const n={code:0,msg:"",permissionList:(await D.skip(t).limit(e).get()).data};if(r){const{total:e}=await D.where({_id:Wr.exists(!0)}).count();n.total=e}return n},getPermissionInfo:async function(e){const t=await D.where({permission_id:e}).get();return 0===t.data.length?{code:N,messageValues:{param:this.t("permission-id")}}:{code:0,...t.data[0]}},updatePermission:async function({permissionID:e,permissionName:t,comment:r}){return e?(await D.where({permission_id:e}).update({permission_name:t,comment:r}),{code:0,msg:""}):{code:N,messageValues:{param:this.t("permission-id")}}},deletePermission:async function({permissionID:e}){const t=m(e);if("string"===t)e=[e];else if("array"!==t)throw new Error("typeof permissionID must be array or string");return await D.where({permission_id:Wr.in(e)}).remove(),await j.where({permission:Wr.elemMatch(Wr.in(e))}).update({permission:Wr.pullAll(e)}),{code:0,msg:""}},bindAlipay:async function({uid:e,code:t,platform:r}){const n=r||this.context.PLATFORM,{openid:i}=await this._getAlipayApi({platform:n}).code2Session(t);if(!i)return{code:60401,messageValues:{account:this.t("alipay-account")}};let o=await P.where({ali_openid:i}).get();return o=this._getCurrentAppUser(o.data),o&&o.length>0?{code:60402,messageValues:{type:this.t("alipay-account")}}:(await P.doc(e).update({ali_openid:i}),{code:0,openid:i,msg:""})},bindEmail:async function(e){let{uid:t,email:r,code:n}=e||{};if(r=r&&r.trim(),!r)return{code:N,messageValues:{param:this.t("email")}};if(!n)return{code:N,messageValues:{param:this.t("verify-code")}};const{emailToLowerCase:i}=this._getConfig();i&&(r=r.toLowerCase());let o=await P.where({email:r,email_confirmed:1}).get();if(o=this._getCurrentAppUser(o.data),o&&o.length>0)return{code:60201,messageValues:{type:this.t("email")}};const s=await this.verifyCode({email:r,code:n,type:"bind"});return 0!==s.code?s:(await P.doc(t).update({email:r,email_confirmed:1}),{code:0,msg:"",email:r})},bindMobile:async function(e){let{uid:t,mobile:r,code:n,openid:i,access_token:o,type:s="sms"}=e||{};if("univerify"===s){const e=this._getConfig(),t=e&&e.service&&e.service.univerify;if(!t)throw new Error("请在config.json中配置service.univerify下一键登录相关参数");const n=await Qr.bind(this)({...t,openid:i,access_token:o});if(0!==n.code)return n;r=""+n.phoneNumber}let a=await P.where({mobile:r,mobile_confirmed:1}).get();if(a=this._getCurrentAppUser(a.data),a&&a.length>0)return{code:60101,messageValues:{type:"手机号"}};if("sms"===s&&"code"in e){if(!r)return{code:N,messageValues:{param:this.t("mobile")}};if(!n)return{code:N,messageValues:{param:this.t("verify-code")}};const e=await this.verifyCode({mobile:r,code:n,type:"bind"});if(0!==e.code)return e}return await P.doc(t).update({mobile:r,mobile_confirmed:1}),{code:0,msg:"",mobile:r}},bindWeixin:async function({uid:e,code:t,platform:r}){const n=r||this.context.PLATFORM,i="mp-weixin"===n,{openid:o,unionid:s,sessionKey:a,accessToken:c,refreshToken:u,expired:d}=await this._getWeixinApi({platform:n})[i?"code2Session":"getOauthAccessToken"](t);if(!o)return{code:60301,messageValues:{account:"微信openid"}};const p=Jr.command,l=[{wx_openid:{[n]:o}}];s&&l.push({wx_unionid:s});let f=await P.where(p.or(...l)).get();if(f=this._getCurrentAppUser(f.data),f&&f.length>0)return{code:60302,messageValues:{type:this.t("wechat-account")}};const m={wx_openid:{[n]:o}};let h;return s&&(m.wx_unionid=s),await P.doc(e).update(m),h=i?{sessionKey:a}:{accessToken:c,refreshToken:u,accessTokenExpired:d},{code:0,msg:"",openid:o,unionid:s,...h}},bindQQ:async function({uid:e,code:t,accessToken:r,platform:n}={}){const i=n||this.context.PLATFORM,o="mp-qq"===i,{openid:s,unionid:a,sessionKey:c}=await this._getQQApi()[o?"code2Session":"getOpenidByToken"]({code:t,accessToken:r});if(!s)return{code:60501,messageValues:{account:"qq openid"}};const u=Zr.command,d=[{qq_openid:{[i]:s}}];a&&d.push({qq_unionid:a});let p=await P.where(u.or(...d)).get();if(p=this._getCurrentAppUser(p.data),p&&p.length>0)return{code:60502,messageValues:{type:this.t("qq-account")}};const l={qq_openid:{[i]:s}};return a&&(l.qq_unionid=a),await P.doc(e).update(l),{code:0,msg:"",openid:s,unionid:a,...{accessToken:r,sessionKey:c}}},unbindAlipay:async function(e){const t=en.command,r=await P.doc(e).update({ali_openid:t.remove()});return E("upRes:",r),1===r.updated?{code:0,msg:""}:{code:70401}},unbindEmail:async function(e){let{uid:t,email:r,code:n}=e||{};if(r=r&&r.trim(),!t||!r)return{code:N,messageValues:{param:t?this.t("email"):this.t("user-id")}};const{emailToLowerCase:i}=this._getConfig();if("code"in e){const e=await this.verifyCode({email:r,code:n,type:"unbind"});if(0!==e.code)return e}const o=tn.command;let s={_id:t,email:r};if(i){const e=r.toLowerCase();e!==r&&(s=o.or(s,{_id:t,email:e}))}return 1===(await P.where(s).update({email:o.remove(),email_confirmed:o.remove()})).updated?{code:0,msg:""}:{code:70201}},unbindMobile:async function(e){const{uid:t,mobile:r,code:n}=e||{};if("code"in e){const e=await this.verifyCode({mobile:r,code:n,type:"unbind"});if(0!==e.code)return e}const i=rn.command;return 1===(await P.where({_id:t,mobile:r}).update({mobile:i.remove(),mobile_confirmed:i.remove()})).updated?{code:0,msg:""}:{code:70101}},unbindWeixin:async function(e){const t=nn.command,r=await P.doc(e).update({wx_openid:t.remove(),wx_unionid:t.remove()});return E("upRes:",r),1===r.updated?{code:0,msg:""}:{code:70301}},unbindQQ:async function(e){const t=on.command,r=await P.doc(e).update({qq_openid:t.remove(),qq_unionid:t.remove()});return E("upRes:",r),1===r.updated?{code:0,msg:""}:{code:70501}},getSupportedLoginType:function({appid:e,platform:t}={}){if(!e||!t)throw new Error("Parameter appid and platform is required");const r=this._getConfig({appid:e,platform:t}),n=["username-password","mobile-password","email-password"];for(const e in sn)sn[e](r)&&n.push(e);return{supportedLoginType:n}},code2SessionAlipay:async function(e){let t=e;"string"==typeof e&&(t={code:e});try{const e=t.platform||this.context.PLATFORM,r=await this._getAlipayApi({platform:e}).code2Session(t.code);return r.openid?{code:0,msg:"",...r}:{code:80701,messageValues:{account:this.t("alipay-account")}}}catch(e){return console.error(e),{code:80702,messageValues:{account:this.t("alipay-account")}}}},code2SessionWeixin:async function(e){let t=e;"string"==typeof e&&(t={code:e});try{const e=t.platform||this.context.PLATFORM,r=await this._getWeixinApi({platform:e})["mp-weixin"===e?"code2Session":"getOauthAccessToken"](t.code);return r.openid?{code:0,msg:"",...r}:{code:80601,messageValues:{account:"微信openid"}}}catch(e){return console.error(e),{code:80602,messageValues:{account:"微信openid"}}}},verifyAppleIdentityToken:async function({identityToken:e,platform:t}){const r=t||this.context.PLATFORM,{code:n,msg:i}=await Lr({clientType:r}).verifyIdentityToken(e);return 0!==n?{code:n,msg:i}:{code:n,msg:"验证通过",...i}},wxBizDataCrypt:async function({code:e,sessionKey:r,encryptedData:n,iv:i}){if(!n)return{code:N,messageValues:{param:"encryptedData"}};if(!i)return{code:N,messageValues:{param:"iv"}};if(!e&&!r)return{code:N,messageValues:{param:"sessionKey"}};const o=this._getWeixinApi();if(!r){const t=await o.code2Session(e);if(!t.sessionKey)return{code:80801};r=t.sessionKey}r=Buffer.from(r,"base64"),n=Buffer.from(n,"base64"),i=Buffer.from(i,"base64");try{var s=t.createDecipheriv("aes-128-cbc",r,i);s.setAutoPadding(!0);var a=s.update(n,"binary","utf8");a+=s.final("utf8"),a=JSON.parse(a)}catch(e){return console.error(e),{code:80802}}return a.watermark.appid!==o.options.appId?{code:80803}:{code:0,msg:"",...a}},getWeixinUserInfo:async function({accessToken:e,openid:t}={}){const r=this.context.PLATFORM;if("app"!==r&&"app-plus"!==r)throw new Error(this.t("limit-client-platform"));try{return{code:0,msg:"",...await this._getWeixinApi().getUserInfo({accessToken:e,openid:t})}}catch(e){return console.error(e),{code:80901}}},encryptPwd:function(e,{value:r,version:n}={}){if(!(e=e&&e.trim()))throw new Error(this.t("param-required",{param:this.t("password")}));if(!r){const e=this._getConfig(),{passwordSecret:t}=e;if("array"===m(t)){const e=t.sort((e,t)=>e.version-t.version);r=e[e.length-1].value,n=e[e.length-1].version}else r=t}if(!r)throw new Error(this.t("param-error",{param:"passwordSecret",reason:"invalid passwordSecret"}));const i=t.createHmac("sha1",r.toString("ascii"));return i.update(e),{passwordHash:i.digest("hex"),version:n}},checkToken:async function(e,{needPermission:t,needUserInfo:r=!0}={}){const n=this._getConfig(),i=this._verifyToken(e);if(i.code)return i;const{uid:o,needPermission:s,role:a,permission:c,exp:u,iat:d,...p}=i,l=a&&c;t=void 0===t?s:t;const f=n.removePermissionAndRoleFromToken||!l||r,m=!n.removePermissionAndRoleFromToken&&!l||n.removePermissionAndRoleFromToken&&l||n.tokenExpiresThreshold&&u-Date.now()/1e3<n.tokenExpiresThreshold;let h={};if(f||m){const t=await P.doc(o).get();if(!t.data||0===t.data.length||!t.data[0].token)return{code:30202};if(h=t.data[0],h.status===B)return{code:10001};if(h.status===F)return{code:10006};let r=h.token;if(r?"string"==typeof r&&(r=[r]):r=[],-1===r.indexOf(e))return{code:30202}}const g={code:0,uid:o,...p};let y,w;if(l&&(g.role=a,g.permission=c),r&&(g.userInfo=h),(!l&&t||m)&&(y=g.role=h.role||[],w=0===y.length||y.includes("admin")?g.permission=[]:g.permission=await this._getPermissionListByRoleList(g.role),t&&(g.role=y,g.permission=w)),m){let e;e=n.removePermissionAndRoleFromToken?await this.createToken({uid:o,needPermission:s}):await this.createToken({uid:o,role:y,permission:w});const t=h.token;return await this._updateToken({uid:o,tokenList:t,addToken:[e.token]}),{...g,...e}}return g},createToken:function({uid:e,needPermission:t,role:r,permission:n}){if(!e)return{code:30101,messageValues:{param:this.t("user-id")}};const i={uid:e,needPermission:t,role:r,permission:n},o=this._getConfig();if(!this.interceptorMap.has("customToken")){const e={...i};return this._createTokenInternal({signContent:e,config:o})}const s=this.interceptorMap.get("customToken");if("function"!=typeof s)throw new Error(this.t("type-function-required","customToken"));const a=s(i);return a instanceof Promise?a.then(e=>this._createTokenInternal({signContent:e,config:o})):this._createTokenInternal({signContent:a,config:o})},_updateToken:async function({uid:e,tokenList:t,removeToken:r=[],addToken:n=[]}={}){if(!t){const r=await P.doc(e).get(),n=r.data&&r.data[0];t=n&&n.token||[]}"string"==typeof t&&(t=[t]);const i=this._getExpiredToken(t);(t=t.filter(e=>-1===i.indexOf(e))).push(...n);for(let e=0;e<r.length;e++){const n=t.indexOf(r[e]);t.splice(n,1)}await P.doc(e).update({token:t,last_login_date:Date.now(),last_login_ip:this.context.CLIENTIP})},refreshToken:async function({token:e}={}){const t=this._getConfig(),r=this._verifyToken(e);if(r.code)return r;const{uid:n,needPermission:i}=r;let o;if(t.removePermissionAndRoleFromToken)o=await this.createToken({uid:n,needPermission:i});else{const{role:e,permission:t}=await this.getPermissionByUid({uid:n});o=await this.createToken({uid:n,role:e,permission:t})}return await this._updateToken({uid:n,addToken:[o.token],removeToken:[e]}),o},_checkPwd:function(e,t){if(!t)return{code:1};const{password:r,password_secret_version:n}=e,i=this._getConfig(),{passwordSecret:o}=i,s=m(o);if("string"===s){const{passwordHash:e}=this.encryptPwd(t,{value:o});return e===r?{code:0,message:""}:{code:2}}if("array"!==s)throw new Error(this.t("password-secret-type-error"));const a=o.sort((e,t)=>e.version-t.version);let c;if(c=n?a.find(e=>e.version===n):a[0],!c)return{code:3};const u=a[a.length-1],{passwordHash:d}=this.encryptPwd(t,c);if(d===r){const e={code:0};if(c!==u){const{passwordHash:r,version:n}=this.encryptPwd(t,u);e.passwordHash=r,e.passwordVersion=n}return e}return{code:4,message:""}},_verifyToken:function(e){const t=this._getConfig();let r;try{r=Pr(e,t.tokenSecret)}catch(e){return"TokenExpiredError"===e.name?{code:30203,err:e}:{code:30204,err:e}}return t.bindTokenToDevice&&r.clientId&&r.clientId!==this._getClientUaHash()?{code:30201}:{code:0,message:"",...r}},_getExpiredToken:function(e){const t=this._getConfig(),r=[];return e.forEach(e=>{try{Pr(e,t.tokenSecret)}catch(t){r.push(e)}}),r},_getPermissionListByRoleList:async function(e){if(!Array.isArray(e))return[];if(0===e.length)return[];if(e.includes("admin")){return(await D.limit(500).get()).data.map(e=>e.permission_id)}const t=await j.where({role_id:Hr.in(e)}).get(),r=[];return t.data.forEach(e=>{Array.prototype.push.apply(r,e.permission)}),A(r)},_getClientUaHash:function(){const e=t.createHash("md5"),r=/MicroMessenger/i.test(this.context.CLIENTUA)?this.context.CLIENTUA.replace(/(MicroMessenger\S+).*/i,"$1"):this.context.CLIENTUA;return e.update(r),e.digest("hex")},_createTokenInternal:function({signContent:e,config:t}){if(t.tokenExpiresIn&&t.tokenExpiresThreshold&&t.tokenExpiresIn<=t.tokenExpiresThreshold)throw new Error(this.t("token-expires-config-warning"));return"object"===m(e)&&e.uid?(t.bindTokenToDevice&&(e.clientId=this._getClientUaHash()),{token:Rr(e,t.tokenSecret,{expiresIn:t.tokenExpiresIn}),tokenExpired:Date.now()+1e3*t.tokenExpiresIn}):{code:30101,messageValues:{param:this.t("user-id")}}},setVerifyCode:async function({mobile:e,email:t,code:r,expiresIn:n,type:i}){if(t=t&&t.trim(),e=e&&e.trim(),t){const{emailToLowerCase:e}=this._getConfig();e&&(t=t.toLowerCase())}if(!e&&!t)return{code:50101,messageValues:{param:"手机号或邮箱"}};if(e&&t)return{code:50102,messageValues:{param:"参数",reason:"手机号和邮箱不可同时存在"}};r||(r=C()),n||(n=180);const o=Date.now(),s={mobile:e,email:t,type:i,code:r,state:0,ip:this.context.CLIENTIP,created_at:o,expired_at:o+1e3*n};return await R.add(s),{code:0,mobile:e,email:t}},verifyCode:async function({mobile:e,email:t,code:r,type:n}){if(t=t&&t.trim(),e=e&&e.trim(),t){const{emailToLowerCase:e}=this._getConfig();e&&(t=t.toLowerCase())}if(!e&&!t)return{code:50201,messageValues:{param:"手机号或邮箱"}};if(e&&t)return{code:50203,messageValues:{param:"参数",reason:"手机号和邮箱不可同时存在"}};if(!r)return{code:50202,messageValues:{type:this.t(e?"sms":"email")}};const i=an.command,o=Date.now(),s={mobile:e,email:t,type:n,code:r,state:0,expired_at:i.gt(o)},a=await R.where(s).orderBy("created_at","desc").limit(1).get();if(a&&a.data&&a.data.length>0){const e=a.data[0];return await R.doc(e._id).update({state:1}),{code:0,msg:"验证通过"}}return{code:50202,messageValues:{type:this.t(e?"sms":"email")}}},sendSmsCode:async function({mobile:e,code:t,type:r,templateId:n}){if(!e)return{code:N,messageValues:{param:this.t("mobile")}};if(t||(t=C()),!r)return{code:N,messageValues:{param:this.t("verify-code-type")}};const i=this._getConfig();let o=i&&i.service&&i.service.sms;if(!o)throw new Error(this.t("config-param-required",{param:"service.sms"}));o=Object.assign({codeExpiresIn:300},o);const s=["smsKey","smsSecret"];for(let e=0,t=s.length;e<t;e++){const t=s[e];if(!o[t])throw new Error(this.t("config-param-required",{param:"service.sms."+t}))}const{name:a,smsKey:c,smsSecret:u,codeExpiresIn:d}=o;let p;switch(r){case"login":p=this.t("login");break;default:p=this.t("verify-mobile")}try{const i={name:a,code:t,action:p,expMinute:""+Math.round(d/60)};a&&(i.name=a),await uniCloud.sendSms({smsKey:c,smsSecret:u,phone:e,templateId:n||"uniID_code",data:i});const o=await this.setVerifyCode({mobile:e,code:t,expiresIn:d,type:r});return o.code>=0?o:{code:0,msg:""}}catch(e){return console.error(e),{code:50301}}}});let un;try{un=require("uni-config-center")}catch(e){throw new Error("Plugin[uni-config-center] was not found")}class dn{constructor({context:e,clientInfo:t,config:r}={}){const n=un({pluginId:"uni-id"});this.pluginConfig=n,this.config=r||this._getConfigContent(),this._configCache={},Object.defineProperty(this,"context",{get(){let r;r=t?{OS:t.os,CLIENTIP:t.clientIP,CLIENTUA:t.userAgent,PLATFORM:t.platform,APPID:t.appId,LOCALE:t.locale,DEVICEID:t.deviceId}:Object.assign({},e||global.__ctx__||{});const n=["CLIENTIP","PLATFORM","APPID","LOCALE"];for(let e=0;e<n.length;e++){const t=n[e];void 0===r[t]&&console.warn(i.t("context-required",{key:t}))}const o=r.APPID,s=r.PLATFORM,a=this._getAppConfig(this.config,o);if(!a)throw new Error(`Config for current app (${o}) was not found, please check your config file or client appId`);if("app"===s||"app-plus"===s?r.PLATFORM=a.preferedAppPlatform||s:"web"!==s&&"h5"!==s||(r.PLATFORM=a.preferedWebPlatform||s),"app"===r.PLATFORM&&a["app-plus"]||"app-plus"===r.PLATFORM&&a.app)throw new Error(`Client platform is ${r.PLATFORM}, but ${"app"===r.PLATFORM?"app-plus":"app"} was found in config. Please refer to: https://uniapp.dcloud.net.cn/uniCloud/uni-id?id=prefered-app-platform`);if("web"===r.PLATFORM&&a.h5||"h5"===r.PLATFORM&&a.web)throw new Error(`Client platform is ${r.PLATFORM}, but ${"web"===r.PLATFORM?"h5":"web"} was found in config. Please refer to: https://uniapp.dcloud.net.cn/uniCloud/uni-id?id=prefered-web-platform`);return r}}),this.interceptorMap=new Map,n&&n.hasFile("custom-token.js")&&this.setInterceptor("customToken",require(n.resolve("custom-token.js")));let i,o=k;if(n&&n.hasFile("lang/index.js")){const e=n.requireFile("lang/index.js");o=function(e,t){const r=Object.keys(e);r.push(...Object.keys(t));const n={};for(let i=0;i<r.length;i++){const o=r[i];n[o]=Object.assign({},e[o],t[o])}return n}(k,e)}if(!uniCloud.initI18n)throw new Error("The HBuilderX version is too old, please upgrade to the latest version of HBuilderX");i=uniCloud.initI18n({locale:"en",fallbackLocale:"zh-Hans",messages:o}),Object.defineProperty(this,"t",{get(){return i.setLocale(this.context.LOCALE||"zh-Hans"),i.t.bind(i)}})}get dev(){return console.warn(this.t("dev-warning")),{getConfig:this._getConfig.bind(this)}}_getAppConfig(e,t){return Array.isArray(e)?e.find(e=>e.dcloudAppid===t)||e.find(e=>e.isDefaultConfig):e}_parseConfigContent(e){return Array.isArray(e)?e:e[0]?Object.values(e):e}_getConfigContent(){if(this.pluginConfig&&this.pluginConfig.hasFile("config.json")){let e;try{e=this.pluginConfig.config()}catch(e){throw new Error("Invalid uni-id config file\n"+e.message)}return this._parseConfigContent(e)}{let e;try{e=require("./config.json")}catch(e){if("MODULE_NOT_FOUND"===e.code||"ENOENT"===e.code)throw new Error("uni-id config file[uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json] not found");throw e}return this._parseConfigContent(e)}}init(){throw new Error("uniID.init has been deprecated, use uniID.createInstance instead")}setInterceptor(e,t){this.interceptorMap.set(e,t)}_getConfig({appid:e,platform:t}={}){const r=`${e=e||this.context.APPID}_${t=t||this.context.PLATFORM}`;if(this._configCache[r])return this._configCache[r];if(!(this.config&&0!==Object.keys(this.config).length))throw new Error(this.t("config-file-not-found"));const n=this._getAppConfig(this.config,e);"app"!==t&&"app-plus"!==t||(t=n.preferedAppPlatform||t),"web"!==t&&"h5"!==t||(t=n.preferedWebPlatform||t);const i=Object.assign(n,n[t])||{},o=Object.assign({bindTokenToDevice:!1,tokenExpiresIn:7200,tokenExpiresThreshold:1200,passwordErrorLimit:6,passwordErrorRetryTime:3600,usernameToLowerCase:!0,emailToLowerCase:!0},i);return["passwordSecret","tokenSecret","tokenExpiresIn","passwordErrorLimit","passwordErrorRetryTime"].forEach(e=>{if(!o||!o[e])throw new Error(this.t("config-param-required",{param:e}))}),this._configCache[r]=o,o}}for(const e in cn)dn.prototype[e]=cn[e];function pn(e){const t=new dn(e);return new Proxy(t,{get(e,t){if(t in e&&0!==t.indexOf("_")){if("function"==typeof e[t])return(r=e[t],function(){const e=r.apply(this,arguments);return f(e)?e.then(e=>(S.bind(this)(e),e)):(S.bind(this)(e),e)}).bind(e);if("context"!==t&&"config"!==t)return e[t]}var r}})}dn.prototype.createInstance=pn;var ln=pn();module.exports=ln;
diff --git a/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/package.json b/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/package.json
deleted file mode 100644
index 59edd1ed41985db8ca442a928f9896975f10dc31..0000000000000000000000000000000000000000
--- a/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/package.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name": "uni-id",
-  "version": "3.3.29",
-  "description": "uni-id for uniCloud",
-  "main": "index.js",
-  "homepage": "https://uniapp.dcloud.io/uniCloud/uni-id",
-  "repository": {
-    "type": "git",
-    "url": "git+https://gitee.com/dcloud/uni-id.git"
-  },
-  "author": "",
-  "license": "Apache-2.0",
-  "dependencies": {
-    "uni-config-center": "file:../../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center",
-    "uni-open-bridge-common": "file:../../../../../uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common"
-  }
-}
\ No newline at end of file
diff --git a/uni_modules/uni-popup/changelog.md b/uni_modules/uni-popup/changelog.md
index 41abeb44ccb6277517b617640720ed75908679b7..bc59f0720eae315a3d258175105af293c551ce18 100644
--- a/uni_modules/uni-popup/changelog.md
+++ b/uni_modules/uni-popup/changelog.md
@@ -1,3 +1,5 @@
+## 1.8.3（2023-04-17）
+- 修复 uni-popup 重复打开时的 bug
 ## 1.8.2（2023-02-02）
 - uni-popup-dialog 组件新增 inputType 属性
 ## 1.8.1（2022-12-01）
diff --git a/uni_modules/uni-popup/package.json b/uni_modules/uni-popup/package.json
index 8a1703441f130a3952d83b61f66f07f1aebf7964..f40556ba4d996bec726701c51f1e8d555b8a47e5 100644
--- a/uni_modules/uni-popup/package.json
+++ b/uni_modules/uni-popup/package.json
@@ -1,7 +1,7 @@
 {
 	"id": "uni-popup",
 	"displayName": "uni-popup 弹出层",
-	"version": "1.8.2",
+	"version": "1.8.3",
 	"description": " Popup 组件，提供常用的弹层",
 	"keywords": [
         "uni-ui",