lxd/FlowPacs
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
5,866 Commits 2 Branches 0 Tags 165 MiB
be0e0f5d71
Commit Graph

380 Commits

Author SHA1 Message Date
YunaiV
53767614fe 增加商城的提示 2023-02-04 20:38:51 +08:00
YunaiV
6bf5eb0133 适配 mall 模块的 openapi 2023-02-04 13:06:54 +08:00
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
 2023-02-04 10:21:45 +08:00
YunaiV
3aeebef036 完善 MenuServiceImplTest 单元测试 2023-02-01 23:33:59 +08:00
xingyu
c6f880bfc1 up springboot 2.7.8 2023-01-31 09:28:07 +08:00
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
ea39dcc5c8 邮箱模块：完善 template 模版的增删改查功能 2023-01-25 20:44:48 +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
xingyu
fa32611fe7 revert: file 2023-01-18 16:16:52 +08:00
xingyu
be9d670bee feat: mp springdoc 2023-01-18 16:15:08 +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
3166cd7063 mp：同步 mp 公众号 SQL 2023-01-17 23:56:27 +08:00
xingyu
3d390d0d8f feat: knife4j 2023-01-17 20:42:18 +08:00
xingyu
4d35bcef65 feat: springdoc success 2023-01-16 22:58:56 +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
d77e5b07c7 revert: file 2023-01-16 11:29:07 +08:00
xingyu
216fbeeffd chore: update deps 2023-01-16 11:12:50 +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
97330fd7b1 chore: 升级springboot 2.7.7 2023-01-05 10:01:49 +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
YunaiV
c671b01b0a mp：增加公众号的校验签名回调 2023-01-01 23:48:10 +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
2706463e49 修复 local 环境的配置文件 2022-12-27 21:53:03 +08: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
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
xingyu4j
9fc6e0f00b refactor: springdoc 替换 springfox 2022-12-09 13:43:15 +08:00
xingyu4j
9315ac0bec Revert "feat: add search slots" 
This reverts commit 078249677b.
 2022-12-08 12:37:16 +08:00
xingyu4j
078249677b feat: add search slots 2022-12-08 12:36:40 +08:00
YunaiV
ffab0b1d6a 1. 优化 menu 本地缓存的刷新策略，在修改或删除菜单时，强制刷新缓存 
2. 修复 pub/sub 未初始化的问题
3. 优化 Job 定时的 mybatis 日志输出，避免一直打印
 2022-12-06 20:38:05 +08:00
YunaiV
0b9ddddd18 promotion：code review 秒杀的代码 2022-11-30 19:59:38 +08:00
xingyu
b079513dc8 chore: 升级springboot 2.7.6 2022-11-30 00:41:24 +08:00
YunaiV
07f1681b50 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-11-26 18:41:02 +08:00
xingyu
693288d33d Merge remote-tracking branch 'origin/master' into feature/vue3 
# Conflicts:
#	yudao-dependencies/pom.xml
 2022-11-26 13:07:51 +08:00
YunaiV
2d78b02086 移除云片短信渠道，解决云片的安全风险 2022-11-25 21:04:40 +08:00
YunaiV
1cd9085c59 pay: PayNotifyJob 增加多租户的支持 2022-11-24 23:56:13 +08:00
YunaiV
8798944069 优化 pay 支付成功后的回调逻辑 2022-11-23 21:09:16 +08:00
YunaiV
73d847ae2e 调整支付模块的回调地址 2022-11-22 19:54:52 +08:00
xingyu4j
b081bb8e71 chore: devs 2022-11-18 17:25:37 +08:00
xingyu
7df72c4d85 fix 2022-11-17 23:24:50 +08:00
xingyu
6291a3d7d8 refactor: dictData ==> dictClass 2022-11-17 23:09:29 +08:00
YunaiV
969b9c3458 修复 swagger 404 的问题 2022-11-16 21:52:33 +08:00
YunaiV
f6420e301e 修复部分单元测试报错的问题 2022-11-13 22:05:13 +08:00
YunaiV
38f67d4130 将 mall 使用到 Date 的部分，迁移到 LocalDateTime 中 2022-11-13 21:23:38 +08:00
YunaiV
12d045ea58 修复部分单元测试报错的问题 2022-11-13 21:08:15 +08:00
YunaiV
a543b8c67a 同步商城的最新代码 2022-11-13 19:58:21 +08:00
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
 2022-11-13 12:07:59 +08:00
