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
咱哥丶
2d1ff0aff7
commit 增加webSocket
2023-01-02 22:53:55 +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
a83b8e8fbc
修复报错的单元测试
2022-12-30 00:27:14 +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
cacefb4eea
feat: knife4j springdoc
2022-12-22 00:25:22 +08:00
xingyu
69420c0a9c
feat: 适配springboot 2.7 configuration ==> AutoConfiguration
2022-12-21 22:52:47 +08:00
xingyu
4f2c08f8db
Merge remote-tracking branch 'origin/dev' into feature/springdoc
2022-12-21 22:46:52 +08:00
xingyu
91abae8898
refactor: cropper
2022-12-21 16:10:28 +08:00
xingyu
2d79130106
chore: update deps
2022-12-20 14:21:27 +08:00
xingyu
6c521fd5e0
chore: update deps
2022-12-19 22:21:36 +08:00
xingyu
46c93b637f
chore: update deps
2022-12-19 10:51:36 +08:00
YunaiV
bddbedd781
增加城市库
2022-12-10 00:17:08 +08:00
xingyu4j
88ce5e540e
refactor: springdoc 替换 springfox
2022-12-09 14:24:09 +08:00
xingyu4j
9fc6e0f00b
refactor: springdoc 替换 springfox
2022-12-09 13:43:15 +08:00
xingyu4j
4397d47da1
升级版本,保证统一的版本号
2022-12-06 17:04:43 +08:00
xingyu4j
1bdde35dc9
fix: codegen
2022-12-06 14:12:43 +08:00
xingyu4j
fea1ad8f8d
升级最新依赖
2022-12-02 11:37:36 +08:00
YunaiV
03c7e60092
发布 v1.6.5 版本!
2022-12-01 09:30:11 +08:00
xingyu
0a8a41dea1
chore: update tencentcloud version
2022-11-30 01:29:26 +08:00
xingyu
b079513dc8
chore: 升级springboot 2.7.6
2022-11-30 00:41:24 +08:00
xingyu4j
ba547e9e2d
chore: 升级积木报表 1.5.4
2022-11-29 14:52:44 +08:00
xingyu
005a3e6ab0
fix: bugs
2022-11-28 16:50:53 +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
ea95115ffd
移除云片短信渠道,解决云片的安全风险
2022-11-25 20:22:04 +08:00
xingyu
0a6d93fefa
chore: update deps
2022-11-24 12:07:50 +08:00
xingyu
914b7dde60
chore: update deps
2022-11-23 23:01:46 +08:00
xingyu4j
407ac853cb
feat: tenant
2022-11-22 13:15:07 +08:00
xingyu4j
b081bb8e71
chore: devs
2022-11-18 17:25:37 +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
xingyu4j
77067a11bb
chore: update deps
2022-11-07 09:39:44 +08:00
xingyu4j
2e2cd448bd
chore: update devs
2022-11-01 10:04:15 +08:00
xingyu
70fab167be
feat: 升级依赖
2022-10-26 09:02:51 +08:00
xingyu
566238c2dd
feat: 升级依赖
2022-10-20 17:46:07 +08:00
xingyu
2b9d96c1b8
chore: update deps
2022-10-20 12:05:51 +08:00
xingyu
00fbc7c5ba
feat: 升级apollo 到2.0.1
2022-10-14 14:38:55 +08:00
xingyu
f49a55191c
update springboot 2.6.12
2022-10-11 17:12:13 +08:00
xingyu
a98af3edbc
feat: 升级vue3
2022-10-08 18:51:50 +08:00
xingyu
16eaa5f407
feat: 升级依赖
2022-10-05 17:07:54 +08:00
xingyu
72ee1206e6
Merge remote-tracking branch 'origin/master' into dev
2022-09-29 14:13:16 +08:00
xingyu
1aca24b636
feat: 升级依赖
2022-09-28 21:04:13 +08:00
YunaiV
1be09d092b
♻️ 优化“通过注解增加多租户缓存”的代码
2022-09-24 12:26:01 +08:00
xingyu
9054a772b0
feat: 升级依赖
2022-09-20 18:00:43 +08:00
airhead
72883aa975
fix(dependencies): 修改合并错误
2022-09-09 23:06:58 +08:00
airhead
0e1babd7f4
feat(redis): 注解支持多租户缓存
...
1.增加多租户Cache
2.修复Mac M1启动报错
2022-09-09 22:56:25 +08:00
芋道源码
dd6dc2ac3d
!246 集成aj-captcha
...
Merge pull request !246 from xingyu/master
2022-09-04 09:45:54 +00:00
YunaiV
185ea9e861
发布 1.6.4 版本:新增 uniapp 管理后台、数据报表设计器
2022-08-23 08:41:20 +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
史海洋
4014587637
fix: #I5N0GI 升级xercesImpl以解决工作流分配时的validator失败问题.
2022-08-18 22:29:06 +08:00
xingyu
2bf09cbfc2
升级部分依赖,存在高危漏洞报错问题
2022-08-03 13:38:02 +08:00
xingyu
a8ea50a059
update hutool 5.8.5
2022-08-03 13:38:02 +08:00
xingyu
4a92081937
vue2 新增行为验证码
2022-08-03 13:38:01 +08:00
YunaiV
2866b58741
1. 默认不开启 bpm 工作流模块,按需启动,提升启动速度
...
2. 完整移除 activiti 遗留的东东
2022-07-29 22:51:52 +08:00
芋道源码
35413b52c9
!237 集成积木报表
...
Merge pull request !237 from 芋道源码/feature/visual
2022-07-29 04:51:54 +00:00
YunaiV
75c7b88bc3
发版:1.6.3 biubiubiu~
2022-07-29 01:11:01 +08:00
YunaiV
40520b6c88
fix:降级 fastjson 版本,解决新版本的 jimu 报表在 2.0.10 会报错的问题
2022-07-28 00:58:24 +08:00
YunaiV
a01e94a0fb
fix:升级 fastjson 版本,解决新版本的 jimu 报表在 2.0.5 会报错的问题
2022-07-27 23:28:01 +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
xingyu
602149482a
chore: 升级依赖
2022-07-26 09:32:56 +08:00
xingyu
59258f1a1d
feat: Druid升级至1.2.11
2022-07-25 23:17:01 +08:00
xingyu
9bdae339cc
update: hutool 5.6.1 ==> 5.7.22
2022-07-22 12:08:59 +08:00
xingyu
14594e492e
update: springboot 2.6.8 ==> 2.6.9
2022-07-22 11:07:54 +08:00
xingyu
0ed44f29c8
fix: flowable basic ==》 process
2022-07-19 18:16:51 +08:00
jiangqiang
666c38239a
修改报表依赖版本
2022-07-10 20:17:41 +08:00
jiangqiang
b6bbd836a4
新增yudao-module-visualization模块以及积木报表相关依赖
2022-07-10 15:53:46 +08:00
YunaiV
ed097e5ead
基于 tika 识别文件类型
2022-07-08 21:26:34 +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
fengdan
93dfee8e30
build(依赖更换): weixin-java-mp ---> wx-java-mp-spring-boot-starter
2022-06-23 15:17:53 +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
YunaiV
c21e953114
升级 mybatis-plus from 3.4.3.4 to 3.5.2
2022-06-03 09:44:48 +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
741dda8d75
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm-back
2022-05-26 19:19:48 +08:00
October
0e601d9d30
ݹϢȫϢͨļ֣ⷢͰ˾ԴJavafastjsonڷл©fastjsonڶjavaΪɣ㷺javaӦõķ˴С߿©ʵʩļд롢αȹΪɷȨޱȡϢй©Ӱ졣˴¼Ӱfastjson 1.2.80֮ǰа汾ĿǰͰ˾ѷfastjson°汾1.2.83©ַΪ https://github.com/alibaba/fastjson/releases/tag/1.2.83 λ߶ӣѸͨԤϽϵͳλʱŲӰȷȫǰ©ϵͳȫϷ繥¼ͬʱǿȫ⣬ӦͻҪѸٴòһʱ䱨档
...
Signed-off-by: October <githubgit@163.com>
2022-05-26 10:04:10 +08:00
kemengkai
a0d574ad20
增加任务流程预测功能,预测未审批等待审批的任务流程。
2022-05-16 16:25:16 +08:00
kemengkai
d43006dce8
增加初步驳回功能
...
dom4j增加失败
2022-05-11 10:17:40 +08:00
YunaiV
73bf0b6f4f
去除 LoginUser 的 updateTime、username、password、status 字段,简化
2022-05-07 01:30:37 +08:00
YunaiV
8737674d74
去除 LoginUser 的 roleIds、deptId 字段,简化
2022-05-07 00:39:39 +08:00
YunaiV
b34e2691f8
支持主流数据库的代码生成
2022-04-29 23:14:34 +08:00
YunaiV
7ce7baa2d2
增加数据源管理
2022-04-27 23:15:43 +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
FinallySays
6fd52dfbb6
接入腾讯云短信
2022-04-04 17:30:58 +08:00
YunaiV
315be160a8
同步最新 SQL,准备发布 1.6.1 版本
2022-03-20 02:32:18 +08:00
YunaiV
d1517cddb7
* 【升级】apollo-client from 1.7.0 to 1.9.2
...
* 【升级】guide from 4.1.0 to 5.1.0 :解决 Apollo 在 JDK 17 无法启动的问题
2022-03-20 02:31:27 +08:00
YunaiV
34a7399a65
使用 minio client 替代 amazon 客户端,进行 S3 的对接
2022-03-19 17:27:35 +08:00
YunaiV
18a5c46284
完成 FileConfig 的后端模块
2022-03-15 22:30:52 +08:00
YunaiV
e5b711409c
修改版本号为 1.6.0,准备 Flowable 工作流发版!
2022-03-06 09:46:24 +08:00
YunaiV
882660a3a7
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/flowable
2022-02-27 13:47:34 +08:00
YunaiV
ec8b356ba6
v.1.5.1 发布,优化多租户功能,支持自动创建用户、角色等信息
2022-02-27 13:40:10 +08: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
jason
073d860a78
工作流 Flowable 发起流程 相关实现
2022-02-18 09:35:40 +08:00
Jelly
5e43efc555
fix:修复 Maven 构建一些提示
2022-02-10 11:16:17 +08:00
YunaiV
d5c35c23dc
初始化 1.5.0-snapshot 版本
2022-02-07 16:12:37 +08:00
YunaiV
470d1a3a35
* 【升级】Spring Boot Admin from 2.3.2 to 2.6.2,提供更好的监控能力
2022-02-04 18:26:02 +08:00
YunaiV
6441883855
【升级】spring-boot from 2.4.12 to 2.5.9,最新的 Spring Boot 2.6.X 在等更流行一些,稳定第一
2022-02-04 14:26:05 +08:00
YunaiV
eb2ab3cc4d
清理多余文件与配置
2022-02-04 01:56:41 +08:00
YunaiV
8d59384904
多模块重构 10:去除 Freemarker 依赖,修改字典的前缀,从 sys=》system、inf=》infra 见名知意
2022-02-02 01:27:04 +08:00
YunaiV
510917c5ed
多模块重构 8:bom 模块的调整
2022-01-31 22:55:48 +08:00
YunaiV
6aca4ae9fd
Merge branch 'feature/multi-module' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/flowable
...
Conflicts:
pom.xml
yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/config/BpmActivitiConfiguration.java
2022-01-29 10:06:00 +08:00
jason
afa0d623db
增加 bpm-core-service 多模块
2022-01-27 22:08:34 +08:00
YunaiV
06fa85a353
多模块重构 1:将 yudao-user-server 涉及到 member 模块的逻辑,都迁移到 yudao-module-member 中
2022-01-27 13:34:25 +08:00
jason
4ba064d8b3
抽取 activiti 到module-bpm-activiti, 为接入flowable 准备
2022-01-26 15:57:38 +08:00
YunaiV
eeb665739a
优化 Activiti 的依赖管理
2022-01-23 13:02:31 +08:00
YunaiV
f94435d592
* 【升级】redisson from 3.16.3 to 3.16.6,解决 Stream 在调试场景下会存在 NPE 的问题
...
* 【升级】spring-boot from 2.4.5 to 2.4.12,最新的 Spring Boot 2.6.X 在等更流行一些,稳定第一
* 【升级】druid from 1.2.4 to 1.2.8,提升数据库连接池的稳定性
* 【升级】dynamic-datasource from 3.3.2 to 3.5.0,修复动态数据源切换的问题
2021-12-16 09:08:05 +08:00
YunaiV
a92acff99b
1. 升级 1.3.0-snapshot 版本
...
2.【修复】biz-data-permission 组件的缓存机制,导致部分 SQL 未进行数据过滤
2021-12-16 07:19:52 +08:00
YunaiV
1801250516
yudao-spring-boot-starter-data-permission 和 yudao-spring-boot-starter-tenant 调整为 biz 组件
2021-12-15 10:18:29 +08:00
YunaiV
9d97c0ccb4
yudao-spring-boot-starter-data-permission 和 yudao-spring-boot-starter-tenant 调整为 biz 组件
2021-12-15 10:06:02 +08:00
YunaiV
986cb72421
基于部门的数据权限
2021-12-13 00:28:20 +08:00
YunaiV
2334e177c5
1. 引入 mockito-inline
...
2. 优化【数据权限】的单元测试
2021-12-11 15:38:20 +08:00
YunaiV
814c2db65c
初始化数据权限模块
2021-12-07 21:19:23 +08:00
YunaiV
7c8fe2fc50
1. 增加 yudao-spring-boot-starter-tenant 租户的组件
...
2. 改造 UserDO,接入多租户
2021-12-04 21:09:49 +08:00
YunaiV
0050b1e46d
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/activiti
...
Conflicts:
yudao-dependencies/pom.xml
yudao-framework/pom.xml
2021-10-30 10:24:58 +08:00
YunaiV
c3aa2acddf
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/user-social
...
Conflicts:
yudao-admin-server/pom.xml
yudao-dependencies/pom.xml
yudao-user-server/src/main/resources/application-dev.yaml
yudao-user-server/src/main/resources/application-local.yaml
2021-10-30 09:30:18 +08:00
YunaiV
55e5ca4644
code review 用户前台的社交登陆
2021-10-28 08:46:51 +08:00
YunaiV
2df46a7c2d
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into pay_extension
...
Conflicts:
更新日志.md
2021-10-27 12:32:57 +08:00
YunaiV
65843d55a0
修改版本号为 1.2.0-snapshot
2021-10-27 10:17:42 +08:00
YunaiV
44f357cea4
接入 weixin-mp-java ,编写相关示例。
2021-10-24 11:53:42 +08:00
jason
436781507e
merge master change
2021-10-23 19:16:00 +08:00
YunaiV
81126b2b4b
1. 引入 IJPay 组件
...
2. 增加创建支付单的 Service 实现
2021-10-18 09:41:38 +08:00
YunaiV
043c05a083
修复阿里云短信,无法发送的问题
2021-10-12 09:24:58 +08:00
YunaiV
028c99aa10
完成 user-admin-server 的用户手机 + 密码登录
2021-10-10 16:56:22 +08:00
YunaiV
5b723d02b2
增加 yudao-core-service 模块,提供共享逻辑
2021-10-10 01:34:31 +08:00
YunaiV
5f80333232
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into oauth2
...
Conflicts:
yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
2021-09-28 09:33:55 +08:00
芋道源码
98761ef1d3
!44 增加 yudao-user-server 服务
...
Merge pull request !44 from 芋道源码/feature/user-admin-server
2021-09-28 01:22:11 +00:00
YunaiV
0439a5505a
初始化数据字典
2021-09-27 09:47:37 +08:00
zhujiqian
00e15a5c2c
1、集成Activiti7版本,yudao-dependencies模块新增activiti依赖包;
...
2、流程文件上传部署API后端逻辑实现;
2021-09-05 22:46:01 +08:00
weir
133cb49c42
接入第三方登录(已接入Gitee[理论justAuth支持都可以接入]--抢先预览版
2021-08-13 23:44:52 +08:00
weir
92a05a715c
1. 升级Lombok插件(mvn package 报错 )
...
2. 初版Jenkins文件导入
2021-07-23 00:26:40 +08:00
YunaiV
ab4e6d0819
项目结构调整 x 21 : 解决 opentracing 版本的冲突问题
2021-05-03 10:31:29 +08:00
YunaiV
0b5662b698
项目结构调整 x 20 : 拆分出独立的 yudao-spring-boot-starter-mq 组件,整理更加清晰
2021-05-03 01:49:56 +08:00
YunaiV
cf4eeab395
项目结构调整 x 16 : 将 monitor、sms、dict 等组件拆分出去
2021-05-02 15:41:38 +08:00
YunaiV
20066bc864
项目结构调整 x 15 : 将 web、security、operatelog 等组件拆分出去
2021-05-02 00:41:21 +08:00
YunaiV
750ce01ecd
项目结构调整 x 14 : 将 yudao-spring-boot-starter-mybatis 拆分
2021-05-01 22:25:25 +08:00
YunaiV
f281aad6cd
项目结构调整 x 13 : 将 yudao-common 独立拆分
2021-04-30 17:46:49 +08:00
YunaiV
f336b801b9
项目结构调整 x 11 : 修改前端项目为 yudao-admin-ui
2021-04-30 14:15:31 +08:00
YunaiV
d5883771c8
项目结构调整 x 10 : 使用阿里云的源;解决单元测试报错问题
2021-04-30 09:44:36 +08:00
YunaiV
35f1eb95b6
项目结构调整 x 9 : 分拆字典类型的枚举分拆
2021-04-30 00:35:04 +08:00
YunaiV
1fe8d1cc89
项目结构调整 x 8 : 貌似不自闭了 2048
2021-04-29 23:57:12 +08:00
YunaiV
c37d5d7f1d
项目结构调整 x 8 : 自闭 1024
2021-04-29 22:42:10 +08:00
YunaiV
c4cbd730db
项目结构调整 x 7 : 有点问题
2021-04-29 09:49:08 +08:00
YunaiV
21e3475d82
项目结构调整 x 6
2021-04-29 02:07:27 +08:00
YunaiV
d4cf207463
项目结构调整 x 5
2021-04-29 00:52:41 +08:00
YunaiV
90e4966420
项目结构调整 x 3
2021-04-28 13:59:28 +08:00
YunaiV
f99d48a79b
再次调整项目结构 x 2
2021-04-28 01:09:35 +08:00
YunaiV
533cd1d33d
再次调整项目结构
2021-04-28 00:01:14 +08:00