gaibu
|
e5ab9b71b6
|
feat: 完善注释
|
3 years ago |
|
gaibu
|
c60f8d6da2
|
feat: 支持 vo 返回的脱敏
|
3 years ago |
xingyu
|
cba69e94df
|
revert: file
|
3 years ago |
|
xingyu
|
1c0d8fc1eb
|
Merge remote-tracking branch 'origin/dev' into feature/springdoc
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-framework/yudao-spring-boot-starter-web/pom.xml
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSwaggerAutoConfiguration.java
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/core/SpringFoxHandlerProviderBeanPostProcessor.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java
|
3 years ago |
|
xingyu
|
b4b23596a5
|
feat: 升级 knife4j 4.0
|
3 years ago |
|
xingyu
|
55db35e31b
|
chore: update deps
|
3 years ago |
|
xingyu
|
fffe3008b5
|
refactor: captcha-plus
|
3 years ago |
|
xingyu
|
aaf62982e2
|
feat: 优化 captcha 代码
|
3 years ago |
|
xingyu
|
865f101070
|
feat: 将aj-captcha换为源码导入
|
3 years ago |
|
gaibu
|
61a34ddac5
|
feat: 支持 vo 返回的脱敏
|
3 years ago |
|
gaibu
|
70f15ab60d
|
feat: 增加注释
|
3 years ago |
|
gaibu
|
cd9bcda935
|
feat: 支持 vo 返回的脱敏
|
3 years ago |
|
gaibu
|
5c8e41b847
|
feat: 支持 vo 返回的脱敏
|
3 years ago |
|
xingyu
|
3df825034b
|
chore: update deps
|
3 years ago |
|
gaibu
|
099754c26e
|
fix: xss 启用后编辑器上传图片错误
|
3 years ago |
|
gaibu
|
e637bff8cd
|
feat: 支持 vo 返回的脱敏
|
3 years ago |
|
gaibu
|
d7bec143fd
|
fix: xss 启用后编辑器上传图片错误
|
3 years ago |
YunaiV
|
b9246d1543
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/wechat-mp
# Conflicts:
# yudao-server/src/main/resources/application.yaml
|
3 years ago |
|
xingyu
|
6954150fcb
|
feat: websocket init
|
3 years ago |
|
xingyu
|
c5f29f18d3
|
Merge remote-tracking branch 'origin/master' into dev
|
3 years ago |
|
芋道源码
|
4c0275fbf4
|
!348 增加webSocket连接测试以及文件优化
Merge pull request !348 from 咱哥丶/dev
|
3 years ago |
|
芋道源码
|
661a20dc93
|
!351 升级最新依赖 && 修复树形 全部展开 全部关闭
Merge pull request !351 from xingyu/dev
|
3 years ago |
|
xingyu
|
d6fdd924e9
|
Merge remote-tracking branch 'origin/dev' into feature/springdoc
|
3 years ago |
|
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
|
3 years ago |
|
xingyu
|
c98965cd55
|
chore: update spring boot 2.7.7
hutool 5.8.11
mybaits-plus 3.5.3
flowable 6.8.0
|
3 years ago |
咱哥丶
|
2d1ff0aff7
|
commit 增加webSocket
|
3 years ago |
|
gaibu
|
2fea3a8e83
|
fix: 腾讯 COS 异常，Region 必传
|
3 years ago |
|
YunaiV
|
a7e4ff0d76
|
mp：实现消息推送的处理接口
|
3 years ago |
|
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
|
3 years ago |
|
YunaiV
|
a83b8e8fbc
|
修复报错的单元测试
|
3 years ago |
|
芋道源码
|
f469c5caaf
|
!332 redis mq消息丢失问题
Merge pull request !332 from 与或非/issues/I5RFO2
|
3 years ago |
|
YunaiV
|
ac3c751132
|
329 修改`支付模块>支付过期时间格式化异常（yyyy-MM-ddTHH:mm:ssXXX）`
|
3 years ago |
|
YunaiV
|
5a4cc55917
|
【修复】字典类型逻辑删除时，唯一索引冲突的问题
|
3 years ago |
|
YunaiV
|
3443aa6f5f
|
优化本地缓存的刷新实现，数据变更时，强制刷新
|
3 years ago |
|
gaibu
|
604266d33c
|
fix: 解决 redis mq 消息丢失问题
|
3 years ago |
|
芋道源码
|
30a4d7d954
|
!342 同步最新版本的商城进度
Merge pull request !342 from 芋道源码/feature/1.8.0-uniapp
|
3 years ago |
|
芋道源码
|
373eff605b
|
!329 修改`支付模块>支付过期时间格式化异常（yyyy-MM-ddTHH:mm:ssXXX）`
Merge pull request !329 from 骑士梦/master
|
3 years ago |
|
YunaiV
|
92632c046c
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceImpl.java
# yudao-ui-admin/src/views/mall/trade/order/index.vue
|
3 years ago |
|
YunaiV
|
7a4a6a3046
|
product：优化管理后台相关的接口
area：增加地区列表界面
|
3 years ago |
|
gaibu
|
0e6b4e463f
|
fix: 解决 redis mq 消息丢失问题
|
3 years ago |
|
gaibu
|
2d7d3f1511
|
fix: 解决 redis mq 消息丢失问题
|
3 years ago |
|
gaibu
|
e9645d7054
|
fix: 解决 redis mq 消息丢失问题
|
3 years ago |
|
gaibu
|
46f3790492
|
fix: 解决 redis mq 消息丢失问题
|
3 years ago |
|
xingyu
|
683b49a8a4
|
feat: springdoc 开启认证
|
3 years ago |
|
xingyu
|
cacefb4eea
|
feat: knife4j springdoc
|
3 years ago |
|
xingyu
|
4f2c08f8db
|
Merge remote-tracking branch 'origin/dev' into feature/springdoc
|
3 years ago |
|
xingyu
|
6c521fd5e0
|
chore: update deps
|
3 years ago |
|
xingyu
|
46c93b637f
|
chore: update deps
|
3 years ago |
|
gaibu
|
a6c92816f0
|
fix: 解决 redis mq 消息丢失问题
|
3 years ago |
|
gaibu
|
0f31ce7ecf
|
fix: 解决 redis mq 消息丢失问题
|
3 years ago |
|
gaibu
|
766b74f040
|
fix: SQL 条件表达式缺少括号问题
|
3 years ago |
|
YunaiV
|
5474ae876d
|
Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp
|
3 years ago |
|
YunaiV
|
40ce481e2e
|
ip：AreaUtils、IPUtils 优化
|
3 years ago |
qs
|
ec1a933d30
|
修改`支付模块>支付过期时间格式化异常（yyyy-MM-ddTHH:mm:ssXXX）`
|
3 years ago |
|
qs
|
24ed7be5c5
|
修改`支付模块>解析订单通知V3>属性设置错误`
|
3 years ago |
|
gaibu
|
453603b6ad
|
fix: SQL 条件表达式缺少括号问题
|
3 years ago |
|
芋道源码
|
f9b4874ee9
|
!320 秒杀活动相关
Merge pull request !320 from halfninety/feature/1.8.0-uniapp
|
3 years ago |
dark
|
0b5aa560b3
|
ip库引入，查询工具类
|
3 years ago |
|
YunaiV
|
fc48ab4928
|
trade：前端订单管理，联调接口
|
3 years ago |
|
YunaiV
|
fc49f000ce
|
trade：前端订单管理，联调接口
|
3 years ago |
|
YunaiV
|
bddbedd781
|
增加城市库
|
3 years ago |
|
xingyu
|
3937004d5b
|
fix: mysql warn
|
3 years ago |
|
xingyu4j
|
88ce5e540e
|
refactor: springdoc 替换 springfox
|
3 years ago |
|
xingyu4j
|
9fc6e0f00b
|
refactor: springdoc 替换 springfox
|
3 years ago |
|
xingyu4j
|
262ff34160
|
保证统一的版本号
|
3 years ago |
|
xingyu4j
|
232c325608
|
升级版本，保证统一的版本号
|
3 years ago |
|
YunaiV
|
7fc9689f07
|
trade：定义管理后台的订单分页接口
|
3 years ago |
|
xingyu
|
2513bbf02d
|
Merge remote-tracking branch 'origin/master' into dev
|
3 years ago |
|
YunaiV
|
ffab0b1d6a
|
1. 优化 menu 本地缓存的刷新策略，在修改或删除菜单时，强制刷新缓存
2. 修复 pub/sub 未初始化的问题
3. 优化 Job 定时的 mybatis 日志输出，避免一直打印
|
3 years ago |
|
xingyu4j
|
4397d47da1
|
升级版本，保证统一的版本号
|
3 years ago |
halfninety
|
abbb076859
|
完成秒杀时段，秒杀活动相关todo
|
3 years ago |
|
xingyu4j
|
fea1ad8f8d
|
升级最新依赖
|
3 years ago |
|
xingyu4j
|
9d3bbdd8c4
|
v 1.6.5
|
3 years ago |
|
YunaiV
|
650133dda4
|
增加 NumberSerializer 注释
|
3 years ago |
|
xingyu4j
|
1b3ff0e7d1
|
fix: WebSecurityConfigurerAdapter 过期
|
3 years ago |
|
xingyu4j
|
2c8e2209e8
|
feat: 增加全局超长number序列化
|
3 years ago |
|
xingyu4j
|
a43b884c73
|
fix: warn
|
3 years ago |
|
xingyu
|
0a8a41dea1
|
chore: update tencentcloud version
|
3 years ago |
|
xingyu
|
283aae1da2
|
feat: 适配springboot 2.7 configuration ==> AutoConfiguration
|
3 years ago |
|
xingyu
|
1aa05e0198
|
feat: 适配 springboot 2.7
|
3 years ago |
|
xingyu
|
b079513dc8
|
chore: 升级springboot 2.7.6
|
3 years ago |
|
halfninety
|
d6b426970b
|
序列化配置修改名称
|
3 years ago |
|
halfninety
|
cd62c4d220
|
秒杀时段相关
|
3 years ago |
|
芋道源码
|
44249e43dd
|
!313 修复上传七牛云无mime type问题
Merge pull request !313 from 石溪/master
|
3 years ago |
|
YunaiV
|
66abe4a84b
|
trade：完成交易订单的发货逻辑
|
3 years ago |
石溪
|
7f9fc41555
|
修复上传七牛云无mime type问题
|
3 years ago |
|
YunaiV
|
07f1681b50
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
|
3 years ago |
|
xingyu
|
693288d33d
|
Merge remote-tracking branch 'origin/master' into feature/vue3
# Conflicts:
# yudao-dependencies/pom.xml
|
3 years ago |
|
YunaiV
|
2d78b02086
|
移除云片短信渠道，解决云片的安全风险
|
3 years ago |
|
YunaiV
|
ea95115ffd
|
移除云片短信渠道，解决云片的安全风险
|
3 years ago |
|
YunaiV
|
1cd9085c59
|
pay: PayNotifyJob 增加多租户的支持
|
3 years ago |
|
xingyu
|
0d0f64e30a
|
feat: 删除过期方法
|
3 years ago |
|
YunaiV
|
8798944069
|
优化 pay 支付成功后的回调逻辑
|
3 years ago |
|
YunaiV
|
73d847ae2e
|
调整支付模块的回调地址
|
3 years ago |
|
YunaiV
|
35528e8267
|
trade：【交易售后】查询分页列表
|
3 years ago |
zy
|
9b667448ea
|
fix: 加入异步注解配置后redis消费者不能正常消费
|
3 years ago |
|
YunaiV
|
969b9c3458
|
修复 swagger 404 的问题
|
3 years ago |
|
YunaiV
|
38f67d4130
|
将 mall 使用到 Date 的部分，迁移到 LocalDateTime 中
|
3 years ago |
|
YunaiV
|
12d045ea58
|
修复部分单元测试报错的问题
|
3 years ago |
|
YunaiV
|
89580e7903
|
合并 master 代码
|
3 years ago |