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 |