xingyu
|
573ad59edc
|
Merge remote-tracking branch 'origin/master' into feature/mall_product
# Conflicts:
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/string/StrUtils.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryBaseVO.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/spu/vo/ProductSpuBaseVO.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-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuSimpleRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuPageItemRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderItemBaseVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/sku/AppProductSkuBaseRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartDetailRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartItemUpdateSelectedReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartResetReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderDetailRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderGetCreateInfoRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageItemRespVO.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java
|
2023-06-14 15:18:12 +08:00 |
|
YunaiV
|
dd93215139
|
mall + trade：review 商品管理
|
2023-06-03 22:59:34 +08:00 |
|
YunaiV
|
711a2763ed
|
修复 ProjectReactor 一键改包的报错
|
2023-04-24 20:14:00 +08:00 |
|
xingyuv
|
5aff120d77
|
chore: reset
|
2023-04-13 15:11:44 +08:00 |
|
xingyuv
|
01902c4345
|
chore: up minio 8.5.2
|
2023-04-13 14:53:36 +08:00 |
|
芋道源码
|
ce80c6f9d8
|
!453 代码生成时，增加 UI 类型的选择，可生成 Vue2、Vue3 多种管理后台的代码，支持 CRUD Schema 模式
Merge pull request !453 from 芋道源码/feature/codegen-front
|
2023-04-13 00:17:25 +00:00 |
|
YunaiV
|
d500332a18
|
代码生成，支持配置前端 UI 类型
|
2023-04-13 07:53:41 +08:00 |
|
YunaiV
|
de782479be
|
优化 ProjectReactor 提示
|
2023-04-09 11:19:55 +08:00 |
|
YunaiV
|
5c0161d762
|
修复租户名的重复问题
|
2023-04-09 11:12:24 +08:00 |
|
YunaiV
|
f07191437e
|
改造代码生成器，支持多种前端模版
|
2023-03-19 01:17:26 +08:00 |
|
weicong.li
|
0751e57dd8
|
fix: 若同个服务器内其他数据库有相同的工作流表，flowable不会建表的问题
|
2023-03-06 16:00:36 +08:00 |
|
YunaiV
|
6115a1ee34
|
admin-ui 演示环境，迁移到 https://gitee.com/yudaocode/yudao-ui-static 地址
|
2023-03-05 02:10:16 +08:00 |
|
芋道源码
|
c419c1e107
|
!417 支付收银台，接入支付宝的 PC、Wap、二维码、条码、App 等支付方式
Merge pull request !417 from 芋道源码/feature/dev-yunai
|
2023-02-22 14:43:10 +00:00 |
|
YunaiV
|
eefd9a71fc
|
pay：默认禁用 pay 模块，进一步提升启动速度
|
2023-02-22 22:38:16 +08:00 |
|
YunaiV
|
14893c4cff
|
pay: 优化回调的逻辑
|
2023-02-20 23:41:03 +08:00 |
|
芋道源码
|
3dba944d5f
|
!410 去除重复内容并更换为本地化时区
Merge pull request !410 from 小桂子/N/A
|
2023-02-19 08:43:27 +00:00 |
|
YunaiV
|
96ecd5028d
|
1. 优化支付订单回调任务，避免重复打 SQL 查询日志
2. 修复定时任务的回调，回调成功未更新状态的问题。
|
2023-02-16 23:54:23 +08:00 |
|
YunaiV
|
eb660ca619
|
pay：示例订单，增加发起退款的操作
|
2023-02-15 22:40:56 +08:00 |
|
小桂子
|
96282abca0
|
去除重复内容并更换为本地化时区
Signed-off-by: 小桂子 <xgzwlkj@xgzwk.com>
|
2023-02-10 17:53:46 +00:00 |
|
小桂子
|
79c8fd7855
|
去除重复内容，并改时区为本地时区
Signed-off-by: 小桂子 <xgzwlkj@xgzwk.com>
|
2023-02-10 15:13:16 +00:00 |
|
芋道源码
|
877e2376be
|
!404 修复项目启动，链接数据查询时控制台报错java.sql.SQLNonTransientConnectionException: Could not create connection to database server. Attempt
Merge pull request !404 from zhang/master
|
2023-02-09 23:38:46 +00:00 |
|
YunaiV
|
b7198bd373
|
修复 jimu 报表的样式问题
|
2023-02-08 21:46:00 +08:00 |
|
okill.cn
|
13c60e8352
|
修复启动项目时查询数据，控制台报错java.sql.SQLNonTransientConnectionException: Could not create connection to database server. Attempt
Signed-off-by: okill.cn <2029364173@qq.com>
|
2023-02-08 00:41:41 +08:00 |
|
YunaiV
|
fb45a70bce
|
集成 Go-View 大屏设计器
|
2023-02-07 23:08:14 +08:00 |
|
YunaiV
|
53767614fe
|
增加商城的提示
|
2023-02-04 20:38:51 +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 |
|
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
|
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 |
|