diff --git a/App.vue b/App.vue
index 4007c3c..3cbbe5d 100644
--- a/App.vue
+++ b/App.vue
@@ -36,9 +36,29 @@ export default {
     /** 关闭启动画面，锁定竖屏 */
     plus.navigator.closeSplashscreen();
     plus.screen.lockOrientation("portrait-primary");
-	
-    
     // #endif
+	
+	// uni-app客户端获取push客户端标记，代码可以实现在App.vue中  
+	uni.getPushClientId({  
+	    success: (res) => {  
+	        let push_clientid = res.cid  
+			uni.setStorageSync("push_clientid", push_clientid)
+	        console.log('客户端推送标识cid:',push_clientid)  
+	    },  
+	    fail(err) {  
+	        console.error("unipush: ", err)	
+	    }  
+	})
+	
+	
+	uni.onPushMessage((res)=>{
+		console.log("收到推送消息：", res)
+		uni.showModal({
+			title: res.data.title,
+			content: res.type,
+			showCancel: false
+		});
+	})
 
     /** 设置语言 （此处为了方便demo切换语言，将其存到本地，实际需根据业务情况设置）*/
     setLanguage(
diff --git a/androidPrivacy.json b/androidPrivacy.json
new file mode 100644
index 0000000..12df862
--- /dev/null
+++ b/androidPrivacy.json
@@ -0,0 +1,3 @@
+{
+    "prompt": "template"
+}
diff --git a/api/my_api.js b/api/my_api.js
index e6abd35..1bea8e0 100644
--- a/api/my_api.js
+++ b/api/my_api.js
@@ -18,6 +18,10 @@ const my_api = {
 
     checkVersion(data) {
         return request('/expertAPI/checkVersion', data, 'post', true);
+    },
+
+    startpage() {
+        return request('/expertAPI/startpage', {}, 'post', true);
     }
 }
 
diff --git a/manifest.json b/manifest.json
index 684fb8e..1e19baf 100644
--- a/manifest.json
+++ b/manifest.json
@@ -21,7 +21,8 @@
             "Payment" : {},
             "Share" : {},
             "Webview-x5" : {},
-            "UIWebview" : {}
+            "UIWebview" : {},
+            "Push" : {}
         },
         /* 模块配置 */
         "distribute" : {
@@ -74,10 +75,29 @@
                         "UniversalLinks" : "https://doc.igandan.com/gdxzExpert/"
                     }
                 },
-                "speech" : {}
+                "speech" : {},
+                "push" : {
+                    "unipush" : {
+                        "version" : "2",
+                        "offline" : false,
+                        "hms" : {},
+                        "oppo" : {},
+                        "vivo" : {},
+                        "mi" : {},
+                        "meizu" : {},
+                        "honor" : {},
+                        "icons" : {
+                            "small" : {
+                                "xxhdpi" : "D:/haomi/Documents/WeChat Files/wxid_x5u4rycntnkq21/FileStorage/File/2025-09/专家版图标/专家版图标/72.png"
+                            }
+                        }
+                    }
+                }
             },
             "splashscreen" : {
-                "androidStyle" : "common"
+                "androidStyle" : "common",
+                "useOriginalMsgbox" : true,
+                "iosStyle" : "common"
             },
             "icons" : {
                 "android" : {
@@ -132,5 +152,7 @@
     "vueVersion" : "3",
     "uniStatistics" : {
         "version" : "2"
-    }
+    },
+    "fallbackLocale" : "zh-Hans",
+    "locale" : "zh-Hans"
 }
diff --git a/pages.json b/pages.json
index db493d8..9391cdd 100644
--- a/pages.json
+++ b/pages.json
@@ -8,7 +8,18 @@
 
 		}
 	},
