438 Commits (4de1ee7d2f74ffb52b79f2db611504c2e06a36fb)

Author SHA1 Message Date
YunaiV eb660ca619 pay:示例订单,增加发起退款的操作 3 years ago
小桂子 96282abca0
去除重复内容并更换为本地化时区
Signed-off-by: 小桂子 <xgzwlkj@xgzwk.com>
3 years ago
小桂子 79c8fd7855
去除重复内容,并改时区为本地时区
Signed-off-by: 小桂子 <xgzwlkj@xgzwk.com>
3 years ago
芋道源码 877e2376be
!404 修复项目启动,链接数据查询时控制台报错java.sql.SQLNonTransientConnectionException: Could not create connection to database server. Attempt
Merge pull request !404 from zhang/master
3 years ago
YunaiV b7198bd373 修复 jimu 报表的样式问题 3 years ago
okill.cn 13c60e8352 修复启动项目时查询数据,控制台报错java.sql.SQLNonTransientConnectionException: Could not create connection to database server. Attempt
Signed-off-by: okill.cn <2029364173@qq.com>
3 years ago
YunaiV fb45a70bce 集成 Go-View 大屏设计器 3 years ago
YunaiV 1b6124a0db 集成 Go-View 大屏设计器 3 years ago
YunaiV 53767614fe 增加商城的提示 3 years ago
YunaiV 6bf5eb0133 适配 mall 模块的 openapi 3 years ago
YunaiV c3eb9022b8 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/springdoc
# Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
#	yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/clean.sql
#	yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/create_tables.sql
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
#	yudao-server/pom.xml
3 years ago
YunaiV 3aeebef036 完善 MenuServiceImplTest 单元测试 3 years ago
xingyu c6f880bfc1 up springboot 2.7.8 3 years ago
xingyu 08a4de37c2 Merge remote-tracking branch 'origin/master' into feature/springdoc
# Conflicts:
#	README.md
3 years ago
YunaiV ca8bb72417 版本 1.7.0 发布:增加微信公众号、站内信、邮箱、数据脱敏! 3 years ago
xingyu ffb0358ce2 Merge remote-tracking branch 'origin/master' into feature/springdoc 3 years ago
YunaiV ae3ee95cdd 站内信模块:整体功能实现 3 years ago
YunaiV ea39dcc5c8 邮箱模块:完善 template 模版的增删改查功能 3 years ago
YunaiV 6b1f3140b8 spring doc:移除多余字段~ 3 years ago
YunaiV d193d2dd4a spring doc:支持通过 springdoc.api-docs 禁用 3 years ago
YunaiV 711a39b8e9 spring doc:增加模块分组 3 years ago
xingyu fa32611fe7 revert: file 3 years ago
xingyu be9d670bee feat: mp springdoc 3 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
3 years ago
YunaiV 3166cd7063 mp:同步 mp 公众号 SQL 3 years ago
xingyu 3d390d0d8f feat: knife4j 3 years ago
xingyu 4d35bcef65 feat: springdoc success 3 years ago
xingyu cba69e94df revert: file 3 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
3 years ago
xingyu d77e5b07c7 revert: file 3 years ago
xingyu 216fbeeffd chore: update deps 3 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
3 years ago
xingyu 6954150fcb feat: websocket init 3 years ago
xingyu 97330fd7b1 chore: 升级springboot 2.7.7 3 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
3 years ago
YunaiV c671b01b0a mp:增加公众号的校验签名回调 3 years ago
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
3 years ago
YunaiV 2706463e49 修复 local 环境的配置文件 3 years ago
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
3 years ago
xingyu 683b49a8a4 feat: springdoc 开启认证 3 years ago
xingyu cacefb4eea feat: knife4j springdoc 3 years ago
xingyu4j 9fc6e0f00b refactor: springdoc 替换 springfox 3 years ago
xingyu4j 9315ac0bec Revert "feat: add search slots"
This reverts commit 078249677b.
3 years ago
xingyu4j 078249677b feat: add search slots 3 years ago
YunaiV ffab0b1d6a 1. 优化 menu 本地缓存的刷新策略,在修改或删除菜单时,强制刷新缓存
2. 修复 pub/sub 未初始化的问题
3. 优化 Job 定时的 mybatis 日志输出,避免一直打印
3 years ago
YunaiV 0b9ddddd18 promotion:code review 秒杀的代码 3 years ago
xingyu b079513dc8 chore: 升级springboot 2.7.6 3 years ago
YunaiV 07f1681b50 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 3 years ago
xingyu 693288d33d Merge remote-tracking branch 'origin/master' into feature/vue3
# Conflicts:
#	yudao-dependencies/pom.xml
3 years ago
YunaiV 2d78b02086 移除云片短信渠道,解决云片的安全风险 3 years ago
YunaiV 1cd9085c59 pay: PayNotifyJob 增加多租户的支持 3 years ago
YunaiV 8798944069 优化 pay 支付成功后的回调逻辑 3 years ago
YunaiV 73d847ae2e 调整支付模块的回调地址 3 years ago
xingyu4j b081bb8e71 chore: devs 3 years ago
xingyu 7df72c4d85 fix 3 years ago
xingyu 6291a3d7d8 refactor: dictData ==> dictClass 3 years ago
YunaiV 969b9c3458 修复 swagger 404 的问题 3 years ago
YunaiV f6420e301e 修复部分单元测试报错的问题 3 years ago
YunaiV 38f67d4130 将 mall 使用到 Date 的部分,迁移到 LocalDateTime 中 3 years ago
YunaiV 12d045ea58 修复部分单元测试报错的问题 3 years ago
YunaiV a543b8c67a 同步商城的最新代码 3 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
3 years ago
YunaiV 4807854df6 默认不引入 mall 模块,保证启动速度 3 years ago
YunaiV 1819e0e1d6 异步化 Redis MQ 的初始化,提升启动速度 3 years ago
YunaiV c5b547e0f3 优化,使用 @Configuration(proxyBeanMethods = false) 提升启动速度 3 years ago
YunaiV f5ef87094d 优化,使用 @Configuration(proxyBeanMethods = false) 提升启动速度 3 years ago
YunaiV 92ace031fe 【修复】访问数据库存储的文件,path 多层级时,无法访问的问题 3 years ago
YunaiV 3310b766bc 【修复】工作流程-流程管理-流程模型,在发布完流程后,点击激活状态的按钮,显示“是否确认挂起流程名字为‘xxx’‘的数据项“,点击取消,前端显示的激活状态改变,但是数据库没有更新,报错 3 years ago
YunaiV ff1379d454 优化 README 说明~ 3 years ago
YunaiV a8cdf74120 【移除】Apollo 配置中心,简化学习成本 3 years ago
YunaiV ce3aefadd7 移除 jasypt-spring-boot-starter 依赖,使用 hutool AES 替代 3 years ago
YunaiV 3fbb0b4c54 修复滑块验证码,存在失败的情况 3 years ago
YunaiV 93b8a2b6c1 1. 修复滑块验证码,存在失败的情况
2. 重新构建 demo 预览项目
3 years ago
YunaiV 40ba456fde 1. 修复 MenuServiceTest 单元测试 3 years ago
YunaiV 5934d6b029 trade:完成下单时,创建支付单逻辑 3 years ago
xingyu4j 632a132a6a refactor: Date ==> LocalDateTime 3 years ago
YunaiV 873b530652 promotion:增加优惠劵的回收操作 3 years ago
YunaiV e6acdf7098 将 market 模块,调整成 promotion 模块 3 years ago
YunaiV 829bbf58b5 price:完成优惠劵的价格计算~ 3 years ago
YunaiV c00ded3ed3 优化商品的 index 界面 3 years ago
YunaiV 2bd2cb56a1 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
 Conflicts:
	yudao-module-mall/yudao-module-trade-biz/pom.xml