YunaiV
4807854df6 默认不引入 mall 模块，保证启动速度 2022-11-12 21:31:22 +08:00
YunaiV
1819e0e1d6 异步化 Redis MQ 的初始化，提升启动速度 2022-11-12 20:57:28 +08:00
YunaiV
c5b547e0f3 优化，使用 @Configuration(proxyBeanMethods = false) 提升启动速度 2022-11-12 20:22:09 +08:00
YunaiV
f5ef87094d 优化，使用 @Configuration(proxyBeanMethods = false) 提升启动速度 2022-11-12 20:17:58 +08:00
YunaiV
92ace031fe 【修复】访问数据库存储的文件，path 多层级时，无法访问的问题 2022-11-12 19:37:21 +08:00
YunaiV
3310b766bc 【修复】工作流程-流程管理-流程模型，在发布完流程后，点击激活状态的按钮，显示“是否确认挂起流程名字为‘xxx’‘的数据项“，点击取消，前端显示的激活状态改变，但是数据库没有更新，报错 2022-11-12 19:09:43 +08:00
YunaiV
ff1379d454 优化 README 说明~ 2022-11-12 18:57:41 +08:00
YunaiV
a8cdf74120 【移除】Apollo 配置中心，简化学习成本 2022-11-12 09:52:36 +08:00
YunaiV
ce3aefadd7 移除 jasypt-spring-boot-starter 依赖，使用 hutool AES 替代 2022-11-12 09:15:02 +08:00
YunaiV
3fbb0b4c54 修复滑块验证码，存在失败的情况 2022-11-11 20:47:45 +08:00
YunaiV
93b8a2b6c1 1. 修复滑块验证码，存在失败的情况 
2. 重新构建 demo 预览项目
 2022-11-11 20:02:11 +08:00
YunaiV
40ba456fde 1. 修复 MenuServiceTest 单元测试 2022-11-11 01:24:39 +08:00
YunaiV
5934d6b029 trade：完成下单时，创建支付单逻辑 2022-11-10 09:27:20 +08:00
xingyu4j
632a132a6a refactor: Date ==> LocalDateTime 2022-11-09 11:14:46 +08:00
YunaiV
873b530652 promotion：增加优惠劵的回收操作 2022-11-04 21:17:37 +08:00
YunaiV
e6acdf7098 将 market 模块，调整成 promotion 模块 2022-10-30 17:37:07 +08:00
YunaiV
829bbf58b5 price：完成优惠劵的价格计算~ 2022-10-30 17:32:59 +08:00
YunaiV
c00ded3ed3 优化商品的 index 界面 2022-10-24 21:27:13 +08:00
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
 2022-10-23 22:16:54 +08:00
YunaiV
dc8eb8e362 修复 Redis 地址不正确的问题 2022-10-18 19:57:56 +08:00
YunaiV
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
YunaiV
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
YunaiV
1be09d092b ♻️优化“通过注解增加多租户缓存”的代码 2022-09-24 12:26:01 +08:00
ex_yang.li@ca-nio.com
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
ex_yang.li@ca-nio.com
5889093a64 创建交易订单-单元测试 2022-09-15 16:57:04 +08:00
YunaiV
15798cea10 mall：价格计算的 API 简单实现 2022-09-12 21:37:24 +08:00
YunaiV
9632c33d27 mall：优化商品的分类、品牌的代码 2022-09-05 20:03:13 +08:00
YunaiV
37e948cc1b Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 2022-09-04 23:15:36 +08:00
wuxiran
02aede0417 1、修改coupon的页面、以及增加coupon的enum 2022-09-04 22:52:28 +08:00
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
 2022-09-04 21:06:28 +08:00
芋道源码
dd6dc2ac3d
!246 集成aj-captcha 
Merge pull request !246 from xingyu/master
 2022-09-04 09:45:54 +00:00
YunaiV
926c75d29a 优化图片验证码的后端实现 2022-09-04 11:26:37 +08:00
GuoLei
c4f416c7cd 修复dev环境WxMaService 报错 2022-08-27 10:02:27 +08:00
xingyu
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
YunaiV
face9cae76 mall：调整 trade 的接口 2022-08-06 19:10:28 +08:00
xingyu
da0ab98fae revert 2022-08-03 13:38:02 +08:00
xingyu
e477179cd5 refactor: store action name 2022-08-03 13:38:02 +08:00
xingyu
a8ea50a059 update hutool 5.8.5 2022-08-03 13:38:02 +08:00
xingyu
85e21092b8 删除文件 yudao-server/src/main/resources/application-local.yaml 2022-08-03 13:38:02 +08:00
xingyu
5ce8e64369 fix: axios config 2022-08-03 13:38:02 +08:00
xingyu
6b2fbdf8c1 优化行为验证码配置 2022-08-03 13:38:02 +08:00
xingyu
4a92081937 vue2 新增行为验证码 2022-08-03 13:38:01 +08:00
cksspk
c8fcb6d3ed [fix] 代码格式规范 2022-08-01 09:36:57 +08:00
YunaiV
2866b58741 1. 默认不开启 bpm 工作流模块，按需启动，提升启动速度 
2. 完整移除 activiti 遗留的东东
 2022-07-29 22:51:52 +08:00