-	"pages": [{
+	"pages": [
+	{
+		"path" : "pages/ad/ad",
+		"style": {
+			"navigationBarTitleText": "",
+				"navigationStyle": "custom",
+				"app": {
+					"bounce": "none"
+				}
+			}
+	},
+	{
 		"path": "pages/index/index",
 		"style": {
 			"navigationBarTitleText": "",
@@ -75,6 +86,7 @@
 	       "enablePullDownRefresh": false
 		}
 	}
+	
 	],
 	"subPackages": [
 	{
@@ -1216,7 +1228,7 @@
 		"list": [
 			{
 				"name": "",
-				"path": "pages/index/index",
+				"path": "pages/ad/ad",
 				"query": ""
 			}
 		]
diff --git a/pages/ad/ad.vue b/pages/ad/ad.vue
new file mode 100644
index 0000000..2e9f6b1
--- /dev/null
+++ b/pages/ad/ad.vue
@@ -0,0 +1,193 @@
+<template>
+	<view class="ad-container" v-if="adData.path">
+		<!-- 广告图片 -->
+		<image 
+			class="ad-image" 
+			:src="adData.path" 
+			mode="aspectFill"
+			@click="handleAdClick"
+		></image>
+		
+		<!-- 右上角倒计时跳过按钮 -->
+		<view class="skip-button" @click="skipAd">
+			<text class="skip-text">跳过 {{countdown}}s</text>
+		</view>
+		
+		<!-- 底部点击跳转按钮 -->
+		<view class="bottom-button" v-if="adData.url" @click="handleAdClick">
+			<text class="button-text">点击查看详情</text>
+		</view>
+	</view>
+	
+	<!-- 加载状态 -->
+	<view class="loading-container" v-else>
+		<text class="loading-text">加载中...</text>
+	</view>
+</template>
+
+<script setup>
+	import { ref, reactive, onMounted, nextTick, computed, onUnmounted } from 'vue';
+	import { onShow, onLoad, onPageScroll } from "@dcloudio/uni-app";
+	import my_api from '@/api/my_api.js'
+    import docUrl from "@/utils/docUrl.js";
+
+	// 广告数据
+	const adData = ref({
+		path: '',
+		url: ''
+	});
+	
+	// 倒计时
+	const countdown = ref(5);
+	let timer = null;
+	
+	// 页面加载
+	onLoad(() => {
+		console.log('开屏广告页面加载');
+		getStartpage();
+	});
+	
+	// 获取开屏广告数据
+	const getStartpage = () => {
+		my_api.startpage().then(res => {
+			console.log('开屏广告数据:', res);
+			if (res && res.data) {
+				adData.value = {
+					path: docUrl + res.data.path || '',
+					url: res.data.url || ''
+				};
+				
+				// 如果有广告图片，开始倒计时
+				if (res.data.path) {
+					startCountdown();
+				} else {
+					// 没有广告，直接跳转到首页
+					navigateToHome();
+				}
+			} else {
+				// 接口返回异常，直接跳转到首页
+				navigateToHome();
+			}
+		}).catch(err => {
+			console.error('获取开屏广告失败:', err);
+			// 接口调用失败，直接跳转到首页
+			navigateToHome();
+		});
+	}
+	
+	// 开始倒计时
+	const startCountdown = () => {
+		timer = setInterval(() => {
+			countdown.value--;
+			if (countdown.value <= 0) {
+				clearInterval(timer);
+				navigateToHome();
+			}
+		}, 1000);
+	}
+	
+	// 跳过广告
+	const skipAd = () => {
+		clearInterval(timer);
+		navigateToHome();
+	}
+	
+	// 点击广告
+	const handleAdClick = () => {
+		if (adData.value.url) {
+			// 有跳转链接，跳转到指定页面
+			uni.navigateTo({
+				url: '/pages/webview/webview?url=' + adData.value.url
+			});
+		} else {
+			// 没有跳转链接，直接跳转到首页
+			navigateToHome();
+		}
+	}
+	
+	// 跳转到首页
+	const navigateToHome = () => {
+		uni.redirectTo({
+			url: '/pages/index/index'
+		});
+	}
+	
+	// 页面卸载时清理定时器
+	onUnmounted(() => {
+		if (timer) {
+			clearInterval(timer);
+		}
+	});
+	
+</script>
+
+<style scoped>
+.ad-container {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100vw;
+	height: 100vh;
+	background-color: #000;
+	z-index: 9999;
+}
+
+.ad-image {
+	width: 100%;
+	height: 100%;
+	object-fit: cover;
+}
+
+
+.skip-button {
+	position: absolute;
+	top: 60rpx;
+	right: 30rpx;
+	background-color: rgba(0, 0, 0, 0.6);
+	border-radius: 40rpx;
+	padding: 16rpx 24rpx;
+	z-index: 10000;
+}
+
+.skip-text {
+	color: #fff;
+	font-size: 28rpx;
+	font-weight: 500;
+}
+
+.bottom-button {
+	position: absolute;
+	bottom: 100rpx;
+	left: 50%;
+	transform: translateX(-50%);
+	background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+	border-radius: 50rpx;
+	padding: 24rpx 60rpx;
+	box-shadow: 0 8rpx 32rpx rgba(102, 126, 234, 0.3);
+	z-index: 10000;
+}
+
+.button-text {
+	color: #fff;
+	font-size: 32rpx;
+	font-weight: 600;
+}
+
+.loading-container {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100vw;
+	height: 100vh;
+	background-color: #f5f5f5;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	z-index: 9999;
+}
+
+.loading-text {
+	color: #666;
+	font-size: 32rpx;
+}
+</style>
diff --git a/pages/my/my.vue b/pages/my/my.vue
index fa6baa8..5f43b12 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -144,9 +144,9 @@
 					<up-image :src="ghsjhImg" width="48rpx" height="48rpx"></up-image>
 					<text>更换手机号</text>
 				</view>
-				<view class="operation-item" @click="goToPage('notifications')">
+				<view class="operation-item" @click="switchPushPermissions">
 					<up-image :src="tzykImg" width="48rpx" height="48rpx"></up-image>
-					<text>通知已开</text>
+					<text>通知已{{notice_on?'开':'关'}}</text>
 				</view>
 				<view class="operation-item" @click="showVersion">
 					<up-image :src="versionImg" width="48rpx" height="48rpx"></up-image>
@@ -269,6 +269,7 @@
 	const totalPoints = ref(0)
 	const sign_in = ref(0)
 	const honor_list = ref([])
+	const notice_on = ref(false)
 	// 从storage获取用户信息
 	const getUserInfoFromStorage = () => {
 		try {
@@ -428,8 +429,9 @@
               url="/pages_app/setting/setting"
 				break;
 			default:
+				const push_clientid = uni.getStorageSync("push_clientid")
 				uni.showToast({
-					title: '功能开发中',
+					title: 'push_clientid: '+push_clientid,
 					icon: 'none'
 				});
 		}
@@ -438,6 +440,131 @@
 		})
 	};
 
+// 判断通知权限是否开启  
+const isNoticeOn = () => { 
+    // #ifdef APP-PLUS  
+    if (plus.os.name == "Android") {  
+        var main = plus.android.runtimeMainActivity();  
+        var NotificationManagerCompat = plus.android.importClass("android.support.v4.app.NotificationManagerCompat");  
+        if (NotificationManagerCompat == null) {  
+            NotificationManagerCompat = plus.android.importClass("androidx.core.app.NotificationManagerCompat");  
+        }  
+        var areNotificationsEnabled = NotificationManagerCompat.from(main).areNotificationsEnabled();  
+		notice_on.value = areNotificationsEnabled
+        return areNotificationsEnabled;  
+    } else if (plus.os.name == "iOS") {  
+        var isIosOn = undefined;  
+        var types = 0;  
+        var app = plus.ios.invoke("UIApplication", "sharedApplication");  
+        var settings = plus.ios.invoke(app, "currentUserNotificationSettings");  
+        if (settings) {  
+            types = settings.plusGetAttribute("types");  
+            plus.ios.deleteObject(settings);  
+        } else {  
+            types = plus.ios.invoke(app, "enabledRemoteNotificationTypes");  
+        }  
+        plus.ios.deleteObject(app);  
+        isIosOn = 0 != types;  
+		notice_on.value = isIosOn
+        return isIosOn;  
+    }  
+    // #endif  
+}  
+
+// 前往系统设置页面开启或关闭通知权限  
+const switchPushPermissions = () => { 
+	const push_clientid = uni.getStorageSync("push_clientid")
+    // #ifdef APP-PLUS  
+    let title = isNoticeOn() ? "通知权限关闭提醒" : "通知权限开启提醒";  
+    let content = isNoticeOn()  
+        ? "通知权限已开启，是否前往设置关闭？"+push_clientid  
+        : "您还没有开启通知权限，无法接受到消息通知，是否前往设置？"+push_clientid;  
+    // 打开安卓系统设置页面  
+    let openAndroidSetting = () => {  
+        var main = plus.android.runtimeMainActivity();  
+        var pkName = main.getPackageName();  
+        var uid = main.getApplicationInfo().plusGetAttribute("uid");  
+        var Intent = plus.android.importClass("android.content.Intent");  
+        var Build = plus.android.importClass("android.os.Build");  
+        //android 8.0引导  
+        if (Build.VERSION.SDK_INT >= 26) {  
+            var intent = new Intent("android.settings.APP_NOTIFICATION_SETTINGS");  
+            intent.putExtra("android.provider.extra.APP_PACKAGE", pkName);  
+        } else if (Build.VERSION.SDK_INT >= 21) {  
+            //android 5.0-7.0  
+            var intent = new Intent("android.settings.APP_NOTIFICATION_SETTINGS");  
+            intent.putExtra("app_package", pkName);  
+            intent.putExtra("app_uid", uid);  
+        } else {  
+            //(<21)其他--跳转到该应用管理的详情页  
+            intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);  
+            var uri = Uri.fromParts("package", mainActivity.getPackageName(), null);  
+            intent.setData(uri);  
+        }  
+        // 跳转到该应用的系统通知设置页  
+        main.startActivity(intent);  
+    };  
+    // 打开苹果系统设置页面  
+    let openIOSSetting = () => {  
+        var app = plus.ios.invoke("UIApplication", "sharedApplication");  
+        var setting = plus.ios.invoke("NSURL", "URLWithString:", "app-settings:");  
+        plus.ios.invoke(app, "openURL:", setting);  
+        plus.ios.deleteObject(setting);  
+        plus.ios.deleteObject(app);  
+        // ios18跳转不过去的解决方案  
+        // 方案一：使用uni.openAppAuthorizeSetting()，文档地址：https://uniapp.dcloud.net.cn/api/system/openappauthorizesetting.html  
+        // 方案二：待验证，AI生成；来源评论区：iOS 18以后，openURL:完全被弃用，需要用openURL:options:completionHandler:替代。  
+        // var app = plus.ios.invoke("UIApplication", "sharedApplication");  
+        // var url;  
+        // // 获取安全 URL（iOS 8+）  
+        // if (plus.ios.invoke("UIApplication", "respondsToSelector:", "openSettingsURLString")) {  
+        //  var urlString = plus.ios.invoke("UIApplication", "openSettingsURLString");  
+        //  url = plus.ios.invoke("NSURL", "URLWithString:", urlString);  
+        // } else {  
+        //  url = plus.ios.invoke("NSURL", "URLWithString:", "app-settings:");  
+        // }  
+        // // 判断新 API 可用性（iOS 10+）  
+        // var supportsNewAPI = plus.ios.invoke(app, "respondsToSelector:", "openURL:options:completionHandler:");  
+        // if (supportsNewAPI) {  
+        //  var options = plus.ios.newObject("NSDictionary");  
+        //  var completion = plus.ios.newBlock(function(success) {  
+        //      console.log("跳转结果：" + success);  
+        //      if (!success) {  
+        //          plus.nativeUI.toast("无法打开设置，请手动前往");  
+        //      }  
+        //  }, "v@:B");  
+        //  plus.ios.invoke(app, "openURL:options:completionHandler:", url, options, completion);  
+        //  plus.ios.deleteObject(completion);  
+        // } else {  
+        //  if (plus.ios.invoke(app, "canOpenURL:", url)) {  
+        //      plus.ios.invoke(app, "openURL:", url);  
+        //  } else {  
+        //      throw new Error("当前系统不支持跳转设置");  
+        //  }  
+        // }  
+        // plus.ios.deleteObject(url);  
+        // plus.ios.deleteObject(app);  
+    };  
+    // 弹窗提醒开通或关闭权限，点击确认后，跳转到系统设置页面进行设置  
+    uni.showModal({  
+        title: title,  
+        content: content,  
+        showCancel: true,  
+        confirmColor: "#ff903f",  
+        success: (res) => {  
+            if (res.confirm) {  
+                if (plus.os.name == "Android") {  
+                    openAndroidSetting();  
+                } else if (plus.os.name == "iOS") {  
+                    openIOSSetting();  
+                }  
+            }  
+        },  
+    });  
+    // #endif  
+}  
+
+
 	const showYearSummary = () => {
 		console.log('显示年度总结');
 		uni.showToast({
@@ -491,6 +618,7 @@
 		getUserInfoFromStorage() // 先从storage获取用户信息
 		fetchMyInfo() // 然后从API获取最新数据
 		getIsBoundWechat()
+		isNoticeOn()
 	});
 </script>
 
diff --git a/pages_app/setting/setting.vue b/pages_app/setting/setting.vue
index 7784d5d..4a8e66e 100644
--- a/pages_app/setting/setting.vue
+++ b/pages_app/setting/setting.vue
@@ -22,7 +22,7 @@
 			<view class="setting-item" @click="toggleNotification">
 				<text class="setting-text">消息通知</text>
 				<view class="setting-right">
-					<text class="setting-status">已开启</text>
+					<text class="setting-status">{{notice_on?'已':'未'}}开启</text>
 					
 				</view>
 			</view>
@@ -73,7 +73,7 @@
 			<view class="setting-item" @click="clearCache">
 				<text class="setting-text">清除缓存</text>
 				<view class="setting-right">
-					<text class="cache-size">1.39MB</text>
+					<text class="cache-size">{{fileSizeString}}</text>
 					<uni-icons type="right" size="20" color="#999"></uni-icons>
 				</view>
 			</view>
@@ -144,7 +144,13 @@
 
 <script setup>
 	import { ref } from 'vue';
+	import {
+		onShow
+	} from "@dcloudio/uni-app";
 	import my_api from '@/api/my_api.js'
+	const notice_on = ref(false)
+	
+	const fileSizeString = ref("0B")
 	// 返回上一页
 	const goBack = () => {
 		uni.navigateBack();
@@ -159,6 +165,53 @@
 		});
 	};
 	
