wenjiarui
|
e0957e5c8f
|
修改mergeUser时merge自己的bug
|
2023-04-24 19:05:16 +08:00 |
wangcheng
|
9b29f3e87a
|
Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev
|
2023-04-24 15:26:35 +08:00 |
|
wangcheng
|
1c3207adbe
|
初始化地铁数据
|
2023-04-24 15:26:29 +08:00 |
 Wang Kejun
|
bbfe33720c
|
二维码 小程序 支持小时选择
|
2023-04-24 12:21:21 +08:00 |
|
wenjiarui
|
c677499282
|
wechatUser.accessToken度
|
2023-04-24 12:15:15 +08:00 |
|
Wang Kejun
|
5083ea100a
|
Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev
|
2023-04-23 16:42:41 +08:00 |
|
Wang Kejun
|
110477a5f0
|
二维码授权 增加分钟、小时选择
|
2023-04-23 16:42:00 +08:00 |
|
wangcheng
|
db6b0a35cc
|
新增地铁线及站点entities
|
2023-04-23 16:38:08 +08:00 |
|
Wang Kejun
|
91f3162a2a
|
微信 jssdk
|
2023-04-20 15:14:23 +08:00 |
|
Wang Kejun
|
2ebcde733b
|
跳转小程序配置
|
2023-04-20 09:54:33 +08:00 |
|
Wang Kejun
|
ceaf1004fb
|
application 公众号增加小程序跳转配置
|
2023-04-19 23:05:25 +08:00 |
|
Wang Kejun
|
4bec5506b7
|
lib
|
2023-04-19 14:31:29 +08:00 |
|
Wang Kejun
|
dbabfc0dc2
|
originalId 声明问题
|
2023-04-19 09:50:22 +08:00 |
|
Wang Kejun
|
d406b70579
|
新增feature weiXinJsSdk 来支持jssdk api调用
|
2023-04-18 17:59:46 +08:00 |
|
wenjiarui
|
3bf5d75dad
|
build
|
2023-04-17 19:21:09 +08:00 |
 Xu Chang
