xingyu
|
08a4de37c2
|
Merge remote-tracking branch 'origin/master' into feature/springdoc
# Conflicts:
# README.md
|
2023-01-30 10:08:31 +08:00 |
|
YunaiV
|
ca8bb72417
|
版本 1.7.0 发布：增加微信公众号、站内信、邮箱、数据脱敏！
|
2023-01-30 02:30:42 +08:00 |
|
xingyu
|
ffb0358ce2
|
Merge remote-tracking branch 'origin/master' into feature/springdoc
|
2023-01-29 16:11:51 +08:00 |
|
YunaiV
|
ae3ee95cdd
|
站内信模块：整体功能实现
|
2023-01-28 20:10:19 +08:00 |
|
YunaiV
|
c0b029b244
|
邮箱模块：完善 template 的单元测试
|
2023-01-26 23:32:18 +08:00 |
|
YunaiV
|
0895ee7d98
|
邮箱模块：完善 account 的单元测试
|
2023-01-26 23:04:26 +08:00 |
|
YunaiV
|
179fdc8464
|
优化 xss 的代码实现，独立 xss 包
|
2023-01-25 11:17:52 +08:00 |
|
YunaiV
|
c744e115e3
|
简化本地缓存的实现，萌新更容易看懂！
|
2023-01-25 10:11:16 +08:00 |
|
YunaiV
|
0763c720d2
|
优化脱敏组件的注释
|
2023-01-21 13:17:08 +08:00 |
|
芋道源码
|
e7f8e0c507
|
!372 支持 vo 返回脱敏
Merge pull request !372 from 与或非/issues/I3QPZV
|
2023-01-19 13:59:34 +00:00 |
|
gaibu
|
729ec31dab
|
feat: 修改脱敏注解名称
|
2023-01-19 20:16:03 +08:00 |
|
YunaiV
|
6b1f3140b8
|
spring doc：移除多余字段~
|
2023-01-19 15:22:58 +08:00 |
|
YunaiV
|
d193d2dd4a
|
spring doc：支持通过 springdoc.api-docs 禁用
|
2023-01-19 15:15:40 +08:00 |
|
YunaiV
|
711a39b8e9
|
spring doc：增加模块分组
|
2023-01-19 15:03:46 +08:00 |
|
gaibu
|
2aa208f441
|
feat: 脱敏组件代码规范更新
|
2023-01-19 10:35:54 +08:00 |
|
YunaiV
|
6593ec4214
|
code review 脱敏组件的代码
|
2023-01-19 10:25:43 +08:00 |
|
芋道源码
|
2a332a95f9
|
!376 重构 滑块验证码实现 vue3 自动引入
Merge pull request !376 from xingyu/dev
|
2023-01-19 01:24:20 +00:00 |
|
xingyu
|
ba65a864fa
|
perf: 优化Springdoc配置
|
2023-01-18 17:40:49 +08:00 |
|
xingyu
|
f2adb441cd
|
Merge remote-tracking branch 'origin/master' into feature/springdoc
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java
|
2023-01-18 15:39:58 +08:00 |
|
YunaiV
|
5e9706007e
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/wechat-mp
# Conflicts:
# yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/DefaultDatabaseQueryTest.java
|
2023-01-18 00:38:55 +08:00 |
|
xingyu
|
13afc3d57a
|
feat: springdoc
|
2023-01-17 21:25:06 +08:00 |
|
xingyu
|
0ef05fba7c
|
Merge remote-tracking branch 'origin/dev' into feature/springdoc
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java
|
2023-01-17 21:18:53 +08:00 |
|
xingyu
|
0ebba2eb81
|
移除springfox配置
|
2023-01-17 20:47:07 +08:00 |
|
xingyu
|
3d390d0d8f
|
feat: knife4j
|
2023-01-17 20:42:18 +08:00 |
|
xingyu
|
8c4bc638a4
|
chore: captcha-plus
|
2023-01-17 16:57:10 +08:00 |
|
gaibu
|
42bc0d1519
|
feat: 脱敏组件增加单元测试
|
2023-01-17 11:28:33 +08:00 |
|
gaibu
|
7b3fca2844
|
feat: 脱敏组件代码规范更新
|
2023-01-17 10:52:37 +08:00 |
|
YunaiV
|
32d7d6ab29
|
code review 脱敏组件的代码
|
2023-01-17 08:11:57 +08:00 |
|
xingyu
|
4d35bcef65
|
feat: springdoc success
|
2023-01-16 22:58:56 +08:00 |
|
gaibu
|
e5ab9b71b6
|
feat: 完善注释
|
2023-01-16 21:50:09 +08:00 |
|
gaibu
|
c60f8d6da2
|
feat: 支持 vo 返回的脱敏
|
2023-01-16 21:45:18 +08:00 |
|
xingyu
|
cba69e94df
|
revert: file
|
2023-01-16 15:15:31 +08:00 |
|
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
|
2023-01-16 14:25:03 +08:00 |
|
xingyu
|
b4b23596a5
|
feat: 升级 knife4j 4.0
|
2023-01-16 14:22:39 +08:00 |
|
xingyu
|
55db35e31b
|
chore: update deps
|
2023-01-16 13:43:05 +08:00 |
|
xingyu
|
fffe3008b5
|
refactor: captcha-plus
|
2023-01-16 10:47:39 +08:00 |
|
xingyu
|
aaf62982e2
|
feat: 优化 captcha 代码
|
2023-01-12 21:51:53 +08:00 |
|
xingyu
|
865f101070
|
feat: 将aj-captcha换为源码导入
|
2023-01-12 20:57:11 +08:00 |
|
gaibu
|
61a34ddac5
|
feat: 支持 vo 返回的脱敏
|
2023-01-12 19:57:11 +08:00 |
|
gaibu
|
70f15ab60d
|
feat: 增加注释
|
2023-01-12 15:43:31 +08:00 |
|
gaibu
|
cd9bcda935
|
feat: 支持 vo 返回的脱敏
|
2023-01-12 15:31:44 +08:00 |
|
gaibu
|
5c8e41b847
|
feat: 支持 vo 返回的脱敏
|
2023-01-12 14:54:33 +08:00 |
|
xingyu
|
3df825034b
|
chore: update deps
|
2023-01-12 13:58:32 +08:00 |
|
gaibu
|
099754c26e
|
fix: xss 启用后编辑器上传图片错误
|
2023-01-10 19:27:24 +08:00 |
|
gaibu
|
e637bff8cd
|
feat: 支持 vo 返回的脱敏
|
2023-01-10 15:10:16 +08:00 |
|
gaibu
|
d7bec143fd
|
fix: xss 启用后编辑器上传图片错误
|
2023-01-09 13:23:45 +08:00 |
|
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
|
2023-01-07 18:57:04 +08:00 |
|
xingyu
|
6954150fcb
|
feat: websocket init
|
2023-01-06 17:30:48 +08:00 |
|
xingyu
|
c5f29f18d3
|
Merge remote-tracking branch 'origin/master' into dev
|
2023-01-05 09:41:54 +08:00 |
|
芋道源码
|
4c0275fbf4
|
!348 增加webSocket连接测试以及文件优化
Merge pull request !348 from 咱哥丶/dev
|
2023-01-04 14:30:40 +00:00 |
|
芋道源码
|
661a20dc93
|
!351 升级最新依赖 && 修复树形 全部展开 全部关闭
Merge pull request !351 from xingyu/dev
|
2023-01-04 14:26:01 +00:00 |
|
xingyu
|
d6fdd924e9
|
Merge remote-tracking branch 'origin/dev' into feature/springdoc
|
2023-01-04 10:58:34 +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 |
|
咱哥丶
|
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
|
a7e4ff0d76
|
mp：实现消息推送的处理接口
|
2023-01-02 17:44:37 +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
|
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 |
|
YunaiV
|
ac3c751132
|
329 修改支付模块>支付过期时间格式化异常（yyyy-MM-ddTHH:mm:ssXXX）
|
2022-12-29 18:56:55 +08:00 |
|
YunaiV
|
5a4cc55917
|
【修复】字典类型逻辑删除时，唯一索引冲突的问题
|
2022-12-29 12:52:37 +08:00 |
|
YunaiV
|
3443aa6f5f
|
优化本地缓存的刷新实现，数据变更时，强制刷新
|
2022-12-29 00:09:58 +08:00 |
|
gaibu
|
604266d33c
|
fix: 解决 redis mq 消息丢失问题
|
2022-12-27 22:52:19 +08:00 |
|
芋道源码
|
30a4d7d954
|
!342 同步最新版本的商城进度
Merge pull request !342 from 芋道源码/feature/1.8.0-uniapp
|
2022-12-27 13:39:56 +00:00 |
|
芋道源码
|
373eff605b
|
!329 修改支付模块>支付过期时间格式化异常（yyyy-MM-ddTHH:mm:ssXXX）
Merge pull request !329 from 骑士梦/master
|
2022-12-25 03:39:24 +00:00 |
|
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
|
2022-12-23 19:12:45 +08:00 |
|
YunaiV
|
7a4a6a3046
|
product：优化管理后台相关的接口
area：增加地区列表界面
|
2022-12-23 18:47:59 +08:00 |
|
gaibu
|
0e6b4e463f
|
fix: 解决 redis mq 消息丢失问题
|
2022-12-23 10:33:38 +08:00 |
|
gaibu
|
2d7d3f1511
|
fix: 解决 redis mq 消息丢失问题
|
2022-12-23 10:32:18 +08:00 |
|
gaibu
|
e9645d7054
|
fix: 解决 redis mq 消息丢失问题
|
2022-12-23 10:31:41 +08:00 |
|
gaibu
|
46f3790492
|
fix: 解决 redis mq 消息丢失问题
|
2022-12-23 10:28:59 +08:00 |
|
xingyu
|
683b49a8a4
|
feat: springdoc 开启认证
|
2022-12-22 00:49:23 +08:00 |
|
xingyu
|
cacefb4eea
|
feat: knife4j springdoc
|
2022-12-22 00:25:22 +08:00 |
|
xingyu
|
4f2c08f8db
|
Merge remote-tracking branch 'origin/dev' into feature/springdoc
|
2022-12-21 22:46:52 +08:00 |
|
xingyu
|
6c521fd5e0
|
chore: update deps
|
2022-12-19 22:21:36 +08:00 |
|
xingyu
|
46c93b637f
|
chore: update deps
|
2022-12-19 10:51:36 +08:00 |
|
gaibu
|
a6c92816f0
|
fix: 解决 redis mq 消息丢失问题
|
2022-12-15 15:33:15 +08:00 |
|
gaibu
|
0f31ce7ecf
|
fix: 解决 redis mq 消息丢失问题
|
2022-12-15 14:36:17 +08:00 |
|
gaibu
|
766b74f040
|
fix: SQL 条件表达式缺少括号问题
|
2022-12-14 08:57:52 +08:00 |
|
YunaiV
|
5474ae876d
|
Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp
|
2022-12-13 20:20:04 +08:00 |
|
YunaiV
|
40ce481e2e
|
ip：AreaUtils、IPUtils 优化
|
2022-12-13 20:19:54 +08:00 |
|
qs
|
ec1a933d30
|
修改支付模块>支付过期时间格式化异常（yyyy-MM-ddTHH:mm:ssXXX）
|
2022-12-13 15:41:30 +08:00 |
|
qs
|
24ed7be5c5
|
修改支付模块>解析订单通知V3>属性设置错误
|
2022-12-13 15:21:55 +08:00 |
|
gaibu
|
453603b6ad
|
fix: SQL 条件表达式缺少括号问题
|
2022-12-13 10:37:41 +08:00 |
|
芋道源码
|
f9b4874ee9
|
!320 秒杀活动相关
Merge pull request !320 from halfninety/feature/1.8.0-uniapp
|
2022-12-13 02:04:54 +00:00 |
|
dark
|
0b5aa560b3
|
ip库引入，查询工具类
|
2022-12-11 22:20:43 +08:00 |
|
YunaiV
|
fc48ab4928
|
trade：前端订单管理，联调接口
|
2022-12-10 17:06:34 +08:00 |
|
YunaiV
|
fc49f000ce
|
trade：前端订单管理，联调接口
|
2022-12-10 11:52:11 +08:00 |
|
YunaiV
|
bddbedd781
|
增加城市库
|
2022-12-10 00:17:08 +08:00 |
|
xingyu
|
3937004d5b
|
fix: mysql warn
|
2022-12-09 18:34:34 +08:00 |
|
xingyu4j
|
88ce5e540e
|
refactor: springdoc 替换 springfox
|
2022-12-09 14:24:09 +08:00 |
|
xingyu4j
|
9fc6e0f00b
|
refactor: springdoc 替换 springfox
|
2022-12-09 13:43:15 +08:00 |
|
xingyu4j
|
262ff34160
|
保证统一的版本号
|
2022-12-08 13:58:48 +08:00 |
|
xingyu4j
|
232c325608
|
升级版本，保证统一的版本号
|
2022-12-08 13:52:01 +08:00 |
|
YunaiV
|
7fc9689f07
|
trade：定义管理后台的订单分页接口
|
2022-12-08 00:07:14 +08:00 |
|
xingyu
|
2513bbf02d
|
Merge remote-tracking branch 'origin/master' into dev
|
2022-12-06 20:53:09 +08:00 |
|
YunaiV
|
ffab0b1d6a
|
1. 优化 menu 本地缓存的刷新策略，在修改或删除菜单时，强制刷新缓存
2. 修复 pub/sub 未初始化的问题
3. 优化 Job 定时的 mybatis 日志输出，避免一直打印
|
2022-12-06 20:38:05 +08:00 |
|
xingyu4j
|
4397d47da1
|
升级版本，保证统一的版本号
|
2022-12-06 17:04:43 +08:00 |
|
halfninety
|
abbb076859
|
完成秒杀时段，秒杀活动相关todo
|
2022-12-02 22:33:07 +08:00 |
|