+	 const formatSize = () => {
+		plus.cache.calculate(function(size) {  
+			let sizeCache = parseInt(size);  
+			if (sizeCache == 0) {  
+				fileSizeString.value = "0B";  
+			} else if (sizeCache < 1024) {  
+				fileSizeString.value = sizeCache + "B";  
+			} else if (sizeCache < 1048576) {  
+				fileSizeString.value = (sizeCache / 1024).toFixed(2) + "KB";  
+			} else if (sizeCache < 1073741824) {  
+				fileSizeString.value = (sizeCache / 1048576).toFixed(2) + "MB";  
+			} else {  
+				fileSizeString.value = (sizeCache / 1073741824).toFixed(2) + "GB";  
+			}  
+		});  
+	}
+				
+	const isNoticeOn = () => {
+	    // #ifdef APP-PLUS  
+	    if (plus.os.name == "Android") {  
+	        var main = plus.android.runtimeMainActivity();  
+	        var NotificationManagerCompat = plus.android.importClass("android.support.v4.app.NotificationManagerCompat");  
+	        if (NotificationManagerCompat == null) {  
+	            NotificationManagerCompat = plus.android.importClass("androidx.core.app.NotificationManagerCompat");  
+	        }  
+	        var areNotificationsEnabled = NotificationManagerCompat.from(main).areNotificationsEnabled();  
+			notice_on.value = areNotificationsEnabled
+	        return areNotificationsEnabled;  
+	    } else if (plus.os.name == "iOS") {  
+	        var isIosOn = undefined;  
+	        var types = 0;  
+	        var app = plus.ios.invoke("UIApplication", "sharedApplication");  
+	        var settings = plus.ios.invoke(app, "currentUserNotificationSettings");  
+	        if (settings) {  
+	            types = settings.plusGetAttribute("types");  
+	            plus.ios.deleteObject(settings);  
+	        } else {  
+	            types = plus.ios.invoke(app, "enabledRemoteNotificationTypes");  
+	        }  
+	        plus.ios.deleteObject(app);  
+	        isIosOn = 0 != types;  
+			notice_on.value = isIosOn
+	        return isIosOn;  
+	    }  
+	    // #endif  
+	}  
+	
 	const goToPage = (url) => {
 		uni.navigateTo({
 				url: '/pages/webview/webview?url=' + url
@@ -417,10 +470,41 @@ const appdownLoad = (url) => {
 			content: '确定要清除缓存吗？',
 			success: (res) => {
 				if (res.confirm) {
-					uni.showToast({
-						title: '缓存已清除',
-						icon: 'none'
-					});
+					let os = plus.os.name;  
+					if (os == 'Android') {  
+						let main = plus.android.runtimeMainActivity();  
+						let sdRoot = main.getCacheDir();  
+						let files = plus.android.invoke(sdRoot, "listFiles");  
+						let len = files.length;  
+						for (let i = 0; i < len; i++) {  
+							let filePath = '' + files[i]; // 没有找到合适的方法获取路径，这样写可以转成文件路径  
+							plus.io.resolveLocalFileSystemURL(filePath, function(entry) {  
+								if (entry.isDirectory) {  
+									entry.removeRecursively(function(entry) { //递归删除其下的所有文件及子目录  
+										uni.showToast({  
+											title: '缓存清理完成',  
+											duration: 2000  
+										});  
+										formatSize(); // 重新计算缓存  
+									}, function(e) {  
+										console.log(e.message)  
+									});  
+								} else {  
+									entry.remove();  
+								}  
+							}, function(e) {  
+								console.log('文件路径读取失败')  
+							});  
+						}  
+					} else { // ios暂时未找到清理缓存的方法，以下是官方提供的方法，但是无效，会报错  
+						plus.cache.clear(function() {  
+							uni.showToast({  
+								title: '缓存清理完成',  
+								duration: 2000  
+							});  
+							formatSize();  
+						});  
+					}  
 				}
 			}
 		});
@@ -473,6 +557,10 @@ const appdownLoad = (url) => {
 			}
 		});
 	};
+	
+	onShow(() => {
+		isNoticeOn()
+	});
 </script>
 
 <style scoped>