|
98ce89072f
|
token中的bug
|
2023-04-17 19:13:53 +08:00 |
|
Xu Chang
|
510c88b86a
|
token中原先登录路径上的小bug
|
2023-04-17 11:39:01 +08:00 |
|
wenjiarui
|
46b9be2846
|
修改token在有同system下wechatUser但无当前system下wechatUser的逻辑
|
2023-04-17 11:23:19 +08:00 |
|
wenjiarui
|
8cda173e06
|
build
|
2023-04-14 20:24:05 +08:00 |
|
Xu Chang
|
6c96f6a331
|
没编译appdomain
|
2023-04-14 20:10:05 +08:00 |
|
Xu Chang
|
ce00384ee2
|
2.5.8-publish
|
2023-04-14 18:07:21 +08:00 |
|
wenjiarui
|
8393958557
|
build
|
2023-04-14 12:23:52 +08:00 |
|
Wang Kejun
|
84bf078e00
|
ActionBtnPanel引用调整
|
2023-04-14 12:22:13 +08:00 |
|
wangcheng
|
da2e085f8a
|
编译文件
|
2023-04-14 09:23:02 +08:00 |
|
wenjiarui
|
418fe68a4b
|
build
|
2023-04-13 18:56:41 +08:00 |
|
wangcheng
|
9de904ff51
|
build文件
|
2023-04-13 13:46:34 +08:00 |
|
Xu Chang
|
a0ad920507
|
actionPanel中的properties的修正
|
2023-04-13 12:39:17 +08:00 |
|
Xu Chang
|
04c8b71057
|
Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev
|
2023-04-13 11:54:37 +08:00 |
|
Xu Chang
|
1da972b428
|
适配front
|
2023-04-13 11:54:22 +08:00 |
|
wangcheng
|
3a422a1523
|
提交build文件
|
2023-04-13 11:46:08 +08:00 |
|
wenjiarui
|
0c1bcb5c91
|
Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev
|
2023-04-12 23:02:12 +08:00 |
|
wenjiarui
|
b113760f34
|
fix
|
2023-04-12 23:02:10 +08:00 |
|
Wang Kejun
|
c09f2ae6ba
|
features extraFile getUrl声明
|
2023-04-12 22:51:16 +08:00 |
|
wenjiarui
|
17faf4bc26
|
build
|
2023-04-12 20:16:11 +08:00 |
|
Wang Kejun
|
903d6738a4
|
userrelation upsert 申明
|
2023-04-12 19:48:58 +08:00 |
|
wenjiarui
|
fc24142008
|
Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev
|
2023-04-12 19:27:01 +08:00 |
|
wenjiarui
|
e530a156f3
|
修改schema
|
2023-04-12 19:26:58 +08:00 |
|
Wang Kejun
|
09657078db
|
小程序上传时， 打开文件失败提示
|
2023-04-12 17:03:54 +08:00 |
|
wenjiarui
|
ca4dd2a0e4
|
改schema
|
2023-04-12 16:10:30 +08:00 |
|
wangcheng
|
ed05cfca3a
|
build文件
|
2023-04-12 14:13:54 +08:00 |
|
Xu Chang
|
b6e4a25f14
|
Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev
|
2023-04-12 13:41:57 +08:00 |
|
Xu Chang
|
16df186172
|
extrafile中的属性required设置
|
2023-04-12 13:41:42 +08:00 |
|
wenjiarui
|
97e03ecfb8
|
userRlation&subscriptionlist修改entityDict
|
2023-04-11 20:32:02 +08:00 |
|
wenjiarui
|
2f12abdef2
|
二维码异步修改
|
2023-04-11 17:41:14 +08:00 |
|
Xu Chang
|
64dca4a470
|
extrafile的定义
|
2023-04-11 15:43:13 +08:00 |
|
Wang Kejun
|
287c96fd52
|
extrafile properties
|
2023-04-11 15:13:04 +08:00 |
|
wenjiarui
|
e67e77c718
|
Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev
|
2023-04-10 18:16:33 +08:00 |
|
wenjiarui
|
58fedd15d5
|
fix
|
2023-04-10 18:16:29 +08:00 |
|
wangcheng
|
dcd4f36c69
|
lib文件
|
2023-04-10 17:52:30 +08:00 |
|
Xu Chang
|
425f5d0af3
|
build中的一些小问题
|
2023-04-10 17:41:55 +08:00 |
梁朝伟
|
c8f73a8729
|
fix
|
2023-04-10 17:23:36 +08:00 |
|
梁朝伟
|
d90db33b25
|
fix
|
2023-04-10 16:37:21 +08:00 |
|
梁朝伟
|
43c9a82f45
|
fix properties
|
2023-04-10 09:21:40 +08:00 |
|
Xu Chang
|
3dda0abe2f
|
Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev
|
2023-04-05 14:22:28 +08:00 |
|
Xu Chang
|
43bdaeb51b
|
build的一些修正
|
2023-04-05 14:22:20 +08:00 |
|
Wang Kejun
|
fa30041f86
|
extraFile disabled申明
|
2023-04-04 12:40:16 +08:00 |
|
wenjiarui
|
f8e67846ca
|
Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev
|
2023-04-03 10:39:24 +08:00 |
|
wenjiarui
|
25e797bb10
|
二维码注入当不需要取buffer时不去调用外部接口
|
2023-04-03 10:39:18 +08:00 |
|
Wang Kejun
|
b0aa05c33b
|
扫码 projection去掉buffer
|
2023-04-01 00:19:41 +08:00 |
|
wenjiarui
|
8340ba774c
|
logout循环注掉
|
2023-03-31 22:40:03 +08:00 |
|
wenjiarui
|
169c8f0735
|
token死循环先注掉
|
2023-03-31 22:35:47 +08:00 |
|
Xu Chang
|
887c33a610
|
增加了logout
|
2023-03-31 21:27:31 +08:00 |
|
wenjiarui
|
4a2ec48e7e
|
二维码创建逻辑改为trigger
|
2023-03-31 20:23:31 +08:00 |
|
Xu Chang
|
b329f38eff
|
分离了selectionRewriter,前台也注入这个逻辑
|
2023-03-31 16:09:00 +08:00 |
|
Xu Chang
|
70825388c5
|
Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev
|
2023-03-31 14:45:38 +08:00 |
|
Xu Chang
|
6f5817855f
|
userLogin的业务逻辑重构
|
2023-03-31 14:45:25 +08:00 |
|
wenjiarui
|
c76862bdc9
|
小程序二维码注入
|
2023-03-31 14:04:28 +08:00 |
|
Xu Chang
|
c6cf1847c6
|
BackendContext实现了refineOpRecord
|
2023-03-30 19:53:54 +08:00 |
|
Xu Chang
|
d31c3995b6
|
新的oper对象的编译,mergeUser时处理了已经merge指向本user的行
|
2023-03-30 19:33:52 +08:00 |
|
Xu Chang
|
6355b6c55d
|
userRelation适配frontend的改动
|
2023-03-22 20:26:17 +08:00 |
|
Xu Chang
|
04b5f41c61
|
token在get时，接受context作为输入。userRelation的一个oakId没置
|
2023-03-22 17:33:47 +08:00 |
|
Xu Chang
|
566cc9c805
|
Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev
|
2023-03-22 14:34:39 +08:00 |
|
Xu Chang
|
16ee3f75d3
|
build
|
2023-03-22 14:34:35 +08:00 |
|
wenjiarui
|
0585f09184
|
Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev
|
2023-03-22 12:00:55 +08:00 |
|
wenjiarui
|
0725963f6a
|
当userENtityGrant过期时，推送过期消息
|
2023-03-22 12:00:51 +08:00 |
|
梁朝伟
|
23ca1c1256
|
commoni18增加detail
|
2023-03-22 10:47:46 +08:00 |
|
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 |