702 Commits (b287fdb9f2a78e10011b511e1e90f86e8c3c2e8d)

Author SHA1 Message Date
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
YunaiV 25e7c8dceb 同步 Master 最新代码 4 years ago
YunaiV 1be09d092b ♻️优化“通过注解增加多租户缓存”的代码 4 years ago
芋道源码 597a923828
!257 通过注解增加多租户缓存
Merge pull request !257 from CrazyAirhead/master
4 years ago
xingyu 9054a772b0 feat: 升级依赖 4 years ago
YunaiV 38e88b02f5 🐛修复数据权限,不支持隐式内连接的问题 4 years ago
airhead 6b429584bf fix(tenant): 租户缓存增加注释 4 years ago
airhead 0e1babd7f4 feat(redis): 注解支持多租户缓存
1.增加多租户Cache
2.修复Mac M1启动报错
4 years ago
芋道源码 61b0624a59
!262 接口实现-交易订单创建(未完全实现)
Merge pull request !262 from LeeYan9/ly_uniapp
4 years ago
YunaiV 833fd33844 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
 Conflicts:
	sql/optional/mall/mall.sql
4 years ago
YunaiV 9715087b54 管理后台的 uniapp 验证码,增加开关 4 years ago
YunaiV a484cd5193 优化图片验证码的后端实现 4 years ago
YunaiV 926c75d29a 优化图片验证码的后端实现 4 years ago
ex_yang.li@ca-nio.com 19a703b8c9 创建订单接口定义 4 years ago
luowenfeng 0bc2ef1d39 feature(uniapp商品): 商品业务代码调整 4 years ago
xingyu e5bd517829 perf: final方法改为大写命名 4 years ago
xingyu e1b8ae09c9 增加手机号正则验证 4 years ago
xingyu4j 40f730033f 压缩图片尺寸 4 years ago
YunaiV cfde3dcacb mall:优化订单表的设计 4 years ago
xingyu 2bf09cbfc2 升级部分依赖,存在高危漏洞报错问题 4 years ago
xingyu a8ea50a059 update hutool 5.8.5 4 years ago
xingyu 4a92081937 vue2 新增行为验证码 4 years ago
YunaiV 2866b58741 1. 默认不开启 bpm 工作流模块,按需启动,提升启动速度
2. 完整移除 activiti 遗留的东东
4 years ago
YunaiV 39ac59efee 默认禁用报表模块, 4 years ago
xgd 8c5681f4f9 [新增]接入支付宝【PC网站支付】 4 years ago
芋道源码 35413b52c9
!237 集成积木报表
Merge pull request !237 from 芋道源码/feature/visual
4 years ago
YunaiV e5a7b8474f fix:短信验证码的每日发送条数不正确 4 years ago
xingyu 88fc7ed39b 删除未引用 4 years ago
YunaiV d872676748 完善积木报表的集成 4 years ago
YunaiV 62dc600c51 reactor:完善多租户的配置类 4 years ago
YunaiV 26a094a710 refactor:优化时间范围查询 4 years ago
xingyu 611e11ae23 增加区间查询字段判断 4 years ago
xingyu b4ee434289 fix: #I5II34 hutool error 4 years ago
xingyu 9bdae339cc update: hutool 5.6.1 ==> 5.7.22 4 years ago
xingyu 14594e492e update: springboot 2.6.8 ==> 2.6.9 4 years ago
xingyu c7a64fc8b4 时间区间查询 betweenIfPresent 支持传入数组 4 years ago
xingyu bc233df980 feat: 添加 vue3 时间区间查询 4 years ago
YunaiV b0cdfd7afc 完善工作流的注释 4 years ago
xingyu 0ed44f29c8 fix: flowable basic ==》 process 4 years ago
YunaiV c92cc26171 增加文档、视频教程的地址 4 years ago
YunaiV 33a31cfb0f 优化文件的 type 识别与存储 4 years ago
jiangqiang 2621f2195d 优化代码 4 years ago
jiangqiang a5d16c11e8 优化获取mimetype方式,优化生成path方式 4 years ago
YunaiV ed097e5ead 基于 tika 识别文件类型 4 years ago
YunaiV fceec9fadc 合并 master 分支 4 years ago
YunaiV 9270924597 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm-back
 Conflicts:
	README.md
	yudao-framework/pom.xml
	yudao-framework/yudao-spring-boot-starter-biz-error-code/pom.xml
	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSwaggerAutoConfiguration.java
	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/security/config/SecurityConfiguration.java