diff --git a/uniCloud-aliyun/cloudfunctions/commentPush/index.js b/uniCloud-aliyun/cloudfunctions/commentPush/index.js
new file mode 100644
index 0000000..0a489fb
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/commentPush/index.js
@@ -0,0 +1,20 @@
+// 简单的使用示例  
+'use strict';  
+const uniPush = uniCloud.getPushManager({  
+appId: "__UNI__89F511F"
+})  
+exports.main = async (event) => {  
+    let obj = JSON.parse(event.body)  
+        const res = await uniPush.sendMessage({  
+        "push_clientid": obj.cids, // 设备id，支持多个以数组的形式指定多个设备，如["cid-1","cid-2"]，数组长度不大于1000  
+        "title": obj.title, // 标题  
+        "content": obj.content, // 内容  
+        "settings": obj.settings, // 消息有效期  
+        "payload": obj.payload, // 数据  
+        "category": obj.category, // HarmonyOS NEXT系统（纯血鸿蒙、非安卓鸿蒙）的消息分类，要给鸿蒙设备推送时才必传  
+        "force_notification": true, //填写true，客户端就会对在线消息自动创建“通知栏消息”，不填写则需要客户端自己处理。  
+        "request_id": obj.request_id ,//请求唯一标识号，10-32位之间；如果request_id重复，会导致消息丢失  
+        "options":obj.options //消息分类，没申请可以不传这个参数  
+    })  
+    return res;  
+};
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/commentPush/package.json b/uniCloud-aliyun/cloudfunctions/commentPush/package.json
new file mode 100644
index 0000000..374d301
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/commentPush/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "commentPush",
+  "dependencies": {},
+  "extensions": {
+    "uni-cloud-push": {}
+  }
+}
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/testPush2/index.js b/uniCloud-aliyun/cloudfunctions/testPush2/index.js
new file mode 100644
index 0000000..8615351
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/testPush2/index.js
@@ -0,0 +1,40 @@
+// 简单的使用示例  
+'use strict';  
+const uniPush = uniCloud.getPushManager({appId:"__UNI__89F511F"}) //注意这里需要传入你的应用appId  
+exports.main = async (event, context) => {  
+    return await uniPush.sendMessage({  
+        "push_clientid": "a297ac02dc531b7d43ff539f3163efcb",     //填写上一步在uni-app客户端获取到的客户端推送标识push_clientid  
+        "force_notification":true,  //填写true，客户端就会对在线消息自动创建“通知栏消息”。  
+        "title": "通知栏显示的标题",      
+        "content": "通知栏显示的内容",  
+        "settings": {  
+            //消息有效期设置，单位毫秒，-1表示不设离线。默认是 2 小时，取值范围：-1 ～ 3 * 24 * 3600 * 1000(3天)之间  
+            "ttl":86400000  
+        },  
+        "payload": {  
+            "text":"体验一下uni-push2.0"  
+        },  
+        "category": {  
+            //HarmonyOS NEXT系统（纯血鸿蒙、非安卓鸿蒙）的消息分类，要给鸿蒙设备推送时才必传  
+            "harmony":"MARKETING"  
+        },  
+        "options":{  
+            "HW": {      
+                 // 值为int 类型。1 表示华为测试消息，华为每个应用每日可发送该测试消息500条。此 target_user_type 参数请勿发布至线上。      
+                  "/message/android/target_user_type":1      
+              } ,    
+            "HO": {      
+                 //值为int 类型。1 表示测试推送，不填默认为0。荣耀每个应用每日可发送该测试消息1000条。此测试参数请勿发布至线上。  
+                  "/android/targetUserType": 1   
+              } ,  
+            "VV": {      
+                 //值为int 类型。0 表示正式推送；1 表示测试推送，不填默认为0。此 pushMode 参数请勿发布至线上。  
+                  "/pushMode":1      
+              } ,    
+            "XM": {      
+                 //新小米消息分类下，私信公信id都必须要传，否则请求小米厂商接口会被拦截  
+                  "/extra.channel_id": "填写小米平台申请的渠道id"   
+              }    
+        }  
+    })  
+};
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/testPush2/package.json b/uniCloud-aliyun/cloudfunctions/testPush2/package.json
new file mode 100644
index 0000000..d51fecd
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/testPush2/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "testPush2",
+  "dependencies": {},
+  "extensions": {
+    "uni-cloud-push": {}
+  }
+}
\ No newline at end of file
diff --git a/uniCloud-aliyun/database/JQL查询.jql b/uniCloud-aliyun/database/JQL查询.jql
new file mode 100644
index 0000000..35d21de
--- /dev/null
+++ b/uniCloud-aliyun/database/JQL查询.jql
@@ -0,0 +1,12 @@
+// 本文件用于，使用JQL语法操作项目关联的uniCloud空间的数据库，方便开发调试和远程数据库管理
+// 编写clientDB的js API（也支持常规js语法，比如var），可以对云数据库进行增删改查操作。不支持uniCloud-db组件写法
+// 可以全部运行，也可以选中部分代码运行。点击工具栏上的运行按钮或者按下【F5】键运行代码
+// 如果文档中存在多条JQL语句，只有最后一条语句生效
+// 如果混写了普通js，最后一条语句需是数据库操作语句
+// 此处代码运行不受DB Schema的权限控制，移植代码到实际业务中注意在schema中配好permission
+// 不支持clientDB的action
+// 数据库查询有最大返回条数限制，详见：https://uniapp.dcloud.net.cn/uniCloud/cf-database.html#limit
+// 详细JQL语法，请参考：https://uniapp.dcloud.net.cn/uniCloud/jql.html
+
+// 下面示例查询uni-id-users表的所有数据
+db.collection('uni-id-users').get();
diff --git a/uni_modules/uni-config-center/changelog.md b/uni_modules/uni-config-center/changelog.md
new file mode 100644
index 0000000..57dbcb5
--- /dev/null
+++ b/uni_modules/uni-config-center/changelog.md
@@ -0,0 +1,6 @@
+## 0.0.3（2022-11-11）
+- 修复 config 方法获取根节点为数组格式配置时错误的转化为了对象的Bug
+## 0.0.2（2021-04-16）
+- 修改插件package信息
+## 0.0.1（2021-03-15）
+- 初始化项目
diff --git a/uni_modules/uni-config-center/package.json b/uni_modules/uni-config-center/package.json
new file mode 100644
index 0000000..bace866
--- /dev/null
+++ b/uni_modules/uni-config-center/package.json
@@ -0,0 +1,81 @@
+{
+  "id": "uni-config-center",
+  "displayName": "uni-config-center",
+  "version": "0.0.3",
+  "description": "uniCloud 配置中心",
+  "keywords": [
+    "配置",
+    "配置中心"
+],
+  "repository": "",
+  "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"
+  },
+  "directories": {
+    "example": "../../../scripts/dist"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "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"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "u"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-config-center/readme.md b/uni_modules/uni-config-center/readme.md
new file mode 100644
index 0000000..03f7fc2
--- /dev/null
+++ b/uni_modules/uni-config-center/readme.md
@@ -0,0 +1,93 @@
+# 为什么使用uni-config-center
+
+实际开发中很多插件需要配置文件才可以正常运行，如果每个插件都单独进行配置的话就会产生下面这样的目录结构
+
+```bash
+cloudfunctions
+└─────common 公共模块
+        ├─plugin-a // 插件A对应的目录
+        │  ├─index.js
+        │  ├─config.json // plugin-a对应的配置文件
+        │  └─other-file.cert  // plugin-a依赖的其他文件
+        └─plugin-b // plugin-b对应的目录
+           ├─index.js
+           └─config.json // plugin-b对应的配置文件
+```
+
+假设插件作者要发布一个项目模板，里面使用了很多需要配置的插件，无论是作者发布还是用户使用都是一个大麻烦。
+
+uni-config-center就是用了统一管理这些配置文件的，使用uni-config-center后的目录结构如下
+
+```bash
+cloudfunctions
+└─────common 公共模块
+        ├─plugin-a // 插件A对应的目录
+        │  └─index.js
+        ├─plugin-b // plugin-b对应的目录
+        │  └─index.js
+        └─uni-config-center
+           ├─index.js // config-center入口文件
+           ├─plugin-a
+           │  ├─config.json  // plugin-a对应的配置文件
+           │  └─other-file.cert  // plugin-a依赖的其他文件
+           └─plugin-b
+              └─config.json  // plugin-b对应的配置文件
+```
+
+使用uni-config-center后的优势
+
+- 配置文件统一管理，分离插件主体和配置信息，更新插件更方便
+- 支持对config.json设置schema，插件使用者在HBuilderX内编写config.json文件时会有更好的提示（后续HBuilderX会提供支持）
+
+# 用法
+
+在要使用uni-config-center的公共模块或云函数内引入uni-config-center依赖，请参考：[使用公共模块](https://uniapp.dcloud.net.cn/uniCloud/cf-common)
+
+```js
+const createConfig = require('uni-config-center')
+
+const uniIdConfig = createConfig({
+    pluginId: 'uni-id', // 插件id
+    defaultConfig: { // 默认配置
+        tokenExpiresIn: 7200,
+        tokenExpiresThreshold: 600,
+    },
+    customMerge: function(defaultConfig, userConfig) { // 自定义默认配置和用户配置的合并规则，不设置的情况侠会对默认配置和用户配置进行深度合并
+        // defaudltConfig 默认配置
+        // userConfig 用户配置
+        return Object.assign(defaultConfig, userConfig)
+    }
+})
+
+
+// 以如下配置为例
+// {
+//   "tokenExpiresIn": 7200,
+//   "passwordErrorLimit": 6,
+//   "bindTokenToDevice": false,
+//   "passwordErrorRetryTime": 3600,
+//   "app-plus": {
+//     "tokenExpiresIn": 2592000
+//   },
+//   "service": {
+//     "sms": {
+//       "codeExpiresIn": 300
+//     }
+//   }
+// }
+
+// 获取配置
+uniIdConfig.config() // 获取全部配置，注意：uni-config-center内不存在对应插件目录时会返回空对象
+uniIdConfig.config('tokenExpiresIn') // 指定键值获取配置，返回：7200
+uniIdConfig.config('service.sms.codeExpiresIn') // 指定键值获取配置，返回：300
+uniIdConfig.config('tokenExpiresThreshold', 600) // 指定键值获取配置，如果不存在则取传入的默认值，返回：600
+
+// 获取文件绝对路径
+uniIdConfig.resolve('custom-token.js') // 获取uni-config-center/uni-id/custom-token.js文件的路径
+
+// 引用文件（require）
+uniIDConfig.requireFile('custom-token.js') // 使用require方式引用uni-config-center/uni-id/custom-token.js文件。文件不存在时返回undefined，文件内有其他错误导致require失败时会抛出错误。
+
+// 判断是否包含某文件
+uniIDConfig.hasFile('custom-token.js') // 配置目录是否包含某文件，true: 文件存在，false: 文件不存在
+```
\ No newline at end of file
diff --git a/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/index.js b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/index.js
new file mode 100644
index 0000000..00ba62f
--- /dev/null
+++ b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/index.js
@@ -0,0 +1 @@
+"use strict";var t=require("fs"),r=require("path");function e(t){return t&&"object"==typeof t&&"default"in t?t:{default:t}}var n=e(t),o=e(r),i="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};var u=function(t){var r={exports:{}};return t(r,r.exports),r.exports}((function(t,r){var e="__lodash_hash_undefined__",n=9007199254740991,o="[object Arguments]",u="[object Function]",c="[object Object]",a=/^\[object .+?Constructor\]$/,f=/^(?:0|[1-9]\d*)$/,s={};s["[object Float32Array]"]=s["[object Float64Array]"]=s["[object Int8Array]"]=s["[object Int16Array]"]=s["[object Int32Array]"]=s["[object Uint8Array]"]=s["[object Uint8ClampedArray]"]=s["[object Uint16Array]"]=s["[object Uint32Array]"]=!0,s[o]=s["[object Array]"]=s["[object ArrayBuffer]"]=s["[object Boolean]"]=s["[object DataView]"]=s["[object Date]"]=s["[object Error]"]=s[u]=s["[object Map]"]=s["[object Number]"]=s[c]=s["[object RegExp]"]=s["[object Set]"]=s["[object String]"]=s["[object WeakMap]"]=!1;var l="object"==typeof i&&i&&i.Object===Object&&i,h="object"==typeof self&&self&&self.Object===Object&&self,p=l||h||Function("return this")(),_=r&&!r.nodeType&&r,v=_&&t&&!t.nodeType&&t,d=v&&v.exports===_,y=d&&l.process,g=function(){try{var t=v&&v.require&&v.require("util").types;return t||y&&y.binding&&y.binding("util")}catch(t){}}(),b=g&&g.isTypedArray;function j(t,r,e){switch(e.length){case 0:return t.call(r);case 1:return t.call(r,e[0]);case 2:return t.call(r,e[0],e[1]);case 3:return t.call(r,e[0],e[1],e[2])}return t.apply(r,e)}var w,O,m,A=Array.prototype,z=Function.prototype,M=Object.prototype,x=p["__core-js_shared__"],C=z.toString,F=M.hasOwnProperty,U=(w=/[^.]+$/.exec(x&&x.keys&&x.keys.IE_PROTO||""))?"Symbol(src)_1."+w:"",S=M.toString,I=C.call(Object),P=RegExp("^"+C.call(F).replace(/[\\^$.*+?()[\]{}|]/g,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),T=d?p.Buffer:void 0,q=p.Symbol,E=p.Uint8Array,$=T?T.allocUnsafe:void 0,D=(O=Object.getPrototypeOf,m=Object,function(t){return O(m(t))}),k=Object.create,B=M.propertyIsEnumerable,N=A.splice,L=q?q.toStringTag:void 0,R=function(){try{var t=vt(Object,"defineProperty");return t({},"",{}),t}catch(t){}}(),G=T?T.isBuffer:void 0,V=Math.max,W=Date.now,H=vt(p,"Map"),J=vt(Object,"create"),K=function(){function t(){}return function(r){if(!xt(r))return{};if(k)return k(r);t.prototype=r;var e=new t;return t.prototype=void 0,e}}();function Q(t){var r=-1,e=null==t?0:t.length;for(this.clear();++r<e;){var n=t[r];this.set(n[0],n[1])}}function X(t){var r=-1,e=null==t?0:t.length;for(this.clear();++r<e;){var n=t[r];this.set(n[0],n[1])}}function Y(t){var r=-1,e=null==t?0:t.length;for(this.clear();++r<e;){var n=t[r];this.set(n[0],n[1])}}function Z(t){var r=this.__data__=new X(t);this.size=r.size}function tt(t,r){var e=Ot(t),n=!e&&wt(t),o=!e&&!n&&At(t),i=!e&&!n&&!o&&Ft(t),u=e||n||o||i,c=u?function(t,r){for(var e=-1,n=Array(t);++e<t;)n[e]=r(e);return n}(t.length,String):[],a=c.length;for(var f in t)!r&&!F.call(t,f)||u&&("length"==f||o&&("offset"==f||"parent"==f)||i&&("buffer"==f||"byteLength"==f||"byteOffset"==f)||dt(f,a))||c.push(f);return c}function rt(t,r,e){(void 0!==e&&!jt(t[r],e)||void 0===e&&!(r in t))&&ot(t,r,e)}function et(t,r,e){var n=t[r];F.call(t,r)&&jt(n,e)&&(void 0!==e||r in t)||ot(t,r,e)}function nt(t,r){for(var e=t.length;e--;)if(jt(t[e][0],r))return e;return-1}function ot(t,r,e){"__proto__"==r&&R?R(t,r,{configurable:!0,enumerable:!0,value:e,writable:!0}):t[r]=e}Q.prototype.clear=function(){this.__data__=J?J(null):{},this.size=0},Q.prototype.delete=function(t){var r=this.has(t)&&delete this.__data__[t];return this.size-=r?1:0,r},Q.prototype.get=function(t){var r=this.__data__;if(J){var n=r[t];return n===e?void 0:n}return F.call(r,t)?r[t]:void 0},Q.prototype.has=function(t){var r=this.__data__;return J?void 0!==r[t]:F.call(r,t)},Q.prototype.set=function(t,r){var n=this.__data__;return this.size+=this.has(t)?0:1,n[t]=J&&void 0===r?e:r,this},X.prototype.clear=function(){this.__data__=[],this.size=0},X.prototype.delete=function(t){var r=this.__data__,e=nt(r,t);return!(e<0)&&(e==r.length-1?r.pop():N.call(r,e,1),--this.size,!0)},X.prototype.get=function(t){var r=this.__data__,e=nt(r,t);return e<0?void 0:r[e][1]},X.prototype.has=function(t){return nt(this.__data__,t)>-1},X.prototype.set=function(t,r){var e=this.__data__,n=nt(e,t);return n<0?(++this.size,e.push([t,r])):e[n][1]=r,this},Y.prototype.clear=function(){this.size=0,this.__data__={hash:new Q,map:new(H||X),string:new Q}},Y.prototype.delete=function(t){var r=_t(this,t).delete(t);return this.size-=r?1:0,r},Y.prototype.get=function(t){return _t(this,t).get(t)},Y.prototype.has=function(t){return _t(this,t).has(t)},Y.prototype.set=function(t,r){var e=_t(this,t),n=e.size;return e.set(t,r),this.size+=e.size==n?0:1,this},Z.prototype.clear=function(){this.__data__=new X,this.size=0},Z.prototype.delete=function(t){var r=this.__data__,e=r.delete(t);return this.size=r.size,e},Z.prototype.get=function(t){return this.__data__.get(t)},Z.prototype.has=function(t){return this.__data__.has(t)},Z.prototype.set=function(t,r){var e=this.__data__;if(e instanceof X){var n=e.__data__;if(!H||n.length<199)return n.push([t,r]),this.size=++e.size,this;e=this.__data__=new Y(n)}return e.set(t,r),this.size=e.size,this};var it,ut=function(t,r,e){for(var n=-1,o=Object(t),i=e(t),u=i.length;u--;){var c=i[it?u:++n];if(!1===r(o[c],c,o))break}return t};function ct(t){return null==t?void 0===t?"[object Undefined]":"[object Null]":L&&L in Object(t)?function(t){var r=F.call(t,L),e=t[L];try{t[L]=void 0;var n=!0}catch(t){}var o=S.call(t);n&&(r?t[L]=e:delete t[L]);return o}(t):function(t){return S.call(t)}(t)}function at(t){return Ct(t)&&ct(t)==o}function ft(t){return!(!xt(t)||function(t){return!!U&&U in t}(t))&&(zt(t)?P:a).test(function(t){if(null!=t){try{return C.call(t)}catch(t){}try{return t+""}catch(t){}}return""}(t))}function st(t){if(!xt(t))return function(t){var r=[];if(null!=t)for(var e in Object(t))r.push(e);return r}(t);var r=yt(t),e=[];for(var n in t)("constructor"!=n||!r&&F.call(t,n))&&e.push(n);return e}function lt(t,r,e,n,o){t!==r&&ut(r,(function(i,u){if(o||(o=new Z),xt(i))!function(t,r,e,n,o,i,u){var a=gt(t,e),f=gt(r,e),s=u.get(f);if(s)return void rt(t,e,s);var l=i?i(a,f,e+"",t,r,u):void 0,h=void 0===l;if(h){var p=Ot(f),_=!p&&At(f),v=!p&&!_&&Ft(f);l=f,p||_||v?Ot(a)?l=a:Ct(j=a)&&mt(j)?l=function(t,r){var e=-1,n=t.length;r||(r=Array(n));for(;++e<n;)r[e]=t[e];return r}(a):_?(h=!1,l=function(t,r){if(r)return t.slice();var e=t.length,n=$?$(e):new t.constructor(e);return t.copy(n),n}(f,!0)):v?(h=!1,d=f,y=!0?(g=d.buffer,b=new g.constructor(g.byteLength),new E(b).set(new E(g)),b):d.buffer,l=new d.constructor(y,d.byteOffset,d.length)):l=[]:function(t){if(!Ct(t)||ct(t)!=c)return!1;var r=D(t);if(null===r)return!0;var e=F.call(r,"constructor")&&r.constructor;return"function"==typeof e&&e instanceof e&&C.call(e)==I}(f)||wt(f)?(l=a,wt(a)?l=function(t){return function(t,r,e,n){var o=!e;e||(e={});var i=-1,u=r.length;for(;++i<u;){var c=r[i],a=n?n(e[c],t[c],c,e,t):void 0;void 0===a&&(a=t[c]),o?ot(e,c,a):et(e,c,a)}return e}(t,Ut(t))}(a):xt(a)&&!zt(a)||(l=function(t){return"function"!=typeof t.constructor||yt(t)?{}:K(D(t))}(f))):h=!1}var d,y,g,b;var j;h&&(u.set(f,l),o(l,f,n,i,u),u.delete(f));rt(t,e,l)}(t,r,u,e,lt,n,o);else{var a=n?n(gt(t,u),i,u+"",t,r,o):void 0;void 0===a&&(a=i),rt(t,u,a)}}),Ut)}function ht(t,r){return bt(function(t,r,e){return r=V(void 0===r?t.length-1:r,0),function(){for(var n=arguments,o=-1,i=V(n.length-r,0),u=Array(i);++o<i;)u[o]=n[r+o];o=-1;for(var c=Array(r+1);++o<r;)c[o]=n[o];return c[r]=e(u),j(t,this,c)}}(t,r,Pt),t+"")}var pt=R?function(t,r){return R(t,"toString",{configurable:!0,enumerable:!1,value:(e=r,function(){return e}),writable:!0});var e}:Pt;function _t(t,r){var e,n,o=t.__data__;return("string"==(n=typeof(e=r))||"number"==n||"symbol"==n||"boolean"==n?"__proto__"!==e:null===e)?o["string"==typeof r?"string":"hash"]:o.map}function vt(t,r){var e=function(t,r){return null==t?void 0:t[r]}(t,r);return ft(e)?e:void 0}function dt(t,r){var e=typeof t;return!!(r=null==r?n:r)&&("number"==e||"symbol"!=e&&f.test(t))&&t>-1&&t%1==0&&t<r}function yt(t){var r=t&&t.constructor;return t===("function"==typeof r&&r.prototype||M)}function gt(t,r){if(("constructor"!==r||"function"!=typeof t[r])&&"__proto__"!=r)return t[r]}var bt=function(t){var r=0,e=0;return function(){var n=W(),o=16-(n-e);if(e=n,o>0){if(++r>=800)return arguments[0]}else r=0;return t.apply(void 0,arguments)}}(pt);function jt(t,r){return t===r||t!=t&&r!=r}var wt=at(function(){return arguments}())?at:function(t){return Ct(t)&&F.call(t,"callee")&&!B.call(t,"callee")},Ot=Array.isArray;function mt(t){return null!=t&&Mt(t.length)&&!zt(t)}var At=G||function(){return!1};function zt(t){if(!xt(t))return!1;var r=ct(t);return r==u||"[object GeneratorFunction]"==r||"[object AsyncFunction]"==r||"[object Proxy]"==r}function Mt(t){return"number"==typeof t&&t>-1&&t%1==0&&t<=n}function xt(t){var r=typeof t;return null!=t&&("object"==r||"function"==r)}function Ct(t){return null!=t&&"object"==typeof t}var Ft=b?function(t){return function(r){return t(r)}}(b):function(t){return Ct(t)&&Mt(t.length)&&!!s[ct(t)]};function Ut(t){return mt(t)?tt(t,!0):st(t)}var St,It=(St=function(t,r,e){lt(t,r,e)},ht((function(t,r){var e=-1,n=r.length,o=n>1?r[n-1]:void 0,i=n>2?r[2]:void 0;for(o=St.length>3&&"function"==typeof o?(n--,o):void 0,i&&function(t,r,e){if(!xt(e))return!1;var n=typeof r;return!!("number"==n?mt(e)&&dt(r,e.length):"string"==n&&r in e)&&jt(e[r],t)}(r[0],r[1],i)&&(o=n<3?void 0:o,n=1),t=Object(t);++e<n;){var u=r[e];u&&St(t,u,e,o)}return t})));function Pt(t){return t}t.exports=It}));const c=Object.prototype.hasOwnProperty,a=(t,r)=>c.call(t,r);class f{constructor({pluginId:t,defaultConfig:r={},customMerge:e,root:n}){this.pluginId=t,this.defaultConfig=r,this.pluginConfigPath=o.default.resolve(n||__dirname,t),this.customMerge=e,this._config=void 0}resolve(t){return o.default.resolve(this.pluginConfigPath,t)}hasFile(t){return n.default.existsSync(this.resolve(t))}requireFile(t){try{return require(this.resolve(t))}catch(t){if("MODULE_NOT_FOUND"===t.code)return;throw t}}_getUserConfig(){return this.requireFile("config.json")}config(t,r){if(!this._config){const t=this._getUserConfig();this._config=Array.isArray(t)?t:(this.customMerge||u)(this.defaultConfig,t)}let e=this._config;return t?function(t,r,e){if("number"==typeof r)return t[r];if("symbol"==typeof r)return a(t,r)?t[r]:e;const n="string"!=typeof(o=r)?o:o.split(".").reduce(((t,r)=>(r.split(/\[([^}]+)\]/g).forEach((r=>r&&t.push(r))),t)),[]);var o;let i=t;for(let t=0;t<n.length;t++){const r=n[t];if(!a(i,r))return e;i=i[r]}return i}(e,t,r):e}}const s=new class{constructor(){this._configMap=new Map}plugin({pluginId:t,defaultConfig:r,customMerge:e,root:n=__dirname,cache:o=!0}){if(this._configMap.has(t)&&o)return this._configMap.get(t);const i=new f({pluginId:t,defaultConfig:r,customMerge:e,root:n});return o&&this._configMap.set(t,i),i}};var l=s.plugin.bind(s);module.exports=l;
diff --git a/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/package.json b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/package.json
new file mode 100644
index 0000000..3b73592
--- /dev/null
+++ b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/package.json
@@ -0,0 +1,13 @@
+{
+    "name": "uni-config-center",
+    "version": "0.0.3",
+    "description": "配置中心",
+    "main": "index.js",
+    "keywords": [],
+    "author": "DCloud",
+    "license": "Apache-2.0",
+    "origin-plugin-dev-name": "uni-config-center",
+    "origin-plugin-version": "0.0.3",
+    "plugin-dev-name": "uni-config-center",
+    "plugin-version": "0.0.3"
+}
\ No newline at end of file
diff --git a/uni_modules/uni-id-common/changelog.md b/uni_modules/uni-id-common/changelog.md
new file mode 100644
index 0000000..1ef0882
--- /dev/null
+++ b/uni_modules/uni-id-common/changelog.md
@@ -0,0 +1,36 @@
+## 1.0.18（2024-07-08）
+- checkToken时如果传入的token为空则返回uni-id-check-token-failed错误码以便uniIdRouter能正常跳转
+## 1.0.17（2024-04-26）
+- 兼容uni-app-x对客户端uniPlatform的调整（uni-app-x内uniPlatform区分app-android、app-ios）
+## 1.0.16（2023-04-25）
+- 新增maxTokenLength配置，用于限制数据库用户记录token数组的最大长度
+## 1.0.15（2023-04-06）
+- 修复部分语言国际化出错的Bug
+## 1.0.14（2023-03-07）
+- 修复 admin用户包含其他角色时未包含在token的Bug
+## 1.0.13（2022-07-21）
+- 修复 创建token时未传角色权限信息生成的token不正确的bug
+## 1.0.12（2022-07-15）
+- 提升与旧版本uni-id的兼容性（补充读取配置文件时回退平台app-plus、h5），但是仍推荐使用新平台名进行配置（app、web）
+## 1.0.11（2022-07-14）
+- 修复 部分情况下报`read property 'reduce' of undefined`的错误
+## 1.0.10（2022-07-11）
+- 将token存储在用户表的token字段内，与旧版本uni-id保持一致
+## 1.0.9（2022-07-01）
+- checkToken兼容token内未缓存角色权限的情况，此时将查库获取角色权限
+## 1.0.8（2022-07-01）
+- 修复clientDB默认依赖时部分情况下获取不到uni-id配置的Bug
+## 1.0.7（2022-06-30）
+- 修复config文件不合法时未抛出具体错误的Bug
+## 1.0.6（2022-06-28）
+- 移除插件内的数据表schema
+## 1.0.5（2022-06-27）
+- 修复使用多应用配置时报`Cannot read property 'appId' of undefined`的Bug
+## 1.0.4（2022-06-27）
+- 修复使用自定义token内容功能报错的Bug [详情](https://ask.dcloud.net.cn/question/147945)
+## 1.0.2（2022-06-23）
+- 对齐旧版本uni-id默认配置
+## 1.0.1（2022-06-22）
+- 补充对uni-config-center的依赖
+## 1.0.0（2022-06-21）
+- 提供uni-id token创建、校验、刷新接口，简化旧版uni-id公共模块
diff --git a/uni_modules/uni-id-common/package.json b/uni_modules/uni-id-common/package.json
new file mode 100644
index 0000000..4605424
--- /dev/null
+++ b/uni_modules/uni-id-common/package.json
@@ -0,0 +1,84 @@
+{
+	"id": "uni-id-common",
+	"displayName": "uni-id-common",
+	"version": "1.0.18",
+	"description": "包含uni-id token生成、校验、刷新功能的云函数公共模块",
+	"keywords": [
+        "uni-id-common",
+        "uniCloud",
+        "token",
+        "权限"
+    ],
+	"repository": "https://gitcode.net/dcloud/uni-id-common",
+    "engines": {
+	},
+    "dcloudext": {
+        "sale": {
+			"regular": {
+				"price": 0
+			},
+			"sourcecode": {
+				"price": 0
+			}
+		},
+		"contact": {
+			"qq": ""
+		},
+		"declaration": {
+			"ads": "无",
+			"data": "无",
+			"permissions": "无"
+		},
+        "npmurl": "",
+        "type": "unicloud-template-function"
+	},
+	"uni_modules": {
+		"dependencies": ["uni-config-center"],
+		"encrypt": [],
+		"platforms": {
+			"cloud": {
+				"tcb": "y",
+                "aliyun": "y",
+                "alipay": "n"
+			},
+			"client": {
+				"Vue": {
+					"vue2": "u",
+					"vue3": "u"
+				},
+				"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"
+				}
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-id-common/readme.md b/uni_modules/uni-id-common/readme.md
new file mode 100644
index 0000000..5f6a37a
--- /dev/null
+++ b/uni_modules/uni-id-common/readme.md
@@ -0,0 +1,3 @@
+# uni-id-common
+
+文档请参考：[uni-id-common](https://uniapp.dcloud.net.cn/uniCloud/uni-id-common.html)
\ No newline at end of file
diff --git a/uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/index.js b/uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/index.js
new file mode 100644
index 0000000..a8b99d0
--- /dev/null
+++ b/uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/index.js
@@ -0,0 +1 @@
+"use strict";var e,t=(e=require("crypto"))&&"object"==typeof e&&"default"in e?e.default:e;const n={TOKEN_EXPIRED:"uni-id-token-expired",CHECK_TOKEN_FAILED:"uni-id-check-token-failed",PARAM_REQUIRED:"uni-id-param-required",ACCOUNT_EXISTS:"uni-id-account-exists",ACCOUNT_NOT_EXISTS:"uni-id-account-not-exists",ACCOUNT_CONFLICT:"uni-id-account-conflict",ACCOUNT_BANNED:"uni-id-account-banned",ACCOUNT_AUDITING:"uni-id-account-auditing",ACCOUNT_AUDIT_FAILED:"uni-id-account-audit-failed",ACCOUNT_CLOSED:"uni-id-account-closed"};function i(e){return!!e&&("object"==typeof e||"function"==typeof e)&&"function"==typeof e.then}function r(e){if(!e)return;const t=e.match(/^(\d+).(\d+).(\d+)/);return t?t.slice(1,4).map(e=>parseInt(e)):void 0}function o(e,t){const n=r(e),i=r(t);return n?i?function(e,t){const n=Math.max(e.length,t.length);for(let i=0;i<n;i++){const n=e[i],r=t[i];if(n>r)return 1;if(n<r)return-1}return 0}(n,i):1:i?-1:0}const s={"uni-id-token-expired":30203,"uni-id-check-token-failed":30202};function c(e){const{errCode:t,errMsgValue:n}=e;e.errMsg=this._t(t,n),t in s&&(e.code=s[t]),delete e.errMsgValue}function a(e){return"object"===(i=e,Object.prototype.toString.call(i).slice(8,-1).toLowerCase())&&e.errCode&&(t=e.errCode,Object.values(n).includes(t))&&!!e.errCode;var t,i}let u={"zh-Hans":{"uni-id-token-expired":"登录状态失效，token已过期","uni-id-check-token-failed":"token校验未通过","uni-id-param-required":"缺少参数: {param}","uni-id-account-exists":"此账号已注册","uni-id-account-not-exists":"此账号未注册","uni-id-account-conflict":"用户账号冲突","uni-id-account-banned":"从账号已封禁","uni-id-account-auditing":"此账号正在审核中","uni-id-account-audit-failed":"此账号审核失败","uni-id-account-closed":"此账号已注销"},en:{"uni-id-token-expired":"The login status is invalid, token has expired","uni-id-check-token-failed":"Check token failed","uni-id-param-required":"Parameter required: {param}","uni-id-account-exists":"Account exists","uni-id-account-not-exists":"Account does not exists","uni-id-account-conflict":"User account conflict","uni-id-account-banned":"Account has been banned","uni-id-account-auditing":"Account audit in progress","uni-id-account-audit-failed":"Account audit failed","uni-id-account-closed":"Account has been closed"}};try{const e=require.resolve("uni-config-center/uni-id/lang/index.js");u=function(e,t){const n=Object.keys(e);n.push(...Object.keys(t));const i={};for(let r=0;r<n.length;r++){const o=n[r];i[o]=Object.assign({},e[o],t[o])}return i}(u,require(e))}catch(e){}var d=u;function l(e){return e.replace(/=/g,"").replace(/\+/g,"-").replace(/\//g,"_")}function h(e){return JSON.parse((t=function(e){var t=4-(e=e.toString()).length%4;if(4!==t)for(var n=0;n<t;++n)e+="=";return e.replace(/-/g,"+").replace(/_/g,"/")}(e),Buffer.from(t,"base64").toString("utf-8")));var t}function f(e){return l((t=JSON.stringify(e),Buffer.from(t,"utf-8").toString("base64")));var t}function p(e,n){return l(t.createHmac("sha256",n).update(e).digest("base64"))}const k=function(e,t){if("string"!=typeof e)throw new Error("Invalid token");const n=e.split(".");if(3!==n.length)throw new Error("Invalid token");const[i,r,o]=n;if(p(i+"."+r,t)!==o)throw new Error("Invalid token");const s=h(i);if("HS256"!==s.alg||"JWT"!==s.typ)throw new Error("Invalid token");const c=h(r);if(1e3*c.exp<Date.now()){const e=new Error("Token expired");throw e.name="TokenExpiredError",e}return c},g=function(e,t,n={}){const{expiresIn:i}=n;if(!i)throw new Error("expiresIn is required");const r=parseInt(Date.now()/1e3),o={...e,iat:r,exp:r+n.expiresIn},s=f({alg:"HS256",typ:"JWT"})+"."+f(o);return s+"."+p(s,t)},_=uniCloud.database(),I=_.command,C=_.collection("uni-id-users"),T=_.collection("uni-id-roles");class E{constructor({uniId:e}={}){this.uid=null,this.userRecord=null,this.userPermission=null,this.oldToken=null,this.oldTokenPayload=null,this.uniId=e,this.config=this.uniId._getConfig(),this.clientInfo=this.uniId._clientInfo,this.checkConfig()}checkConfig(){const{tokenExpiresIn:e,tokenExpiresThreshold:t}=this.config;if(t>=e)throw new Error("Config error, tokenExpiresThreshold should be less than tokenExpiresIn");t>e/2&&console.warn(`Please check whether the tokenExpiresThreshold configuration is set too large, tokenExpiresThreshold: ${t}, tokenExpiresIn: ${e}`)}get customToken(){return this.uniId.interceptorMap.get("customToken")}isTokenInDb(e){return o(e,"1.0.10")>=0}async getUserRecord(){if(this.userRecord)return this.userRecord;const e=await C.doc(this.uid).get();if(this.userRecord=e.data[0],!this.userRecord)throw{errCode:n.ACCOUNT_NOT_EXISTS};switch(this.userRecord.status){case void 0:case 0:break;case 1:throw{errCode:n.ACCOUNT_BANNED};case 2:throw{errCode:n.ACCOUNT_AUDITING};case 3:throw{errCode:n.ACCOUNT_AUDIT_FAILED};case 4:throw{errCode:n.ACCOUNT_CLOSED}}if(this.oldTokenPayload){if(this.isTokenInDb(this.oldTokenPayload.uniIdVersion)){if(-1===(this.userRecord.token||[]).indexOf(this.oldToken))throw{errCode:n.CHECK_TOKEN_FAILED}}if(this.userRecord.valid_token_date&&this.userRecord.valid_token_date>1e3*this.oldTokenPayload.iat)throw{errCode:n.TOKEN_EXPIRED}}return this.userRecord}async updateUserRecord(e){await C.doc(this.uid).update(e)}async getUserPermission(){if(this.userPermission)return this.userPermission;const e=(await this.getUserRecord()).role||[];if(0===e.length)return this.userPermission={role:[],permission:[]},this.userPermission;if(e.includes("admin"))return this.userPermission={role:e,permission:[]},this.userPermission;const t=await T.where({role_id:I.in(e)}).get(),n=(i=t.data.reduce((e,t)=>(t.permission&&e.push(...t.permission),e),[]),Array.from(new Set(i)));var i;return this.userPermission={role:e,permission:n},this.userPermission}async _createToken({uid:e,role:t,permission:i}={}){if(!t||!i){const e=await this.getUserPermission();t=e.role,i=e.permission}let r={uid:e,role:t,permission:i};if(this.uniId.interceptorMap.has("customToken")){const n=this.uniId.interceptorMap.get("customToken");if("function"!=typeof n)throw new Error("Invalid custom token file");r=await n({uid:e,role:t,permission:i})}const o=Date.now(),{tokenSecret:s,tokenExpiresIn:c,maxTokenLength:a=10}=this.config,u=g({...r,uniIdVersion:"1.0.18"},s,{expiresIn:c}),d=await this.getUserRecord(),l=(d.token||[]).filter(e=>{try{const t=this._checkToken(e);if(d.valid_token_date&&d.valid_token_date>1e3*t.iat)return!1}catch(e){if(e.errCode===n.TOKEN_EXPIRED)return!1}return!0});return l.push(u),l.length>a&&l.splice(0,l.length-a),await this.updateUserRecord({last_login_ip:this.clientInfo.clientIP,last_login_date:o,token:l}),{token:u,tokenExpired:o+1e3*c}}async createToken({uid:e,role:t,permission:i}={}){if(!e)throw{errCode:n.PARAM_REQUIRED,errMsgValue:{param:"uid"}};this.uid=e;const{token:r,tokenExpired:o}=await this._createToken({uid:e,role:t,permission:i});return{errCode:0,token:r,tokenExpired:o}}async refreshToken({token:e}={}){if(!e)throw{errCode:n.PARAM_REQUIRED,errMsgValue:{param:"token"}};this.oldToken=e;const t=this._checkToken(e);this.uid=t.uid,this.oldTokenPayload=t;const{uid:i}=t,{role:r,permission:o}=await this.getUserPermission(),{token:s,tokenExpired:c}=await this._createToken({uid:i,role:r,permission:o});return{errCode:0,token:s,tokenExpired:c}}_checkToken(e){const{tokenSecret:t}=this.config;let i;try{i=k(e,t)}catch(e){if("TokenExpiredError"===e.name)throw{errCode:n.TOKEN_EXPIRED};throw{errCode:n.CHECK_TOKEN_FAILED}}return i}async checkToken(e,{autoRefresh:t=!0}={}){if(!e)throw{errCode:n.CHECK_TOKEN_FAILED};this.oldToken=e;const i=this._checkToken(e);this.uid=i.uid,this.oldTokenPayload=i;const{tokenExpiresThreshold:r}=this.config,{uid:o,role:s,permission:c}=i,a={role:s,permission:c};if(!s&&!c){const{role:e,permission:t}=await this.getUserPermission();a.role=e,a.permission=t}if(!r||!t){const e={code:0,errCode:0,...i,...a};return delete e.uniIdVersion,e}const u=Date.now();let d={};1e3*i.exp-u<1e3*r&&(d=await this._createToken({uid:o}));const l={code:0,errCode:0,...i,...a,...d};return delete l.uniIdVersion,l}}var m=Object.freeze({__proto__:null,checkToken:async function(e,{autoRefresh:t=!0}={}){return new E({uniId:this}).checkToken(e,{autoRefresh:t})},createToken:async function({uid:e,role:t,permission:n}={}){return new E({uniId:this}).createToken({uid:e,role:t,permission:n})},refreshToken:async function({token:e}={}){return new E({uniId:this}).refreshToken({token:e})}});const w=require("uni-config-center")({pluginId:"uni-id"});class x{constructor({context:e,clientInfo:t,config:n}={}){this._clientInfo=e?function(e){return{appId:e.APPID,platform:e.PLATFORM,locale:e.LOCALE,clientIP:e.CLIENTIP,deviceId:e.DEVICEID}}(e):t,this._config=n,this.config=this._getOriginConfig(),this.interceptorMap=new Map,w.hasFile("custom-token.js")&&this.setInterceptor("customToken",require(w.resolve("custom-token.js")));this._i18n=uniCloud.initI18n({locale:this._clientInfo.locale,fallbackLocale:"zh-Hans",messages:JSON.parse(JSON.stringify(d))}),d[this._i18n.locale]||this._i18n.setLocale("zh-Hans")}setInterceptor(e,t){this.interceptorMap.set(e,t)}_t(...e){return this._i18n.t(...e)}_parseOriginConfig(e){return Array.isArray(e)?e:e[0]?Object.values(e):e}_getOriginConfig(){if(this._config)return this._config;if(w.hasFile("config.json")){let e;try{e=w.config()}catch(e){throw new Error("Invalid uni-id config file\n"+e.message)}return this._parseOriginConfig(e)}try{return this._parseOriginConfig(require("uni-id/config.json"))}catch(e){throw new Error("Invalid uni-id config file")}}_getAppConfig(){const e=this._getOriginConfig();return Array.isArray(e)?e.find(e=>e.dcloudAppid===this._clientInfo.appId)||e.find(e=>e.isDefaultConfig):e}_getPlatformConfig(){const e=this._getAppConfig();if(!e)throw new Error(`Config for current app (${this._clientInfo.appId}) was not found, please check your config file or client appId`);let t;switch(["app-plus","app-android","app-ios"].indexOf(this._clientInfo.platform)>-1&&(this._clientInfo.platform="app"),"h5"===this._clientInfo.platform&&(this._clientInfo.platform="web"),this._clientInfo.platform){case"web":t="h5";break;case"app":t="app-plus"}const n=[{tokenExpiresIn:7200,tokenExpiresThreshold:1200,passwordErrorLimit:6,passwordErrorRetryTime:3600},e];t&&e[t]&&n.push(e[t]),n.push(e[this._clientInfo.platform]);const i=Object.assign(...n);return["tokenSecret","tokenExpiresIn"].forEach(e=>{if(!i||!i[e])throw new Error(`Config parameter missing, ${e} is required`)}),i}_getConfig(){return this._getPlatformConfig()}}for(const e in m)x.prototype[e]=m[e];function y(e){const t=new x(e);return new Proxy(t,{get(e,t){if(t in e&&0!==t.indexOf("_")){if("function"==typeof e[t])return(n=e[t],function(){let e;try{e=n.apply(this,arguments)}catch(e){if(a(e))return c.call(this,e),e;throw e}return i(e)?e.then(e=>(a(e)&&c.call(this,e),e),e=>{if(a(e))return c.call(this,e),e;throw e}):(a(e)&&c.call(this,e),e)}).bind(e);if("context"!==t&&"config"!==t)return e[t]}var n}})}x.prototype.createInstance=y;const O={createInstance:y};module.exports=O;
diff --git a/uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/package.json b/uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/package.json
new file mode 100644
index 0000000..7003ea0
--- /dev/null
+++ b/uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/package.json
@@ -0,0 +1,20 @@
+{
+    "name": "uni-id-common",
+    "version": "1.0.18",
+    "description": "uni-id token生成、校验、刷新",
+    "main": "index.js",
+    "homepage": "https:\/\/uniapp.dcloud.io\/uniCloud\/uni-id-common.html",
+    "repository": {
+        "type": "git",
+        "url": "git+https:\/\/gitee.com\/dcloud\/uni-id-common.git"
+    },
+    "author": "DCloud",
+    "license": "Apache-2.0",
+    "dependencies": {
+        "uni-config-center": "file:..\/..\/..\/..\/..\/uni-config-center\/uniCloud\/cloudfunctions\/common\/uni-config-center"
+    },
+    "origin-plugin-dev-name": "uni-id-common",
+    "origin-plugin-version": "1.0.18",
+    "plugin-dev-name": "uni-id-common",
+    "plugin-version": "1.0.18"
+}
\ No newline at end of file