Commit Graph

241 Commits

Author SHA1 Message Date
5934d6b029 trade:完成下单时,创建支付单逻辑 2022-11-10 09:27:20 +08:00
632a132a6a refactor: Date ==> LocalDateTime 2022-11-09 11:14:46 +08:00
873b530652 promotion:增加优惠劵的回收操作 2022-11-04 21:17:37 +08:00
c00ded3ed3 优化商品的 index 界面 2022-10-24 21:27:13 +08:00
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
2022-10-23 22:16:54 +08:00
dc8eb8e362 修复 Redis 地址不正确的问题 2022-10-18 19:57:56 +08:00
f634ecf7c3 完善 pom.xml 的注释 2022-10-02 13:05:19 +08:00
952e6aa4a8 !266 接口实现-交易订单 单元测试
Merge pull request !266 from LeeYan9/ly_uniapp
2022-09-30 08:56:13 +00:00
d26c78a0df Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-09-24 12:55:05 +08:00
1be09d092b ♻️优化“通过注解增加多租户缓存”的代码 2022-09-24 12:26:01 +08:00
f21ce954ec Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into ly_uniapp
# Conflicts:
#	yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/api/price/PriceApiImpl.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/sku/ProductSkuApiImpl.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/spu/ProductSpuApiImpl.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderItemConvert.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java
#	yudao-server/src/main/resources/application.yaml
2022-09-15 17:09:17 +08:00
5889093a64 创建交易订单-单元测试 2022-09-15 16:57:04 +08:00
15798cea10 mall:价格计算的 API 简单实现 2022-09-12 21:37:24 +08:00
9632c33d27 mall:优化商品的分类、品牌的代码 2022-09-05 20:03:13 +08:00
dd6dc2ac3d !246 集成aj-captcha
Merge pull request !246 from xingyu/master
2022-09-04 09:45:54 +00:00
926c75d29a 优化图片验证码的后端实现 2022-09-04 11:26:37 +08:00
c4f416c7cd 修复dev环境WxMaService 报错 2022-08-27 10:02:27 +08:00
020535ab3a Merge branch 'master' of gitee.com:zhijiantianya/ruoyi-vue-pro into master
Signed-off-by: xingyu <xingyu4j@vip.qq.com>
2022-08-22 00:57:43 +00:00
83dc4047a9 !229 关于 一键改包 目录问题
Merge pull request !229 from @C/master
2022-08-19 12:08:02 +00:00
da0ab98fae revert 2022-08-03 13:38:02 +08:00
e477179cd5 refactor: store action name 2022-08-03 13:38:02 +08:00
a8ea50a059 update hutool 5.8.5 2022-08-03 13:38:02 +08:00
85e21092b8 删除文件 yudao-server/src/main/resources/application-local.yaml 2022-08-03 13:38:02 +08:00
5ce8e64369 fix: axios config 2022-08-03 13:38:02 +08:00
6b2fbdf8c1 优化行为验证码配置 2022-08-03 13:38:02 +08:00
4a92081937 vue2 新增行为验证码 2022-08-03 13:38:01 +08:00
c8fcb6d3ed [fix] 代码格式规范 2022-08-01 09:36:57 +08:00
35413b52c9 !237 集成积木报表
Merge pull request !237 from 芋道源码/feature/visual
2022-07-29 04:51:54 +00:00
8a6c48f236 fix: test、stage、prod 不打印日志的问题 2022-07-29 00:41:30 +08:00
e52a966b81 完善积木报表的集成 2022-07-28 23:23:44 +08:00
d872676748 完善积木报表的集成 2022-07-28 09:29:51 +08:00
b2f5900abc Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/visual 2022-07-27 22:45:40 +08:00
@C
b8e5eeb271 update yudao-server/src/test/java/cn/iocoder/yudao/ProjectReactor.java.
解决 一键改包 可能发生的目录问题。
2022-07-27 07:24:36 +00:00
63877cf475 fix: spring admin prefer-ip 过期 2022-07-22 15:32:34 +00:00
d00a88a75d 修改积木报表相关访问配置 2022-07-16 11:00:07 +08:00
5da611d85d 修复MongoDB自动配置日志错误提示 2022-07-16 10:07:50 +08:00
653520d85b 积木报表SQL脚本,拦截配置,以及组件扫描包配置 2022-07-10 18:08:26 +08:00
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
2022-07-08 09:41:50 +08:00
65ad977267 增加会签、或签的文档说明 2022-07-08 09:12:21 +08:00
8de74dc476 !209 修改项目控制台日志为彩色,方便开发调试
Merge pull request !209 from 随心/master
2022-07-07 01:04:58 +00:00
d9c2da7c91 1. 【新增】接口支持通过 @PermitAll 注解,允许匿名(未登录)进行访问
2. 【新增】`yudao.security.permit-all-urls` 配置项,允许匿名(未登录)进行访问
2022-07-06 21:45:25 +08:00
d14ad888e2 修改日志为彩色 2022-07-06 15:30:18 +08:00
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
2022-07-04 19:56:54 +08:00
a9fc4a9d7b !206 多租户场景下,支付回调存在报错的问题
Merge pull request !206 from qc/1.6.2-master
2022-06-30 05:16:39 +00:00
65f2509763 支付回调通知,不携带租户编号 2022-06-25 20:50:07 +08:00
cca8375a97 【新增】yudao.error-code.enable 错误码的开关,默认在 local 环境关闭自动生成错误码 2022-06-25 11:09:50 +08:00
9040b1734c 【新增】yudao.access-log.enable 访问日志的开关,默认在 local 环境关闭记录访问日志 2022-06-25 10:49:48 +08:00
69a3a835a5 新增 yudao-spring-boot-starter-banner 组件,用于项目启动时打印开发文档、接口文档等 2022-06-18 09:22:26 +08:00
667c8459c0 Revert "code review:mp 模块的代码"
This reverts commit 89a5ea1939.
2022-06-16 12:41:52 +08:00
f788258309 refactor(yudao-module-mp-biz): 微信公众号配置重构 2022-06-16 12:41:51 +08:00