Merge branch 'backend' of https://gitcode.net/qq_50679803/great-teamwork into backend

alpha/admin/manifest.json

@@ -17,7 +17,9 @@
             "delay" : 0
         },
         /* 模块配置 */
-        "modules" : {},
+        "modules" : {
+            "Push" : {}
+        },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
@@ -43,7 +45,14 @@
             /* ios打包配置 */
             "ios" : {},
             /* SDK配置 */
-            "sdkConfigs" : {}
+            "sdkConfigs" : {
+                "push" : {
+                    "unipush" : {
+                        "version" : "2",
+                        "offline" : false
+                    }
+                }
+            }
         }
     },
     /* 快应用特有相关 */

alpha/admin/pages.json

@@ -136,7 +136,50 @@
 				"navigationBarTitleText": "设置密码"
 			}
 		}
-	],
+	,{
+    "path": "uni_modules/uni-push-admin/pages/extra/extra",
+    "style": {
+        "h5": {
+            "titleNView": {
+                "type": "transparent"
+            }
+        },
+        "navigationBarTitleText": "push-admin",
+        "navigationStyle": "default"
+    }
+}
+,{
+    "path": "uni_modules/uni-push-admin/pages/log/list",
+    "style": {
+        "h5": {
+            "titleNView": {
+                "type": "transparent"
+            }
+        },
+        "navigationBarTitleText": "推送记录",
+        "navigationStyle": "default"
+    }
+}
+,{
+    "path": "uni_modules/uni-push-admin/pages/log/detail",
+    "style": {
+        "navigationBarTitleText": "推送详情",
+        "navigationStyle": "default"
+    }
+}
+,{
+    "path": "uni_modules/uni-push-admin/pages/sendMessage/sendMessage",
+    "style": {
+        "h5": {
+            "titleNView": {
+                "type": "transparent"
+            }
+        },
+        "navigationBarTitleText": "消息推送",
+        "navigationStyle": "default"
+    }
+}
+],
 	"subPackages": [{
 			"root": "pages/system",
 			"pages": [{

alpha/admin/uniCloud-aliyun/cloudfunctions/uni-cloud-push/index.js

+// 简单的使用示例
+'use strict';
+const uniPush = uniCloud.getPushManager({appId:"__UNI__AAFC50C"}) //注意这里需要传入你的应用appId
+exports.main = async (event, context) => {
+	return await uniPush.sendMessage({
+		"push_clientid": "b4f399168b2b0c434ef3f2cdff9cbed3", 	//填写上一步在uni-app客户端获取到的客户端推送标识push_clientid
+		"title": "111111",	
+		"content": "2222",
+		"payload": {
+			"text":"体验一下uni-push2.0"
+		}
+	})
+};
\ No newline at end of file

alpha/admin/uniCloud-aliyun/cloudfunctions/uni-cloud-push/package.json

+{
+  "name": "uni-cloud-push",
+  "dependencies": {},
+  "extensions": {
+    "uni-cloud-push": {}
+  }
+}
\ No newline at end of file

alpha/admin/uni_modules/uni-id-common/changelog.md

+## 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）

alpha/admin/uni_modules/uni-id-common/package.json

 {
 	"id": "uni-id-common",
 	"displayName": "uni-id-common",
-	"version": "1.0.13",
+	"version": "1.0.16",
 	"description": "包含uni-id token生成、校验、刷新功能的云函数公共模块",
 	"keywords": [
         "uni-id-common",
@@ -13,12 +13,8 @@
 	"engines": {
 		"HBuilderX": "^3.1.0"
 	},
-	"dcloudext": {
-		"category": [
-			"uniCloud",
-			"云函数模板"
-		],
-		"sale": {
+    "dcloudext": {
+        "sale": {
 			"regular": {
 				"price": "0.00"
 			},
@@ -34,7 +30,8 @@
 			"data": "无",
 			"permissions": "无"
 		},
-		"npmurl": ""
+        "npmurl": "",
+        "type": "unicloud-template-function"
 	},
 	"uni_modules": {
 		"dependencies": ["uni-config-center"],

alpha/admin/uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/package.json

 {
   "name": "uni-id-common",
-  "version": "1.0.13",
+  "version": "1.0.16",
   "description": "uni-id token生成、校验、刷新",
   "main": "index.js",
   "homepage": "https://uniapp.dcloud.io/uniCloud/uni-id-common.html",

alpha/admin/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/node_modules/uni-id-common/package.json

 {
   "name": "uni-id-common",
-  "version": "1.0.13",
+  "version": "1.0.16",
   "description": "uni-id token生成、校验、刷新",
   "main": "index.js",
   "homepage": "https://uniapp.dcloud.io/uniCloud/uni-id-common.html",

alpha/admin/uni_modules/uni-push-admin/changelog.md

+## 1.0.8（2022-08-02）
+修复channel_id字段错误，vivo和oppo改成VO和OP
+## 1.0.7（2022-08-02）
+修复某些情况下报`fc_function_not_found`的bug
+## 1.0.6（2022-08-01）
+修复部分情况下，不能输入多行设备id的问题
+## 1.0.5（2022-07-21）
+消息推送功能，新增是否强制创建通知栏选项
+## 1.0.4（2022-07-08）
+新增[pages_init](https://uniapp.dcloud.io/plugin/uni_modules.html#pages-init)，当导入插件到项目工程时，自动合并本插件的页面路由到项目的pages.json
+## 1.0.3（2022-07-08）
+注释多余的console.log
+## 1.0.2（2022-07-07）
+修改帮助文档链接
+## 1.0.1（2022-07-06）
+第一版
+## 1.0.0（2022-07-05）
+正式版
+## 0.0.0（2022-07-02）
+init

alpha/admin/uni_modules/uni-push-admin/menu.json

+[{
+	"menu_id": "uni-push-admin",
+	"name": "推送管理",
+	"icon": "uni-icons-paperplane",
+	"sort": 4000,
+	"parent_id": "",
+	"permission": [],
+	"enable": true
+},{
+	"menu_id": "uni-push-send",
+	"name": "消息推送",
+	"icon": "uni-icons-chat-filled",
+	"url": "/uni_modules/uni-push-admin/pages/sendMessage/sendMessage",
+	"sort": 4010,
+	"parent_id": "uni-push-admin",
+	"permission": [],
+	"enable": true
+},{
+	"menu_id": "uni-push-log",
+	"name": "推送统计",
+	"icon": "admin-icons-tongji",
+	"url": "/uni_modules/uni-push-admin/pages/log/list",
+	"sort": 4010,
+	"parent_id": "uni-push-admin",
+	"permission": [],
+	"enable": true
+},{
+	"menu_id": "uni-push-extra",
+	"name": "其他功能",
+	"icon": "uni-icons-more-filled",
+	"url": "/uni_modules/uni-push-admin/pages/extra/extra",
+	"sort": 4010,
+	"parent_id": "uni-push-admin",
+	"permission": [],
+	"enable": true
+}]
\ No newline at end of file

alpha/admin/uni_modules/uni-push-admin/package.json

+{
+  "id": "uni-push-admin",
+  "displayName": "uni-push-admin",
+  "version": "1.0.8",
+  "description": "管理员端云端一体统一推送服务控制台",
+  "keywords": [
+    "uni-push-admin"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "category": [
+        "uniCloud",
+        "Admin插件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [
+    	"uni-id-common"
+    ],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "y",
+          "vue3": "y"
+        },
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "u",
+          "微信浏览器(Android)": "u",
+          "QQ浏览器(Android)": "u"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "u",
+          "Edge": "u",
+          "Firefox": "u",
+          "Safari": "u"
+        },
+        "小程序": {
+          "微信": "u",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u",
+          "钉钉": "u",
+          "快手": "u",
+          "飞书": "u",
+        "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file

alpha/admin/uni_modules/uni-push-admin/uniCloud/cloudfunctions/uni-push-co/package.json

+{
+  "name": "uni-push-admin-co",
+  "dependencies": {
+    "uni-id-common": "file:../../../../uni-id-common/uniCloud/cloudfunctions/common/uni-id-common"
+  },
+  "extensions": {
+    "uni-cloud-push": {}
+  }
+}
\ No newline at end of file

alpha/admin/uni_modules/uni-push-admin/uniCloud/cloudfunctions/uni-push-co/uni-push-co.param.json

+{
+	"method": "sendMessage",
+	"params": []
+}
\ No newline at end of file