From 6b97c47eca952901d9e81f76e35cd825b95a04ec Mon Sep 17 00:00:00 2001
From: wangwenchen <920960949@qq.com>
Date: Tue, 30 Jan 2024 15:56:07 +0800
Subject: [PATCH 01/10] =?UTF-8?q?userRelation=20=E4=B8=80=E4=B8=AAprojecti?=
 =?UTF-8?q?on=E5=B0=91=E5=8E=BB=E4=BA=86=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 es/types/Projection.js  | 3 +++
 lib/types/Projection.js | 3 +++
 src/types/Projection.ts | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/es/types/Projection.js b/es/types/Projection.js
index 80852c434..4abf556ac 100644
--- a/es/types/Projection.js
+++ b/es/types/Projection.js
@@ -40,6 +40,9 @@ const userProjection = {
     user$ref: {
         $entity: 'user',
         data: {
+            id: 1,
+            userState: 1,
+            refId: 1,
             mobile$user: {
                 $entity: 'mobile',
                 data: {
diff --git a/lib/types/Projection.js b/lib/types/Projection.js
index 4b01678bc..b4752ff79 100644
--- a/lib/types/Projection.js
+++ b/lib/types/Projection.js
@@ -43,6 +43,9 @@ const userProjection = {
     user$ref: {
         $entity: 'user',
         data: {
+            id: 1,
+            userState: 1,
+            refId: 1,
             mobile$user: {
                 $entity: 'mobile',
                 data: {
diff --git a/src/types/Projection.ts b/src/types/Projection.ts
index 3d8d0edd4..eea60c01e 100644
--- a/src/types/Projection.ts
+++ b/src/types/Projection.ts
@@ -45,6 +45,9 @@ const userProjection: EntityDict['user']['Selection']['data'] = {
     user$ref: {
         $entity: 'user',
         data: {
+            id: 1,
+            userState: 1,
+            refId: 1,
             mobile$user: {
                 $entity: 'mobile',
                 data: {

From 917eaec869eb7fe97ff3647a60c7aeac9a5efe5a Mon Sep 17 00:00:00 2001
From: wangwenchen <920960949@qq.com>
Date: Tue, 30 Jan 2024 15:57:26 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=E9=A1=B5=E9=9D=A2=EF=BC=8C=E7=9B=B4=E6=8E=A5=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=90=A6=E6=98=AF=E6=96=B0=E7=9A=84=E6=9C=89?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E6=94=B9=E6=88=90=E6=88=90=E4=B8=8A?=
 =?UTF-8?q?=E5=B1=82=E4=BC=A0=E4=B8=8B=E5=8E=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 es/components/userRelation/upsert/byMobile/web.d.ts    | 1 +
 es/components/userRelation/upsert/byMobile/web.js      | 4 ++--
 es/components/userRelation/upsert/byMobile/web.pc.js   | 2 +-
 es/components/userRelation/upsert/onUser/index.js      | 3 ++-
 src/components/userRelation/upsert/byMobile/web.pc.tsx | 1 +
 src/components/userRelation/upsert/byMobile/web.tsx    | 3 +++
 src/components/userRelation/upsert/onUser/index.ts     | 5 +++--
 7 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/es/components/userRelation/upsert/byMobile/web.d.ts b/es/components/userRelation/upsert/byMobile/web.d.ts
index abd5a7d44..144b1ca8b 100644
--- a/es/components/userRelation/upsert/byMobile/web.d.ts
+++ b/es/components/userRelation/upsert/byMobile/web.d.ts
@@ -11,6 +11,7 @@ export default function Render(props: WebComponentProps<EntityDict, 'mobile', fa
     passwordRequire: boolean;
     allowUpdateName?: boolean;
     allowUpdateNickname?: boolean;
+    isNew: boolean;
 }, {
     onMobileChange: (value: string) => Promise<void>;
     onConfirm: () => Promise<void>;
diff --git a/es/components/userRelation/upsert/byMobile/web.js b/es/components/userRelation/upsert/byMobile/web.js
index 7cdee2022..5b05d0342 100644
--- a/es/components/userRelation/upsert/byMobile/web.js
+++ b/es/components/userRelation/upsert/byMobile/web.js
@@ -3,7 +3,7 @@ import { Form, Input, Button } from 'antd-mobile';
 import Style from './web.module.less';
 import OnUser from '../onUser/index';
 export default function Render(props) {
-    const { mobileValue, mobileValueReady, relations, entity, entityId, userId, oakFullpath, oakExecutable, oakDirty, passwordRequire, allowUpdateName, allowUpdateNickname, } = props.data;
+    const { mobileValue, mobileValueReady, relations, entity, entityId, userId, oakFullpath, oakExecutable, oakDirty, passwordRequire, allowUpdateName, allowUpdateNickname,isNew } = props.data;
     const { onConfirm, onMobileChange, onReset, t } = props.methods;
     return (<Form footer={<div className={Style.btnContainer}>
                     <Button color="primary" style={{ flex: 2 }} onClick={() => {
@@ -35,6 +35,6 @@ export default function Render(props) {
         }} placeholder={t('inputMobile')} type="tel" clearable/>
                 </>
             </Form.Item>
-            {mobileValueReady && (<OnUser oakAutoUnmount={true} oakPath={`${oakFullpath}.user`} entity={entity} entityId={entityId} relations={relations} passwordRequire={passwordRequire} allowUpdateName={allowUpdateName} allowUpdateNickname={allowUpdateNickname}/>)}
+        {mobileValueReady && (<OnUser oakAutoUnmount={true} oakPath={`${oakFullpath}.user`} entity={entity} entityId={entityId} relations={relations} passwordRequire={passwordRequire} allowUpdateName={allowUpdateName} allowUpdateNickname={allowUpdateNickname} isNew={isNew} />)}
         </Form>);
 }
diff --git a/es/components/userRelation/upsert/byMobile/web.pc.js b/es/components/userRelation/upsert/byMobile/web.pc.js
index 3e8cf3ab1..395d0679b 100644
--- a/es/components/userRelation/upsert/byMobile/web.pc.js
+++ b/es/components/userRelation/upsert/byMobile/web.pc.js
@@ -29,7 +29,7 @@ export default function Render(props) {
         }} placeholder="请输入手机号码" type="tel"/>
                 </Form.Item>
             </Form>
-            {mobileValueReady && (<OnUser oakAutoUnmount={true} oakPath={`${oakFullpath}.user`} entity={entity} entityId={entityId} relations={relations} setPasswordConfirm={setPasswordConfirm} passwordRequire={passwordRequire} allowUpdateName={allowUpdateName} allowUpdateNickname={allowUpdateNickname}/>)}
+        {mobileValueReady && (<OnUser oakAutoUnmount={true} oakPath={`${oakFullpath}.user`} entity={entity} entityId={entityId} relations={relations} setPasswordConfirm={setPasswordConfirm} passwordRequire={passwordRequire} allowUpdateName={allowUpdateName} allowUpdateNickname={allowUpdateNickname} isNew={isNew} />)}
             <Form colon labelCol={{ span: 4 }} wrapperCol={{ span: 8 }}>
                 <Form.Item wrapperCol={{ offset: 4 }}>
                     <Space>
diff --git a/es/components/userRelation/upsert/onUser/index.js b/es/components/userRelation/upsert/onUser/index.js
index 3b77327ed..5ad7ab7aa 100644
--- a/es/components/userRelation/upsert/onUser/index.js
+++ b/es/components/userRelation/upsert/onUser/index.js
@@ -63,7 +63,7 @@ export default OakComponent({
             password,
             name,
             nickname,
-            isNew: $$createAt$$ === 1,
+            // isNew: $$createAt$$ === 1,
         };
     },
     properties: {
@@ -75,5 +75,6 @@ export default OakComponent({
         passwordRequire: false,
         allowUpdateName: false,
         allowUpdateNickname: false,
+        isNew: false,
     },
 });
diff --git a/src/components/userRelation/upsert/byMobile/web.pc.tsx b/src/components/userRelation/upsert/byMobile/web.pc.tsx
index 7a74336d0..77fd77ad9 100644
--- a/src/components/userRelation/upsert/byMobile/web.pc.tsx
+++ b/src/components/userRelation/upsert/byMobile/web.pc.tsx
@@ -91,6 +91,7 @@ export default function Render(
                     passwordRequire={passwordRequire}
                     allowUpdateName={allowUpdateName}
                     allowUpdateNickname={allowUpdateNickname}
+                    isNew={isNew}
                 />
             )}
             <Form colon labelCol={{ span: 4 }} wrapperCol={{ span: 8 }}>
diff --git a/src/components/userRelation/upsert/byMobile/web.tsx b/src/components/userRelation/upsert/byMobile/web.tsx
index 7b686efe6..8adf9151b 100644
--- a/src/components/userRelation/upsert/byMobile/web.tsx
+++ b/src/components/userRelation/upsert/byMobile/web.tsx
@@ -20,6 +20,7 @@ export default function Render(
             passwordRequire: boolean;
             allowUpdateName?: boolean;
             allowUpdateNickname?: boolean;
+            isNew: boolean;
         },
         {
             onMobileChange: (value: string) => Promise<void>;
@@ -41,6 +42,7 @@ export default function Render(
         passwordRequire,
         allowUpdateName,
         allowUpdateNickname,
+        isNew,
     } = props.data;
     const { onConfirm, onMobileChange, onReset, t } = props.methods;
     return (
@@ -104,6 +106,7 @@ export default function Render(
                     passwordRequire={passwordRequire}
                     allowUpdateName={allowUpdateName}
                     allowUpdateNickname={allowUpdateNickname}
+                    isNew={isNew}
                 />
             )}
         </Form>
diff --git a/src/components/userRelation/upsert/onUser/index.ts b/src/components/userRelation/upsert/onUser/index.ts
index 36dd1a0e6..112970f36 100644
--- a/src/components/userRelation/upsert/onUser/index.ts
+++ b/src/components/userRelation/upsert/onUser/index.ts
@@ -68,7 +68,7 @@ export default OakComponent({
             password,
             name,
             nickname,
-            isNew: $$createAt$$ === 1,
+            // isNew: $$createAt$$ === 1,
         };
     },
     properties: {
@@ -76,9 +76,10 @@ export default OakComponent({
         entityId: '',
         relations: [] as EntityDict['relation']['OpSchema'][],
         mobile: '',
-        setPasswordConfirm: (value: boolean) => {},
+        setPasswordConfirm: (value: boolean) => { },
         passwordRequire: false,
         allowUpdateName: false,
         allowUpdateNickname: false,
+        isNew: false,
     },
 });

From 339bb88057e47124007aecff82c4b2e22e0c96be Mon Sep 17 00:00:00 2001
From: wkj <278599135@.com>
Date: Wed, 31 Jan 2024 20:22:16 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=A8=A1=E7=89=88=E6=97=B6=EF=BC=8C=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=20OakApplicationLoadingException?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 es/features/token.js  |   2 +-
 es/page.mp.js         | 220 ++++++++++++++++++++++---------------
 lib/features/token.js |   2 +-
 lib/page.mp.js        | 219 ++++++++++++++++++++++---------------
 src/features/token.ts |   2 +-
 src/page.mp.ts        | 249 +++++++++++++++++++++++++-----------------
 6 files changed, 414 insertions(+), 280 deletions(-)

diff --git a/es/features/token.js b/es/features/token.js
index 9301864ef..d80343faa 100644
--- a/es/features/token.js
+++ b/es/features/token.js
@@ -130,7 +130,7 @@ export class Token extends Feature {
         return this.tokenValue;
     }
     getToken(allowUnloggedIn) {
-        if (this.tokenValue === '') {
+        if (!allowUnloggedIn && this.tokenValue === '') {
             throw new OakUserInfoLoadingException();
         }
         if (this.tokenValue) {
diff --git a/es/page.mp.js b/es/page.mp.js
index 5cd82a461..eb77d487d 100644
--- a/es/page.mp.js
+++ b/es/page.mp.js
@@ -1,5 +1,9 @@
-import { OakMpHaveToSubscribeMessage } from './types/Exception';
+import {
+    OakMpHaveToSubscribeMessage,
+    OakApplicationLoadingException,
+} from './types/Exception';
 import { createComponent as createBaseComponent } from 'oak-frontend-base/es/page.mp';
+
 /**
  * 这里的逻辑暴露出去，是为了让general可以被其它库重载
  * @param this
@@ -63,98 +67,134 @@ export function createComponent(option, features) {
     const { wechatMp, data, methods, lifetimes, userInsensitive, ...rest } = option;
     const { relatedMessageTypes } = wechatMp || {};
     const { ready, attached, show, hide, ...restLifeTimes } = lifetimes || {};
-    return createBaseComponent({
-        data: typeof data === 'function' ? function () {
-            return {
-                __userId: undefined,
-                ...(data.call(this)),
-            };
-        } : {
-            __userId: undefined,
-            ...data,
-        },
-        methods: {
-            async subscribeMpMessage(messageTypes, haveToAccept, tip) {
-                return await subscribeMpMessage.call(this, messageTypes, haveToAccept, tip);
+    return createBaseComponent(
+        {
+            data:
+                typeof data === 'function'
+                    ? function () {
+                          return {
+                              __userId: null,
+                              ...data.call(this),
+                          };
+                      }
+                    : {
+                          __userId: null,
+                          ...data,
+                      },
+            methods: {
+                async subscribeMpMessage(messageTypes, haveToAccept, tip) {
+                    return await subscribeMpMessage.call(
+                        this,
+                        messageTypes,
+                        haveToAccept,
+                        tip
+                    );
+                },
+                getMessageTypeTemplate() {
+                    if (relatedMessageTypes) {
+                        try {
+                            const applicationId =
+                                this.features.application.getApplicationId();
+                            const existedOnes = this.features.cache.get(
+                                'messageTypeTemplate',
+                                {
+                                    data: {
+                                        id: 1,
+                                        templateId: 1,
+                                        template: {
+                                            id: 1,
+                                            applicationId: 1,
+                                            wechatId: 1,
+                                        },
+                                        type: 1,
+                                    },
+                                    filter: {
+                                        type: {
+                                            $in: relatedMessageTypes,
+                                        },
+                                        template: {
+                                            applicationId,
+                                        },
+                                    },
+                                }
+                            );
+                            if (existedOnes.length === 0) {
+                                this.features.cache.refresh(
+                                    'messageTypeTemplate',
+                                    {
+                                        data: {
+                                            id: 1,
+                                            templateId: 1,
+                                            template: {
+                                                id: 1,
+                                                applicationId: 1,
+                                                wechatId: 1,
+                                            },
+                                            type: 1,
+                                        },
+                                        filter: {
+                                            type: {
+                                                $in: relatedMessageTypes,
+                                            },
+                                            template: {
+                                                applicationId,
+                                            },
+                                        },
+                                    }
+                                );
+                            }
+                        } catch (err) {
+                            if (err instanceof OakApplicationLoadingException) {
+                                if (process.env.NODE_ENV === 'development') {
+                                    console.warn(
+                                        '当Application（全局应用程序）对象正在加载和配置时，为了确保正确地获取模板消息类型的数据，我们会在Application准备就绪之后重新执行getMessageTypeTemplate方法来安全地获取并应用所需模版'
+                                    );
+                                }
+                            } else {
+                                throw err;
+                            }
+                        }
+                    }
+                },
+                ...methods,
             },
-            ...methods,
-        },
-        lifetimes: {
-            attached() {
-                if (!userInsensitive) {
-                    this.addFeatureSub('token', () => this.refresh());
-                }
-                attached && attached.call(this);
-            },
-            ready() {
-                if (relatedMessageTypes) {
-                    const applicationId = this.features.application.getApplicationId();
-                    const existedOnes = this.features.cache.get('messageTypeTemplate', {
-                        data: {
-                            id: 1,
-                            templateId: 1,
-                            template: {
-                                id: 1,
-                                applicationId: 1,
-                                wechatId: 1,
-                            },
-                            type: 1,
-                        },
-                        filter: {
-                            type: {
-                                $in: relatedMessageTypes,
-                            },
-                            template: {
-                                applicationId,
-                            },
-                        },
-                    });
-                    if (existedOnes.length === 0) {
-                        this.features.cache.refresh('messageTypeTemplate', {
-                            data: {
-                                id: 1,
-                                templateId: 1,
-                                template: {
-                                    id: 1,
-                                    applicationId: 1,
-                                    wechatId: 1,
-                                },
-                                type: 1,
-                            },
-                            filter: {
-                                type: {
-                                    $in: relatedMessageTypes,
-                                },
-                                template: {
-                                    applicationId,
-                                },
-                            },
+            lifetimes: {
+                attached() {
+                    if (!userInsensitive) {
+                        this.addFeatureSub('token', () => this.refresh());
+                    }
+                    this.addFeatureSub('application', () =>
+                        this.getMessageTypeTemplate()
+                    );
+                    attached && attached.call(this);
+                },
+                ready() {
+                    this.getMessageTypeTemplate();
+                    ready && ready.call(this);
+                },
+                show() {
+                    show && show.call(this);
+                    if (!userInsensitive) {
+                        const userId = this.features.token.getUserId(true);
+                        if (userId !== this.state.__userId) {
+                            this.refresh();
+                        }
+                    }
+                },
+                hide() {
+                    hide && hide.call(this);
+                    if (!userInsensitive) {
+                        const userId = this.features.token.getUserId(true);
+                        this.setState({
+                            __userId: userId,
                         });
                     }
-                }
-                ready && ready.call(this);
+                },
+                ...restLifeTimes,
             },
-            show() {
-                show && show.call(this);
-                if (!userInsensitive) {
-                    const userId = this.features.token.getUserId(true);
-                    if (userId !== this.state.__userId) {
-                        this.refresh();
-                    }
-                }
-            },
-            hide() {
-                hide && hide.call(this);
-                if (!userInsensitive) {
-                    const userId = this.features.token.getUserId(true);
-                    this.setState({
-                        __userId: userId,
-                    });
-                }
-            },
-            ...restLifeTimes,
+            wechatMp,
+            ...rest,
         },
-        wechatMp,
-        ...rest,
-    }, features);
+        features
+    );
 }
diff --git a/lib/features/token.js b/lib/features/token.js
index afe0f920d..5f50c6a7f 100644
--- a/lib/features/token.js
+++ b/lib/features/token.js
@@ -133,7 +133,7 @@ class Token extends oak_frontend_base_1.Feature {
         return this.tokenValue;
     }
     getToken(allowUnloggedIn) {
-        if (this.tokenValue === '') {
+        if (!allowUnloggedIn && this.tokenValue === '') {
             throw new Exception_2.OakUserInfoLoadingException();
         }
         if (this.tokenValue) {
diff --git a/lib/page.mp.js b/lib/page.mp.js
index 2e15fe2dd..837025238 100644
--- a/lib/page.mp.js
+++ b/lib/page.mp.js
@@ -67,99 +67,140 @@ function createComponent(option, features) {
     const { wechatMp, data, methods, lifetimes, userInsensitive, ...rest } = option;
     const { relatedMessageTypes } = wechatMp || {};
     const { ready, attached, show, hide, ...restLifeTimes } = lifetimes || {};
-    return (0, page_mp_1.createComponent)({
-        data: typeof data === 'function' ? function () {
-            return {
-                __userId: undefined,
-                ...(data.call(this)),
-            };
-        } : {
-            __userId: undefined,
-            ...data,
-        },
-        methods: {
-            async subscribeMpMessage(messageTypes, haveToAccept, tip) {
-                return await subscribeMpMessage.call(this, messageTypes, haveToAccept, tip);
+    return (0, page_mp_1.createComponent)(
+        {
+            data:
+                typeof data === 'function'
+                    ? function () {
+                          return {
+                              __userId: null,
+                              ...data.call(this),
+                          };
+                      }
+                    : {
+                          __userId: null,
+                          ...data,
+                      },
+            methods: {
+                async subscribeMpMessage(messageTypes, haveToAccept, tip) {
+                    return await subscribeMpMessage.call(
+                        this,
+                        messageTypes,
+                        haveToAccept,
+                        tip
+                    );
+                },
+                getMessageTypeTemplate() {
+                    if (relatedMessageTypes) {
+                        try {
+                            const applicationId =
+                                this.features.application.getApplicationId();
+                            const existedOnes = this.features.cache.get(
+                                'messageTypeTemplate',
+                                {
+                                    data: {
+                                        id: 1,
+                                        templateId: 1,
+                                        template: {
+                                            id: 1,
+                                            applicationId: 1,
+                                            wechatId: 1,
+                                        },
+                                        type: 1,
+                                    },
+                                    filter: {
+                                        type: {
+                                            $in: relatedMessageTypes,
+                                        },
+                                        template: {
+                                            applicationId,
+                                        },
+                                    },
+                                }
+                            );
+                            if (existedOnes.length === 0) {
+                                this.features.cache.refresh(
+                                    'messageTypeTemplate',
+                                    {
+                                        data: {
+                                            id: 1,
+                                            templateId: 1,
+                                            template: {
+                                                id: 1,
+                                                applicationId: 1,
+                                                wechatId: 1,
+                                            },
+                                            type: 1,
+                                        },
+                                        filter: {
+                                            type: {
+                                                $in: relatedMessageTypes,
+                                            },
+                                            template: {
+                                                applicationId,
+                                            },
+                                        },
+                                    }
+                                );
+                            }
+                        } catch (err) {
+                            if (
+                                err instanceof
+                                Exception_1.OakApplicationLoadingException
+                            ) {
+                                      if (
+                                          process.env.NODE_ENV === 'development'
+                                      ) {
+                                          console.warn(
+                                              '当Application（全局应用程序）对象正在加载和配置时，为了确保正确地获取模板消息类型的数据，我们会在Application准备就绪之后重新执行getMessageTypeTemplate方法来安全地获取并应用所需模版'
+                                          );
+                                      }
+                            } else {
+                                throw err;
+                            }
+                        }
+                    }
+                },
+                ...methods,
             },
-            ...methods,
-        },
-        lifetimes: {
-            attached() {
-                if (!userInsensitive) {
-                    this.addFeatureSub('token', () => this.refresh());
-                }
-                attached && attached.call(this);
-            },
-            ready() {
-                if (relatedMessageTypes) {
-                    const applicationId = this.features.application.getApplicationId();
-                    const existedOnes = this.features.cache.get('messageTypeTemplate', {
-                        data: {
-                            id: 1,
-                            templateId: 1,
-                            template: {
-                                id: 1,
-                                applicationId: 1,
-                                wechatId: 1,
-                            },
-                            type: 1,
-                        },
-                        filter: {
-                            type: {
-                                $in: relatedMessageTypes,
-                            },
-                            template: {
-                                applicationId,
-                            },
-                        },
-                    });
-                    if (existedOnes.length === 0) {
-                        this.features.cache.refresh('messageTypeTemplate', {
-                            data: {
-                                id: 1,
-                                templateId: 1,
-                                template: {
-                                    id: 1,
-                                    applicationId: 1,
-                                    wechatId: 1,
-                                },
-                                type: 1,
-                            },
-                            filter: {
-                                type: {
-                                    $in: relatedMessageTypes,
-                                },
-                                template: {
-                                    applicationId,
-                                },
-                            },
+            lifetimes: {
+                attached() {
+                    if (!userInsensitive) {
+                        this.addFeatureSub('token', () => this.refresh());
+                    }
+                    this.addFeatureSub('application', () =>
+                        this.getMessageTypeTemplate()
+                    );
+                    attached && attached.call(this);
+                },
+                ready() {
+                    this.getMessageTypeTemplate()
+                    ready && ready.call(this);
+                },
+                show() {
+                    show && show.call(this);
+                    if (!userInsensitive) {
+                        const userId = this.features.token.getUserId(true);
+                        if (userId !== this.state.__userId) {
+                            this.refresh();
+                        }
+                    }
+                },
+                hide() {
+                    hide && hide.call(this);
+                    if (!userInsensitive) {
+                        const userId = this.features.token.getUserId(true);
+                        this.setState({
+                            __userId: userId,
                         });
                     }
-                }
-                ready && ready.call(this);
+                },
+                ...restLifeTimes,
             },
-            show() {
-                show && show.call(this);
-                if (!userInsensitive) {
-                    const userId = this.features.token.getUserId(true);
-                    if (userId !== this.state.__userId) {
-                        this.refresh();
-                    }
-                }
-            },
-            hide() {
-                hide && hide.call(this);
-                if (!userInsensitive) {
-                    const userId = this.features.token.getUserId(true);
-                    this.setState({
-                        __userId: userId,
-                    });
-                }
-            },
-            ...restLifeTimes,
+            wechatMp,
+            ...rest,
         },
-        wechatMp,
-        ...rest,
-    }, features);
+        features
+    );
 }
 exports.createComponent = createComponent;
diff --git a/src/features/token.ts b/src/features/token.ts
index b56b4e3b5..05102b654 100644
--- a/src/features/token.ts
+++ b/src/features/token.ts
@@ -188,7 +188,7 @@ export class Token<
     }
 
     getToken(allowUnloggedIn?: boolean) {
-        if (this.tokenValue === '') {
+        if (!allowUnloggedIn && this.tokenValue === '') {
             throw new OakUserInfoLoadingException();
         }
         if (this.tokenValue) {
diff --git a/src/page.mp.ts b/src/page.mp.ts
index 7dcbd8fe3..469a006f5 100644
--- a/src/page.mp.ts
+++ b/src/page.mp.ts
@@ -5,7 +5,7 @@ import { BasicFeatures } from 'oak-frontend-base';
 import { CommonAspectDict } from 'oak-common-aspect';
 import { BackendRuntimeContext } from './context/BackendRuntimeContext';
 import { FrontendRuntimeContext } from './context/FrontendRuntimeContext';
-import { OakMpHaveToSubscribeMessage } from './types/Exception';
+import { OakMpHaveToSubscribeMessage, OakApplicationLoadingException } from './types/Exception';
 import { GAD, GFD, OakComponentOption } from './types/Page';
 import { createComponent as createBaseComponent } from 'oak-frontend-base/es/page.mp';
 
@@ -128,111 +128,164 @@ export function createComponent<
     const { relatedMessageTypes } = wechatMp || {};
     const { ready, attached, show, hide, ...restLifeTimes } = lifetimes || {};
 
-    return createBaseComponent<IsList, ED, T, Cxt, FrontCxt, AD, FD, FormedData, TData & {
-        __userId: string | undefined;
-    }, TProperty, TMethod & {
-        subscribeMpMessage: (messageTypes: string[], haveToAccept?: boolean, tip?: string) => Promise<boolean>;
-    }>({
-        data: typeof data === 'function' ? function() {
-            return {
-                __userId: undefined,
-                ...(data.call(this)),
-            } as TData & {
-                __userId: string | undefined;
-            }
-        } : {
-            __userId: undefined,
-            ...data,
-        } as TData & {
+    return createBaseComponent<
+        IsList,
+        ED,
+        T,
+        Cxt,
+        FrontCxt,
+        AD,
+        FD,
+        FormedData,
+        TData & {
             __userId: string | undefined;
         },
-        methods: {
-            async subscribeMpMessage(messageTypes: string[], haveToAccept?: boolean, tip?: string) {
-                return await subscribeMpMessage.call(this as any, messageTypes, haveToAccept, tip);
-            },
-            ...(methods as TMethod),
-        },
-        lifetimes: {
-            attached() {
-                if (!userInsensitive) {
-                    this.addFeatureSub('token', () => this.refresh());
-                }
-                attached && attached.call(this);
-            },
-            ready() {
-                if (relatedMessageTypes) {
-                    const applicationId = this.features.application.getApplicationId();
-                    const existedOnes = this.features.cache.get(
-                        'messageTypeTemplate',
-                        {
-                            data: {
-                                id: 1,
-                                templateId: 1,
-                                template: {
-                                    id: 1,
-                                    applicationId: 1,
-                                    wechatId: 1,
-                                },
-                                type: 1,
-                            },
-                            filter: {
-                                type: {
-                                    $in: relatedMessageTypes,
-                                },
-                                template: {
-                                    applicationId,
-                                },
-                            },
-                        }
+        TProperty,
+        TMethod & {
+            subscribeMpMessage: (
+                messageTypes: string[],
+                haveToAccept?: boolean,
+                tip?: string
+            ) => Promise<boolean>;
+        }
+    >(
+        {
+            data:
+                typeof data === 'function'
+                    ? function () {
+                          return {
+                              __userId: null,
+                              ...data.call(this),
+                          } as TData & {
+                              __userId: string | undefined | null;
+                          };
+                      }
+                    : ({
+                          __userId: null,
+                          ...data,
+                      } as TData & {
+                          __userId: string | undefined | null;
+                      }),
+            methods: {
+                async subscribeMpMessage(
+                    messageTypes: string[],
+                    haveToAccept?: boolean,
+                    tip?: string
+                ) {
+                    return await subscribeMpMessage.call(
+                        this as any,
+                        messageTypes,
+                        haveToAccept,
+                        tip
                     );
-                    if (existedOnes.length === 0) {
-                        this.features.cache.refresh('messageTypeTemplate', {
-                            data: {
-                                id: 1,
-                                templateId: 1,
-                                template: {
-                                    id: 1,
-                                    applicationId: 1,
-                                    wechatId: 1,
-                                },
-                                type: 1,
-                            },
-                            filter: {
-                                type: {
-                                    $in: relatedMessageTypes,
-                                },
-                                template: {
-                                    applicationId,
-                                },
-                            },
-                        });
+                },
+                getMessageTypeTemplate() {
+                    if (relatedMessageTypes) {
+                        try {
+                            const applicationId =
+                                this.features.application.getApplicationId();
+                            const existedOnes = this.features.cache.get(
+                                'messageTypeTemplate',
+                                {
+                                    data: {
+                                        id: 1,
+                                        templateId: 1,
+                                        template: {
+                                            id: 1,
+                                            applicationId: 1,
+                                            wechatId: 1,
+                                        },
+                                        type: 1,
+                                    },
+                                    filter: {
+                                        type: {
+                                            $in: relatedMessageTypes,
+                                        },
+                                        template: {
+                                            applicationId,
+                                        },
+                                    },
+                                }
+                            );
+                            if (existedOnes.length === 0) {
+                                this.features.cache.refresh(
+                                    'messageTypeTemplate',
+                                    {
+                                        data: {
+                                            id: 1,
+                                            templateId: 1,
+                                            template: {
+                                                id: 1,
+                                                applicationId: 1,
+                                                wechatId: 1,
+                                            },
+                                            type: 1,
+                                        },
+                                        filter: {
+                                            type: {
+                                                $in: relatedMessageTypes,
+                                            },
+                                            template: {
+                                                applicationId,
+                                            },
+                                        },
+                                    }
+                                );
+                            }
+                        } catch (err) {
+                            if (err instanceof OakApplicationLoadingException) {
+                                if (process.env.NODE_ENV === 'development') {
+                                    console.warn(
+                                        '当Application（全局应用程序）对象正在加载和配置时，为了确保正确地获取模板消息类型的数据，我们会在Application准备就绪之后重新执行getMessageTypeTemplate方法来安全地获取并应用所需模版'
+                                    );
+                                }
+                            } else {
+                                throw err;
+                            }
+                        }
                     }
-                }
-                ready && ready.call(this);
+                },
+                ...(methods as TMethod),
             },
-            show() {
-                show && show.call(this);
-                if (!userInsensitive) {
-                    const userId = this.features.token.getUserId(true);
-                    if (userId !== this.state.__userId) {
-                        this.refresh();
+            lifetimes: {
+                attached() {
+                    if (!userInsensitive) {
+                        this.addFeatureSub('token', () => this.refresh());
                     }
-                }
+                    this.addFeatureSub('application', () =>
+                        this.getMessageTypeTemplate()
+                    );
+                    attached && attached.call(this);
+                },
+                ready() {
+                    this.getMessageTypeTemplate();
+                    ready && ready.call(this);
+                },
+                show() {
+                    show && show.call(this);
+                    if (!userInsensitive) {
+                        const userId = this.features.token.getUserId(true);
+                        if (userId !== this.state.__userId) {
+                            this.refresh();
+                        }
+                    }
+                },
+                hide() {
+                    hide && hide.call(this);
+                    if (!userInsensitive) {
+                        const userId = this.features.token.getUserId(true);
+                        this.setState({
+                            __userId: userId as string | undefined,
+                        } as any);
+                    }
+                },
+                ...restLifeTimes,
             },
-            hide() {
-                hide && hide.call(this);
-                if (!userInsensitive) {
-                    const userId = this.features.token.getUserId(true);
-                    this.setState({
-                        __userId: userId as string | undefined,
-                    } as any);
-                }
-            },
-            ...restLifeTimes,
+            wechatMp,
+            ...rest,
         },
-        wechatMp,
-        ...rest,
-    }, features);
+        features
+    );
 }
 
 

From 40431a4cffc0b5faffbd231ff69a31c9dddaddd5 Mon Sep 17 00:00:00 2001
From: wkj <278599135@.com>
Date: Wed, 31 Jan 2024 20:29:14 +0800
Subject: [PATCH 04/10] ts warning

---
 src/page.mp.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/page.mp.ts b/src/page.mp.ts
index 469a006f5..d0c40a4e0 100644
--- a/src/page.mp.ts
+++ b/src/page.mp.ts
@@ -138,7 +138,7 @@ export function createComponent<
         FD,
         FormedData,
         TData & {
-            __userId: string | undefined;
+            __userId: string | undefined | null;
         },
         TProperty,
         TMethod & {

From 6a15f2785a80c13185906889a3c4a05423be8bcf Mon Sep 17 00:00:00 2001
From: wangwenchen <920960949@qq.com>
Date: Thu, 1 Feb 2024 16:13:48 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E5=92=8Ctoken=20me=E5=8F=96=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 es/components/token/me/index.js               | 10 ++--
 es/endpoints/wechat.js                        |  2 +-
 lib/endpoints/wechat.js                       |  2 +-
 src/components/token/me/index.ts              | 22 ++++++---
 .../upsert/byUserEntityGrant/index.ts         | 48 +++++++++----------
 src/endpoints/wechat.ts                       | 30 ++++++------
 6 files changed, 59 insertions(+), 55 deletions(-)

diff --git a/es/components/token/me/index.js b/es/components/token/me/index.js
index 294cbbb07..3e5a3090e 100644
--- a/es/components/token/me/index.js
+++ b/es/components/token/me/index.js
@@ -5,6 +5,7 @@ export default OakComponent({
         id: 1,
         userId: 1,
         playerId: 1,
+        value: 1,
         user: {
             id: 1,
             nickname: 1,
@@ -64,14 +65,9 @@ export default OakComponent({
     filters: [
         {
             filter() {
-                const tokenId = this.features.token.getTokenValue();
-                if (tokenId) {
-                    return {
-                        id: tokenId,
-                    };
-                }
+                const value = this.features.token.getTokenValue();
                 return {
-                    id: 'none',
+                    value,
                 };
             },
         },
diff --git a/es/endpoints/wechat.js b/es/endpoints/wechat.js
index 1ec0bb80c..1d4951ff0 100644
--- a/es/endpoints/wechat.js
+++ b/es/endpoints/wechat.js
@@ -203,7 +203,7 @@ async function setUserSubscribed(openId, eventKey, context) {
                                 nickname: 1,
                             },
                             expired: 1,
-                            relationalEntity: 1,
+                            relationEntity: 1,
                         },
                         filter: {
                             id: entityId,
diff --git a/lib/endpoints/wechat.js b/lib/endpoints/wechat.js
index e0383a276..863f20f61 100644
--- a/lib/endpoints/wechat.js
+++ b/lib/endpoints/wechat.js
@@ -208,7 +208,7 @@ async function setUserSubscribed(openId, eventKey, context) {
                                 nickname: 1,
                             },
                             expired: 1,
-                            relationalEntity: 1,
+                            relationEntity: 1,
                         },
                         filter: {
                             id: entityId,
diff --git a/src/components/token/me/index.ts b/src/components/token/me/index.ts
index 154e90862..66201ea78 100644
--- a/src/components/token/me/index.ts
+++ b/src/components/token/me/index.ts
@@ -6,6 +6,7 @@ export default OakComponent({
         id: 1,
         userId: 1,
         playerId: 1,
+        value: 1,
         user: {
             id: 1,
             nickname: 1,
@@ -65,18 +66,25 @@ export default OakComponent({
     filters: [
         {
             filter() {
-                const tokenId = this.features.token.getTokenValue();
-                if (tokenId) {
-                    return {
-                        id: tokenId,
-                    };
-                }
+                const value = this.features.token.getTokenValue();
+                // if (tokenId) {
+                //     return {
+                //         id: tokenId,
+                //     };
+                // }
+                // return {
+                //     id: 'none',
+                // };
                 return {
-                    id: 'none',
+                    value,
                 };
             },
         },
     ],
+    features: [{
+        feature: 'token',
+        behavior: 'refresh',
+    }],
     formData: ({ data, features }) => {
         const [token] = data || [];
         const user = token?.user;
diff --git a/src/components/userRelation/upsert/byUserEntityGrant/index.ts b/src/components/userRelation/upsert/byUserEntityGrant/index.ts
index a47725f6e..8cf4bceaf 100644
--- a/src/components/userRelation/upsert/byUserEntityGrant/index.ts
+++ b/src/components/userRelation/upsert/byUserEntityGrant/index.ts
@@ -101,32 +101,32 @@ export default OakComponent({
                 rule,
                 ruleOnRow,
             } = this.props;
-            if (this.isCreation()) {
-                this.update({
-                    entity,
-                    entityId,
-                    relationEntity: entity,
-                    relationEntityFilter: {
-                        id: entityId,
-                    },
-                    type: type || 'grant',
-                    multiple,
-                    rule: rule || 'single',
-                    ruleOnRow: ruleOnRow || 'single',
-                    granterId: userId,
-                    redirectTo:
-                        redirectToAfterConfirm as EntityDict['userEntityGrant']['Schema']['redirectTo'],
-                    qrCodeType: qrCodeType as QrCodeType,
-                    claimUrl,
-                });
+            // if (this.isCreation()) {
+            this.update({
+                entity,
+                entityId,
+                relationEntity: entity,
+                relationEntityFilter: {
+                    id: entityId,
+                },
+                type: type || 'grant',
+                multiple,
+                rule: rule || 'single',
+                ruleOnRow: ruleOnRow || 'single',
+                granterId: userId,
+                redirectTo:
+                    redirectToAfterConfirm as EntityDict['userEntityGrant']['Schema']['redirectTo'],
+                qrCodeType: qrCodeType as QrCodeType,
+                claimUrl,
+            });
 
-                this.setState({
-                    userEntityGrantId: '',
-                });
-                if (process.env.OAK_PLATFORM === 'wechatMp') {
-                    wx.hideShareMenu();
-                }
+            this.setState({
+                userEntityGrantId: '',
+            });
+            if (process.env.OAK_PLATFORM === 'wechatMp') {
+                wx.hideShareMenu();
             }
+            // }
         },
         setRelation(value: any) {
             this.update({
diff --git a/src/endpoints/wechat.ts b/src/endpoints/wechat.ts
index 7fc908305..b1371c858 100644
--- a/src/endpoints/wechat.ts
+++ b/src/endpoints/wechat.ts
@@ -280,7 +280,7 @@ async function setUserSubscribed(
                                     nickname: 1,
                                 },
                                 expired: 1,
-                                relationalEntity: 1,
+                                relationEntity: 1,
                             },
                             filter: {
                                 id: entityId,
@@ -518,17 +518,17 @@ async function setClickEventKey(openId: string, eventKey: string, context: BRC)
                 filter:
                     indexOfDollarSign !== -1
                         ? {
-                              applicationId,
-                              wechatPublicTag: {
-                                  wechatId: Number(resultString),
-                              },
-                          }
+                            applicationId,
+                            wechatPublicTag: {
+                                wechatId: Number(resultString),
+                            },
+                        }
                         : {
-                              applicationId,
-                              wechatPublicTagId: {
-                                  $exists: false,
-                              },
-                          },
+                            applicationId,
+                            wechatPublicTagId: {
+                                $exists: false,
+                            },
+                        },
             },
             { dontCollect: true }
         );
@@ -714,9 +714,9 @@ async function onWeChatPublicEvent(data: WechatPublicEventData, context: BRC) {
             break;
         }
     }
-   if (process.env.NODE_ENV === 'development') {
-       console.log(evt);
-   }
+    if (process.env.NODE_ENV === 'development') {
+        console.log(evt);
+    }
     try {
         await createSession(
             {
@@ -923,7 +923,7 @@ const endpoints: Record<string, Endpoint<EntityDict, BRC>> = {
                 const applicationId = searchParams.get('applicationId');
                 const mediaId = searchParams.get('mediaId');
                 const isPermanent = searchParams.get('isPermanent');
-     
+
                 const base64 = await getMaterial(
                     {
                         applicationId: applicationId!,

From 791b89288a15fef5c192656ba323e7174413bbcc Mon Sep 17 00:00:00 2001
From: wangwenchen <920960949@qq.com>
Date: Thu, 1 Feb 2024 19:51:35 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E8=BE=93=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=9C=89=E5=87=A0=E7=8E=87?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E5=88=9B=E5=BB=BA=E6=96=B0=E7=9A=84bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../userRelation/upsert/onUser/web.js         | 20 +++++++++++--------
 .../userRelation/upsert/onUser/web.pc.tsx     | 16 +++++++++------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/es/components/userRelation/upsert/onUser/web.js b/es/components/userRelation/upsert/onUser/web.js
index ab4f4cbdc..3a38dcdfe 100644
--- a/es/components/userRelation/upsert/onUser/web.js
+++ b/es/components/userRelation/upsert/onUser/web.js
@@ -23,19 +23,23 @@ export default function Render(props) {
             },
         ]}>
                 <>
-                    <Input disabled={!isNew && !allowUpdateName} onChange={(value) => {
-            update({
-                name: value,
-            });
+                <Input disabled={!isNew && !allowUpdateName} onChange={(value) => {
+                    if (isNew) {
+                        update({
+                            name: value,
+                        });
+                    }
         }} value={name} placeholder={t('placeholder.name')}/>
                 </>
             </Form.Item>
             <Form.Item label={t('user:attr.nickname')} name="nickname">
                 <>
-                    <Input disabled={!isNew && !allowUpdateNickname} value={nickname} onChange={(value) => {
-            update({
-                nickname: value,
-            });
+                <Input disabled={!isNew && !allowUpdateNickname} value={nickname} onChange={(value) => {
+                     if (isNew) {
+                        update({
+                            nickname: value,
+                        });
+                    }
         }} placeholder={t('placeholder.nickname')}/>
                 </>
             </Form.Item>
diff --git a/src/components/userRelation/upsert/onUser/web.pc.tsx b/src/components/userRelation/upsert/onUser/web.pc.tsx
index 186df7df4..ce97fcb0a 100644
--- a/src/components/userRelation/upsert/onUser/web.pc.tsx
+++ b/src/components/userRelation/upsert/onUser/web.pc.tsx
@@ -96,9 +96,11 @@ export default function Render(
                             disabled={!isNew && !allowUpdateName}
                             onChange={(e) => {
                                 const strValue = e.target.value;
-                                update({
-                                    name: strValue,
-                                });
+                                if (isNew) {
+                                    update({
+                                        name: strValue,
+                                    });
+                                }
                             }}
                             value={name}
                             placeholder={t('placeholder.name')}
@@ -112,9 +114,11 @@ export default function Render(
                             value={nickname}
                             onChange={(e) => {
                                 const strValue = e.target.value;
-                                update({
-                                    nickname: strValue,
-                                });
+                                if (isNew) {
+                                    update({
+                                        nickname: strValue,
+                                    });
+                                }
                             }}
                             placeholder={t('placeholder.nickname')}
                         />

From c86b55d9520cffe20d89679daaab474e4d7ad15e Mon Sep 17 00:00:00 2001
From: wangwenchen <920960949@qq.com>
Date: Fri, 2 Feb 2024 12:04:42 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=85=AC=E4=BC=97?=
 =?UTF-8?q?=E5=8F=B7=E7=99=BB=E9=99=86=E4=BF=AE=E5=A4=8D=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 es/aspects/token.js                      |  3 ++-
 es/components/wechatUser/login/index.js  | 10 +++++-----
 lib/aspects/token.js                     |  2 ++
 src/aspects/token.ts                     |  6 ++++--
 src/components/wechatUser/login/index.ts |  9 ++++-----
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/es/aspects/token.js b/es/aspects/token.js
index 5441b1f01..936005d63 100644
--- a/es/aspects/token.js
+++ b/es/aspects/token.js
@@ -531,6 +531,7 @@ export async function loginByMobile(params, context) {
 }
 async function setUserInfoFromWechat(user, userInfo, context) {
     const application = context.getApplication();
+    const applicationId = context.getApplicationId();
     const config = application?.system?.config || application?.system?.platform?.config;
     const { nickname, gender, avatar } = userInfo;
     const { nickname: originalNickname, gender: originalGender, extraFile$entity, } = user;
@@ -564,6 +565,7 @@ async function setUserInfoFromWechat(user, userInfo, context) {
                     type: 'image',
                     filename: '',
                     bucket: '',
+                    applicationId: applicationId,
                 }),
             },
         ];
@@ -1328,7 +1330,6 @@ function checkTokenEnvConsistency(env1, env2) {
             return false;
         }
     }
-    return true;
 }
 export async function refreshToken(params, context) {
     const { env, tokenValue } = params;
diff --git a/es/components/wechatUser/login/index.js b/es/components/wechatUser/login/index.js
index 17fdbbe83..dd95f3a5d 100644
--- a/es/components/wechatUser/login/index.js
+++ b/es/components/wechatUser/login/index.js
@@ -17,8 +17,8 @@ export default OakComponent({
             this.setState({
                 loading: true,
             });
-            const { features, t } = this;
-            const token = features.token.getToken(true);
+            // const { features, t } = this;
+            const token = this.features.token.getToken(true);
             const url = window.location.href;
             const urlParse = new URL(url);
             //格式 xx?code=xx&state=/xx/xx?d=xx
@@ -27,7 +27,7 @@ export default OakComponent({
             const wechatLoginId = urlParse?.searchParams?.get('wechatLoginId');
             if (!code) {
                 this.setState({
-                    error: t('missingCodeParameter'),
+                    error: this.t('missingCodeParameter'),
                     loading: false,
                 });
                 return;
@@ -42,7 +42,7 @@ export default OakComponent({
             else {
                 try {
                     // web微信扫码跟公众号授权
-                    await features.token.loginWechat(code, {
+                    await this.features.token.loginWechat(code, {
                         wechatLoginId,
                     });
                     this.setState({
@@ -52,7 +52,7 @@ export default OakComponent({
                 }
                 catch (err) {
                     this.setState({
-                        error: t('weChatLoginFailed'),
+                        error: this.t('weChatLoginFailed'),
                         loading: false,
                     });
                     throw err;
diff --git a/lib/aspects/token.js b/lib/aspects/token.js
index df7108560..df6c4e9c3 100644
--- a/lib/aspects/token.js
+++ b/lib/aspects/token.js
@@ -535,6 +535,7 @@ async function loginByMobile(params, context) {
 exports.loginByMobile = loginByMobile;
 async function setUserInfoFromWechat(user, userInfo, context) {
     const application = context.getApplication();
+    const applicationId = context.getApplicationId();
     const config = application?.system?.config || application?.system?.platform?.config;
     const { nickname, gender, avatar } = userInfo;
     const { nickname: originalNickname, gender: originalGender, extraFile$entity, } = user;
@@ -568,6 +569,7 @@ async function setUserInfoFromWechat(user, userInfo, context) {
                     type: 'image',
                     filename: '',
                     bucket: '',
+                    applicationId: applicationId,
                 }),
             },
         ];
diff --git a/src/aspects/token.ts b/src/aspects/token.ts
index e7689e098..e40119726 100644
--- a/src/aspects/token.ts
+++ b/src/aspects/token.ts
@@ -742,6 +742,7 @@ async function setUserInfoFromWechat<
     context: Cxt
 ) {
     const application = context.getApplication();
+    const applicationId = context.getApplicationId();
     const config =
         application?.system?.config || application?.system?.platform?.config;
     const { nickname, gender, avatar } = userInfo;
@@ -782,6 +783,7 @@ async function setUserInfoFromWechat<
                     type: 'image',
                     filename: '',
                     bucket: '',
+                    applicationId: applicationId!,
                 }),
             },
         ];
@@ -1899,7 +1901,7 @@ export async function refreshToken<
 ) {
     const { env, tokenValue } = params;
     const fn = context.openRootMode();
-    let [ token ] = await context.select('token', {
+    let [token] = await context.select('token', {
         data: Object.assign({
             env: 1,
             ...tokenProjection,
@@ -1936,7 +1938,7 @@ export async function refreshToken<
             filter: {
                 id: token.id,
             }
-        }, { });
+        }, {});
         fn();
         return newValue;
     }
diff --git a/src/components/wechatUser/login/index.ts b/src/components/wechatUser/login/index.ts
index 6891c46a0..12baa8901 100644
--- a/src/components/wechatUser/login/index.ts
+++ b/src/components/wechatUser/login/index.ts
@@ -18,8 +18,7 @@ export default OakComponent({
             this.setState({
                 loading: true,
             });
-            const { features, t } = this;
-            const token = features.token.getToken(true);
+            const token = this.features.token.getToken(true);
             const url = window.location.href;
             const urlParse = new URL(url);
             //格式 xx?code=xx&state=/xx/xx?d=xx
@@ -28,7 +27,7 @@ export default OakComponent({
             const wechatLoginId = urlParse?.searchParams?.get('wechatLoginId') as string;
             if (!code) {
                 this.setState({
-                    error: t('missingCodeParameter'),
+                    error: this.t('missingCodeParameter'),
                     loading: false,
                 });
                 return;
@@ -45,7 +44,7 @@ export default OakComponent({
             } else {
                 try {
                     // web微信扫码跟公众号授权
-                    await features.token.loginWechat(code, {
+                    await this.features.token.loginWechat(code, {
                         wechatLoginId,
                     });
                     this.setState({
@@ -54,7 +53,7 @@ export default OakComponent({
                     this.go(state);
                 } catch (err) {
                     this.setState({
-                        error: t('weChatLoginFailed'),
+                        error: this.t('weChatLoginFailed'),
                         loading: false,
                     });
                     throw err;

From 48a7758c2f29380a6adac1b29092b04bef3bd8f8 Mon Sep 17 00:00:00 2001
From: wkj <278599135@.com>
Date: Sat, 3 Feb 2024 17:52:59 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20=E8=BF=9B=E5=85=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E9=A1=B5=E9=9D=A2=E6=8A=A5?=
 =?UTF-8?q?assert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 es/components/changePassword/index.js  | 67 +++++++++++++---------
 es/components/changePassword/web.d.ts  | 22 +++++---
 es/components/changePassword/web.js    |  7 ++-
 es/features/weiXinJsSdk.web.d.ts       |  2 +-
 lib/features/weiXinJsSdk.web.d.ts      |  2 +-
 src/components/changePassword/index.ts | 78 ++++++++++++++++----------
 src/components/changePassword/web.tsx  | 28 +++++++--
 src/features/weiXinJsSdk.web.ts        | 12 ++--
 8 files changed, 142 insertions(+), 76 deletions(-)

diff --git a/es/components/changePassword/index.js b/es/components/changePassword/index.js
index 761825727..7bf11aefe 100644
--- a/es/components/changePassword/index.js
+++ b/es/components/changePassword/index.js
@@ -2,39 +2,56 @@ const SEND_KEY = 'captcha:sendAt';
 const SEND_CAPTCHA_LATENCY = process.env.NODE_ENV === 'development' ? 10 : 60;
 export default OakComponent({
     isList: false,
-    entity: 'user',
-    projection: {
-        id: 1,
-        name: 1,
-        nickname: 1,
-        mobile$user: {
-            $entity: 'mobile',
-            data: {
-                id: 1,
-                mobile: 1,
-            },
-            filter: {
-                ableState: 'enabled'
-            }
-        }
-    },
-    formData: function ({ data: user, features, props }) {
-        return {
-            user,
-        };
-    },
+    // entity: 'user',
+    // projection: {
+    //     id: 1,
+    //     name: 1,
+    //     nickname: 1,
+    //     mobile$user: {
+    //         $entity: 'mobile',
+    //         data: {
+    //             id: 1,
+    //             mobile: 1,
+    //         },
+    //         filter: {
+    //             ableState: 'enabled'
+    //         }
+    //     }
+    // },
+    // formData: function ({ data: user, features, props }) {
+    //     return {
+    //         user,
+    //     };
+    // },
     data: {
         channels: [],
     },
+    properties: {
+        oakId: '',
+    },
     lifetimes: {
         async attached() {
             const userId = this.props.oakId;
-            const { result } = await this.features.cache.exec('getChangePasswordChannels', {
-                userId,
-            });
             this.setState({
-                channels: result
+                loading: true,
             });
+            try {
+                const { result } = await this.features.cache.exec(
+                    'getChangePasswordChannels',
+                    {
+                        userId: userId,
+                    }
+                );
+                this.setState({
+                    channels: result,
+                    loading: false,
+                });
+            } catch {
+                this.setState({
+                    loading: false,
+                    channels: [],
+                });
+            }
         },
     },
     methods: {
diff --git a/es/components/changePassword/web.d.ts b/es/components/changePassword/web.d.ts
index c17eb3860..1a9cd689b 100644
--- a/es/components/changePassword/web.d.ts
+++ b/es/components/changePassword/web.d.ts
@@ -1,10 +1,18 @@
 import React from 'react';
 import { WebComponentProps } from 'oak-frontend-base';
 import { EntityDict } from '../../oak-app-domain';
-export default function Render(props: WebComponentProps<EntityDict, 'message', false, {
-    user: EntityDict['user']['Schema'];
-    channels: string[];
-    oakId: string;
-}, {
-    goToMobile: () => void;
-}>): React.JSX.Element;
+export default function Render(
+    props: WebComponentProps<
+        EntityDict,
+        'user',
+        false,
+        {
+            loading: boolean;
+            channels: string[];
+            oakId: string;
+        },
+        {
+            goToMobile: () => void;
+        }
+    >
+): React.JSX.Element;
diff --git a/es/components/changePassword/web.js b/es/components/changePassword/web.js
index 64e4313ab..97dca056b 100644
--- a/es/components/changePassword/web.js
+++ b/es/components/changePassword/web.js
@@ -4,8 +4,13 @@ import ByMobile from './byMobile';
 import ByPassword from './byPassword';
 export default function Render(props) {
     const { data, methods } = props;
-    const { channels, user, oakFullpath, oakId } = data;
+    const { channels, oakFullpath, oakId, loading } = data;
     const { goToMobile } = methods;
+
+    if (loading) {
+        return null;
+    }
+
     const items = [
         {
             key: 'password',
diff --git a/es/features/weiXinJsSdk.web.d.ts b/es/features/weiXinJsSdk.web.d.ts
index 837cc13a1..e2165d3ea 100644
--- a/es/features/weiXinJsSdk.web.d.ts
+++ b/es/features/weiXinJsSdk.web.d.ts
@@ -17,7 +17,7 @@ type ConfigOptions = {
     jsApiList?: wx.jsApiList;
     openTagList?: wx.openTagList;
 };
-type ParamOptions = wx.IcheckJsApi | wx.IaddCard | wx.IchooseCard | wx.IonMenuShareTimeline | wx.IonMenuShareAppMessage | wx.IonMenuShareQQ | wx.IonMenuShareWeibo | wx.IonMenuShareQZone | wx.IchooseImage | wx.IpreviewImage | wx.IuploadImage | wx.IdownloadImage | wx.IgetLocalImgData | wx.IplaypausestopVoice | wx.IupdownloadVoice | wx.IopenLocation | wx.IgetLocation | wx.IscanQRCode | wx.IopenProductSpecificView | wx.IchooseCard | wx.IopenCard | wx.IchooseWXPay;
+type ParamOptions = wx.IcheckJsApi | wx.IaddCard | wx.IchooseCard | wx.IonMenuShareTimeline | wx.IonMenuShareAppMessage | wx.IonMenuShareQQ | wx.IonMenuShareWeibo | wx.IonMenuShareQZone | wx.IchooseImage | wx.IpreviewImage | wx.IgetLocalImgData | wx.IplaypausestopVoice | wx.IopenLocation | wx.IgetLocation | wx.IscanQRCode | wx.IopenProductSpecificView | wx.IchooseCard | wx.IopenCard | wx.IchooseWXPay;
 export declare class WeiXinJsSdk<ED extends EntityDict, Cxt extends BackendRuntimeContext<ED>, FrontCxt extends FrontendRuntimeContext<ED, Cxt, AD>, AD extends AspectDict<ED, Cxt> & CommonAspectDict<ED, Cxt>> extends Feature {
     private cache;
     private storage;
diff --git a/lib/features/weiXinJsSdk.web.d.ts b/lib/features/weiXinJsSdk.web.d.ts
index 837cc13a1..e2165d3ea 100644
--- a/lib/features/weiXinJsSdk.web.d.ts
+++ b/lib/features/weiXinJsSdk.web.d.ts
@@ -17,7 +17,7 @@ type ConfigOptions = {
     jsApiList?: wx.jsApiList;
     openTagList?: wx.openTagList;
 };
-type ParamOptions = wx.IcheckJsApi | wx.IaddCard | wx.IchooseCard | wx.IonMenuShareTimeline | wx.IonMenuShareAppMessage | wx.IonMenuShareQQ | wx.IonMenuShareWeibo | wx.IonMenuShareQZone | wx.IchooseImage | wx.IpreviewImage | wx.IuploadImage | wx.IdownloadImage | wx.IgetLocalImgData | wx.IplaypausestopVoice | wx.IupdownloadVoice | wx.IopenLocation | wx.IgetLocation | wx.IscanQRCode | wx.IopenProductSpecificView | wx.IchooseCard | wx.IopenCard | wx.IchooseWXPay;
+type ParamOptions = wx.IcheckJsApi | wx.IaddCard | wx.IchooseCard | wx.IonMenuShareTimeline | wx.IonMenuShareAppMessage | wx.IonMenuShareQQ | wx.IonMenuShareWeibo | wx.IonMenuShareQZone | wx.IchooseImage | wx.IpreviewImage | wx.IgetLocalImgData | wx.IplaypausestopVoice | wx.IopenLocation | wx.IgetLocation | wx.IscanQRCode | wx.IopenProductSpecificView | wx.IchooseCard | wx.IopenCard | wx.IchooseWXPay;
 export declare class WeiXinJsSdk<ED extends EntityDict, Cxt extends BackendRuntimeContext<ED>, FrontCxt extends FrontendRuntimeContext<ED, Cxt, AD>, AD extends AspectDict<ED, Cxt> & CommonAspectDict<ED, Cxt>> extends Feature {
     private cache;
     private storage;
diff --git a/src/components/changePassword/index.ts b/src/components/changePassword/index.ts
index a82262274..a57050b16 100644
--- a/src/components/changePassword/index.ts
+++ b/src/components/changePassword/index.ts
@@ -5,48 +5,64 @@ const SEND_CAPTCHA_LATENCY = process.env.NODE_ENV === 'development' ? 10 : 60;
 
 export default OakComponent({
     isList: false,
-    entity: 'user',
-    projection: {
-        id: 1,
-        name: 1,
-        nickname: 1,
-        mobile$user: {
-            $entity: 'mobile',
-            data: {
-                id: 1,
-                mobile: 1,
-            },
-            filter: {
-                ableState: 'enabled'
-            }
-        }
-    },
-    formData: function ({ data: user, features, props }) {
-        return {
-            user,
-        };
-    },
+    // entity: 'user',
+    // projection: {
+    //     id: 1,
+    //     name: 1,
+    //     nickname: 1,
+    //     mobile$user: {
+    //         $entity: 'mobile',
+    //         data: {
+    //             id: 1,
+    //             mobile: 1,
+    //         },
+    //         filter: {
+    //             ableState: 'enabled'
+    //         }
+    //     }
+    // },
+    // formData: function ({ data: user, features, props }) {
+    //     return {
+    //         user,
+    //     };
+    // },
     data: {
         channels: [] as string[],
+        loading: false,
+    },
+    properties: {
+        oakId: '',
     },
     lifetimes: {
         async attached() {
-            const userId = this.props.oakId as string;
-            const { result } = await this.features.cache.exec('getChangePasswordChannels', {
-                userId,
-            });
+            const userId = this.props.oakId;
             this.setState({
-                channels: result
+                loading: true,
             });
+            try {
+                const { result } = await this.features.cache.exec(
+                    'getChangePasswordChannels',
+                    {
+                        userId: userId!,
+                    }
+                );
+                this.setState({
+                    channels: result,
+                    loading: false,
+                });
+            } catch {
+                this.setState({
+                    loading: false,
+                    channels: [],
+                });
+            }
         },
     },
     methods: {
         goToMobile() {
-            this.navigateTo(
-                {
-                    url: '/mobile/me',
-                }
-            )
+            this.navigateTo({
+                url: '/mobile/me',
+            });
         },
     },
 });
diff --git a/src/components/changePassword/web.tsx b/src/components/changePassword/web.tsx
index a75ed642a..f81a5ec62 100644
--- a/src/components/changePassword/web.tsx
+++ b/src/components/changePassword/web.tsx
@@ -9,12 +9,12 @@ import ByPassword from './byPassword';
 export default function Render(
     props: WebComponentProps<
         EntityDict,
-        'message',
+        'user',
         false,
         {
-            user: EntityDict['user']['Schema'];
             channels: string[];
             oakId: string;
+            loading: boolean;
         },
         {
             goToMobile: () => void;
@@ -22,18 +22,36 @@ export default function Render(
     >
 ) {
     const { data, methods } = props;
-    const { channels, user, oakFullpath, oakId } = data;
+    const { channels, oakFullpath, oakId, loading } = data;
     const { goToMobile } = methods;
+
+
+    if (loading) {
+        return null
+    }
+
     const items = [
         {
             key: 'password',
             label: '原密码验证',
-            children: <ByPassword oakId={oakId} oakPath={oakFullpath} />,
+            children: (
+                <ByPassword
+                    oakId={oakId}
+                    oakPath={oakFullpath + '.user'}
+                    oakAutoUnmount={true}
+                />
+            ),
         },
         {
             key: 'mobile',
             label: '手机号验证',
-            children: <ByMobile oakId={oakId} oakPath={oakFullpath} />,
+            children: (
+                <ByMobile
+                    oakId={oakId}
+                    oakPath={oakFullpath + '.user'}
+                    oakAutoUnmount={true}
+                />
+            ),
         },
     ];
     if (channels.length === 0) {
diff --git a/src/features/weiXinJsSdk.web.ts b/src/features/weiXinJsSdk.web.ts
index 6562a8635..0c0c0da2c 100644
--- a/src/features/weiXinJsSdk.web.ts
+++ b/src/features/weiXinJsSdk.web.ts
@@ -40,11 +40,8 @@ type ParamOptions =
     | wx.IonMenuShareQZone
     | wx.IchooseImage
     | wx.IpreviewImage
-    | wx.IuploadImage
-    | wx.IdownloadImage
     | wx.IgetLocalImgData
     | wx.IplaypausestopVoice
-    | wx.IupdownloadVoice
     | wx.IopenLocation
     | wx.IgetLocation
     | wx.IscanQRCode
@@ -112,12 +109,17 @@ export class WeiXinJsSdk<
     async init(options?: {
         jsApiList?: wx.jsApiList;
         openTagList?: wx.openTagList;
+        debug?: boolean;
     }) {
         if (!isWeiXin) {
             console.warn('只能在微信客户端初始化JSSDK');
             return;
         }
-        const { jsApiList, openTagList } = options || {};
+        const {
+            jsApiList,
+            openTagList,
+            debug = process.env.NODE_ENV === 'development',
+        } = options || {};
 
         let url = window.location.href;
         //在ios上 实际真正有效的的签名URL是【第一次进入应用时的URL】
@@ -153,7 +155,7 @@ export class WeiXinJsSdk<
         }
 
         return this.getConfig({
-            debug: process.env.NODE_ENV === 'development',
+            debug: debug,
             appId: result.appId,
             timestamp: result.timestamp,
             nonceStr: result.noncestr,

From 501016db5c09a548ed00bc74b3cf8fb29ba6611e Mon Sep 17 00:00:00 2001
From: wkj <278599135@.com>
Date: Sun, 4 Feb 2024 13:51:36 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E7=BC=96=E8=AF=91es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 es/components/changePassword/web.js | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/es/components/changePassword/web.js b/es/components/changePassword/web.js
index 97dca056b..e1ee3a5ea 100644
--- a/es/components/changePassword/web.js
+++ b/es/components/changePassword/web.js
@@ -15,12 +15,24 @@ export default function Render(props) {
         {
             key: 'password',
             label: '原密码验证',
-            children: <ByPassword oakId={oakId} oakPath={oakFullpath}/>,
+            children: (
+                <ByPassword
+                    oakId={oakId}
+                    oakPath={oakFullpath + '.user'}
+                    oakAutoUnmount={true}
+                />
+            ),
         },
         {
             key: 'mobile',
             label: '手机号验证',
-            children: <ByMobile oakId={oakId} oakPath={oakFullpath}/>,
+            children: (
+                <ByMobile
+                    oakId={oakId}
+                    oakPath={oakFullpath + '.user'}
+                    oakAutoUnmount={true}
+                />
+            ),
         },
     ];
     if (channels.length === 0) {

From 0a89b24c2574a293b253961ac633020c05319b11 Mon Sep 17 00:00:00 2001
From: wkj <278599135@.com>
Date: Mon, 5 Feb 2024 16:47:57 +0800
Subject: [PATCH 10/10] =?UTF-8?q?locales/common/zh=5FCN.json=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 es/locales/common/zh_CN.json  | 8 ++++++--
 lib/locales/common/zh_CN.json | 8 ++++++--
 src/locales/common/zh_CN.json | 8 ++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/es/locales/common/zh_CN.json b/es/locales/common/zh_CN.json
index 57edc4c87..1e9adf5a6 100644
--- a/es/locales/common/zh_CN.json
+++ b/es/locales/common/zh_CN.json
@@ -14,11 +14,14 @@
         "detail": "详情",
         "editor": "编辑",
         "newAdd": "新增",
-        "add": "添加"
+        "add": "添加",
+        "submit": "提交"
     },
+    "operate": "操作",
     "submit": "提交",
     "reset": "重置",
     "select": "查询",
+    "search": "搜索",
     "expand": "展开",
     "shrink": "收起",
     "back": "返回",
@@ -34,5 +37,6 @@
     "true": "是",
     "false": "否",
     "open": "开",
-    "close": "关"
+    "close": "关",
+    "other": "其他"
 }
diff --git a/lib/locales/common/zh_CN.json b/lib/locales/common/zh_CN.json
index 57edc4c87..1e9adf5a6 100644
--- a/lib/locales/common/zh_CN.json
+++ b/lib/locales/common/zh_CN.json
@@ -14,11 +14,14 @@
         "detail": "详情",
         "editor": "编辑",
         "newAdd": "新增",
-        "add": "添加"
+        "add": "添加",
+        "submit": "提交"
     },
+    "operate": "操作",
     "submit": "提交",
     "reset": "重置",
     "select": "查询",
+    "search": "搜索",
     "expand": "展开",
     "shrink": "收起",
     "back": "返回",
@@ -34,5 +37,6 @@
     "true": "是",
     "false": "否",
     "open": "开",
-    "close": "关"
+    "close": "关",
+    "other": "其他"
 }
diff --git a/src/locales/common/zh_CN.json b/src/locales/common/zh_CN.json
index 28954a787..aea7ad177 100644
--- a/src/locales/common/zh_CN.json
+++ b/src/locales/common/zh_CN.json
@@ -14,11 +14,14 @@
         "detail": "详情",
         "editor": "编辑",
         "newAdd": "新增",
-        "add": "添加"
+        "add": "添加",
+        "submit": "提交"
     },
+    "operate": "操作",
     "submit": "提交",
     "reset": "重置",
     "select": "查询",
+    "search": "搜索",
     "expand": "展开",
     "shrink": "收起",
     "back": "返回",
@@ -34,5 +37,6 @@
     "true": "是",
     "false": "否",
     "open": "开",
-    "close": "关"
+    "close": "关",
+    "other": "其他"
 }