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 |
|
YunaiV
|
b7380019ba
|
完善项目 README 说明
|
2022-12-30 22:09:53 +08:00 |
|
YunaiV
|
a83b8e8fbc
|
修复报错的单元测试
|
2022-12-30 00:27:14 +08:00 |
|
xingyu
|
664c6258de
|
chore: update deps
|
2022-12-22 14:15:22 +08:00 |
|
xingyu
|
cacefb4eea
|
feat: knife4j springdoc
|
2022-12-22 00:25:22 +08:00 |
|
xingyu
|
50c4fb7bfd
|
docs: 优化文档排版
|
2022-12-20 16:36:54 +08:00 |
|
xingyu
|
e78e1a9cf1
|
docs: 升级对应版本
|
2022-12-20 15:22:17 +08:00 |
|
xingyu
|
6c521fd5e0
|
chore: update deps
|
2022-12-19 22:21:36 +08:00 |
|
xingyu4j
|
6beac96b44
|
docs: update deps
|
2022-12-14 13:50:33 +08:00 |
|
xingyu
|
f936122f85
|
docs: update deps
|
2022-12-08 23:04:00 +08:00 |
|
xingyu4j
|
aa3b4bf1fa
|
增加精简版地址
|
2022-12-08 14:26:28 +08:00 |
|
xingyu
|
182c23fa1a
|
docs: 升级 springboot 2.7.6
|
2022-11-30 00:46:40 +08:00 |
|
xingyu
|
314323f1ea
|
chore: update vue 2.7.14
|
2022-11-29 23:50:39 +08:00 |
|
xingyu
|
005a3e6ab0
|
fix: bugs
|
2022-11-28 16:50:53 +08:00 |
|
xingyu
|
dec05a6c40
|
Merge remote-tracking branch 'origin/master' into feature/vue3
|
2022-11-28 14:38:43 +08:00 |
|
芋道源码
|
17c93d6a09
|
!310 update README.md. 修改错别字
Merge pull request !310 from strangeKindness/N/A
|
2022-11-27 09:12:39 +00:00 |
|
xingyu
|
7e5c44b0db
|
docs: 升级依赖
|
2022-11-26 13:20:12 +08:00 |
|
xingyu
|
82b70a18f6
|
docs: 增加说明
|
2022-11-26 13:18:49 +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 |
|
xingyu4j
|
a5287d7186
|
chore: update deps
|
2022-11-23 14:37:35 +08:00 |
|
strangeKindness
|
33c7af4492
|
update README.md. 修改错别字
Signed-off-by: strangeKindness <12070449+strangeKindness@user.noreply.gitee.com>
|
2022-11-23 01:39:12 +00:00 |
|
xingyu4j
|
8b466d6e97
|
chore: update deps
|
2022-11-23 09:31:55 +08:00 |
|
xingyu4j
|
dfb24dda81
|
chore: update
|
2022-11-21 16:09:44 +08:00 |
|
xingyu4j
|
b081bb8e71
|
chore: devs
|
2022-11-18 17:25:37 +08:00 |
|
xingyu4j
|
cbd2815c8e
|
chore: update deps
|
2022-11-15 16:54:13 +08:00 |
|
YunaiV
|
ff1379d454
|
优化 README 说明~
|
2022-11-12 18:57:41 +08:00 |
|
xingyu4j
|
33e887c07d
|
chore: update devs
|
2022-11-10 10:09:12 +08:00 |
|
xingyu4j
|
375229111e
|
docs: update devs
|
2022-11-09 11:39:45 +08:00 |
|
xingyu4j
|
2e2cd448bd
|
chore: update devs
|
2022-11-01 10:04:15 +08:00 |
|
xingyu
|
3b3404747e
|
chore: update deps
|
2022-10-26 09:44:07 +08:00 |
|
xingyu
|
97cab05df2
|
feat: 升级依赖
|
2022-10-26 09:16:26 +08:00 |
|
xingyu
|
922b39c02c
|
docs: update
|
2022-10-17 13:02:23 +08:00 |
|
xingyu
|
ce92c96a1e
|
Merge remote-tracking branch 'origin/master' into dev
|
2022-10-14 13:47:34 +08:00 |
|
YunaiV
|
587360a54f
|
增加内置功能的说明
|
2022-10-13 23:17:40 +08:00 |
|
YunaiV
|
ca7ea3309b
|
增加计数架构图
|
2022-10-13 00:00:01 +08:00 |
|
xingyu
|
f49a55191c
|
update springboot 2.6.12
|
2022-10-11 17:12:13 +08:00 |
|
xingyu
|
21b0e1fded
|
docs: 更新版本说明
|
2022-10-11 14:10:13 +08:00 |
|
xingyu
|
a98af3edbc
|
feat: 升级vue3
|
2022-10-08 18:51:50 +08:00 |
|
xingyu4j
|
50fdc65f5b
|
更新文档
|
2022-08-07 21:52:56 +08:00 |
|
YunaiV
|
995f31af24
|
调整 yudao-ui-admin-uniapp 的说明
|
2022-08-03 13:07:22 +08:00 |
|
xingyu
|
efb22b2552
|
docs: 增加 vue3 使用说明
|
2022-08-02 11:51:33 +08:00 |
|
xingyu
|
27133e971b
|
更新 README
|
2022-08-01 19:29:22 +08:00 |
|
YunaiV
|
d9aa0af158
|
完善 README 说明,补充更多演示图
|
2022-07-29 22:13:38 +08:00 |
|
YunaiV
|
4cd1b83822
|
完善 README 说明,补充更多演示图
|
2022-07-29 22:07:56 +08:00 |
|
YunaiV
|
4a8dba7001
|
增加「数据报表」的演示图
|
2022-07-29 21:46:51 +08:00 |
|
xingyu
|
f3e1fc4f9b
|
!238 新增 todo done 页面,优化redis页面
* chore: update deps
* feat: add todo done pages
* chore: update deps
* docs: update
* feat: redis dialog
|
2022-07-29 07:57:48 +00:00 |
|
YunaiV
|
e5a7b8474f
|
fix:短信验证码的每日发送条数不正确
|
2022-07-29 00:56:17 +08:00 |
|
YunaiV
|
26a094a710
|
refactor:优化时间范围查询
|
2022-07-27 00:15:59 +08:00 |
|
xingyu
|
e29f4b5068
|
更新 README 文档
|
2022-07-25 21:29:35 +08:00 |
|
YunaiV
|
4fe3da058c
|
更新 README 文档
|
2022-07-25 00:19:32 +08:00 |
|
xingyu
|
09526966ba
|
docs: update doc
|
2022-07-22 14:08:14 +08:00 |
|
xingyu
|
ba96eef51a
|
docs: update doc
|
2022-07-19 19:21:46 +08:00 |
|
xingyu
|
992630e2b2
|
docs: add vue3
|
2022-07-19 18:14:46 +08:00 |
|
YunaiV
|
c92cc26171
|
增加文档、视频教程的地址
|
2022-07-13 22:05:01 +08:00 |
|
YunaiV
|
33a31cfb0f
|
优化文件的 type 识别与存储
|
2022-07-10 00:02:21 +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
|
26ff753701
|
暂时去除回退功能,边界处理不够正确
|
2022-07-08 08:54:15 +08:00 |
|
YunaiV
|
7963e9a80a
|
压缩演示图片的分辨率
|
2022-06-26 20:01:06 +08:00 |
|
YunaiV
|
c21e953114
|
升级 mybatis-plus from 3.4.3.4 to 3.5.2
|
2022-06-03 09:44:48 +08:00 |
|
YunaiV
|
6fd14b30c2
|
1. 升级 spring boot 到 2.6.8
2. 修复 Spring Fox 在 2.6.X 版本的兼容性
|
2022-06-01 22:18:02 +08:00 |
|
YunaiV
|
a9cedfa7f2
|
Spring Cloud 开始迭代:https://gitee.com/zhijiantianya/yudao-cloud
|
2022-05-06 01:00:27 +08:00 |
|
YunaiV
|
ccdf0e4151
|
增加多数据库的适配说明
|
2022-05-02 18:17:44 +08:00 |
|
YunaiV
|
4c2e8c92d1
|
增加多数据库的适配说明
|
2022-05-02 18:11: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 |
|
芋道源码
|
1a30deb28c
|
update README.md.
|
2022-04-10 03:43:33 +00:00 |
|
芋道源码
|
7198aa36b9
|
修改 README 文档,进一步声明个人和企业 100% 使用,项目 100% 开源
|
2022-04-10 03:42:18 +00:00 |
|
YunaiV
|
d23232aab0
|
完成新 File 的功能
|
2022-03-17 00:02:57 +08:00 |
|
YunaiV
|
5a2169b688
|
将 tool 合并到 infra 模块
|
2022-03-11 00:39:34 +08:00 |
|
YunaiV
|
6489047a7d
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/flowable
|
2022-03-05 17:01:31 +08:00 |
|
YunaiV
|
d2636a7787
|
调整 DataScopeEnum 到 yudao-module-system-api 包下,合理~
|
2022-03-03 13:12:52 +08:00 |
|
感觉
|
e2a9b2d3e5
|
修改错误链接
|
2022-03-01 05:42:47 +00:00 |
|
YunaiV
|
e90fc607f0
|
v.1.5.1 发布,优化多租户功能,支持自动创建用户、角色等信息
|
2022-02-27 13:45:21 +08:00 |
|
YunaiV
|
ec8b356ba6
|
v.1.5.1 发布,优化多租户功能,支持自动创建用户、角色等信息
|
2022-02-27 13:40:10 +08:00 |
|
芋道源码
|
2af0e40fe7
|
!84 租户优化
Merge pull request !84 from 芋道源码/feature/tenant_op
|
2022-02-26 18:44:39 +00:00 |
|
YunaiV
|
66d6825657
|
* 【升级】spring-boot from 2.5.9 to 2.5.10
* 【升级】mybatis-plus from 3.4.3.4 to 3.5.1
|
2022-02-27 01:48:13 +08:00 |
|
芋道源码
|
124576005a
|
update README.md.
|
2022-02-21 04:53:00 +00:00 |
|
芋道源码
|
7c42632a50
|
update README.md.
|
2022-02-21 04:52:25 +00:00 |
|