3 years ago
YunaiV dc8eb8e362 修复 Redis 地址不正确的问题 3 years ago
YunaiV f634ecf7c3 完善 pom.xml 的注释 3 years ago
芋道源码 952e6aa4a8
!266 接口实现-交易订单 单元测试
Merge pull request !266 from LeeYan9/ly_uniapp
3 years ago
YunaiV d26c78a0df Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 3 years ago
YunaiV 1be09d092b ♻️优化“通过注解增加多租户缓存”的代码 3 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
3 years ago
ex_yang.li@ca-nio.com 5889093a64 创建交易订单-单元测试 3 years ago
YunaiV 15798cea10 mall:价格计算的 API 简单实现 3 years ago
YunaiV 9632c33d27 mall:优化商品的分类、品牌的代码 3 years ago
YunaiV 37e948cc1b Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 3 years ago
wuxiran 02aede0417 1、修改coupon的页面、以及增加coupon的enum 3 years ago
YunaiV 833fd33844 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
 Conflicts:
	sql/optional/mall/mall.sql
3 years ago
芋道源码 dd6dc2ac3d
!246 集成aj-captcha
Merge pull request !246 from xingyu/master
3 years ago
YunaiV 926c75d29a 优化图片验证码的后端实现 3 years ago
GuoLei c4f416c7cd 修复dev环境WxMaService 报错 3 years ago
xingyu 020535ab3a Merge branch 'master' of gitee.com:zhijiantianya/ruoyi-vue-pro into master
Signed-off-by: xingyu <xingyu4j@vip.qq.com>
4 years ago
芋道源码 83dc4047a9
!229 关于 一键改包 目录问题
Merge pull request !229 from @C/master
4 years ago
YunaiV face9cae76 mall:调整 trade 的接口 4 years ago
xingyu da0ab98fae revert 4 years ago
xingyu e477179cd5 refactor: store action name 4 years ago
xingyu a8ea50a059 update hutool 5.8.5 4 years ago
xingyu 85e21092b8 删除文件 yudao-server/src/main/resources/application-local.yaml 4 years ago
xingyu 5ce8e64369 fix: axios config 4 years ago
xingyu 6b2fbdf8c1 优化行为验证码配置 4 years ago
xingyu 4a92081937 vue2 新增行为验证码 4 years ago
cksspk c8fcb6d3ed [fix] 代码格式规范 4 years ago
YunaiV 2866b58741 1. 默认不开启 bpm 工作流模块,按需启动,提升启动速度
2. 完整移除 activiti 遗留的东东
4 years ago
YunaiV 39ac59efee 默认禁用报表模块, 4 years ago
芋道源码 35413b52c9
!237 集成积木报表
Merge pull request !237 from 芋道源码/feature/visual
4 years ago
YunaiV 8a6c48f236 fix: test、stage、prod 不打印日志的问题 4 years ago
YunaiV e52a966b81 完善积木报表的集成 4 years ago
YunaiV d872676748 完善积木报表的集成 4 years ago
YunaiV b2f5900abc Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/visual 4 years ago
@C b8e5eeb271
update yudao-server/src/test/java/cn/iocoder/yudao/ProjectReactor.java.
解决 一键改包 可能发生的目录问题。
4 years ago
xingyu 63877cf475
fix: spring admin prefer-ip 过期 4 years ago
jiangqiang d00a88a75d 修改积木报表相关访问配置 4 years ago
jiangqiang 5da611d85d 修复MongoDB自动配置日志错误提示 4 years ago
jiangqiang 653520d85b 积木报表SQL脚本,拦截配置,以及组件扫描包配置 4 years ago
jiangqiang b6bbd836a4 新增yudao-module-visualization模块以及积木报表相关依赖 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
芋道源码 8de74dc476
!209 修改项目控制台日志为彩色,方便开发调试
Merge pull request !209 from 随心/master
4 years ago
YunaiV d9c2da7c91 1. 【新增】接口支持通过 `@PermitAll` 注解,允许匿名(未登录)进行访问
2. 【新增】`yudao.security.permit-all-urls` 配置项,允许匿名(未登录)进行访问
4 years ago
jiangqiang d14ad888e2 修改日志为彩色 4 years ago
YunaiV b69b74b770 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
 Conflicts:
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java
4 years ago
芋道源码 a9fc4a9d7b
!206 多租户场景下,支付回调存在报错的问题
Merge pull request !206 from qc/1.6.2-master
4 years ago
delisha 65f2509763 支付回调通知,不携带租户编号 4 years ago
YunaiV cca8375a97 【新增】`yudao.error-code.enable` 错误码的开关,默认在 `local` 环境关闭自动生成错误码 4 years ago
YunaiV 9040b1734c 【新增】`yudao.access-log.enable` 访问日志的开关,默认在 `local` 环境关闭记录访问日志 4 years ago
YunaiV 69a3a835a5 新增 `yudao-spring-boot-starter-banner` 组件,用于项目启动时打印开发文档、接口文档等 4 years ago
YunaiV 7a86a61079 【重构】新增 `yudao-spring-boot-starter-biz-error-code` 错误码组件 4 years ago
fengdan 667c8459c0 Revert "code review:mp 模块的代码"
This reverts commit 89a5ea1939.
4 years ago
fengdan f788258309 refactor(yudao-module-mp-biz): 微信公众号配置重构 4 years ago
YunaiV b1aa9f484f 增加 SecurityProperties 和 WebProperties 默认值,简化配置 4 years ago
YunaiV 89a5ea1939 code review:mp 模块的代码 4 years ago
亚洲 70adfe8fe5 公众号开发 4 years ago
fengdan 2aec04a888 yudao-module-wechat-mp 模块合并到 yudao-module-wechat 模块 中
weixin-java-mp 更新为 最新正式版本 4.3.0
4 years ago
YunaiV 6fd14b30c2 1. 升级 spring boot 到 2.6.8
2. 修复 Spring Fox 在 2.6.X 版本的兼容性
4 years ago
亚洲 1d935f58f8 微信公众号对接 4 years ago
YunaiV e1c08c4661 新增 member/auth/weixin-mini-app-login 接口,实现小程序的手机登录 4 years ago
YunaiV bb26bc4012 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
 Conflicts:
	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/UserController.java
	yudao-ui-admin/src/components/ImageUpload/index.vue