YunaiV
39ac59efee 默认禁用报表模块， 2022-07-29 20:57:18 +08:00
芋道源码
35413b52c9
!237 集成积木报表 
Merge pull request !237 from 芋道源码/feature/visual
 2022-07-29 04:51:54 +00:00
YunaiV
8a6c48f236 fix: test、stage、prod 不打印日志的问题 2022-07-29 00:41:30 +08:00
YunaiV
e52a966b81 完善积木报表的集成 2022-07-28 23:23:44 +08:00
YunaiV
d872676748 完善积木报表的集成 2022-07-28 09:29:51 +08:00
YunaiV
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
xingyu
63877cf475
fix: spring admin prefer-ip 过期 2022-07-22 15:32:34 +00:00
jiangqiang
d00a88a75d 修改积木报表相关访问配置 2022-07-16 11:00:07 +08:00
jiangqiang
5da611d85d 修复MongoDB自动配置日志错误提示 2022-07-16 10:07:50 +08:00
jiangqiang
653520d85b 积木报表SQL脚本，拦截配置，以及组件扫描包配置 2022-07-10 18:08:26 +08:00
jiangqiang
b6bbd836a4 新增yudao-module-visualization模块以及积木报表相关依赖 2022-07-10 15:53:46 +08:00
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
 2022-07-08 09:41:50 +08:00
YunaiV
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
YunaiV
d9c2da7c91 1. 【新增】接口支持通过 @PermitAll 注解，允许匿名（未登录）进行访问 
2. 【新增】`yudao.security.permit-all-urls` 配置项，允许匿名（未登录）进行访问
 2022-07-06 21:45:25 +08:00
jiangqiang
d14ad888e2 修改日志为彩色 2022-07-06 15:30:18 +08:00
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
 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
delisha
65f2509763 支付回调通知，不携带租户编号 2022-06-25 20:50:07 +08:00
YunaiV
cca8375a97 【新增】yudao.error-code.enable 错误码的开关，默认在 local 环境关闭自动生成错误码 2022-06-25 11:09:50 +08:00
YunaiV
9040b1734c 【新增】yudao.access-log.enable 访问日志的开关，默认在 local 环境关闭记录访问日志 2022-06-25 10:49:48 +08:00
YunaiV
69a3a835a5 新增 yudao-spring-boot-starter-banner 组件，用于项目启动时打印开发文档、接口文档等 2022-06-18 09:22:26 +08:00
YunaiV
7a86a61079 【重构】新增 yudao-spring-boot-starter-biz-error-code 错误码组件 2022-06-17 22:56:06 +08:00
fengdan
667c8459c0 Revert "code review：mp 模块的代码" 
This reverts commit 89a5ea1939.
 2022-06-16 12:41:52 +08:00
fengdan
f788258309 refactor(yudao-module-mp-biz): 微信公众号配置重构 2022-06-16 12:41:51 +08:00
YunaiV
b1aa9f484f 增加 SecurityProperties 和 WebProperties 默认值，简化配置 2022-06-11 23:54:30 +08:00
YunaiV
89a5ea1939 code review：mp 模块的代码 2022-06-07 00:41:06 +08:00
亚洲
70adfe8fe5 公众号开发 2022-06-03 09:42:26 +08:00
fengdan
2aec04a888 yudao-module-wechat-mp 模块合并到 yudao-module-wechat 模块 中 
weixin-java-mp 更新为 最新正式版本 4.3.0
 2022-06-02 00:19:23 +08:00
YunaiV
6fd14b30c2 1. 升级 spring boot 到 2.6.8 
2. 修复 Spring Fox 在 2.6.X 版本的兼容性
 2022-06-01 22:18:02 +08:00
亚洲
1d935f58f8 微信公众号对接 2022-05-31 21:59:03 +08:00
YunaiV
e1c08c4661 新增 member/auth/weixin-mini-app-login 接口，实现小程序的手机登录 2022-05-29 23:48:52 +08:00
YunaiV
bb26bc4012 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 
 Conflicts:
	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/UserController.java
	yudao-ui-admin/src/components/ImageUpload/index.vue
 2022-05-29 11:05:33 +08:00
