747 Commits (cc71aabd3d6de1e37d2c1fe8a4f03e17c424cd32)

Author SHA1 Message Date
芋道源码 aa16b8279f
!446 配合周建进行测试所提bug的后端修改
Merge pull request !446 from clockdotnet/master_pr
3 years ago
zhangxingjia bc6eaea2b4 fix xss请求Wrapper getAttribute方法 问题修复 3 years ago
shizhong 2b1e5f1a3a 解决登录时输入无效租户名称登录失败提示不友好问题,还原修改 3 years ago
YunaiV 09afdaafcf !24 【轻量级 PR】:PasswordEncoder 加密复杂度自定义 3 years ago
YunaiV b9ba17a477 !31 IP查询导致异常问题 3 years ago
芋道源码 bb0110656b
!440 test: job 租户单元测试
Merge pull request !440 from 与或非/test/tenant-job
3 years ago
冰是睡着的水 fbbd3bc66c
优化大陆手机号验证。以19013896321为例,原来的正则匹配结果为false。
Signed-off-by: 冰是睡着的水 <850083043@qq.com>
3 years ago
shizhong 8d2c33e9b0 解决字符串型字段等值查询条件前端传空字符串不能正常忽略问题 3 years ago
shizhong 37fcc5cbe7 解决登录时输入无效租户名称登录失败提示不友好问题 3 years ago
gaibu 348a0ff02a test: 修复 code view 存在的问题 3 years ago
gaibu b54c5eaa45 test: job 租户单元测试 3 years ago
YunaiV 467170d3de Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 3 years ago
wangzhs f9569f910f 切换 Mybatis-plus-join 依赖 3 years ago
wangzhs 95159b0257 调整Mybaits Plus Join的SQL注入器到YudaoMybatisAutoConfiguration 3 years ago
wangzhs 7e0fb6cb56 调整Mybaits Plus Join的SQL注入器到YudaoMybatisAutoConfiguration 3 years ago
YunaiV ef510f9478 增加 mybatis plus join 集成的修改建议 3 years ago
wangzhs 670f67e551 新增 mybatis-plus-join 3 years ago
Xuing eed3d8b18d
修复ContextHolder的NPE异常 3 years ago
芋道源码 a31887568a
!422 feat: 修改错误注释
Merge pull request !422 from 与或非/feat/20230224
3 years ago
zhangxingjia 911040492e fix: 去掉Swagger自动配置类中的冗余配置 3 years ago
gaibu 2083fb7846 test: 修改 code review 3 years ago
gaibu e5957f9133 test: 字典数据模块单元测试 3 years ago
gaibu 5d6e2725a8 feat: 修改错误注释 3 years ago
芋道源码 c419c1e107
!417 支付收银台,接入支付宝的 PC、Wap、二维码、条码、App 等支付方式
Merge pull request !417 from 芋道源码/feature/dev-yunai
3 years ago
YunaiV 14893c4cff pay: 优化回调的逻辑 3 years ago
YunaiV 4390e28eea pay: 新增支付宝 App 支付的接入 3 years ago
YunaiV 2093c3bdb5 pay: 重构支付客户端,移除 PayCommonResult 累 3 years ago
YunaiV 8e1be01451 pay: 增加支付宝的条形码支付的配置 3 years ago
YunaiV 379aeeae16 pay: 接入支付宝 App 支付 3 years ago
YunaiV e6f414b918 pay: 接入支付宝 Wap 支付 3 years ago
YunaiV ce8571e313 pay: 接入支付宝 PC 支付的表单 3 years ago
YunaiV b34801f303 pay: 接入支付宝 PC 支付的跳转模式 3 years ago
YunaiV df702e8d24 pay: 临时性的提交,准备 client 部分的重构 3 years ago
筱龙缘 edc52d5f4f
修复 Redis Pub/Sub 广播消费的容器 默认未启动的问题
默认配置没有启动Redis Pub/Sub 广播消费的容器 导致发出消息后 消费者收不到消息