4 years ago
yjb 22e231ffdb 一键改包增加新项目目录检测,若新目录存在则退出程序。 4 years ago
yjb e613652e67 一键改包增加新项目目录检测,若新目录存在则退出程序。 4 years ago
YunaiV 741dda8d75 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm-back 4 years ago
YunaiV c09b070812 调整接口文档的地址 4 years ago
YunaiV 24d46ad23a 去除 mybatis plus 的 type handler 配置系项,避免全局生效 4 years ago
YunaiV e81ac9c1d0 增加 MyBatis Plus 的字段加密时,查询的示例 4 years ago
YunaiV 0ae9af0492 增加 MyBatis Plus 的 EncryptTypeHandler 类型处理器,实现字段的加密解密 4 years ago
YunaiV 3cc7a35ccc 项目启动时,打印相关文档 4 years ago
YunaiV 1f1970e6c8 提供最新的内嵌模式 4 years ago
hezhenhui 0fd1435e94 fixed: 在特定情况下,flowable数据库表自动创建不了。 4 years ago
YunaiV f46d81dab5 增加 OAuth2 客户端 4 years ago
YunaiV 5cf68961e1 1. 修改在线会话的实现
2. 接入到会员管理 OAuth2.0
4 years ago
YunaiV 4f52d1367b 实现管理后台登录时,使用 OAuth2 的 access token 4 years ago
YunaiV 7f5788aed1 YudaoServerApplication 中,增加启动项目的文档地址 4 years ago
YunaiV a233ab1395 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
 Conflicts:
	sql/ruoyi-vue-pro.sql
	yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
