Commit Graph

6798 Commits

Author SHA1 Message Date
芋道源码
e08a103cbc
!962 feat: 添加自动转换py脚本
Merge pull request !962 from dhb52/feature/db
2024-05-02 10:05:03 +00:00
YunaiV
b0b8067629 【修复】代码生成:处理 SQLServer 数据库获取不到数据表结构注释 2024-05-02 18:03:34 +08:00
dhb52
1d4bb4d563 feat: 添加自动转换py脚本 2024-05-02 17:42:07 +08:00
芋道源码
9163ede8de
!961 wip: SQLServer数据库更新, 代码生成注释乱码
Merge pull request !961 from dhb52/feature/db
2024-05-02 07:42:05 +00:00
dhb52
fd8889e76a wip: SQLServer数据库更新, 代码生成注释乱码 2024-05-02 15:30:33 +08:00
YunaiV
b7554e935c 【修复】商城系统:优惠活动中的限时活动,添加活动报错系统异常 2024-05-02 14:57:53 +08:00
芋道源码
5aca12e689
!960 fix: Postgres/Oracle部分字段注释缺失
Merge pull request !960 from dhb52/feature/db
2024-05-02 03:08:36 +00:00
YunaiV
3f7e99c938 【修复】商城系统:管理后台的商城订单统计数据有问题 2024-05-02 09:25:03 +08:00
YunaiV
f9a50116bc 【修复】商城系统:管理后台修改待支付订单,调整价格取值错误 2024-05-02 09:13:31 +08:00
dhb52
977a250f1a fix: Postgres/Oracle部分字段注释缺失 2024-05-02 00:34:25 +08:00
dhb52
7e47d2efbb feat: 将数据库工具迁移至sql/tools目录 2024-05-01 23:49:09 +08:00
YunaiV
dae4e64a64 【修复】商城系统:管理后台发放优惠劵时,只能发送未修改过有效期类型的优惠券 2024-05-01 23:36:44 +08:00
YunaiV
bbfff1bae3 【修复】商城系统:店铺装修时,商品列表组件返回的商品信息,按照选择的顺序返回 2024-05-01 19:09:12 +08:00
YunaiV
ab00986a1d Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2024-05-01 08:37:56 +08:00
YunaiV
6f68834249 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/db 2024-05-01 08:34:33 +08:00
YunaiV
c6eed9a636 【修复】Oracle 自带系统表,影响代码生成 2024-05-01 08:17:23 +08:00
YunaiV
c0722b3a19 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/db
# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
2024-05-01 08:05:18 +08:00
芋道源码
97fa3cbb80
!959 Oracle数据库DDL更新适配
Merge pull request !959 from dhb52/feature/db
2024-04-30 22:29:06 +00:00
YunaiV
1df2fb3b85 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-05-01 01:56:10 +08:00
YunaiV
02e0f5d034 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	pom.xml
2024-05-01 01:22:06 +08:00
YunaiV
1c9b5ddae9 【优化】降低 JDK 21 最低到 17 版本 2024-05-01 01:21:34 +08:00
YunaiV
174d180abe Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseDbAndRedisUnitTest.java
#	yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseRedisUnitTest.java
#	yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/product/CrmProductCategoryServiceImpl.java
#	yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/spu/dto/ProductSpuRespDTO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
#	yudao-module-pay/yudao-module-pay-biz/src/test-integration/java/cn/iocoder/yudao/module/pay/test/BaseDbAndRedisIntegrationTest.java
#	yudao-module-pay/yudao-module-pay-biz/src/test-integration/java/cn/iocoder/yudao/module/pay/test/BaseRedisIntegrationTest.java
2024-05-01 01:09:10 +08:00
YunaiV
4de1ee7d2f Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-05-01 00:27:53 +08:00
YunaiV
b380b5b8a3 【优化】README,将版本说明提前 2024-05-01 00:26:28 +08:00
YunaiV
14c1b58fb8 【优化】README,将版本说明提前 2024-05-01 00:24:05 +08:00
YunaiV
39c9a6883f 【优化】README,将版本说明提前 2024-05-01 00:21:52 +08:00
dhb52
06dacb747b feat: Oracle数据 DDL 适配 2024-04-30 23:41:25 +08:00
YunaiV
0520f572e8 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-example/yudao-sso-demo-by-code/pom.xml
#	yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java
#	yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/UserController.java
#	yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/config/SecurityConfiguration.java
#	yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/filter/TokenAuthenticationFilter.java
#	yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AccessDeniedHandlerImpl.java
#	yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AuthenticationEntryPointImpl.java
#	yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/util/SecurityUtils.java
#	yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/util/ServletUtils.java
#	yudao-example/yudao-sso-demo-by-password/pom.xml
#	yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java
#	yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/controller/UserController.java
#	yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/config/SecurityConfiguration.java
#	yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/filter/TokenAuthenticationFilter.java
#	yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AccessDeniedHandlerImpl.java
#	yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AuthenticationEntryPointImpl.java
#	yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/util/SecurityUtils.java
#	yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/util/ServletUtils.java
2024-04-30 22:50:07 +08:00
YunaiV
16b8f3ba94 【移除】移除 yudao-example 项目,统一到 https://gitee.com/yudaocode/yudao-demo 2024-04-30 22:49:19 +08:00
芋道源码
56de8b0135
!958 测试数据库docker-compose, postgres DDL更新
Merge pull request !958 from dhb52/feature/db
2024-04-30 05:01:17 +00:00
YunaiV
1d00261c77 【优化】demo 功能,使用 yudao 作为表前缀,避免影响理解 2024-04-30 10:00:22 +08:00
dhb52
f700f0de74 fix: system_user_seq => system_users_seq 2024-04-30 01:25:51 +08:00
dhb52
4f3aaa124c feat: 测试数据库docker-compose, postgres DDL初稿 2024-04-29 23:41:33 +08:00
dhb52
94377b5009 fix: 删除两个MySQL的两个没用的,甚至是错的UINQUE KEY定义 2024-04-29 23:18:19 +08:00
YunaiV
ff891d1a14 Merge branch 'master-jdk21' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk21 2024-04-29 20:54:44 +08:00
芋道源码
f4364a4f7e
Merge pull request #487 from DevDengChao/fix/typo
修复错误拼写的注释
2024-04-29 20:54:27 +08:00
YunaiV
ba7d9c046f Merge branch 'master-jdk21' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk21 2024-04-29 20:52:32 +08:00
芋道源码
38cf944ba5
Merge pull request #496 from DevDengChao/fix/sms-template-type-description
修复短信模板中关于 type 字段的描述
2024-04-29 20:51:26 +08:00
YunaiV
4d45e3ace9 【增强】一键改包:支持 site、org 等包 2024-04-29 00:18:39 +08:00
YunaiV
853db724ec Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityAutoConfiguration.java
#	yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
2024-04-29 00:14:06 +08:00
YunaiV
cd5e6319d9 【增强】一键改包:支持 site、org 等包 2024-04-29 00:13:04 +08:00
YunaiV
c1df35d305 【修复】商城:取消订单,返回优惠劵时,状态校验不正确的问题 2024-04-28 20:06:42 +08:00
DevDengChao
e133c28da5 修复短信回执外部文档的链接 2024-04-28 14:57:46 +08:00
DevDengChao
af597f2329 补充短信渠道与短信模板的启用状态示例值 2024-04-28 14:23:02 +08:00
DevDengChao
fc0a1f669d fix: 修复短信模板中关于 type 字段的描述 2024-04-28 13:48:45 +08:00
芋道源码
e0652831a6
!957 fix: CRM 管理员数据权限 bug
Merge pull request !957 from puhui999/develop
2024-04-28 04:49:11 +00:00
puhui999
9a2eb2d02c Merge remote-tracking branch 'refs/remotes/yudao/develop' into develop 2024-04-25 23:16:52 +08:00
puhui999
0808bdaa41 fix: CRM 管理员数据权限 bug 2024-04-25 23:16:34 +08:00
DevDengChao
bc6775d64b 修复错误拼写的注释
"Redisson 自动高配置类" 改为 "Redisson 自动配置类"
2024-04-25 15:35:44 +08:00
YunaiV
99d9896507 同步最新代码到简化分支 2024-04-24 22:37:28 +08:00