Commit Graph

696 Commits

Author SHA1 Message Date
Wang Kejun c5a16eb037 token/me mobile样式小调整 2023-03-20 22:17:41 +08:00
Wang Kejun 1e11b81b72 公众号网页同步微信信息注释了,微信现在不能通过getuserinfo获取昵称头像了 2023-03-20 21:52:07 +08:00
Wang Kejun 6d4825ae24 修复 一处redirectToAfterConfirm没有传入到userentitygant组件中 2023-03-19 22:42:19 +08:00
梁朝伟 f48157d119 小程序editori 2023-03-18 16:15:23 +08:00
wenjiarui 6e026c1740 useruserEntityGrant默认qrCodeType为public 2023-03-18 12:25:10 +08:00
Xu Chang d34aed0b0f 2.5.5-publish 2023-03-17 19:57:50 +08:00
wenjiarui 296b335ffd 修改notification对message状态影响trigger 2023-03-17 19:37:08 +08:00
Xu Chang 7c7684b163 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-03-17 18:58:49 +08:00
Xu Chang 4081f5e23d notification中的bug以及message中的容错 2023-03-17 18:58:43 +08:00
Wang Kejun 1df1d615fb 小程序 跳到tabBar 必须switchTab 2023-03-17 16:56:22 +08:00
wenjiarui e3797247a2 loginByMobile处理mergedUser情况 2023-03-17 15:48:38 +08:00
wenjiarui 6e20f5f6e7 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-03-16 21:48:15 +08:00
wenjiarui 0967d37350 build 2023-03-16 21:48:13 +08:00
Wang Kejun 0a5ef37233 fix 授权领取 跳转修正 2023-03-16 21:47:27 +08:00
Wang Kejun 6feeb9fce9 fix 授权领取页面调整 2023-03-16 21:11:28 +08:00
Wang Kejun f251273f9c 授权 没有redirectTo 不显示 2023-03-16 18:58:58 +08:00
wenjiarui eb602169e5 userEntityGrant确认时生成relationblockblockTrigger 2023-03-16 18:53:34 +08:00
Wang Kejun d4421f721b 修复 wechatqrcode 一处笔误 2023-03-16 09:46:42 +08:00
wenjiarui 7c9dbe529b build 2023-03-15 21:58:36 +08:00
Wang Kejun 20beec54fb fix notification触发器 拼接url时 公众号的时候 加上域名 2023-03-15 15:55:21 +08:00
Xu Chang 30e90f396a build 2023-03-15 10:53:40 +08:00
Wang Kejun 496a59aca3 root 添加权限 手机号可以使用 2023-03-15 10:12:48 +08:00
Xu Chang 2f2a3b9add userRelation检查可用的relation 2023-03-14 20:15:33 +08:00
Xu Chang 5a0ce2996a userRelation的relations改成默认最高级别 2023-03-14 17:56:32 +08:00
Xu Chang e3098bcb9f application的feature修改了getApplication的返回声明 2023-03-14 16:12:33 +08:00
梁朝伟 e680702864 useRelation list properties定义小改 2023-03-14 11:37:27 +08:00
Xu Chang 3446885cc6 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-03-14 11:32:44 +08:00
Xu Chang 55977ceabf 对初始relations的判断 2023-03-14 11:32:29 +08:00
梁朝伟 b980e281fa 小程序editor改个icon显示 2023-03-14 10:53:59 +08:00
Xu Chang ea3d5f1dd8 修改了subscribeMessage的最后一个参数 2023-03-14 10:49:58 +08:00
Xu Chang c226fd32fe subscribeMessageMp增加了一个参数 2023-03-14 10:45:57 +08:00
Xu Chang 8c60e5c149 搬部分业务无关的抽象组件到front里 2023-03-10 17:47:16 +08:00
Xu Chang a4f863cdea 修改了新的componentToProps下的编译问题 2023-03-08 15:47:21 +08:00
wangwenchen 7f3e9ebe93 linniu改到@oak-frontend-base 2023-03-07 16:41:00 +08:00
Xu Chang a7e1a7f697 增加了colorDict的初始化 2023-03-07 15:14:02 +08:00
梁朝伟 81ea42685c fix 2023-03-07 10:58:11 +08:00
梁朝伟 b6a9b2f2a1 type 增加actionBtnPanelProps类型定义 2023-03-06 19:15:57 +08:00
梁朝伟 3415e5c7db i18增加创建时间和更新时间 2023-03-06 18:13:59 +08:00
Xu Chang 73a48c9627 适配了front的改动,改变了mp订阅message的函数名 2023-03-03 18:49:55 +08:00
Wang Kejun d0fd8d6fca 搜索组件 支持money类型 2023-03-03 11:27:10 +08:00
Wang Kejun f94b763aa4 message entities name修改 2023-03-01 17:30:48 +08:00
Xu Chang 07c38629ca 修改了token改变对页面的刷新,修改了context对初始化过程中出错的处理 2023-03-01 17:11:52 +08:00
wenjiarui a64e1f431d build 2023-02-28 06:17:34 +08:00
wenjiarui 351f873227 build 2023-02-27 20:03:26 +08:00
Xu Chang 6f1f8b34f8 build 2023-02-25 20:08:35 +08:00
Wang Kejun 31acbb1f75 解决ts申明问题 2023-02-25 20:04:03 +08:00
Xu Chang 1767a31066 编译中的一些问题,以及对Front的适配 2023-02-25 19:35:39 +08:00
Wang Kejun e9d9a2df2d 增加 搜索组件 2023-02-24 16:48:45 +08:00
Wang Kejun f1cf36d92b amap组件 2023-02-22 11:10:33 +08:00
Xu Chang 2983c7c732 新编译的storage 2023-02-21 18:57:51 +08:00
Xu Chang 9543bf1538 编译出enum类型的storage 2023-02-21 17:56:23 +08:00
Xu Chang 86003d290f Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-02-21 17:30:19 +08:00
Xu Chang 2c9bc28130 修改了userRelation中的listeners属性 2023-02-21 17:30:15 +08:00
Wang Kejun 7c3b649b67 lib 2023-02-21 17:18:22 +08:00
Xu Chang 75a7651331 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-02-21 16:33:46 +08:00
Xu Chang 46ef4b9e08 新的编译器对enumeration的支持 2023-02-21 16:33:42 +08:00
Wang Kejun 36c8bc85ba entityactionbtn 已改成 acttionBtnPanel 2023-02-21 15:17:18 +08:00
Xu Chang 4ffcb85bdd wechatQrCode 2023-02-20 09:27:54 +08:00
Xu Chang 0b6a0b42cb 增加了公众号发跳转小程序认领授权的逻辑 2023-02-20 08:51:58 +08:00
Xu Chang 7957b64257 手机号冲突的情况默认改成合并 2023-02-20 06:43:33 +08:00
Xu Chang a12f8656ee userEntityGrant中的OakRowInconsistencyException处理 2023-02-20 04:06:53 +08:00
Wang Kejun 3a00ccad61 去掉打印 2023-02-19 22:06:17 +08:00
Xu Chang 4c836ba649 userEntityGrant的临时生成二维码代码 2023-02-19 21:27:15 +08:00
Wang Kejun 0fb34a9fd4 小程序码 动态生成不物化 2023-02-19 21:21:31 +08:00
Wang Kejun 91096c8325 小程序 根据开发环境生成二维码 2023-02-19 18:02:16 +08:00
Wang Kejun 819406c409 fix 判断 图片base64正则 2023-02-17 20:21:35 +08:00
wenjiarui 1698de7f37 fixts 2023-02-17 19:48:04 +08:00
Wang Kejun 584122a23b 页面list按钮调整 2023-02-17 15:49:11 +08:00
Wang Kejun 3fe637b9fd application 调整小程序config声明 2023-02-17 15:26:09 +08:00
Wang Kejun 2edf8308e6 lib 2023-02-17 13:52:38 +08:00
Wang Kejun a15762f66e lib 2023-02-17 13:46:57 +08:00
wenjiarui 7d066a7026 buikld 2023-02-16 12:01:46 +08:00
wenjiarui 28a96a0a7c 修改wechatQrCode生成时取application逻辑 2023-02-16 12:00:44 +08:00
Wang Kejun 5a19abeb03 useentitygant 创建时 把qrcode传给 wechatqrcode 2023-02-16 11:39:03 +08:00
Wang Kejun d50742d514 antd 5.2.0 2023-02-16 11:10:54 +08:00
Wang Kejun 823816c260 sms配置 可录人secretId 2023-02-15 20:57:50 +08:00
Xu Chang 4fd66ee537 适配了编译器对常量属性的处理 2023-02-15 19:23:37 +08:00
Xu Chang 1a22ecc7d6 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-02-15 17:45:27 +08:00
Xu Chang 33be59a5ba 注入了mesage和notification的trigger 2023-02-15 17:45:23 +08:00
Wang Kejun 98e9bcc1c9 lib 2023-02-15 17:32:57 +08:00
Xu Chang 39cb510f7a message即使没有notification的渠道,对应的messageSystem也应该生成 2023-02-15 17:31:35 +08:00
Xu Chang 5e2f3983b9 build 2023-02-15 15:59:47 +08:00
Xu Chang c6b4777665 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-02-15 15:57:50 +08:00
Xu Chang 73a818b7df message和notification的逻辑(未测试) 2023-02-15 15:57:48 +08:00
Wang Kejun f68a2d9b13 小程序码 根据环境使用page url 2023-02-15 14:38:25 +08:00
Wang Kejun 6456a7112f 生成二维码 库qr-image 改成 qecode.react 2023-02-15 14:21:17 +08:00
Wang Kejun f883fa7b14 一些ts waring 及antd 5.2.1 2023-02-15 12:36:13 +08:00
wenjiarui 62984acf2a userEntityGrant支持传入二维码类型 2023-02-15 11:03:29 +08:00
Xu Chang 0f8d42573d 适配external的改动 2023-02-14 11:40:01 +08:00
Xu Chang 2023f23101 编译中的声明修正 2023-02-14 10:29:46 +08:00
Xu Chang e816133c26 重构了message及相关对象,重构了初始化逻辑,适配了frontend的改动 2023-02-13 19:34:30 +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 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 224740cd26 aspectwrapper的返回结构适配,以及token中loginWechat去更新用户信息 2023-02-09 14:37:59 +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 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 9116ec3a19 完善了公众号用户getUserInfo 2023-02-08 20:49:51 +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 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
Wang Kejun 4027677a8a 修正 entityActionBtn组件 2023-02-06 12:32:03 +08:00
梁朝伟 6dc9457070 fix entityactionbutton 2023-02-06 12:01:33 +08:00
Wang Kejun 29021b3c01 lib 2023-02-05 20:15:02 +08:00
Xu Chang c461ea0e25 修正了userRelation.byMobile中的几个问题 2023-02-05 12:43:39 +08:00
Xu Chang 9b2f010e2a 2.3.8-publish 2023-02-03 16:19:48 +08:00
Wang Kejun bfb183653e 登录发短信 修改一处配置判断 2023-02-03 10:21:41 +08:00
Wang Kejun bd81447011 发送短信 支持mocksend参数 2023-02-03 10:09:01 +08:00
Xu Chang 92477938d7 build 2023-02-02 22:16:41 +08:00
Wang Kejun 3aa69e24a1 applcation 有一处 projection没改完 2023-02-02 22:10:47 +08:00
Wang Kejun 38b808fe0c user chceker 对select检查先注释 2023-02-02 20:04:23 +08:00
Xu Chang ad900e64d4 修改以适配front对filter的改动 2023-02-02 16:59:47 +08:00
Xu Chang 0e0ee688ff build暨2.3.5-publish 2023-02-01 21:07:39 +08:00
Wang Kejun 45c818421f 二维码添加 授权是 relations中文翻译 entity不存在 不执行t函数 2023-02-01 16:13:02 +08:00
Wang Kejun 662bcc9834 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-02-01 14:47:06 +08:00
Wang Kejun 69c64d140e fix utils domain文件, 放到数组里面 Url += Url.includes('?') ? '&' : '?'; 2023-02-01 14:46:44 +08:00
Xu Chang 5cbb0c93fe 一个exception的文字完善 2023-02-01 14:41:34 +08:00
Xu Chang fd5122eb5c Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-02-01 14:38:41 +08:00
Xu Chang e8f4738d2e token中取数据的一个小问题 2023-02-01 14:38:26 +08:00
Wang Kejun 74d7e7604a lib 2023-01-31 21:21:44 +08:00
Xu Chang b8199b94bd wechatPublicTag的一些代码暨2.3.4-publish 2023-01-31 21:06:50 +08:00
Xu Chang 73744c57a8 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-01-31 19:54:10 +08:00
Xu Chang 41d73db8fd aspect中wechatLogin的一些小问题 2023-01-31 19:53:55 +08:00
Wang Kejun 309e9bd1d6 features application文件 assert 文字提示区分下 2023-01-31 18:22:01 +08:00
Xu Chang 87f4955d64 处理了projection的前后台一致问题 2023-01-31 18:16:27 +08:00
Xu Chang 219c9474e6 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-01-31 16:36:45 +08:00
Xu Chang ac6e04adc9 application的feature处理了历史缓存的情况 2023-01-31 16:36:31 +08:00
Wang Kejun 5d59f94d56 weChatLoginGrant组件 增加disabled属性 2023-01-31 16:24:27 +08:00
Xu Chang ee262c0f35 merge 2023-01-31 16:19:23 +08:00
Xu Chang 452a148627 wechatPublicTag的一些业务代码,application初始化时处理了一个边界 2023-01-31 16:18:10 +08:00
wenjiarui 5cc507fb33 build 2023-01-31 13:41:27 +08:00
Wang Kejun a6e721cf31 对生成url 参数是否跟&的判断 2023-01-31 12:39:58 +08:00
Xu Chang d47f8e3514 一些operation中的小错误 2023-01-31 11:28:30 +08:00
Xu Chang e49ab4bc40 一个笔误 2023-01-30 22:00:15 +08:00
Xu Chang 36fe0de1a2 笔误 2023-01-30 21:53:12 +08:00
Xu Chang b8aabb4cac 低级错误 2023-01-30 21:45:22 +08:00
Xu Chang ca093d38a3 继续改小笔误 2023-01-30 21:37:17 +08:00
Xu Chang 25a3294bb6 低级笔误 2023-01-30 21:28:44 +08:00