yjb
22e231ffdb 一键改包增加新项目目录检测，若新目录存在则退出程序。 2022-05-28 09:18:26 +08:00
yjb
e613652e67 一键改包增加新项目目录检测，若新目录存在则退出程序。 2022-05-28 09:11:12 +08:00
YunaiV
741dda8d75 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm-back 2022-05-26 19:19:48 +08:00
YunaiV
c09b070812 调整接口文档的地址 2022-05-21 10:15:49 +08:00
YunaiV
24d46ad23a 去除 mybatis plus 的 type handler 配置系项，避免全局生效 2022-05-20 10:14:55 +08:00
YunaiV
e81ac9c1d0 增加 MyBatis Plus 的字段加密时，查询的示例 2022-05-19 23:01:35 +08:00
YunaiV
0ae9af0492 增加 MyBatis Plus 的 EncryptTypeHandler 类型处理器，实现字段的加密解密 2022-05-19 02:17:44 +08:00
YunaiV
3cc7a35ccc 项目启动时，打印相关文档 2022-05-18 20:22:42 +08:00
YunaiV
1f1970e6c8 提供最新的内嵌模式 2022-05-17 09:55:21 +08:00
hezhenhui
0fd1435e94 fixed: 在特定情况下，flowable数据库表自动创建不了。 2022-05-13 14:17:03 +08:00
YunaiV
f46d81dab5 增加 OAuth2 客户端 2022-05-11 00:43:03 +08:00
YunaiV
5cf68961e1 1. 修改在线会话的实现 
2. 接入到会员管理 OAuth2.0
 2022-05-10 23:20:15 +08:00
YunaiV
4f52d1367b 实现管理后台登录时，使用 OAuth2 的 access token 2022-05-08 23:52:31 +08:00
YunaiV
7f5788aed1 YudaoServerApplication 中，增加启动项目的文档地址 2022-05-06 10:07:12 +08:00
YunaiV
a233ab1395 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 
 Conflicts:
	sql/ruoyi-vue-pro.sql
	yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
 2022-05-04 23:44:11 +08:00
YunaiV
9848a95eb0 【升级】mysql-connector-java from 5.1.46 to 8.0.28 ：提升 MySQL 客户端的性能 2022-05-02 23:36:49 +08:00
芋道源码
3c2de45067
update yudao-server/src/main/resources/application-local.yaml. 
修改默认使用 MySQL 连接的示例
 2022-05-02 15:06:47 +00:00
YunaiV
60f918da84 增加 SQLServer 的适配~ 2022-05-02 18:04:34 +08:00
YunaiV
1f5e168e79 默认注释 Redis 的账号密码 2022-05-02 16:03:06 +08:00
YunaiV
fd0c07c1f8 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.6.2-postgresql 2022-05-02 16:01:48 +08:00
芋道源码
6f312f9466
!147 增加redis密码 
Merge pull request !147 from Hermit/fork
 2022-05-02 08:01:34 +00:00
YunaiV
8606f5c605 优化 UserSession 的实现，将 id 变成自增，额外增加 token 字段 2022-05-02 12:33:37 +08:00
YunaiV
0f21b55e6d 解决 Oracle 关键字冲突的问题 
导出最新的 SQL 脚本
 2022-05-01 23:18:50 +08:00
YunaiV
7db1a58bfc 适配 Oracle 数据库 
1. 去除关键字，避免数据库的查询冲突
 2022-05-01 13:33:02 +08:00
cuicui
3a4b0f4f75 合并bpm-base和bpm-flowable 为bpm-biz 2022-05-01 09:31:24 +08:00
YunaiV
72ad12344b 调整 Flowable、Activiti 提供的脚本，通过 db 自动生成 2022-04-30 23:26:43 +08:00
YunaiV
45cbb56ea1 1. 同步 MySQL、PostgreSQL 最新的脚本 
2. 修复单元测试的报错
 2022-04-30 23:11:37 +08:00
YunaiV
30e886be6f 解决 PostgreSQL 集成 Quartz 时的报错 2022-04-30 22:52:55 +08:00
YunaiV
98c317f0e0 封装 IdTypeEnvironmentPostProcessor 组件，自动适配 id-type 策略，用于 Oracle、PostgreSQL 的自动适配 2022-04-30 11:38:21 +08:00
YunaiV
2367280d83 1. 同步最新 SQL 
2. 生成内嵌的页面
 2022-04-30 00:06:49 +08:00
