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 |
|
芋道源码
|
2b87f6a59d
|
!347 fix: 腾讯 COS 异常，Region 必传
Merge pull request !347 from 与或非/issues/I5N76T
|
2023-01-04 01:00:16 +00:00 |
|
芋道源码
|
135ee3f39d
|
!349 vue3 XTable 组件
Merge pull request !349 from xingyu/dev
|
2023-01-04 00:56:44 +00:00 |
|
YunaiV
|
48bea21a46
|
mp：清理冗余代码
|
2023-01-04 00:18:43 +08:00 |
|
YunaiV
|
3cf8575317
|
mp：调整自动回复的表结构
|
2023-01-03 23:32:33 +08:00 |
|
YunaiV
|
c141ebef3f
|
mp：实现消息的存储
|
2023-01-03 21:30:35 +08:00 |
|
xingyu
|
377bc5048e
|
docs: 更新文档版本
|
2023-01-03 17:50:13 +08:00 |
|
xingyu
|
c6445516d8
|
docs: 更新文档版本
|
2023-01-03 17:46:32 +08:00 |
|
xingyu
|
8488933ec4
|
refactor: Xtable
|
2023-01-03 16:35:07 +08:00 |
|
kinlon92
|
29ac759c51
|
是否可见写反了
Signed-off-by: kinlon92 <zhangjinlong1211@126.com>
|
2023-01-03 07:36:15 +00:00 |
|
xingyu
|
f2d2dc4d9e
|
perf: XTable hooks
|
2023-01-03 14:23:48 +08:00 |
|
xingyu
|
df8a0768ea
|
feat: vue3 代码生成
|
2023-01-03 11:23:41 +08:00 |
|
xingyu
|
f352c4d941
|
reactor: 重构 XTable
|
2023-01-03 11:21:27 +08:00 |
|
xingyu
|
a984eac965
|
feat: 完善xtable组件
|
2023-01-03 10:40:53 +08:00 |
|
xingyu
|
a74c6b0805
|
chore: update deps
|
2023-01-03 10:11:13 +08:00 |
|
xingyu
|
f831b43dec
|
feat: 封装xTable 组件
|
2023-01-03 10:10:51 +08:00 |
|
咱哥丶
|
c04ad317cf
|
支持文件上传时可增加追加自定义路径 如aaa/ ,aaa/bbb/
下载文件时可以重新命名文件真实名
|
2023-01-02 23:39:01 +08:00 |
|
咱哥丶
|
7879632cf5
|
commit 增加webSocket 菜单sql
|
2023-01-02 23:13:50 +08:00 |
|
咱哥丶
|
a9aaac39e8
|
commit 增加webSocket
|
2023-01-02 23:09:10 +08:00 |
|
咱哥丶
|
b77a52a4a8
|
commit 增加webSocket
|
2023-01-02 22:55:48 +08:00 |
|
咱哥丶
|
2d1ff0aff7
|
commit 增加webSocket
|
2023-01-02 22:53:55 +08:00 |
|
gaibu
|
2fea3a8e83
|
fix: 腾讯 COS 异常，Region 必传
|
2023-01-02 22:31:15 +08:00 |
|
YunaiV
|
fefad029ad
|
mp：重构部分 message 的实现
|
2023-01-02 22:15:04 +08:00 |
|
YunaiV
|
39d377b0bd
|
mp：完成关注和取消的 user 保存
|
2023-01-02 19:41:05 +08:00 |
|
YunaiV
|
cdb7348b08
|
mp：重构 mp user 的表结构，以及相关的 service
|
2023-01-02 18:37:32 +08:00 |
|
YunaiV
|
a7e4ff0d76
|
mp：实现消息推送的处理接口
|
2023-01-02 17:44:37 +08:00 |
|
gaibu
|
906a3a2c50
|
fix: 重复 file 路径 Bug
|
2023-01-02 12:27:52 +08:00 |
|
YunaiV
|
f0cdc8d296
|
mp：增加消息推送的接口
|
2023-01-02 00:05:27 +08:00 |
|
YunaiV
|
c671b01b0a
|
mp：增加公众号的校验签名回调
|
2023-01-01 23:48:10 +08:00 |
|
YunaiV
|
275a1b10f6
|
mp：增加 MpServiceFactory 管理创建的 MpService~
|
2023-01-01 21:58:26 +08:00 |
|
YunaiV
|
627cb39517
|
mp：完善公众号的账号管理
|
2023-01-01 20:39:47 +08:00 |
|
YunaiV
|
48520a456b
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/wechat-mp
# Conflicts:
# pom.xml
# sql/mysql/ruoyi-vue-pro.sql
# yudao-dependencies/pom.xml
# yudao-framework/yudao-spring-boot-starter-biz-weixin/pom.xml
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsCallbackController.java
# yudao-server/pom.xml
# yudao-server/src/main/resources/admin-ui/static/js/4.js
# yudao-server/src/main/resources/admin-ui/static/js/chunk-vendors.js
# yudao-server/src/main/resources/application-local.yaml
# yudao-ui-admin/yarn.lock
|
2023-01-01 18:11:23 +08:00 |
|
YunaiV
|
52e055aba2
|
移除 yudao-module-work 模块，用途不大
|
2023-01-01 18:06:52 +08:00 |
|
YunaiV
|
6f8384af70
|
增加《敏感词》《地区 & IP》文档
|
2022-12-31 19:30:07 +08:00 |
|
YunaiV
|
7912a54ebd
|
【修复】没有数据权限时，添加/修改用户的唯一手机、账号等字段的校验不正确
|
2022-12-31 17:31:06 +08:00 |
|
YunaiV
|
b7380019ba
|
完善项目 README 说明
|
2022-12-30 22:09:53 +08:00 |
|
gaibu
|
639c7820f9
|
fix: 重复 file 路径 Bug
|
2022-12-30 16:07:53 +08:00 |
|
gaibu
|
9a46860086
|
fix: 重复 file 路径 Bug
|
2022-12-30 15:04:28 +08:00 |
|
dengxiaobing
|
df2c137fe2
|
清理单元测试 sql 脚本
|
2022-12-30 10:10:43 +08:00 |
|
YunaiV
|
a83b8e8fbc
|
修复报错的单元测试
|
2022-12-30 00:27:14 +08:00 |
|
芋道源码
|
f469c5caaf
|
!332 redis mq消息丢失问题
Merge pull request !332 from 与或非/issues/I5RFO2
|
2022-12-29 12:27:38 +00:00 |
|
芋道源码
|
75b3a297ce
|
!344 update yudao-ui-admin/src/components/FileUpload/index.vue.
Merge pull request !344 from plimlips/N/A
|
2022-12-29 12:22:42 +00:00 |
|
芋道源码
|
8690f2dddd
|
!341 修改注释中的错别字
Merge pull request !341 from 王添翼/master
|
2022-12-29 12:20:56 +00:00 |
|
芋道源码
|
e646386603
|
!326 fix typo in uni-swiper-dot.vue
Merge pull request !326 from Ikko Ashimine/N/A
|
2022-12-29 12:20:27 +00:00 |
|
YunaiV
|
1aee4ad00f
|
【修复】DeptService 的 getDeptsByParentIdFromCache 在获取部门列表时，未处理多租户场景
|
2022-12-29 20:18:59 +08:00 |
|
YunaiV
|
ac3c751132
|
329 修改支付模块>支付过期时间格式化异常（yyyy-MM-ddTHH:mm:ssXXX）
|
2022-12-29 18:56:55 +08:00 |
|