Commit Graph

1187 Commits

Author SHA1 Message Date
wangwenchen 34e1f02519 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-10-25 16:05:44 +08:00
wangwenchen dbd26474b8 bridge 2023-10-25 16:05:13 +08:00
qsc 9b04eeb741 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-10-25 15:57:22 +08:00
qsc 1329a487a3 build 2023-10-25 15:56:02 +08:00
Wang Kejun 992b104b01 调整 sessionMessage 发客服消息判断 2023-10-25 15:27:38 +08:00
Wang Kejun a4d3bf4b5c 小程序端 extrafile/commit 2023-10-25 12:45:11 +08:00
qsc 6833edab1e Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-10-25 12:21:41 +08:00
qsc 7a0a8e3fc7 extraFile upload chooseMessageFileByMp()修改 2023-10-25 12:21:38 +08:00
wenjiarui b4a93807b4 extraFileCommit修改 2023-10-25 11:42:12 +08:00
qsc a7848d5273 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-10-24 10:38:26 +08:00
qsc 2053b5e78c articleMenu extraFile 修改 2023-10-24 10:38:18 +08:00
梁朝伟 4fe3e62dc1 account trigger 2023-10-24 10:27:28 +08:00
Wang Kejun 960681a2e8 sessionMessage openId存在才发送微信客服消息 2023-10-23 20:14:46 +08:00
qsc 66fd05cb26 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-10-23 18:49:36 +08:00
qsc 1acbdfa7d3 upload 边界情况:用动作保存 2023-10-23 18:49:29 +08:00
Wang Kejun 1607fd3156 调试微信客服消息回调 2023-10-23 09:28:22 +08:00
Wang Kejun 7bce1dc06d 微信发送图片消息 2023-10-22 12:13:05 +08:00
Wang Kejun dd60ecd25c aspect 增加微信删除素材deleteMaterial 2023-10-20 20:26:20 +08:00
Wang Kejun 4db7235871 extraFile 实现微信图片显示 暂支持image 2023-10-20 20:19:33 +08:00
wenjiarui f2a65e30cc uploadCommit 2023-10-20 18:28:11 +08:00
Wang Kejun 03dafed548 增加 todo实体对象 2023-10-20 12:34:37 +08:00
Xu Chang e340ae4ff3 更新了updateDict相关的数据结构 2023-10-19 19:40:08 +08:00
Wang Kejun 07acc0b8a3 调整 aspect getMaterial的返回值 base64或json 2023-10-19 16:44:21 +08:00
Wang Kejun e8c0205308 fix aspect getMaterial笔误 2023-10-19 16:03:06 +08:00
Wang Kejun 93187ccc78 cos 实现wechat类 upload 2023-10-19 10:43:59 +08:00
Xu Chang 9b85373031 cos的upload支持了uploadToAspect 2023-10-18 10:06:47 +08:00
Wang Kejun 55342a4873 build 2023-10-17 18:53:59 +08:00
梁朝伟 3c1afc8704 user实体增加账户字段 2023-10-17 17:24:57 +08:00
Wang Kejun fb6d793a4a build 2023-10-17 15:42:44 +08:00
Wang Kejun de32625bfd build 2023-10-16 20:34:34 +08:00
Wang Kejun 49ef53ae59 build 2023-10-13 19:28:20 +08:00
wenjiarui 2fd4b31f68 autoUplaodd 2023-10-13 19:11:02 +08:00
wenjiarui 5fec957857 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-10-13 12:08:47 +08:00
wenjiarui 99979914ad 修正发送微信模板消息时取模板Id的逻辑 2023-10-13 12:08:43 +08:00
Wang Kejun 1aa00bab55 去掉不必要的参数 2023-10-13 11:47:57 +08:00
Wang Kejun 2a67be5926 微信api调用调整 2023-10-13 11:43:51 +08:00
Xu Chang c2969bc195 user中增加了address 2023-10-13 10:41:37 +08:00
Wang Kejun 95d1d789ba build 2023-10-12 18:45:18 +08:00
qsc 9a4c27233a Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-10-12 17:15:15 +08:00
qsc 7256c92b0b createMaterial 添加appType 2023-10-12 17:15:07 +08:00
Xu Chang b14ba4d211 merge 2023-10-12 17:09:37 +08:00
Xu Chang 32b191ce01 增加了account对象 2023-10-12 17:04:01 +08:00
wenjiarui eda8081ecf 模板消息显示修改 2023-10-12 15:23:38 +08:00
Wang Kejun 9d80f0882c build 2023-10-12 14:04:23 +08:00
qsc 6c252c3067 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-10-12 14:00:57 +08:00
qsc d87b9b591e wechatUser去掉remark、language 2023-10-12 13:59:12 +08:00
Wang Kejun 78e8b7e9b5 build 2023-10-12 12:28:18 +08:00
Wang Kejun 5a5422c58d build 2023-10-12 12:23:14 +08:00
wenjiarui 889bc37e09 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-10-12 10:36:26 +08:00
wenjiarui 101a7b81b7 模板消息配置 2023-10-12 10:36:20 +08:00
Wang Kejun 40bf1ed898 extrafile/upload removeitem后 过滤 2023-10-12 10:28:43 +08:00
qsc 9c01ba8dd6 wechatMenu菜单默认开启 2023-10-12 10:16:27 +08:00
wangwenchen 1d0bc568a7 微信消息 2023-10-12 10:12:41 +08:00
wenjiarui a4856cf0f0 模板消息配置 2023-10-11 18:59:52 +08:00
qsc 9c0827a28f Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-10-11 17:51:15 +08:00
qsc 14574b27bc application 2023-10-11 17:49:01 +08:00
Wang Kejun b6c73cf373 build 2023-10-11 17:48:03 +08:00
wangwenchen 013dd3a586 发微信客服消息 2023-10-11 16:57:02 +08:00
qsc 5430868181 fix 2023-10-11 09:51:45 +08:00
qsc 810bc665ef Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-10-11 09:46:57 +08:00
qsc 49ec699d8e wechatPublicTag 2023-10-11 09:25:53 +08:00
Xu Chang 4903b992bd 调通qiniu的delete file,brc适配改动 2023-10-10 22:00:26 +08:00
Wang Kejun c0d5c9c4b1 extrafile 图片显示组件, 可展示预览 2023-10-10 20:16:55 +08:00
wangwenchen 5b079a77da warring 2023-10-10 19:58:13 +08:00
wangwenchen bd979ccca0 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-10-10 15:49:53 +08:00
wangwenchen ae09b099b7 session 2023-10-10 15:49:52 +08:00
Wang Kejun a2487b4b95 extrafile 拖拽排序 2023-10-10 15:49:03 +08:00
Wang Kejun 2a04a8a121 extrafile upload 小程序端 缺少状态的渲染 2023-10-10 12:43:56 +08:00
Xu Chang f7ea97cfcf 修改commit的两个trigger 2023-10-10 12:09:23 +08:00
Xu Chang 7cba48f8ad Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-10-10 11:53:47 +08:00
Xu Chang 22264e63a3 更正了extraFile,修正了backendRuntimeContext 2023-10-10 11:53:39 +08:00
wenjiarui 986aa17d48 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-10-09 14:45:42 +08:00
wenjiarui b76972733d mergeconfilct 2023-10-09 14:45:38 +08:00
wangwenchen a8aad2a51a Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-10-09 14:26:13 +08:00
wangwenchen 912436af41 session 2023-10-09 14:26:12 +08:00
wenjiarui 7234e2c73f platformList修改 2023-10-08 18:57:40 +08:00
Xu Chang c9484c0fa1 extraFile的watcher和一些重构 2023-10-08 13:37:41 +08:00
Xu Chang a0b1148247 增加了autoInform方法 2023-10-06 12:00:21 +08:00
Xu Chang 7daedef769 extrafile2 2023-10-05 19:29:10 +08:00
Xu Chang 5ce7619b3e 重构了platform/system/application的管理页面 2023-09-29 23:27:33 +08:00
Xu Chang d4a6422297 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-09-29 20:24:35 +08:00
Xu Chang 559f140186 systemPanel重构 2023-09-29 20:24:33 +08:00
Wang Kejun 0d35858bfe logout 加上 openrootmode 2023-09-27 20:17:47 +08:00
qsc 077fb96c32 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-09-27 20:02:17 +08:00
qsc aeb1acb13c build 2023-09-27 20:02:04 +08:00
wangwenchen c1511a03a0 编译后代码 2023-09-27 19:42:06 +08:00
wangwenchen 0f475035ea 解决冲突 2023-09-27 19:40:57 +08:00
wangwenchen 40e42ea3c7 sessionmessage 2023-09-27 19:36:16 +08:00
qsc 8bee0689df Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-09-27 18:20:05 +08:00
qsc 137c7fc634 关注公众号自动回复管理 2023-09-27 18:01:19 +08:00
Wang Kejun 6cf4ad45dc logout 2023-09-27 17:47:56 +08:00
Wang Kejun 62e7891a81 移除react-router-dom 对pageheader和errorpage 进行调整 2023-09-27 13:14:17 +08:00
梁朝伟 c4c5663dee util/cos/qiniu 改动 2023-09-27 11:15:50 +08:00
Xu Chang 36826725d6 笔误 2023-09-27 10:32:16 +08:00
Xu Chang 8951aeca19 拆分了messageType和template的关联 2023-09-26 19:54:07 +08:00
Xu Chang 30d1093f60 cos的部分重构,以及userWechatPublicTag的结构变更 2023-09-26 18:31:12 +08:00
Xu Chang 0690e3be9b build 2023-09-25 14:07:03 +08:00
Wang Kejun afefc65639 后端 上传微信素材适配 2023-09-24 14:55:03 +08:00
qsc 48784ed889 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-09-22 19:18:10 +08:00
qsc 6881bea7f7 wechatmenu 2023-09-22 19:18:02 +08:00
Xu Chang 2d732106cd Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-09-22 18:52:31 +08:00
Xu Chang 071d8f25d3 增加了extraFileUpload组件 2023-09-22 18:52:15 +08:00
qsc 9c08856b6d Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-09-22 12:25:12 +08:00
qsc 99feadbbac wehchatMenu 2023-09-22 12:22:27 +08:00
Xu Chang 2f157bf423 增加了uploadMedia的aspect声明 2023-09-22 11:00:00 +08:00
Xu Chang 166a72ea8f extraFile2的部分代码 2023-09-21 22:32:02 +08:00
wenjiarui 7228ea7983 mergefromextraFile 2023-09-20 19:28:19 +08:00
wenjiarui 5e54470fd9 Merge branch 'dev' into extraFile 2023-09-20 17:52:41 +08:00
wenjiarui 7431214099 upload 2023-09-20 17:52:19 +08:00
Wang Kejun 3f73dfb64c weixin-js-sdk 声明 2023-09-19 12:30:03 +08:00
Xu Chang ed51bb48f1 brc去掉不必要的代码 2023-09-19 11:55:31 +08:00
Xu Chang f21d37c419 上下文 2023-09-18 19:38:18 +08:00
wenjiarui 5164024000 fix 2023-09-15 15:25:24 +08:00
wenjiarui 0503738571 extraFile 2023-09-15 13:41:20 +08:00
Xu Chang d3f2306a7d 采用了esnext的编译模式 2023-09-15 12:28:35 +08:00
Xu Chang 7f1bde5991 移除了对react-scripts的依赖 2023-09-15 09:58:24 +08:00
Wang Kejun e684c71099 build 2023-09-14 19:26:56 +08:00
Xu Chang b6b83fa0fb 升级TS到5版(编译还有问题) 2023-09-14 18:19:47 +08:00
Wang Kejun 0cb1660f1c 移除无用的代码 2023-09-13 16:55:38 +08:00
Wang Kejun c15c8fdd49 build 2023-09-13 15:48:51 +08:00
wenjiarui ea85a723ad buildfixgetUrl 2023-09-13 15:44:04 +08:00
wenjiarui f7c71d9398 mergefromdev 2023-09-13 15:21:18 +08:00
wenjiarui 52673b8960 extraFile 2023-09-13 15:08:50 +08:00
Wang Kejun c1587854ec fix entities/application下 sessions的定义 2023-09-13 13:44:38 +08:00
Wang Kejun 4cbab4714b build 2023-09-13 12:21:34 +08:00
Wang Kejun 4f7d5f3f08 build 2023-09-11 17:53:18 +08:00
Wang Kejun 5b9dee2768 移除 src下 exceptionHandlers 2023-09-11 14:01:06 +08:00
Wang Kejun e79e7aec00 build 2023-09-09 09:54:07 +08:00
Wang Kejun 454220ae0a lib 2023-09-09 09:52:27 +08:00
Wang Kejun 5121cacbc2 build 2023-09-08 16:46:10 +08:00
Wang Kejun bfe63596fc message 增加platformId 2023-09-08 16:18:03 +08:00
Wang Kejun de261f3ce9 pc端用户管理 2023-09-07 19:28:48 +08:00
梁朝伟 cf3cd5463f fix:extraFile数据结构 2023-09-07 18:41:11 +08:00
wenjiarui 662f835ce7 mergeConfilct 2023-09-07 15:04:42 +08:00
wenjiarui 718cd14ffc build 2023-09-07 11:25:10 +08:00
Wang Kejun 2dc0b41184 build 2023-09-06 23:18:22 +08:00
Wang Kejun 3c13b596e9 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-09-06 23:16:25 +08:00
Xu Chang 026bdfcb52 定义了uploader的形状 2023-09-06 22:33:43 +08:00
wenjiarui 9b700fcab8 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-09-06 12:26:32 +08:00
wenjiarui 0b133e535a buil 2023-09-06 12:26:23 +08:00
wenjiarui 303bd95623 fix 2023-09-06 11:12:15 +08:00
Wang Kejun ebf12a4b6e lib 2023-09-05 18:53:31 +08:00
qsc a7eb2bbf01 fix 冲突 2023-09-01 18:00:02 +08:00
qsc 752306bb7b 帮助文档修改 2023-09-01 17:58:50 +08:00
Wang Kejun faf2ee74e6 fix 扫码登录 state处理 2023-08-30 19:21:54 +08:00
wenjiarui b20d670c63 build 2023-08-30 17:29:30 +08:00
Wang Kejun eca230974b fix selectfree去掉token 2023-08-30 16:33:12 +08:00
Wang Kejun 24fd65bb8e 合并 shadow状态的用户,mergeUser后 shadow状态变成merged的 就不用activate 2023-08-29 19:05:12 +08:00
Xu Chang 07e4ac6011 rewriteSelection的逻辑有问题 2023-08-29 18:49:57 +08:00
Xu Chang f80df3e8dd selectionRewriter处理了脑机 2023-08-29 13:51:15 +08:00
qsc 4f37f2b9a7 articleMenu 级联删除 2023-08-29 12:24:24 +08:00
qsc 7a92338e72 build 2023-08-29 11:53:37 +08:00
qsc f3d831e465 fix 冲突 2023-08-29 11:51:49 +08:00
qsc fa9f5a9bde 帮助文档修改 2023-08-29 11:51:05 +08:00
wangwenchen 812b6a9d1f build 2023-08-28 21:40:38 +08:00
Xu Chang 95c5475797 适配了frontend对前台context的改动,对mobile/me页面进行了细化,不允许删除正在登录中的手机号 2023-08-28 21:20:24 +08:00
wangwenchen ce05ebd7c1 修复 修改密码权限不足 2023-08-28 20:08:55 +08:00
wangwenchen 168ea6b522 build 2023-08-28 18:59:17 +08:00
wenjiarui 31edfc8bfc build 2023-08-28 17:01:07 +08:00
Wang Kejun 25b97c0adc user/login 一处小调整 2023-08-26 12:36:58 +08:00
Wang Kejun 7d7cc5c998 调整 login 构建state的判断 2023-08-26 12:26:34 +08:00
wangwenchen 48abe36434 comfirm 接口 2023-08-25 18:28:00 +08:00
wangwenchen 7b241a0cf9 token等build 2023-08-25 16:43:09 +08:00
wenjiarui 8d6aa3ba78 changePasswordRootmode 2023-08-25 15:59:17 +08:00
wenjiarui ab31b090e1 fix 2023-08-24 20:40:29 +08:00
梁朝伟 b163b8392e Merge branch 'auth' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into auth 2023-08-24 19:09:42 +08:00
梁朝伟 6be20abd3d add: message/detail message/list 2023-08-24 19:09:37 +08:00
wenjiarui 72cc17523c build 2023-08-24 18:13:55 +08:00
Wang Kejun 785e0bb305 extrafile extension可为空 2023-08-24 17:21:39 +08:00
wenjiarui f170482891 build 2023-08-24 17:00:53 +08:00
wenjiarui c037c1fbb4 build 2023-08-24 16:44:34 +08:00
wenjiarui 2586eed18b build 2023-08-24 15:28:01 +08:00
梁朝伟 238caec56c fix: zh_CN.json 增加对开关的翻译 2023-08-24 10:57:34 +08:00
wenjiarui 48ae36ba6d build 2023-08-23 21:20:39 +08:00
Wang Kejun e364d39704 locales 2023-08-23 21:18:38 +08:00
Wang Kejun 0cdc90a3d2 删除 2023-08-23 21:16:32 +08:00
wenjiarui 5f844777a6 build 2023-08-23 20:55:40 +08:00
Xu Chang adca555c75 3.0.0-publish 2023-08-23 17:33:31 +08:00
Wang Kejun 3fe1999fc1 lib 2023-08-23 17:21:27 +08:00
Wang Kejun c7eab9ccdb fix 添加权限 手机号添加称号 手机号输入框的值未清空 2023-08-23 12:41:52 +08:00
Xu Chang b574c7e72c merge 2023-08-23 12:18:30 +08:00
Xu Chang 5be42ef84c 适配一个小的front的改动 2023-08-23 12:12:27 +08:00
Wang Kejun 173456d91f lib 2023-08-23 11:25:14 +08:00
Wang Kejun e3e5b063cb message 样式 2023-08-23 11:23:22 +08:00
Wang Kejun ff6292833d userrelation 布局样式调整 2023-08-22 21:00:39 +08:00
Wang Kejun 057b0106fc lib 2023-08-22 17:43:27 +08:00
Wang Kejun e0b86af2c5 激活采集码使用 openRootMode(); 2023-08-22 17:40:30 +08:00
Wang Kejun dc3262ada1 lib 2023-08-22 17:32:19 +08:00
wenjiarui bd9a4ba71f fixschame 2023-08-22 17:21:30 +08:00
Wang Kejun bee2231298 userRelation 移动components 2023-08-22 12:01:39 +08:00
Xu Chang 31404f62d3 配置参数 2023-08-21 15:38:10 +08:00
qsc 8d59718742 build 2023-08-21 13:44:51 +08:00
Xu Chang 2bd6bb36e5 Merge branch 'auth' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into auth 2023-08-19 17:02:35 +08:00
Xu Chang dda72d26a9 重新规范了localStorage相关的key值 2023-08-19 17:02:33 +08:00
Wang Kejun 6f51e07e28 application initialize 接收外层注入projection 2023-08-19 16:09:18 +08:00
qsc 28fe879dcd captcha type字段添加confirm 2023-08-19 14:53:39 +08:00
Wang Kejun d62d822423 删除 general-app-domain 2023-08-18 17:01:07 +08:00
wenjiarui eedc7a6ec2 mergefromdev 2023-08-18 16:29:55 +08:00
Xu Chang 89e4ae99a1 进行message处理的时候,考虑没有platform的情形 2023-08-18 10:54:39 +08:00
wenjiarui bd1cbe3733 文案修改 2023-08-17 21:07:05 +08:00