From 0be5555f600cadb7c2d14445a4150a116d7c4d35 Mon Sep 17 00:00:00 2001
From: wkj <278599135@.com>
Date: Mon, 25 Dec 2023 11:55:21 +0800
Subject: [PATCH] =?UTF-8?q?app=20=E8=8E=B7=E5=8F=96application?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 es/aspects/application.js  | 38 +++++++++++++++++++-----------
 lib/aspects/application.js | 48 ++++++++++++++++++++++++++------------
 src/aspects/application.ts |  3 +++
 3 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/es/aspects/application.js b/es/aspects/application.js
index 1ddfaf771..eda512d4a 100644
--- a/es/aspects/application.js
+++ b/es/aspects/application.js
@@ -21,29 +21,39 @@ export async function getApplication(params, context) {
     }, {});
     //微信小程序环境下 没有就报错
     if (type === 'wechatMp') {
-        assert(application, '微信小程序环境下 application必须存在小程序相关配置');
-    }
-    else {
+        assert(
+            application,
+            '微信小程序环境下 application必须存在小程序相关配置'
+        );
+    } else if (type === 'native') {
+        assert(application, 'APP环境下 application必须存在APP相关配置');
+    } else {
         //web 或 wechatPublic
         if (type === 'wechatPublic') {
             // 如果微信公众号环境下 application不存在公众号配置，但又在公众号访问，这时可以使用web的application
             if (!application) {
-                const [application2] = await context.select('application', {
-                    data: cloneDeep(applicationProjection),
-                    filter: {
-                        type: 'web',
-                        system: {
-                            domain$system: {
-                                url: domain,
+                const [application2] = await context.select(
+                    'application',
+                    {
+                        data: cloneDeep(applicationProjection),
+                        filter: {
+                            type: 'web',
+                            system: {
+                                domain$system: {
+                                    url: domain,
+                                },
                             },
                         },
                     },
-                }, {});
-                assert(application2, '微信公众号环境下 application不存在公众号配置，但必须存在web相关配置');
+                    {}
+                );
+                assert(
+                    application2,
+                    '微信公众号环境下 application不存在公众号配置，但必须存在web相关配置'
+                );
                 return application2.id;
             }
-        }
-        else {
+        } else {
             assert(application, 'web环境下 application必须存在web相关配置');
         }
     }
diff --git a/lib/aspects/application.js b/lib/aspects/application.js
index cccd95174..a07cbf822 100644
--- a/lib/aspects/application.js
+++ b/lib/aspects/application.js
@@ -25,30 +25,48 @@ async function getApplication(params, context) {
     }, {});
     //微信小程序环境下 没有就报错
     if (type === 'wechatMp') {
-        (0, assert_1.assert)(application, '微信小程序环境下 application必须存在小程序相关配置');
-    }
-    else {
+        (0, assert_1.assert)(
+            application,
+            '微信小程序环境下 application必须存在小程序相关配置'
+        );
+    } else if (type === 'native') {
+        (0, assert_1.assert)(
+            application,
+            'APP环境下 application必须存在APP相关配置'
+        );
+    } else {
         //web 或 wechatPublic
         if (type === 'wechatPublic') {
             // 如果微信公众号环境下 application不存在公众号配置，但又在公众号访问，这时可以使用web的application
             if (!application) {
-                const [application2] = await context.select('application', {
-                    data: (0, lodash_1.cloneDeep)(Projection_1.applicationProjection),
-                    filter: {
-                        type: 'web',
-                        system: {
-                            domain$system: {
-                                url: domain,
+                const [application2] = await context.select(
+                    'application',
+                    {
+                        data: (0, lodash_1.cloneDeep)(
+                            Projection_1.applicationProjection
+                        ),
+                        filter: {
+                            type: 'web',
+                            system: {
+                                domain$system: {
+                                    url: domain,
+                                },
                             },
                         },
                     },
-                }, {});
-                (0, assert_1.assert)(application2, '微信公众号环境下 application不存在公众号配置，但必须存在web相关配置');
+                    {}
+                );
+                (0, assert_1.assert)(
+                    application2,
+                    '微信公众号环境下 application不存在公众号配置，但必须存在web相关配置'
+                );
                 return application2.id;
             }
-        }
-        else {
-            (0, assert_1.assert)(application, 'web环境下 application必须存在web相关配置');
+        } else {
+            (0, assert_1.assert)(
+                application,
+                'web环境下 application必须存在web相关配置'
+            );
         }
     }
     return application.id;
diff --git a/src/aspects/application.ts b/src/aspects/application.ts
index aa67e8e6d..cde40506b 100644
--- a/src/aspects/application.ts
+++ b/src/aspects/application.ts
@@ -55,6 +55,9 @@ export async function getApplication<
             application,
             '微信小程序环境下 application必须存在小程序相关配置'
         );
+    }
+    else if (type === 'native') {
+       assert(application, 'APP环境下 application必须存在APP相关配置'); 
     } else {
         //web 或 wechatPublic
         if (type === 'wechatPublic') {