4 years ago
YunaiV 9848a95eb0 【升级】mysql-connector-java from 5.1.46 to 8.0.28 :提升 MySQL 客户端的性能 4 years ago
芋道源码 3c2de45067
update yudao-server/src/main/resources/application-local.yaml.
修改默认使用 MySQL 连接的示例
4 years ago
YunaiV 60f918da84 增加 SQLServer 的适配~ 4 years ago
YunaiV 1f5e168e79 默认注释 Redis 的账号密码 4 years ago
YunaiV fd0c07c1f8 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.6.2-postgresql 4 years ago
芋道源码 6f312f9466
!147 增加redis密码
Merge pull request !147 from Hermit/fork
4 years ago
YunaiV 8606f5c605 优化 UserSession 的实现,将 id 变成自增,额外增加 token 字段 4 years ago
YunaiV 0f21b55e6d 解决 Oracle 关键字冲突的问题
导出最新的 SQL 脚本
4 years ago
YunaiV 7db1a58bfc 适配 Oracle 数据库
1. 去除关键字,避免数据库的查询冲突
4 years ago
cuicui 3a4b0f4f75 合并bpm-base和bpm-flowable 为bpm-biz 4 years ago
YunaiV 72ad12344b 调整 Flowable、Activiti 提供的脚本,通过 db 自动生成 4 years ago
YunaiV 45cbb56ea1 1. 同步 MySQL、PostgreSQL 最新的脚本
2. 修复单元测试的报错
4 years ago
YunaiV 30e886be6f 解决 PostgreSQL 集成 Quartz 时的报错 4 years ago
YunaiV 98c317f0e0 封装 IdTypeEnvironmentPostProcessor 组件,自动适配 id-type 策略,用于 Oracle、PostgreSQL 的自动适配 4 years ago
YunaiV 2367280d83 1. 同步最新 SQL
2. 生成内嵌的页面
4 years ago
Hermit 49b54f1bae 增加redis密码 4 years ago
YunaiV 7ce7baa2d2 增加数据源管理 4 years ago
YunaiV 7227664f77 进一步重构社交登陆的实现 4 years ago
JeromeSoar 4e67b6bbcf 商品分类代码生成 4 years ago
shuaidawang ece6712d69 【营销模块】新建模块yudao-module-market 4 years ago
YunaiV 09103f310b 1. 【修复】单元测试报错
2. 【优化】yudao-module-xx-impl 调整成 yudao-module-xx-biz,更加符合定位
4 years ago
芋道源码 b5821b4bef
!132 优化一键改包的实现,增强对 win 的兼容性
Merge pull request !132 from 芋道源码/feature/project-reactor
4 years ago
YunaiV 946735ac24 优化一键改码的实现,解决 win 和 mac 的兼容性问题,修复 png、jpg 等文件的编码问题 4 years ago
YunaiV ceb76e7190 优化注释,修复 mac 的兼容性问题 4 years ago
YunaiV 4944f65905 优化 vue2 的前端,登出系统时,拼接 BASE PATH 4 years ago
zhoulc 3e77061c40 Merge branch 'feature/project-reactor' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/project-reactor 4 years ago
YunaiV a2f405f8bd * 【升级】spring-boot from 2.5.10 to 2.5.12 :修复 RCE 漏洞
* 【升级】redisson from 3.16.6 to 3.17.0 :提升 Redisson 客户端的稳定性
4 years ago
YunaiV 5d98ccdff1 复旦核博士说,建议使用 CMD 替换 ENTRYPOINT,方便替换命令 4 years ago
YunaiV 84ca797b1a 增加 yudao-server 的 Dockerfile 文件,编写《Docker 部署》文档 4 years ago
YunaiV 2d5601be92 调整前端和环境的环境配置 4 years ago
YunaiV 9afc297388 统一配置文件的环境名 4 years ago
YunaiV 076c7a4e3e 优化短信模块的代码 4 years ago
YunaiV 696756b3c8 实现 SensitiveWord API 实现类 4 years ago
YunaiV 0547671c9e 修复 API 访问日志不记录的问题 4 years ago
YunaiV 49b906bbfe 增加 Spring Cache 框架 4 years ago
zhoulc 1b496d91e1 兼容mac 4 years ago
YunaiV 5ac7c3bd5d code review ProjectReactor 的代码实现 4 years ago
zhoulc d9afb0e6c6 添加html.gz文件的过滤 4 years ago
zhoulc c729570328 修改title 4 years ago
zhoulc 50b6a4cb5e 更改 文件过滤方法,适应windows 4 years ago
zhoulc f651b86d53 更改 文件过滤方法,适应windows 4 years ago
zhoulc 1f6bf1621a 更改耗时预计 4 years ago
zhoulc 37900a7394 修改一键改包的bug 4 years ago
YunaiV 0bbc03493d 优化 ProjectReactor 一键改包程序 4 years ago
YunaiV 3526353cdf 构建最新的 admin-ui,准备 v1.6.1 版本的发布 4 years ago
YunaiV 87670d18fd 完成新 File 的功能 4 years ago
YunaiV 18a5c46284 完成 FileConfig 的后端模块 4 years ago
YunaiV 5a2169b688 将 tool 合并到 infra 模块 4 years ago
YunaiV 716bbb9813 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.6.1 4 years ago
YunaiV 9a9dbf0e97 移除 Security 无用的 secret 配置项 4 years ago
YunaiV d6333fc353 增加 ProjectReactor 程序,实现一键改包名 4 years ago
YunaiV fc4b677b00 增加一些多租户相关的注释,更加清晰一些~ 4 years ago
YunaiV 5c03b97775 增加一些多租户相关的注释,更加清晰一些~ 4 years ago
YunaiV e5b711409c 修改版本号为 1.6.0,准备 Flowable 工作流发版! 4 years ago
YunaiV d2636a7787 调整 DataScopeEnum 到 yudao-module-system-api 包下,合理~ 4 years ago
YunaiV 3201288036 review flowable 的代码实现,测试通过 4 years ago
YunaiV ec8b356ba6 v.1.5.1 发布,优化多租户功能,支持自动创建用户、角色等信息 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 121fd0652d 1.5.0 版本准备发布,同步最新的 SQL 4 years ago
YunaiV 38ac5270d6 v3.8.0 新增通用方法简化模态/缓存使用 4 years ago
sam efcff7333e fix typo: 上窜 -> 上传 4 years ago
YunaiV 128ee67925 更新日志,更新~ 4 years ago
Jelly 5e43efc555 fix:修复 Maven 构建一些提示 4 years ago
芋道源码 5151112912
Merge pull request #68 from crimson-gao/fix/avatar
fix: 修复 avatar 配置
4 years ago
YunaiV f966fae060 【修复】Knife4j 接口文档 404 的问题,原因是 `spring.mvc.static-path-pattern` 配置项,影响了基础路径 4 years ago
crimson 2bc45ad467 fix: 修复 avatar 配置 4 years ago
YunaiV d649b93017 1. 同步最新的 SQL
2. 修复多租户的定时 Task 无法获取租户编号的问题
4 years ago
YunaiV cb3b172ecc * 【新增】每次发布大版本时,将 yudao-ui-admin 编译后,放到 yudao-server 项目中,可以快速体验,无需搭建前端开发环境 4 years ago
YunaiV 470d1a3a35 * 【升级】Spring Boot Admin from 2.3.2 to 2.6.2,提供更好的监控能力 4 years ago
YunaiV 9f65c46c82 【修复】管理后台 UI 超时登录后,返回登陆界面时,由于未登陆加载不到信息,导致报错的问题 4 years ago
YunaiV 6441883855 【升级】spring-boot from 2.4.12 to 2.5.9,最新的 Spring Boot 2.6.X 在等更流行一些,稳定第一 4 years ago
YunaiV 61672e0180 多模块重构 13:迁移集成测试~ 4 years ago
YunaiV eb2ab3cc4d 清理多余文件与配置 4 years ago
YunaiV c2ccfa3bd6 多模块重构 12:【新增】Spring Security 新增 AuthorizeRequestsCustomizer 抽象类, 自定义每个 Maven Module 的 URL 的安全配置 4 years ago
YunaiV 4890cf05de 修复 swagger 接口文档不展示的问题 4 years ago
YunaiV 24e083b3ae 多模块重构 11:新增 H2 SQL 脚本的生成 4 years ago
YunaiV 0773a4c4d7 多模块重构 12:修改项目名字,按照新的规则 4 years ago