Commit Graph

1204 Commits

Author SHA1 Message Date
Xu Chang 62d153b595 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-02-13 19:34:34 +08:00
Xu Chang e816133c26 重构了message及相关对象,重构了初始化逻辑,适配了frontend的改动 2023-02-13 19:34:30 +08:00
Wang Kejun aa6203b10d actionbtnpanel 在mp使用的按钮样式调整 2023-02-13 18:52:37 +08:00
Wang Kejun 7f47d8e012 actionBtnPanel colum 如果column 传入0 就不进行截取 2023-02-13 17:44:12 +08:00
Wang Kejun 0ee9af0015 actionBtnPanel 2023-02-13 17:40:27 +08:00
Wang Kejun f6eae25e0f actionBtnPanel 组件 2023-02-13 13:33:54 +08:00
Wang Kejun fdbe485b60 根据 action 来判断 是否需要走权限 2023-02-13 11:13:14 +08:00
Wang Kejun 48f5817ef0 小程序增加 popover组件 2023-02-12 21:54:08 +08:00
Wang Kejun 20ff460af6 封装 actionTabsPanel 组件 2023-02-11 20:33:43 +08:00
Xu Chang 71be449b38 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-02-10 12:03:26 +08:00
Xu Chang e06ff541b7 wechatEndpoint暂时支持公开访问,测试小程序线上数据 2023-02-10 12:03:21 +08:00
Wang Kejun 269a966fe6 lib 2023-02-10 11:33:14 +08:00
Wang Kejun 2a87af5b07 extrafile gallery增加disableAdd disableDownload 2023-02-10 11:31:05 +08:00
Wang Kejun 36913ec5eb extrafile gallery 支持小程序文件上传 2023-02-09 20:00:42 +08:00
Xu Chang 781cfae13a 关于message的数据结构改动与部分代码实现 2023-02-09 19:57:32 +08:00
Xu Chang e791c2f7c2 rewriteFilter中的一个bug 2023-02-09 17:26:40 +08:00
Xu Chang 2b80f96de3 重构了一下token 2023-02-09 16:52:56 +08:00
Xu Chang 349bdca5a8 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-02-09 14:38:07 +08:00
Xu Chang 224740cd26 aspectwrapper的返回结构适配,以及token中loginWechat去更新用户信息 2023-02-09 14:37:59 +08:00
Wang Kejun cbf0decf74 小程序 获取手机号 server逻辑待实现 2023-02-09 12:22:04 +08:00
Wang Kejun d95164a323 lib 2023-02-09 00:29:45 +08:00
Wang Kejun 0f2296b363 mobile/me 样式调整 2023-02-09 00:28:15 +08:00
Xu Chang 18d09e0875 build 2023-02-08 22:46:12 +08:00
Xu Chang 6c92d78ea5 先把获取用户信息注释掉 2023-02-08 22:44:14 +08:00
Xu Chang 67ab3b4f4c 一个错误的assert 2023-02-08 22:38:19 +08:00
Xu Chang abc1fa89a0 loginWechat时,更新userInfo改成await 2023-02-08 22:21:04 +08:00
Xu Chang 8f7450588e 2.4.2-dev 2023-02-08 21:19:07 +08:00
Xu Chang 8ca972c357 2.4.1-publish 2023-02-08 21:16:58 +08:00
Xu Chang 9116ec3a19 完善了公众号用户getUserInfo 2023-02-08 20:49:51 +08:00
Wang Kejun bd38eb68d6 增加 支持同步微信公众号的用户信息 2023-02-08 20:34:39 +08:00
Xu Chang 8ccedd8e7d Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-02-08 19:47:48 +08:00
Xu Chang 08653ca4de 重新设计了wechatUser表的结构,以及一些逻辑过程 2023-02-08 19:47:34 +08:00
Wang Kejun e5922375c7 显示返回 2023-02-08 19:19:44 +08:00
Wang Kejun 5b9b493421 web 绑定手机号 2023-02-08 18:13:27 +08:00
Wang Kejun 56b6132dc2 授权组件ui调整 mobile绑定手机号 2023-02-08 17:31:21 +08:00
Wang Kejun c65043e2c1 小程序获取手机号 errmsg处理 2023-02-08 15:18:42 +08:00
Xu Chang 9709fd2c63 在初始化的时候注入处理被merge用户的逻辑 2023-02-08 15:12:38 +08:00
Xu Chang ae8c87450c token中对shadow用户的处理,以及注入对merge用户查询 2023-02-08 11:38:57 +08:00
Wang Kejun 7c2aa0da96 lib 2023-02-07 10:30:35 +08:00
Wang Kejun d5c7c0e828 web 头像上传组件 2023-02-07 10:27:17 +08:00
Xu Chang 9ea5dbe5d2 build 2023-02-06 21:54:15 +08:00
Xu Chang 6aa49282f1 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-02-06 21:53:40 +08:00
Xu Chang 6ac3fa5e2f 适配了domain2.6.1对Exception的定义 2023-02-06 21:53:36 +08:00
Wang Kejun 4027677a8a 修正 entityActionBtn组件 2023-02-06 12:32:03 +08:00
梁朝伟 6dc9457070 fix entityactionbutton 2023-02-06 12:01:33 +08:00
Xu Chang 6fccaa64ee 2.3.10-dev 2023-02-05 22:24:26 +08:00
Xu Chang 48f42fbd1a 2.3.9-publish 2023-02-05 22:23:31 +08:00
Wang Kejun 29021b3c01 lib 2023-02-05 20:15:02 +08:00
Wang Kejun 02a3aebcb5 userrelation/list showback 2023-02-05 20:13:04 +08:00
Xu Chang c461ea0e25 修正了userRelation.byMobile中的几个问题 2023-02-05 12:43:39 +08:00