Commit Graph

191 Commits

Author SHA1 Message Date
YunaiV
859cf74a6c 对齐 boot 与 cloud 的代码 2023-07-27 13:00:52 +08:00
芋道源码
870873e480
!540 修复部分问题,升级依赖
Merge pull request !540 from xingyu/feature/captcha
2023-07-25 11:20:04 +00:00
YunaiV
3f988a890d 完善“支付系统”的说明 2023-07-24 08:46:12 +08:00
xingyu
c95a1d0a7d chore: up springboot 2.10.13 2023-07-21 17:53:40 +08:00
芋道源码
11c4c950b7
回退 'Pull Request !518 : 添加华为云 maven 升级依赖' 2023-07-02 15:41:26 +00:00
xingyu
9826bd614b docs: up Lombok 1.18.28 2023-06-26 16:50:41 +08:00
xingyu
4393c5da1c docs: up Druid 1.2.18 2023-06-26 16:30:00 +08:00
xingyu
0899f5fd29 docs: up springboot 2.10.12 2023-06-26 16:27:06 +08:00
xingyu
cd33f68e2b chore: up springboot 2.10.12 2023-06-14 16:50:46 +08:00
xingyu
d25062ec81 chore: up springboot 2.7.11 2023-05-08 10:04:57 +08:00
xingyu
6a4616b6ea chore: up springdoc 1.7.0 2023-05-06 16:32:28 +08:00
xingyu
235882791f chore: up druid 1.2.17 2023-05-06 16:30:05 +08:00
xingyu
5b13c07e01 chore: up springboot 2.7.11 2023-05-06 16:28:53 +08:00
xingyu
be01cd4894 chore: up mapstruct 1.5.5.Final 2023-05-06 16:26:31 +08:00
YunaiV
640a60231c 增加 vben 演示环境 2023-04-24 01:11:42 +08:00
YunaiV
d23ed5a61d 增加 Vue3 演示环境 2023-04-16 11:53:56 +08:00
YunaiV
d2ba90db5d 修复单元测试报错 2023-04-14 22:59:45 +08:00
YunaiV
8eac97ae12 移除 Vue3 专属菜单,统一菜单! 2023-04-13 23:38:27 +08:00
xingyuv
ed996759bb docs: 升级最新依赖 添加vben版本前端地址 2023-04-13 16:55:19 +08:00
xingyuv
ce65b82fc9 docs: 添加 vue3 vben 版本说明 2023-04-13 14:45:15 +08:00
YunaiV
55a889251f 优化 README 说明,明确前端仓库地址 2023-03-05 15:57:51 +08:00
YunaiV
d6580a3107 优化 README 说明,明确前端仓库地址 2023-03-05 15:15:56 +08:00
YunaiV
1391e20e1f 更新 Spring-Boot-Labs 访问地址 2023-02-11 09:25:05 +08:00
YunaiV
2d38a421c2 Vue3 独立到 https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-02-11 01:36:56 +08:00
YunaiV
0d5daa69fb Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/dev-yunai
# Conflicts:
#	yudao-ui-admin-vue3/pnpm-lock.yaml
2023-02-07 22:56:49 +08:00
YunaiV
1b6124a0db 集成 Go-View 大屏设计器 2023-02-07 22:56:33 +08:00
xingyuv
0486ec9d30 chore: update deps 2023-02-06 10:26:17 +08:00
xingyuv
aba35678bc Merge remote-tracking branch 'origin/master' into 1.X-dev
# Conflicts:
#	yudao-ui-admin-vue3/package.json
#	yudao-ui-admin-vue3/pnpm-lock.yaml
#	yudao-ui-admin-vue3/src/main.ts
2023-02-06 09:18:48 +08:00
YunaiV
de7d26129c Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/vue3-bpm
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveBaseVO.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageReqVO.java
2023-02-04 20:58:09 +08:00
xingyuv
bc75ad7a40 Merge branch 'master' into 1.X-dev 2023-02-04 20:26:55 +08:00
沧海
73d5511899
update README.md.
Signed-off-by: 沧海 <gentoo111@163.com>
2023-02-04 06:15:22 +00:00
xingyu
5fe0106155 chore: update deps 2023-02-01 15:53:39 +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
c04ef59e81 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/vue3-bpm 2023-01-30 08:11:24 +08:00
YunaiV
624b571672 版本 1.7.0 发布:增加微信公众号、站内信、邮箱、数据脱敏! 2023-01-30 08:04:58 +08:00
YunaiV
5d863f8742 版本 1.7.0 发布:增加微信公众号、站内信、邮箱、数据脱敏! 2023-01-30 02:31:58 +08:00
YunaiV
ca8bb72417 版本 1.7.0 发布:增加微信公众号、站内信、邮箱、数据脱敏! 2023-01-30 02:30:42 +08:00
YunaiV
f7762e646e 站内信模块:我的站内信 vue3 2023-01-29 18:31:52 +08:00
xingyu
ffb0358ce2 Merge remote-tracking branch 'origin/master' into feature/springdoc 2023-01-29 16:11:51 +08:00
xingyu
40f6fed29f update: springboot 2.7.8 2023-01-28 09:38:03 +08:00
YunaiV
4cbf7398e8 邮箱模块:vue3 邮箱账号的管理 2023-01-27 15:11:11 +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
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
2023-01-18 00:38:55 +08:00
YunaiV
8208370598 mp:完善微信公众号的 README 说明 2023-01-18 00:34:38 +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
3df825034b chore: update deps 2023-01-12 13:58:32 +08:00
xingyu
d6fdd924e9 Merge remote-tracking branch 'origin/dev' into feature/springdoc 2023-01-04 10:58:34 +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
xingyu
c98965cd55 chore: update spring boot 2.7.7
hutool 5.8.11
mybaits-plus 3.5.3
flowable 6.8.0
2023-01-04 10:12:00 +08:00
xingyu
c6445516d8 docs: 更新文档版本 2023-01-03 17:46:32 +08:00