Hermit
49b54f1bae 增加redis密码 2022-04-29 11:34:06 +08:00
YunaiV
7ce7baa2d2 增加数据源管理 2022-04-27 23:15:43 +08:00
YunaiV
7227664f77 进一步重构社交登陆的实现 2022-04-26 23:36:26 +08:00
JeromeSoar
4e67b6bbcf 商品分类代码生成 2022-04-24 14:42:51 +08:00
shuaidawang
ece6712d69 【营销模块】新建模块yudao-module-market 2022-04-23 23:22:47 +08:00
YunaiV
09103f310b 1. 【修复】单元测试报错 
2. 【优化】yudao-module-xx-impl 调整成 yudao-module-xx-biz，更加符合定位
 2022-04-22 00:07:54 +08:00
芋道源码
b5821b4bef
!132 优化一键改包的实现，增强对 win 的兼容性 
Merge pull request !132 from 芋道源码/feature/project-reactor
 2022-04-20 12:58:56 +00:00
YunaiV
946735ac24 优化一键改码的实现，解决 win 和 mac 的兼容性问题，修复 png、jpg 等文件的编码问题 2022-04-20 20:56:33 +08:00
YunaiV
ceb76e7190 优化注释，修复 mac 的兼容性问题 2022-04-20 12:52:13 +08:00
YunaiV
4944f65905 优化 vue2 的前端，登出系统时，拼接 BASE PATH 2022-04-18 21:15:01 +08:00
zhoulc
3e77061c40 Merge branch 'feature/project-reactor' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/project-reactor 2022-04-16 12:39:26 +08:00
YunaiV
a2f405f8bd * 【升级】spring-boot from 2.5.10 to 2.5.12 ：修复 RCE 漏洞 
* 【升级】redisson from 3.16.6 to 3.17.0 ：提升 Redisson 客户端的稳定性
 2022-04-16 12:28:01 +08:00
YunaiV
5d98ccdff1 复旦核博士说，建议使用 CMD 替换 ENTRYPOINT，方便替换命令 2022-04-14 20:52:51 +08:00
YunaiV
84ca797b1a 增加 yudao-server 的 Dockerfile 文件，编写《Docker 部署》文档 2022-04-14 00:54:20 +08:00
YunaiV
2d5601be92 调整前端和环境的环境配置 2022-04-13 12:24:08 +08:00
YunaiV
9afc297388 统一配置文件的环境名 2022-04-11 22:46:38 +08:00
YunaiV
076c7a4e3e 优化短信模块的代码 2022-04-11 01:21:33 +08:00
YunaiV
696756b3c8 实现 SensitiveWord API 实现类 2022-04-09 10:48:47 +08:00
YunaiV
0547671c9e 修复 API 访问日志不记录的问题 2022-04-04 00:09:47 +08:00
YunaiV
49b906bbfe 增加 Spring Cache 框架 2022-04-03 13:23:00 +08:00
zhoulc
1b496d91e1 兼容mac 2022-03-31 08:13:32 +08:00
YunaiV
5ac7c3bd5d code review ProjectReactor 的代码实现 2022-03-30 21:54:45 +08:00
zhoulc
d9afb0e6c6 添加html.gz文件的过滤 2022-03-30 18:09:51 +08:00
zhoulc
c729570328 修改title 2022-03-30 16:41:40 +08:00
zhoulc
50b6a4cb5e 更改 文件过滤方法，适应windows 2022-03-30 16:22:57 +08:00
zhoulc
f651b86d53 更改 文件过滤方法，适应windows 2022-03-30 16:15:08 +08:00
zhoulc
1f6bf1621a 更改耗时预计 2022-03-30 14:35:05 +08:00
zhoulc
37900a7394 修改一键改包的bug 2022-03-30 10:08:55 +08:00
YunaiV
0bbc03493d 优化 ProjectReactor 一键改包程序 2022-03-27 13:09:12 +08:00
YunaiV
3526353cdf 构建最新的 admin-ui，准备 v1.6.1 版本的发布 2022-03-21 00:24:14 +08:00
YunaiV
87670d18fd 完成新 File 的功能 2022-03-16 23:31:26 +08:00
YunaiV
18a5c46284 完成 FileConfig 的后端模块 2022-03-15 22:30:52 +08:00
YunaiV
5a2169b688 将 tool 合并到 infra 模块 2022-03-11 00:39:34 +08:00
YunaiV
716bbb9813 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.6.1 2022-03-10 21:19:50 +08:00
YunaiV
9a9dbf0e97 移除 Security 无用的 secret 配置项 2022-03-10 00:39:43 +08:00
YunaiV
d6333fc353 增加 ProjectReactor 程序，实现一键改包名 2022-03-09 00:27:26 +08:00