Signed-off-by: 筱龙缘 <794334212@qq.com>
3 years ago
YunaiV fb45a70bce 集成 Go-View 大屏设计器 3 years ago
YunaiV 1b6124a0db 集成 Go-View 大屏设计器 3 years ago
yuanhang c3836ca98b 解决操作日志记录报错的问题
javax.validation.ConstraintViolationException: createOperateLog.arg0.name: 操作名
3 years ago
YunaiV 53767614fe 增加商城的提示 3 years ago
YunaiV c3eb9022b8 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/springdoc
# Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
#	yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/clean.sql
#	yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/create_tables.sql
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
#	yudao-server/pom.xml
3 years ago
YunaiV 837345ed95 system:将 api 的方法名的负数都换成 List 3 years ago
YunaiV 3d3c88dd4f 完善 AdminUserServiceImpl 单元测试 3 years ago
YunaiV 7731b4f503 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/dev-yunai 3 years ago
YunaiV 987fcd366c 完善 LoginLogServiceImplTest 单元测试 3 years ago
YunaiV fed9feb05f 完善 DictTypeServiceImpl 单元测试 3 years ago
xingyu 08a4de37c2 Merge remote-tracking branch 'origin/master' into feature/springdoc
# Conflicts:
#	README.md
3 years ago
YunaiV ca8bb72417 版本 1.7.0 发布:增加微信公众号、站内信、邮箱、数据脱敏! 3 years ago
xingyu ffb0358ce2 Merge remote-tracking branch 'origin/master' into feature/springdoc 3 years ago
YunaiV ae3ee95cdd 站内信模块:整体功能实现 3 years ago
YunaiV c0b029b244 邮箱模块:完善 template 的单元测试 3 years ago
YunaiV 0895ee7d98 邮箱模块:完善 account 的单元测试 3 years ago
YunaiV 179fdc8464 优化 xss 的代码实现,独立 xss 包 3 years ago
YunaiV c744e115e3 简化本地缓存的实现,萌新更容易看懂! 3 years ago
YunaiV 0763c720d2 优化脱敏组件的注释 3 years ago
芋道源码 e7f8e0c507
!372 支持 vo 返回脱敏
Merge pull request !372 from 与或非/issues/I3QPZV
3 years ago
gaibu 729ec31dab feat: 修改脱敏注解名称 3 years ago
YunaiV 6b1f3140b8 spring doc:移除多余字段~ 3 years ago
YunaiV d193d2dd4a spring doc:支持通过 springdoc.api-docs 禁用 3 years ago
YunaiV 711a39b8e9 spring doc:增加模块分组 3 years ago
gaibu 2aa208f441 feat: 脱敏组件代码规范更新 3 years ago
YunaiV 6593ec4214 code review 脱敏组件的代码 3 years ago
芋道源码 2a332a95f9
!376 重构 滑块验证码实现 vue3 自动引入
Merge pull request !376 from xingyu/dev
3 years ago
xingyu ba65a864fa perf: 优化Springdoc配置 3 years ago
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
3 years ago
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
3 years ago
xingyu 13afc3d57a feat: springdoc 3 years ago
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
3 years ago
xingyu 0ebba2eb81 移除springfox配置 3 years ago
xingyu 3d390d0d8f feat: knife4j 3 years ago
xingyu 8c4bc638a4 chore: captcha-plus 3 years ago
gaibu 42bc0d1519 feat: 脱敏组件增加单元测试 3 years ago
gaibu 7b3fca2844 feat: 脱敏组件代码规范更新 3 years ago
YunaiV 32d7d6ab29 code review 脱敏组件的代码 3 years ago
xingyu 4d35bcef65 feat: springdoc success 3 years ago
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
YunaiV afc76973ce Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponBaseVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExcelVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExportReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponPageReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponRespVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteBaseVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExcelVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExportReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempletePageReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteRespVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/CouponTemplete/CouponTempleteDO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/coupon/CouponDO.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/admin/spu/vo/ProductSpuRespVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/discount/DiscountProductDO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/reward/RewardActivityDO.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/dal/dataobject/cart/TradeCartItemDO.java
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/UserInfoDTO.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
#	yudao-server/pom.xml
#	yudao-server/src/main/resources/application-local.yaml
#	yudao-server/src/main/resources/application.yaml
#	yudao-ui-admin/src/views/mall/CouponTemplete/index.vue
#	yudao-ui-admin/src/views/mall/product/property/index.vue
#	yudao-ui-admin/src/views/mall/product/spu/index.vue
#	yudao-ui-admin/src/views/mall/product/spu/save.vue
#	yudao-ui-admin/src/views/system/role/index.vue
3 years ago
YunaiV 0e903df380 调整 YudaoDataPermissionAutoConfiguration 的自动配置 3 years ago
YunaiV 1819e0e1d6 异步化 Redis MQ 的初始化,提升启动速度 3 years ago
YunaiV c5b547e0f3 优化,使用 @Configuration(proxyBeanMethods = false) 提升启动速度 3 years ago
YunaiV f5ef87094d 优化,使用 @Configuration(proxyBeanMethods = false) 提升启动速度 3 years ago
YunaiV ff1379d454 优化 README 说明~ 3 years ago
YunaiV c9f6494bb4 【优化】修改短信模板的渠道为云片时,校验 API 模板编号为整数 3 years ago
芋道源码 ae0227c107
!276 阿里云OSS解析region时兼容带https的配置
Merge pull request !276 from huangyemin/master
3 years ago
YunaiV a8cdf74120 【移除】Apollo 配置中心,简化学习成本 3 years ago
YunaiV ce3aefadd7 移除 jasypt-spring-boot-starter 依赖,使用 hutool AES 替代 3 years ago
芋道源码 fb237423b8
!294 修复单元测试报错
Merge pull request !294 from 芋道源码/dev
3 years ago
YunaiV a539bc211d 1. 修复 MemberAuthServiceTest 单元测试
2. 修复 DataPermissionDatabaseInterceptorTest 单元测试
3 years ago
YunaiV 40ba456fde 1. 修复 MenuServiceTest 单元测试 3 years ago
芋道源码 e51dda6b68
!281 fix WXLitePayClient.java 中copy应忽略的字段
Merge pull request !281 from chenlei65368/N/A
3 years ago
YunaiV d3b6a0ca69 1. 修复 refund/index.vue 的报错
2. 优化 DateUtils 的工具类的方法命名
3 years ago
xingyu4j 9c033d0104 DateUtils ==> LocalDateTime 3 years ago
xingyu4j cb006ddf2b DateUtils.buildLocalDateTime ==> LocalDateTime.of 3 years ago
xingyu4j 632a132a6a refactor: Date ==> LocalDateTime 3 years ago
YunaiV edc5d0f1d0 promotion:增加获得优惠劵匹配结果的列表 3 years ago
YunaiV 3c10058dbd promotion:实现部分优惠劵模板的前端逻辑 3 years ago
chenlei65368 bb8204b5a7
fix WXLitePayClient.java 中copy应忽略的字段
小程序支付,copy应忽略 "privateKeyContent","privateCertContent",而不是“KeyContent”

Signed-off-by: chenlei65368 <chenlei65368@sohu.com>
3 years ago
YunaiV 2bd2cb56a1 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
 Conflicts:
	yudao-module-mall/yudao-module-trade-biz/pom.xml
3 years ago
huangyemin 93135363c6 阿里云OSS解析region时兼容带https的配置 3 years ago
xingyu 72ee1206e6 Merge remote-tracking branch 'origin/master' into dev 4 years ago
xingyu 1aca24b636 feat: 升级依赖 4 years ago
YunaiV 034de50999 完善多租户的注释与代码 4 years ago
YunaiV b73cdd15b5 同步 Master 最新代码 4 years ago