gaibu
|
94bf24ad45
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into issues/I62TCM
# Conflicts:
# yudao-module-visualization/yudao-module-visualization-biz/src/main/java/cn/iocoder/yudao/module/visualization/framework/jmreport/core/service/JmReportTokenServiceImpl.java
|
2023-01-07 10:13:38 +08:00 |
|
gaibu
|
93686c7b60
|
fix: 积木报表 API 数据集解析时 token 未正确解析的问题
|
2023-01-07 10:11:48 +08:00 |
|
芋道源码
|
9e40134355
|
!357 积木报表分享报错
Merge pull request !357 from 与或非/issues/I64GXA
|
2023-01-07 01:34:56 +00:00 |
|
芋道源码
|
c499165fe5
|
!353 同步 增加webSocket
Merge pull request !353 from xingyu/dev
|
2023-01-07 01:29:03 +00:00 |
|
芋道源码
|
a53b0edff2
|
!354 redis监控echarts图表不显示
Merge pull request !354 from zy_2021/master
|
2023-01-07 01:24:26 +00:00 |
|
芋道源码
|
0f95e1e173
|
!356 uniapp refreshToken is not a function 问题修复
Merge pull request !356 from chaining/N/A
|
2023-01-07 01:21:10 +00:00 |
|
芋道源码
|
c958d9b659
|
!358 积木报表的部分请求会报错：JmReportTokenServices实现类getUsername方法返回值不允许为空
Merge pull request !358 from 与或非/issues/I5NQLD
|
2023-01-07 01:15:49 +00:00 |
|
gaibu
|
ee454ace9d
|
fix: 积木报表 API 数据集解析时 token 未正确解析的问题
|
2023-01-07 02:08:22 +08:00 |
|
gaibu
|
a8001a117b
|
fix: 积木报表的部分请求会报错
|
2023-01-07 00:46:46 +08:00 |
|
gaibu
|
717dd1ab7c
|
fix: 积木报表 API 数据集解析时 token 未正确解析的问题
|
2023-01-06 18:23:39 +08:00 |
|
gaibu
|
80ab569fa7
|
fix: 积木报表的部分请求会报错
|
2023-01-06 17:47:10 +08:00 |
|
xingyu
|
6954150fcb
|
feat: websocket init
|
2023-01-06 17:30:48 +08:00 |
|
xingyu
|
ed30f06ae1
|
feat: xtable增加预览功能
|
2023-01-06 17:20:59 +08:00 |
|
gaibu
|
04287fa9d8
|
fix: 积木报表分享报错
|
2023-01-06 17:02:48 +08:00 |
|
chaining
|
d579be7db7
|
fix: 修复 vm.$store.getters.refreshToken is not a function 问题
Signed-off-by: chaining <ning.chai@qq.com>
|
2023-01-06 08:55:55 +00:00 |
|
YunaiV
|
665f4b2b09
|
mp：重构 message 发送消息的方法
|
2023-01-06 09:25:19 +08:00 |
|
YunaiV
|
47f071560f
|
mp：menu 菜单的修改，移除多余的类
|
2023-01-05 20:35:36 +08:00 |
|
zy
|
38f9284593
|
fix:redis监控echarts图表不显示
|
2023-01-05 20:11:12 +08:00 |
|
YunaiV
|
69e653cd94
|
mp：location 的自动回复；关注后的自动回复
|
2023-01-05 19:36:13 +08:00 |
|
xingyu
|
71d4c5ad78
|
feat: remove console
|
2023-01-05 15:02:45 +08:00 |
|
xingyu
|
15ef2dbf78
|
fix: rememberMe bug
|
2023-01-05 15:02:32 +08:00 |
|
xingyu
|
efcbd1ab68
|
perf: 优化字典store
|
2023-01-05 14:52:14 +08:00 |
|
xingyu
|
2dd1e01183
|
perf: 简化login代码
|
2023-01-05 14:21:07 +08:00 |
|
xingyu
|
6a9244a707
|
feat: vue3 add websocket
|
2023-01-05 11:10:31 +08:00 |
|
xingyu
|
97330fd7b1
|
chore: 升级springboot 2.7.7
|
2023-01-05 10:01:49 +08:00 |
|
xingyu
|
459640a222
|
revert: file
|
2023-01-05 09:53:45 +08:00 |
|
xingyu
|
c5f29f18d3
|
Merge remote-tracking branch 'origin/master' into dev
|
2023-01-05 09:41:54 +08:00 |
|
xingyu
|
4e7b5afb9e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-01-04 23:31:04 +08:00 |
|
YunaiV
|
24f0e4dd1f
|
1.6.6 发版：完善 Vue3 管理后台、新增 IP & 地区库
|
2023-01-04 22:36:38 +08:00 |
|
芋道源码
|
4c0275fbf4
|
!348 增加webSocket连接测试以及文件优化
Merge pull request !348 from 咱哥丶/dev
|
2023-01-04 14:30:40 +00:00 |
|
芋道源码
|
3dbe8cd279
|
!350 配置管理，配置是否可见判断写反了
Merge pull request !350 from kinlon92/master
|
2023-01-04 14:29:37 +00:00 |
|
芋道源码
|
ce0f327c42
|
!352 fix: 上传视频无法预览
Merge pull request !352 from 与或非/issues/I683EB
|
2023-01-04 14:28:53 +00:00 |
|
芋道源码
|
661a20dc93
|
!351 升级最新依赖 && 修复树形 全部展开 全部关闭
Merge pull request !351 from xingyu/dev
|
2023-01-04 14:26:01 +00:00 |
|
xingyu
|
00d03ebb7a
|
perf: remove console
|
2023-01-04 22:12:07 +08:00 |
|
xingyu
|
0f722d0b42
|
chore: update deps
|
2023-01-04 22:09:54 +08:00 |
|
xingyu
|
a0f2e0e138
|
fix: #I67WXP bug
|
2023-01-04 22:07:23 +08:00 |
|
xingyu
|
5b64fc3d5d
|
chore: update deps
|
2023-01-04 22:01:41 +08:00 |
|
xingyu
|
474a606711
|
feat: 添加注释
|
2023-01-04 22:01:26 +08:00 |
|
YunaiV
|
44f0bcd182
|
mp：实现关键字，自动回复
|
2023-01-04 21:10:54 +08:00 |
|
咱哥丶
|
18622c5d06
|
删除文件 yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java
|
2023-01-04 12:02:46 +00:00 |
|
咱哥丶
|
ccc4cad1c8
|
删除文件 yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
|
2023-01-04 12:02:26 +00:00 |
|
xingyu
|
050498a55a
|
perf: vue3 代码生成
|
2023-01-04 16:35:09 +08:00 |
|
xingyu
|
ed7e3338f8
|
perf: 优化代码
|
2023-01-04 16:33:51 +08:00 |
|
gaibu
|
29d2aad176
|
fix: 上传视频无法预览
|
2023-01-04 16:33:05 +08:00 |
|
xingyu
|
e63e5ffe4c
|
fix: 树形 展开 关闭 功能 bug
|
2023-01-04 16:04:17 +08:00 |
|
xingyu
|
d6fdd924e9
|
Merge remote-tracking branch 'origin/dev' into feature/springdoc
|
2023-01-04 10:58:34 +08:00 |
|
xingyu
|
854ba3315c
|
marge master
|
2023-01-04 10:57:19 +08:00 |
|
xingyu
|
7b98a3f3f3
|
Merge remote-tracking branch 'origin/master' into feature/springdoc
# Conflicts:
# README.md
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyValueController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyViewRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyAndValueRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyCreateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyListReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyPageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyUpdateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueCreateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValuePageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueUpdateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuCreateOrUpdateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuDetailRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/property/AppProductPropertyValueDetailRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderItemRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderRespVO.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/order/AppPayOrderController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/vo/PayNotifyOrderReqVO.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/vo/PayRefundOrderReqVO.java
# yudao-server/pom.xml
# yudao-server/src/main/java/cn/iocoder/yudao/module/shop/controller/app/AppShopOrderController.java
|
2023-01-04 10:48:18 +08:00 |
|
xingyu
|
c98965cd55
|
chore: update spring boot 2.7.7
hutool 5.8.11
mybaits-plus 3.5.3
flowable 6.8.0
|
2023-01-04 10:12:00 +08:00 |
|
芋道源码
|
427d031ba5
|
!346 file路径Bug
Merge pull request !346 from 与或非/issues/I5KG6T
|
2023-01-04 01:19:37 +00:00 |
|