YunaiV
|
68a4ef98ca
|
mall + pay：
1. 拆分支付回调、退款回调的 URL
2. 修复微信支付回调的时间解析错误
|
3 years ago |
|
YunaiV
|
d500332a18
|
代码生成，支持配置前端 UI 类型
|
3 years ago |
|
YunaiV
|
f07191437e
|
改造代码生成器，支持多种前端模版
|
3 years ago |
|
YunaiV
|
6115a1ee34
|
admin-ui 演示环境，迁移到 https://gitee.com/yudaocode/yudao-ui-static 地址
|
3 years ago |
xingyu
|
08a4de37c2
|
Merge remote-tracking branch 'origin/master' into feature/springdoc
# Conflicts:
# README.md
|
4 years ago |
|
xingyu
|
ffb0358ce2
|
Merge remote-tracking branch 'origin/master' into feature/springdoc
|
4 years ago |
|
YunaiV
|
ae3ee95cdd
|
站内信模块：整体功能实现
|
4 years ago |
|
YunaiV
|
ea39dcc5c8
|
邮箱模块：完善 template 模版的增删改查功能
|
4 years ago |
|
YunaiV
|
6b1f3140b8
|
spring doc：移除多余字段~
|
4 years ago |
|
YunaiV
|
d193d2dd4a
|
spring doc：支持通过 springdoc.api-docs 禁用
|
4 years ago |
|
YunaiV
|
711a39b8e9
|
spring doc：增加模块分组
|
4 years ago |
|
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
|
4 years ago |
|
xingyu
|
3d390d0d8f
|
feat: knife4j
|
4 years ago |
|
xingyu
|
4d35bcef65
|
feat: springdoc success
|
4 years ago |
|
xingyu
|
cba69e94df
|
revert: file
|
4 years ago |
|
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
|
4 years ago |
|
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
|
4 years ago |
|
xingyu
|
6954150fcb
|
feat: websocket init
|
4 years ago |
|
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
|
4 years ago |
|
YunaiV
|
c671b01b0a
|
mp：增加公众号的校验签名回调
|
4 years ago |
|
xingyu
|
683b49a8a4
|
feat: springdoc 开启认证
|
4 years ago |
|
xingyu
|
cacefb4eea
|
feat: knife4j springdoc
|
4 years ago |
|
YunaiV
|
07f1681b50
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
|
4 years ago |
|
YunaiV
|
73d847ae2e
|
调整支付模块的回调地址
|
4 years ago |
|
YunaiV
|
969b9c3458
|
修复 swagger 404 的问题
|
4 years ago |
|
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
|
4 years ago |
|
YunaiV
|
ff1379d454
|
优化 README 说明~
|
4 years ago |
|
YunaiV
|
a8cdf74120
|
【移除】Apollo 配置中心，简化学习成本
|
4 years ago |
|
YunaiV
|
ce3aefadd7
|
移除 jasypt-spring-boot-starter 依赖，使用 hutool AES 替代
|
4 years ago |
|
YunaiV
|
3fbb0b4c54
|
修复滑块验证码，存在失败的情况
|
4 years ago |
|
YunaiV
|
93b8a2b6c1
|
1. 修复滑块验证码，存在失败的情况
2. 重新构建 demo 预览项目
|
4 years ago |
|
YunaiV
|
5934d6b029
|
trade：完成下单时，创建支付单逻辑
|
4 years ago |
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
|
4 years ago |
|
ex_yang.li@ca-nio.com
|
5889093a64
|
创建交易订单-单元测试
|
4 years ago |
|
YunaiV
|
926c75d29a
|
优化图片验证码的后端实现
|
4 years ago |
|
xingyu
|
6b2fbdf8c1
|
优化行为验证码配置
|
4 years ago |
|
xingyu
|
4a92081937
|
vue2 新增行为验证码
|
4 years ago |
|
YunaiV
|
d872676748
|
完善积木报表的集成
|
4 years ago |
jiangqiang
|
d00a88a75d
|
修改积木报表相关访问配置
|
4 years ago |
|
jiangqiang
|
5da611d85d
|
修复MongoDB自动配置日志错误提示
|
4 years ago |
|
jiangqiang
|
653520d85b
|
积木报表SQL脚本，拦截配置，以及组件扫描包配置
|
4 years ago |
|
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
|
4 years ago |
|
YunaiV
|
65ad977267
|
增加会签、或签的文档说明
|
4 years ago |
|
YunaiV
|
d9c2da7c91
|
1. 【新增】接口支持通过 `@PermitAll` 注解，允许匿名（未登录）进行访问
2. 【新增】`yudao.security.permit-all-urls` 配置项，允许匿名（未登录）进行访问
|
4 years ago |
|
芋道源码
|
a9fc4a9d7b
|
!206 多租户场景下，支付回调存在报错的问题
Merge pull request !206 from qc/1.6.2-master
|
4 years ago |
delisha
|
65f2509763
|
支付回调通知，不携带租户编号
|
4 years ago |
|
YunaiV
|
b1aa9f484f
|
增加 SecurityProperties 和 WebProperties 默认值，简化配置
|
4 years ago |
|
YunaiV
|
6fd14b30c2
|
1. 升级 spring boot 到 2.6.8
2. 修复 Spring Fox 在 2.6.X 版本的兼容性
|
4 years ago |
|
YunaiV
|
24d46ad23a
|
去除 mybatis plus 的 type handler 配置系项，避免全局生效
|
4 years ago |
|
YunaiV
|
e81ac9c1d0
|
增加 MyBatis Plus 的字段加密时，查询的示例
|
4 years ago |
|
YunaiV
|
f46d81dab5
|
增加 OAuth2 客户端
|
4 years ago |
|
YunaiV
|
7db1a58bfc
|
适配 Oracle 数据库
1. 去除关键字，避免数据库的查询冲突
|
4 years ago |
|
YunaiV
|
72ad12344b
|
调整 Flowable、Activiti 提供的脚本，通过 db 自动生成
|
4 years ago |
|
YunaiV
|
30e886be6f
|
解决 PostgreSQL 集成 Quartz 时的报错
|
4 years ago |
|
YunaiV
|
98c317f0e0
|
封装 IdTypeEnvironmentPostProcessor 组件，自动适配 id-type 策略，用于 Oracle、PostgreSQL 的自动适配
|
4 years ago |
|
YunaiV
|
7ce7baa2d2
|
增加数据源管理
|
4 years ago |
|
YunaiV
|
2d5601be92
|
调整前端和环境的环境配置
|
4 years ago |
|
YunaiV
|
696756b3c8
|
实现 SensitiveWord API 实现类
|
4 years ago |
|
YunaiV
|
0547671c9e
|
修复 API 访问日志不记录的问题
|
4 years ago |
|
YunaiV
|
49b906bbfe
|
增加 Spring Cache 框架
|
4 years ago |
|
YunaiV
|
87670d18fd
|
完成新 File 的功能
|
4 years ago |
|
YunaiV
|
18a5c46284
|
完成 FileConfig 的后端模块
|
4 years ago |
|
YunaiV
|
5a2169b688
|
将 tool 合并到 infra 模块
|
4 years ago |
|
YunaiV
|
fc4b677b00
|
增加一些多租户相关的注释，更加清晰一些~
|
4 years ago |
|
YunaiV
|
5c03b97775
|
增加一些多租户相关的注释，更加清晰一些~
|
4 years ago |
|
YunaiV
|
3201288036
|
review flowable 的代码实现，测试通过
|
4 years ago |
|
YunaiV
|
75928525ca
|
1. 增加【默认】的系统租户的概念，禁止修改与删除等操作
2. 修复定时任务在刷新本地缓存时，会过滤租户的问题
3. 调整短信的回调地址，并进行租户的白名单
|
4 years ago |
|
YunaiV
|
e4be51b14a
|
1. 新建租户、修改租户、修改租户套餐时，自动修改角色的权限
2. 租户的本地缓存，提升访问性能
3. 精简本地缓存的实现逻辑
|
4 years ago |
|
YunaiV
|
2598c033a9
|
【新增】【优化】新建租户时，自动创建对应的管理员账号、角色等基础信息
|
4 years ago |
|
YunaiV
|
6b6d676a6b
|
【新增】租户套餐的管理，可配置每个租户的可使用的功能
|
4 years ago |
|
YunaiV
|
79311ecc71
|
* 【新增】后端 `yudao.tenant.enable` 配置项，前端 `VUE_APP_TENANT_ENABLE` 配置项，用于开关租户功能
* 【优化】调整默认所有表开启多租户的特性，可通过 `yudao.tenant.ignore-tables` 配置项进行忽略，替代原本默认不开启的策略
* 【新增】通过 `yudao.tenant.ignore-urls` 配置忽略多租户的请求，例如说 ，例如说短信回调、支付回调等 Open API
|
4 years ago |
|
YunaiV
|
f966fae060
|
【修复】Knife4j 接口文档 404 的问题，原因是 `spring.mvc.static-path-pattern` 配置项，影响了基础路径
|
5 years ago |
|
YunaiV
|
c2ccfa3bd6
|
多模块重构 12：【新增】Spring Security 新增 AuthorizeRequestsCustomizer 抽象类， 自定义每个 Maven Module 的 URL 的安全配置
|
5 years ago |
|
YunaiV
|
4890cf05de
|
修复 swagger 接口文档不展示的问题
|
5 years ago |
|
YunaiV
|
0773a4c4d7
|
多模块重构 12：修改项目名字，按照新的规则
|
5 years ago |