Commit Graph

655 Commits

Author SHA1 Message Date
wangjiahao
a1923219dd Merge remote-tracking branch 'origin/main' into main 2021-05-19 16:29:33 +08:00
wangjiahao
c0ccf23a20 fix: 仪表板滚动条的问题 2021-05-19 16:29:19 +08:00
junjie
f525d9154a feat:fontsize fix;仪表板视图过滤组件 2021-05-19 16:21:20 +08:00
taojinlong
1d2e5d846d Merge branch 'main' of github.com:dataease/dataease into main 2021-05-19 15:46:50 +08:00
taojinlong
1249c6f91a fix: 国际化 2021-05-19 15:42:43 +08:00
junjie
dc4482dcaa feat(frontend):UI fix 2021-05-19 15:20:48 +08:00
taojinlong
492dd99188 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-19 15:14:08 +08:00
taojinlong
6b5d27aa72 fix: 限制標題長度 2021-05-19 15:13:59 +08:00
wangjiahao
71da8bb205 Merge remote-tracking branch 'origin/main' into main 2021-05-19 15:13:18 +08:00
wangjiahao
d828901dac fix: bug fxt 2021-05-19 15:13:05 +08:00
junjie
fee4f9a63f feat(frontend):UI fix 2021-05-19 14:58:21 +08:00
taojinlong
1fb3f2ee3b Merge branch 'main' of github.com:dataease/dataease into main 2021-05-19 13:50:31 +08:00
taojinlong
638b8c10cc fix: 国际化 2021-05-19 13:41:25 +08:00
fit2cloud-chenyw
58072f1b13 fix: 过滤组件国际化bug 2021-05-19 12:50:42 +08:00
junjie
a5f088c1ed Merge remote-tracking branch 'origin/main' into main 2021-05-19 11:59:18 +08:00
junjie
72ea246cdc feat(dashboard):UI fix;i18n fix 2021-05-19 11:59:04 +08:00
taojinlong
4399978965 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-19 11:56:09 +08:00
taojinlong
d1d9596624 fix: 国际化 2021-05-19 11:56:00 +08:00
fit2cloud-chenyw
f15253368f feat: <关于>中按钮使用user.isAdmin过滤 2021-05-19 11:52:01 +08:00
fit2cloud-chenyw
e9dc99526e fix: 删除菜单中目录 2021-05-19 11:42:09 +08:00
junjie
27b0ea6df2 feat(dashboard):新建一级目录 按钮fix 2021-05-19 10:52:46 +08:00
fit2cloud-chenyw
5f8a0126d5 feat: 路由名称改为英文 2021-05-19 10:30:51 +08:00
taojinlong
14a5d7f667 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-19 10:18:12 +08:00
taojinlong
144fb84535 fix: 国际化 2021-05-19 10:17:36 +08:00
fit2cloud-chenyw
1107529dc1 fix: 修复线上国际化切换无效问题 2021-05-19 10:03:00 +08:00
wangjiahao
8a88c0bca9 Merge remote-tracking branch 'origin/main' into main 2021-05-18 18:39:32 +08:00
wangjiahao
1c48fc8848 feat: 授权国际化等 2021-05-18 18:39:18 +08:00
fit2cloud-chenyw
a0b6661c5f fix: 国际化头部参数错误 2021-05-18 18:33:52 +08:00
fit2cloud-chenyw
3970913f43 fix: 新加了组织后,编辑已有用户时,无法选择看见新加的组织 2021-05-18 18:16:04 +08:00
junjie
ff37b43bdf feat(dashboard):UI fix 2021-05-18 17:48:33 +08:00
junjie
8a82c4687e Merge remote-tracking branch 'origin/main' into main 2021-05-18 17:31:42 +08:00
junjie
ec58faeee6 feat(dashboard):UI fix 2021-05-18 17:31:28 +08:00
fit2cloud-chenyw
0185c0c4af feat: 前端适配后台国际化 2021-05-18 17:30:36 +08:00
taojinlong
41deddbbfa fix: excel 数据集 2021-05-18 17:28:12 +08:00
junjie
9124a9213d feat(backend):fix 2021-05-18 17:18:47 +08:00
junjie
ad0c75eacf feat(dashboard):仪表盘 Table Label支持,大小自适应;收藏取消bug fix 2021-05-18 16:38:24 +08:00
fit2cloud-chenyw
2d3eb9050c fix: lic错误信息翻译 2021-05-18 16:17:07 +08:00
wangjiahao
c9b206ccd8 Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java
#	backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml
#	backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
#	backend/src/main/resources/generatorConfig.xml
#	frontend/src/views/panel/list/PanelViewShow.vue
2021-05-18 16:14:46 +08:00
wangjiahao
79e93655ec feat: 数据权限配置 2021-05-18 16:07:19 +08:00
fit2cloud-chenyw
31e5cca439 feat:前端增加国际化切换 2021-05-18 15:46:14 +08:00
junjie
6d54dcece4 feat(frontend):UI fix 2021-05-18 15:33:39 +08:00
junjie
4535dd2a5e feat(dashboard):ui fix;创建一级目录 2021-05-18 15:20:48 +08:00
taojinlong
f07065b6f2 Merge branch 'main' of github.com:dataease/dataease into main
# Conflicts:
#	backend/src/main/resources/db/migration/V8__system.sql
2021-05-18 15:00:31 +08:00
taojinlong
b28e2494fb refactor: 整理sql 2021-05-18 14:44:41 +08:00
fit2cloud-chenyw
f8078b0196 fix: topBar头部现实lic错误信息 2021-05-18 14:33:48 +08:00
junjie
78d65f032a feat(dashboard):ui fix 2021-05-18 14:09:51 +08:00
junjie
08153b1f1d feat(frontend):数据集 视图 名称长度限制 2021-05-18 13:55:00 +08:00
taojinlong
4e7d0173fc fix: 限制輸入長度 2021-05-18 13:47:17 +08:00
taojinlong
27d1083d26 fix 2021-05-18 12:46:31 +08:00
taojinlong
c637344575 resolve conflict 2021-05-18 12:45:45 +08:00
taojinlong
776fa22c57 feat: 暂时去掉国际化切换 2021-05-18 12:42:27 +08:00
taojinlong
b65835a7b9 feat: 暂时去掉国际化切换 2021-05-18 12:40:47 +08:00
fit2cloud-chenyw
867ae7cb37 fix: 链接分享label文字修改 2021-05-18 12:30:17 +08:00
junjie
58620d20e3 feat(frontend):登陆页调整 2021-05-18 12:25:48 +08:00
fit2cloud-chenyw
5fc32d6bba feat: 新增关于页面 以及 lic更新功能 2021-05-18 12:23:21 +08:00
junjie
120dd256aa feat(frontend):fix 2021-05-18 12:02:04 +08:00
fit2cloud-chenyw
893d5c68e6 feat: 用户不选组织报错 2021-05-18 11:47:54 +08:00
junjie
afc6563a32 feat:非直连数据集做校验;前端登陆样式fix 测试;不同用户创建db类型数据集可以选择相同表 2021-05-18 11:24:52 +08:00
taojinlong
dcf8fe751b Merge branch 'main' of github.com:dataease/dataease into main 2021-05-18 09:39:13 +08:00
taojinlong
21e38a0ffd feat: 国际化 2021-05-18 09:39:00 +08:00
junjie
a9201c794e feat(frontend):i18n fix;run build 样式冲突 fix后测试 2021-05-17 19:11:07 +08:00
junjie
83fa095052 feat(frontend):i8n fix;top-bar 右上角个人信息 i18n样式优化 2021-05-17 17:23:29 +08:00
taojinlong
8fadc27a29 feat: 去掉角色代碼; 2021-05-17 15:37:06 +08:00
taojinlong
38c0aa90bc feat: 去掉角色代碼; 2021-05-17 15:36:11 +08:00
taojinlong
c96ae8caf2 feat: 去掉暫未支持的按鈕 2021-05-17 15:18:47 +08:00
taojinlong
1bdc6454c7 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-17 14:20:00 +08:00
taojinlong
e2e2b09fee feat: 国际化 2021-05-17 14:19:46 +08:00
junjie
944b1bbfec feat(视图):图表->label类型fix 2021-05-17 12:47:45 +08:00
junjie
e27baac6fd feat(视图):增加标题文字图标 2021-05-17 12:14:27 +08:00
junjie
f8e1a1a7a3 feat(视图):fix 2021-05-14 18:55:53 +08:00
taojinlong
da8e447349 feat: 国际化 2021-05-14 18:51:35 +08:00
junjie
9def83bfed feat(视图):line 面积bug fix 2021-05-14 18:30:22 +08:00
junjie
c55b7dfe01 feat(视图):图表类型新增:gauge 2021-05-14 18:21:03 +08:00
junjie
422fbbfccc feat(视图):bug fix 2021-05-14 12:39:30 +08:00
junjie
52373e01c8 feat(数据集):自助数据集编辑 2021-05-13 17:41:05 +08:00
junjie
4d24485939 feat(视图):视图表格调整 2021-05-13 17:15:07 +08:00
fit2cloud-chenyw
fe29511e38 feat: 右上角功能菜单调整 2021-05-13 16:00:15 +08:00
fit2cloud-chenyw
4b6ed5b064 feat: 头部样式 2021-05-12 18:54:21 +08:00
fit2cloud-chenyw
acb4757ba8 fix: 新用户404 2021-05-12 18:33:09 +08:00
fit2cloud-chenyw
5ef6db9dc2 feat: 新建用户登录404 2021-05-12 18:26:18 +08:00
fit2cloud-chenyw
b637b77812 Merge remote-tracking branch 'origin/main' into main 2021-05-12 16:59:00 +08:00
fit2cloud-chenyw
f62f3e635c feat: 获取标题非空判断 2021-05-12 16:58:36 +08:00
junjie
75337adf7c feat(数据集):数据集优化 2021-05-12 16:39:53 +08:00
fit2cloud-chenyw
469aa684fc feat: xpack功能初版 2021-05-12 16:19:41 +08:00
taojinlong
53b1e6a600 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-12 16:13:22 +08:00
taojinlong
a77fb3c7ae fix: 同步日志按时间排序;修复添加定时任务失败 2021-05-12 16:13:13 +08:00
junjie
ef36e73948 feat(数据集):编辑自助数据集 2021-05-12 15:53:53 +08:00
junjie
602e375071 feat(frontend):编辑自助数据集 2021-05-12 14:45:13 +08:00
junjie
ced0f3477c feat(frontend):code 格式化 2021-05-12 12:25:49 +08:00
junjie
46f8f49709 feat(视图):表格 fix 2021-05-12 12:19:24 +08:00
taojinlong
622169a33e refactor: 去掉调试信息 2021-05-12 11:53:50 +08:00
taojinlong
e3bcf81bc2 refactor: 去掉调试信息 2021-05-12 11:49:07 +08:00
taojinlong
defdc1123c Merge branch 'main' of github.com:dataease/dataease into main 2021-05-11 19:10:03 +08:00
taojinlong
0404536a20 fix: Kettle 状态 2021-05-11 19:09:32 +08:00
junjie
516ce8142e feat(frontend):UI->数据集 字段编辑支持修改字段类型 2021-05-11 17:35:48 +08:00
fit2cloud-chenyw
9d6680ad31 feat: 插件管理v0.01 2021-05-11 16:32:21 +08:00
fit2cloud-chenyw
0bda4eb062 feat: 插件管理v0.01 2021-05-11 16:30:37 +08:00
fit2cloud-chenyw
2703e881eb feat: 插件管理v0.01 2021-05-11 16:30:21 +08:00
junjie
ba6782663b feat(数据集):直连模式 暂时 不支持关联视图 和 制作自助数据集 2021-05-11 14:07:35 +08:00
junjie
ee2956caa9 feat(视图):视图fix 2021-05-11 12:40:12 +08:00
junjie
7a5037068e feat(数据集):自助数据集 优化 2021-05-11 10:48:59 +08:00
junjie
7edaa48a7d feat(frontend):login 后路由fix 2021-05-11 10:11:12 +08:00
junjie
c3f45f5794 feat(数据集):自助数据集 2021-05-10 18:54:08 +08:00
junjie
6d1110bb1b Merge remote-tracking branch 'origin/main' into main 2021-05-10 18:42:06 +08:00
junjie
20ca335a4a feat(数据集):自助数据集 2021-05-10 18:41:49 +08:00
taojinlong
a5d78ab6b1 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-10 18:19:51 +08:00
taojinlong
e46644534d fix: 处理doris 字段长度 2021-05-10 18:19:29 +08:00
junjie
dd0096922d feat(数据集):自助数据集 2021-05-10 18:11:57 +08:00
junjie
ad71308564 feat(数据集):自助数据集 2021-05-10 17:57:31 +08:00
taojinlong
4891c38a8e Merge branch 'main' of github.com:dataease/dataease into main
# Conflicts:
#	frontend/src/lang/zh.js
#	frontend/src/views/dataset/common/DatasetGroupSelector.vue
2021-05-10 16:07:54 +08:00
taojinlong
08f0cd24cb feat: kettle 未运行时,禁用抽取数据 2021-05-10 16:03:56 +08:00
junjie
2ae0b71de5 feat(数据集):自助数据集 测试 2021-05-10 15:30:35 +08:00
junjie
00850c5dd9 feat(数据集):自助数据集 测试 2021-05-10 15:22:36 +08:00
taojinlong
1eb4d7f24b fix: 数据源密码不要明文显示 2021-05-10 10:37:05 +08:00
taojinlong
568288001a fix: 数据集更新 2021-05-10 10:13:00 +08:00
wangjiahao
175f5510c4 feat: 增加flyway 调增模板导入等 2021-05-08 11:49:21 +08:00
wangjiahao
7ff46ff804 fix: 背景图片空url 问题 2021-05-08 11:06:45 +08:00
wangjiahao
104a8a48fa fix: 背景图片空url 问题 2021-05-08 11:04:58 +08:00
wangjiahao
776e1febc1 Merge remote-tracking branch 'origin/main' into main 2021-05-08 10:42:37 +08:00
wangjiahao
0959535093 fix: 背景图片空url 问题 2021-05-08 10:42:23 +08:00
junjie
2adbd392d3 feat(数据集):关联视图 优化 2021-05-08 10:36:06 +08:00
wangjiahao
aec257ef32 fix: 删除仪表盘 2021-05-08 00:18:55 +08:00
wangjiahao
7a27491b53 feat:修改仪表盘编辑侧边弹框样式 2021-05-08 00:04:24 +08:00
wangjiahao
dd17ebe2c5 Merge remote-tracking branch 'origin/main' into main 2021-05-07 19:21:09 +08:00
wangjiahao
33a93b8916 feat:主题 2021-05-07 19:20:47 +08:00
taojinlong
4e8d06e3f7 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-07 19:01:34 +08:00
taojinlong
4e797ff89e feat: excel 数据预览 2021-05-07 19:01:11 +08:00
junjie
7ce09f5b5d feat(frontend):前端一些优化 2021-05-07 18:29:15 +08:00
junjie
ac938c281b feat(数据集):草稿,数据集 关联视图 功能。自助数据集需要关联视图做支撑,先简单做个 数据集 关联视图 的功能,后边再优化 2021-05-07 14:51:40 +08:00
junjie
5a2a5bb368 feat(dialog):dialog 支持拖动位置 2021-05-07 11:04:50 +08:00
wangjiahao
20ce5bbb39 Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	frontend/src/views/chart/view/ChartEdit.vue
2021-05-06 23:42:18 +08:00
wangjiahao
53b021bbf7 feat:样式修改 2021-05-06 23:40:34 +08:00
junjie
6096f85eda feat(视图):表格视图高度优化 2021-05-06 15:44:04 +08:00
junjie
32299104e7 feat(视图):视图优化,样式、属性调整时,不重新计算数据 2021-05-06 15:34:03 +08:00
fit2cloud-chenyw
d1f3d3a7f0 feat: 一级菜单只存一级 2021-05-06 14:43:57 +08:00
junjie
afc46f0c47 fix:请求错误取消loading 2021-05-06 11:14:51 +08:00
wangjiahao
b2182f0b03 fix:table fix 2021-05-06 11:08:57 +08:00
wangjiahao
35e42f0bdd Merge remote-tracking branch 'origin/main' into main 2021-05-06 10:59:04 +08:00
wangjiahao
01eb4abca6 feat:增加预览背景设置 解决改变窗口大小 echart 有滚动条的问题 2021-05-06 10:58:46 +08:00
fit2cloud-chenyw
22a9cc9b21 feat: 系统管理按钮样式 2021-05-06 10:40:08 +08:00
wangjiahao
9ba7aeaedc feat:仪表盘支持表格 2021-05-05 23:48:05 +08:00
wangjiahao
cd5f1af773 Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	frontend/src/components/canvas/components/Editor/ContextMenu.vue
2021-05-05 22:14:47 +08:00
wangjiahao
2cd2365770 feat:主题设置 2021-05-05 22:14:23 +08:00
junjie
9c09d8f8fc feat(数据集): 添加表搜索fix;上传excel增加进度条 2021-04-30 16:18:18 +08:00
junjie
5fd3554a1d feat(数据集): 数据库表不能重复添加到数据集 2021-04-30 12:08:39 +08:00
fit2cloud-chenyw
e0a6ae7962 feat: 角色删除code字段 表单增加重复验证 2021-04-30 11:05:59 +08:00
junjie
53d71998bf fix(UI): fix 2021-04-29 18:03:41 +08:00
junjie
fe82465151 fix(UI): fix选中状态丢失 2021-04-29 18:00:05 +08:00
junjie
d7ccc33954 Merge remote-tracking branch 'origin/main' into main 2021-04-29 16:17:15 +08:00
junjie
d28e652620 fix(UI): fix选中状态丢失 2021-04-29 16:16:56 +08:00
fit2cloud-chenyw
bf6c31c371 Merge remote-tracking branch 'origin/main' into main 2021-04-29 16:15:32 +08:00
fit2cloud-chenyw
389d50a846 feat: 角色api错误 2021-04-29 16:15:11 +08:00
junjie
81ab06c384 feat(数据集): UI调整 2021-04-29 15:47:04 +08:00
junjie
3104588991 feat(数据集): 字段编辑调整 2021-04-29 15:43:15 +08:00
fit2cloud-chenyw
9ed610802c feat: 数据源弹框改为隐藏路由 2021-04-29 15:38:03 +08:00
fit2cloud-chenyw
1285ba494d feat: 系统管理弹框改为隐藏路由 2021-04-29 12:46:51 +08:00
junjie
3526d39e01 feat(数据集): 数据集fix 2021-04-29 12:12:12 +08:00
junjie
098436fa6c fix(视图): 坐标轴,标签等自适应 2021-04-28 18:58:59 +08:00
junjie
f5b3923681 fix(数据集): 预览样式优化;分页展示fix 2021-04-28 18:39:01 +08:00
junjie
794e4651b0 fix: 视图表格样式合计fix;数据集数据预览表格各项优化 2021-04-28 17:30:18 +08:00
fit2cloud-chenyw
e32be3b5a5 feat: 用户管理弹窗修改 2021-04-28 17:09:05 +08:00
fit2cloud-chenyw
52d31b504e fix: 表格按照最新fit2cloud-ui样式 2021-04-28 14:54:55 +08:00
fit2cloud-chenyw
be033a5c66 fix: 顶级组织不能编辑为非顶级组织 2021-04-28 13:27:56 +08:00
fit2cloud-chenyw
e8fa566549 fix: 一级菜单禁用keep-alive缓存组件 2021-04-28 12:23:06 +08:00
fit2cloud-chenyw
2946017dd5 fix: 角色代码必填 2021-04-28 12:16:52 +08:00
junjie
787123ae4a fix(frontend): 视图 bug fix 2021-04-27 18:43:15 +08:00
junjie
86d87d7b47 fix(frontend): 视图 表格合计fix;仪表盘跳转视图编辑fix 2021-04-27 18:10:05 +08:00
wangjiahao
f91661e7fe Merge remote-tracking branch 'origin/main' into main 2021-04-27 16:25:58 +08:00
wangjiahao
d4da4794ef feat:背景图片设置 2021-04-27 16:25:40 +08:00
junjie
d861a4f816 feat(视图):维度过滤与排序 2021-04-27 13:58:25 +08:00
wangjiahao
0f644e7842 Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	frontend/src/components/canvas/components/Toolbar.vue
#	frontend/src/views/panel/edit/index.vue
2021-04-27 10:30:04 +08:00
wangjiahao
43489d63f1 feat:恢复显示设置,仪表盘样式设置等 2021-04-27 10:28:55 +08:00
junjie
2cc91fc188 feat(视图):fix 2021-04-26 17:54:15 +08:00
junjie
807d370346 feat(视图):视图 表格 组件样式,高度自适应 2021-04-26 17:38:33 +08:00
junjie
e6e651e17b feat(视图):视图 表格 组件样式,高度自适应 2021-04-26 16:56:22 +08:00
junjie
a27e61aec2 feat(视图):视图 表格 组件样式,支持'颜色'与'字体'属性修改 2021-04-26 15:20:55 +08:00
junjie
0c477f5bcf feat(视图):视图 表格 组件样式,支持'标题'与'背景'样式修改 2021-04-26 12:35:47 +08:00
junjie
461b0dda24 feat(视图):视图 表格 高度调整,界面变动自适应 2021-04-25 18:49:57 +08:00
junjie
90c406d108 feat(视图):视图增加表格 2021-04-25 18:03:13 +08:00
junjie
e3099e9cb2 feat(视图):视图指标增加数量字段 2021-04-25 15:10:49 +08:00
junjie
9302d0f092 feat(backend):数据抽取,切换Doris 2021-04-23 15:09:43 +08:00
junjie
84f68f1e4a feat(frontend):前端优化 2021-04-23 12:12:37 +08:00
fit2cloud-chenyw
d28a69e056 feat: 调整一级菜单 2021-04-22 17:59:16 +08:00
fit2cloud-chenyw
ef5eab2e19 feat: 修改自定义控制范围样式 2021-04-22 15:36:00 +08:00
fit2cloud-chenyw
89370df958 feat: 登录页面增加用户名验证 2021-04-22 14:53:23 +08:00
fit2cloud-chenyw
69f5a09cdc feat: 解决关闭编辑页面但是没有关闭左侧面板 2021-04-22 13:46:59 +08:00
wangjiahao
70a298025b fix:修改主题样式覆盖问题 2021-04-22 12:16:30 +08:00
wangjiahao
ecdd0ab4df feat:合并冲突 2021-04-22 10:33:51 +08:00
wangjiahao
d6ca7a8b8f Merge remote-tracking branch 'origin/main' into main 2021-04-21 18:49:13 +08:00
wangjiahao
290502b35b feat:新建仪表盘修改 同时支持自建 复用 导入 2021-04-21 18:48:57 +08:00
junjie
e7fd4126ac feat(frontend):全局主题色,logo,favicon等UI初步调整 2021-04-21 12:03:11 +08:00
junjie
4784c1078f feat(数据集):上传excel,保存第一行作为字段 2021-04-20 16:23:47 +08:00
fit2cloud-chenyw
6b285d7391 feat: 分享收藏完善 2021-04-20 14:19:10 +08:00
junjie
5f402b35df feat(数据集):flyway fix;excel数据集创建 2021-04-20 11:48:38 +08:00
wangjiahao
3c17fc57c0 Merge remote-tracking branch 'origin/main' into main 2021-04-20 11:47:03 +08:00
wangjiahao
23729a4c0b feat:仪表盘模板导入导出 2021-04-20 11:46:24 +08:00
fit2cloud-chenyw
46ff744b65 feat: 晚上公共链接 2021-04-20 11:21:53 +08:00
fit2cloud-chenyw
5327d5170b Merge remote-tracking branch 'origin/main' into main 2021-04-20 10:24:54 +08:00
fit2cloud-chenyw
d8239381cc feat: 修复重复查询条件 2021-04-20 10:24:39 +08:00
junjie
109ce64fdd feat(数据集):上传excel并解析预览 2021-04-19 18:33:53 +08:00