4 years ago
YunaiV 26ff753701 暂时去除回退功能,边界处理不够正确 4 years ago
YunaiV d9c2da7c91 1. 【新增】接口支持通过 `@PermitAll` 注解,允许匿名(未登录)进行访问
2. 【新增】`yudao.security.permit-all-urls` 配置项,允许匿名(未登录)进行访问
4 years ago
YunaiV b69b74b770 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
 Conflicts:
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java
4 years ago
YunaiV f0095a2c31 完善 YudaoSwaggerAutoConfiguration 注释 4 years ago
芋道源码 569242d834
!198 修正文字说明
Merge pull request !198 from 枫叶/master
4 years ago
芋道源码 df868109c1
!200 修复导出 Excel 时,报结果码不能为空的错误
Merge pull request !200 from 李树桐/result_code_pr
4 years ago
YunaiV 4dfa816a5a 【新增】集成 Prometheus 监控点 4 years ago
YunaiV cca8375a97 【新增】`yudao.error-code.enable` 错误码的开关,默认在 `local` 环境关闭自动生成错误码 4 years ago
YunaiV 9040b1734c 【新增】`yudao.access-log.enable` 访问日志的开关,默认在 `local` 环境关闭记录访问日志 4 years ago
fengdan 93dfee8e30 build(依赖更换): weixin-java-mp ---> wx-java-mp-spring-boot-starter 4 years ago
lst 892fa63ac3 提交resultCode pr 4 years ago
YunaiV 69a3a835a5 新增 `yudao-spring-boot-starter-banner` 组件,用于项目启动时打印开发文档、接口文档等 4 years ago
YunaiV e5f343a3e9 【重构】新增 `yudao-spring-boot-starter-biz-error-code` 错误码组件 4 years ago
YunaiV 7a86a61079 【重构】新增 `yudao-spring-boot-starter-biz-error-code` 错误码组件 4 years ago
YunaiV 992e20530d 基于 Guava 实现 tenant 租户数据的本地缓存 4 years ago
YunaiV d3200910db 基于 Guava 实现 dict 字典数据的本地缓存 4 years ago
YunaiV d1271f8bff 统一 TenantApi 的封装,与 yudao-cloud~ 4 years ago
leoxxx 6652883aee doc修改 4 years ago
leoxxx 9309ef2fdc Merge remote-tracking branch 'upstream/master' 4 years ago
YunaiV 58e4f11cca 移除 yudao-spring-boot-starter-extension 4 years ago
YunaiV 3276ad0074 优化 yudao-spring-boot-starter-web 的 API 日志封装,和 yudao-cloud 保持一致 4 years ago
YunaiV e68d4f54f7 优化 yudao-spring-boot-starter-biz-operatelog 的封装,和 yudao-cloud 保持一致 4 years ago
leoxxx 0913b82a4c 修正说明文字 4 years ago
YunaiV b1aa9f484f 增加 SecurityProperties 和 WebProperties 默认值,简化配置 4 years ago
YunaiV 61c80ad97b 统一 "tenant-id" 的枚举 4 years ago
YunaiV a1a01cd117 fix swagger 的基础扫描路径不正确 4 years ago
YunaiV 47753467ee 将 yudao-module-system-api 模块的 auth 包,重构成 oauth2 包 4 years ago
YunaiV 6fd14b30c2 1. 升级 spring boot 到 2.6.8
2. 修复 Spring Fox 在 2.6.X 版本的兼容性
4 years ago
YunaiV b9f1eacf5c Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 4 years ago
xiaxiaoYY 247d299cca Banner模块 for review 4 years ago
YunaiV 156a591070 code review 支付的提交,补充相关的注释 4 years ago
YunaiV 17483e8b36 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.6.2-pay 4 years ago
YunaiV e1c08c4661 新增 member/auth/weixin-mini-app-login 接口,实现小程序的手机登录 4 years ago
YunaiV 1b7093f5c1 用户 app 的社交登录接口,合并到手机号 + 密码,手机号 + 验证码的 login 接口中,统一维护。 4 years ago
芋道源码 87a45795a4
Merge pull request #151 from longtai-cn/fix_20220522_docs
修复注释错别字
4 years ago
YunaiV 692daf900b 优化 BpmParallelMultiInstanceBehavior 逻辑,实现会签、或签的任务分配 4 years ago
YunaiV 4657dcf91a 彻底移除 activiti 组件,专注 flowable 工作流 4 years ago
YunaiV 741dda8d75 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm-back 4 years ago
YunaiV 495f121463 完善 OAuth2OpenControllerTest 单元测试 4 years ago
YunaiV 65d2dffe1a 完善 OAuth2ApproveServiceImplTest 单元测试 4 years ago
YunaiV ed847ac2ee Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro into feature/1.6.2 4 years ago
chen.ma ed97284c0f 修复注释错别字 4 years ago
YunaiV e81ac9c1d0 增加 MyBatis Plus 的字段加密时,查询的示例 4 years ago
YunaiV 0ae9af0492 增加 MyBatis Plus 的 EncryptTypeHandler 类型处理器,实现字段的加密解密 4 years ago
YunaiV c7a2916748 完成 system_oauth2_approve 相关的批准逻辑 4 years ago
YunaiV feff5aba07 增加 oauth2 的 scope 的校验方法,与使用示例 4 years ago
YunaiV 99ba7ccee8 完成 oauth2 code 授权码模式的实现 4 years ago
YunaiV 6ca88277d8 完成 oauth2 implicit 简化模式的实现 4 years ago
YunaiV aa8fb4acf0 搭建 oauth/authorize 的初步逻辑 4 years ago
YunaiV 67afd82150 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.6.2 4 years ago
芋道源码 190150d1f4
!166 用户 Token 采用 OAuth2 的 Access Token + Refresh Token,提升安全性
Merge pull request !166 from 芋道源码/feature/1.6.2
4 years ago
YunaiV 5794780c4e 调整 SecurityPermissionFrameworkService 的实现,完善 PermissionServiceTest 的单元测试 4 years ago
YunaiV 97db4586a8 完成 OAuth2 的客户端模块 4 years ago
baihongbin 9d5d192175
fix:使用一键改包之后,可能导致的自定义lock4j失败策略bean与lock4j提供的默认失败策略bean冲突问题
解决方法:
使用@AutoConfigureBefore注解,指定自定义bean在LockAutoConfiguration之前进行加载,使得LockAutoConfiguration中的失败策略bean上的@ConditionalOnMissingBean注解生效
4 years ago
kemengkai d43006dce8 增加初步驳回功能
dom4j增加失败
4 years ago
YunaiV 5cf68961e1 1. 修改在线会话的实现
2. 接入到会员管理 OAuth2.0
4 years ago
YunaiV 5ea9cc3cd7 实现管理后台登出时,删除 oauth 令牌 4 years ago
YunaiV 4f52d1367b 实现管理后台登录时,使用 OAuth2 的 access token 4 years ago
YunaiV 5e8648508e 去除 Spring Security 的 Member 的 loadUsername,使用自己定义的 login0 实现 4 years ago
YunaiV 3bd7e8e682 去除 Spring Security 的 Admin 的 loadUsername,使用自己定义的 login0 实现 4 years ago
YunaiV 3351ebbbb4 去除 Spring Security 的 logout handler,使用自己定义的 logout 接口 4 years ago
YunaiV baadb5a937 简化 mock login 模拟登录的实现,由 TokenAuthenticationFilter 直接实现 4 years ago
YunaiV 73bf0b6f4f 去除 LoginUser 的 updateTime、username、password、status 字段,简化 4 years ago
YunaiV 8737674d74 去除 LoginUser 的 roleIds、deptId 字段,简化 4 years ago
YunaiV d8a242629b Merge branch 'feature/1.6.2' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.6.2 4 years ago
emaisi 12ede349fa
ftp的在操作之前添加一个判断超时的重试。 4 years ago
emaisi b5f97f69d3 注释标点符号和汉字空格 4 years ago
emaisi bddd193185 调整注释 4 years ago
emaisi 472da026de 调整注释 4 years ago
emaisi 735228fcb1 修复ftp上传和下载的 4 years ago
芋道源码 4b90792bf1
!155 增加手机验证码登录
Merge pull request !155 from 酱包/feature/1.6.2-smsLogin
4 years ago
YunaiV 9848a95eb0 【升级】mysql-connector-java from 5.1.46 to 8.0.28 :提升 MySQL 客户端的性能 4 years ago
YunaiV 7753bd4c44 1. code review 后台的短信验证码登陆
2. 解决 SQL Server LIMIT 1 存在报错的问题
4 years ago
YunaiV 60f918da84 增加 SQLServer 的适配~ 4 years ago
YunaiV 8606f5c605 优化 UserSession 的实现,将 id 变成自增,额外增加 token 字段 4 years ago
YunaiV 6f18adb54a 适配 Oracle 数据库
1. 修复配置中心的 DAO 查询报错
2. 适配 LIMIT 1 的查询
4 years ago
YunaiV 7db1a58bfc 适配 Oracle 数据库
1. 去除关键字,避免数据库的查询冲突
4 years ago
YunaiV 1bd86d6ffd 适配 Oracle 数据库
1. 解决 Menu 的 permission 为空,导致缓存初始化报错
2. 多租户拦截时,过滤掉 DUAL 表,避免 TENANT_ID 字段不存在的报错
3. BaseDO 增加 creator、updator 字段的 jdbcType,避免解析 null 值报错
4 years ago
YunaiV 30e886be6f 解决 PostgreSQL 集成 Quartz 时的报错 4 years ago
zwy a30e3c655a 📝
添加微信支付回调注解
4 years ago
YunaiV 98c317f0e0 封装 IdTypeEnvironmentPostProcessor 组件,自动适配 id-type 策略,用于 Oracle、PostgreSQL 的自动适配 4 years ago
YunaiV b34e2691f8 支持主流数据库的代码生成 4 years ago
zwy a9acbca787 🐛
【微信支付回调】:
WXLitePayClient.java:   添加 v2和 v3的回调数据处理
WXNativePayClient.java: 添加 v2和 v3的回调数据处理
WXPubPayClient.java:    添加 v2和 v3的回调数据处理
4 years ago
zwy 7b17e3bc2f Merge branch 'master' into feature/1.6.2-pay 4 years ago
YunaiV 3950c58c18 增加 Oracle Driver 4 years ago
YunaiV d79549b48a 优化代码生成器实现,增加 DatabaseTableDAO 抽象,支持多 db 类型 4 years ago
YunaiV d406bd37ce Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.6.2 4 years ago
YunaiV 7ce7baa2d2 增加数据源管理 4 years ago
zwy d099ad2a8b 🐛
【微信支付】:
WXLitePayClient.java 微信小程序支付模块:
!!前端必须传openid
PayClientFactoryImpl.java 支付客户端的工厂实现类:
添加 小程序支付模块
4 years ago
zwy 03ad548aa2 🐛
【支付宝通知回调】:
 AbstractAlipayClient.java :
添加支付宝回调参数str转map
通知回调:
Map<String, String> params = notifyData.getParams();
Map<String, String> params = strToMap(notifyData.getBody());
4 years ago
芋道源码 0bf5b20fd7
!137 简化三方登录的实现,降低理解成本
Merge pull request !137 from 芋道源码/feature/1.6.2
4 years ago
YunaiV 7227664f77 进一步重构社交登陆的实现 4 years ago
zwy 6505906565 🐛
【支付模块BUG】
修改时间 格式 yyyyMMddHHmmss 为 yyyy-MM-dd'T'HH:mm:ssXXX

支付宝 获取支付回调对象
4 years ago
zwy 802a7b0a30
【支付模块】
修改时间 格式 yyyyMMddHHmmss 为 yyyy-MM-dd'T'HH:mm:ssXXX
4 years ago
zwy 29a384989b
【支付模块】
添加 微信native支付
4 years ago
zwy 4a91dcb3bf
【支付模块】
添加 微信native支付
4 years ago
YunaiV 9b687ff6c9 🐛 修复忽略租户的 URL,未带租户会报错的问题 4 years ago
YunaiV 2d5601be92 调整前端和环境的环境配置 4 years ago
YunaiV 076c7a4e3e 优化短信模块的代码 4 years ago
YunaiV e33b2f0dd3 解决 framework 的库,存在循环依赖的问题 4 years ago