p38192567
/
ruoyi-vue-pro1
mirror of https://gitee.com/zhijiantianya/ruoyi-vue-pro.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
4,819 Commits 8 Branches 31 Tags 233 MiB
Commit Graph

438 Commits

Author SHA1 Message Date
崔家辉 fbeaa06100 bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误 2023-05-19 10:47:23 +08:00
xingyu 0b3640a522 fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED 2023-05-08 10:06:17 +08:00
YunaiV e5fcc7a387 boot3：适合 ServletUtils 2023-04-16 21:40:56 +08:00
芋道源码 89e785dc49
!457 【轻量级 PR】：解决敏感词导出和字典数据编辑保存的两个BUG 
Merge pull request !457 from clockdotnet/master_pr
 2023-04-15 01:39:41 +00:00
YunaiV d2ba90db5d 修复单元测试报错 2023-04-14 22:59:45 +08:00
shizhong 206b5a5e47 解决字典数据编辑颜色清空不能保存问题 2023-04-14 22:15:50 +08:00
shizhong 27c5b5f369 解决敏感词导出excel内容为500错误问题 2023-04-14 22:14:34 +08:00
YunaiV 5c0161d762 修复租户名的重复问题 2023-04-09 11:12:24 +08:00
芋道源码 aa16b8279f
!446 配合周建进行测试所提bug的后端修改 
Merge pull request !446 from clockdotnet/master_pr
 2023-04-09 02:30:08 +00:00
shizhong 92cf4b9e63 租户添加或修改时租户名称改为不可以重复，否则会造成重复名称的租户无法正常登录的问题，按规范优化代码 2023-04-03 12:55:06 +08:00
shizhong 64cd19f7db 解决新增租户时创建的租户第一个用户性别为无效值的问题，前端改了，后端还是默认0即未知吧 2023-03-30 21:15:26 +08:00
shizhong 55358aa170 租户添加或修改时租户名称改为不可以重复，否则会造成重复名称的租户无法正常登录的问题 2023-03-30 16:00:25 +08:00
shizhong b8628f75c5 解决新增租户时创建的租户第一个用户性别为无效值0的问题 2023-03-30 15:19:20 +08:00
打听幸福的下落 aae6f12832 fix: MybatisPlus 主键策略使用雪花算法 ASSIGN_ID 时，获取登录验证码主键精度丢失问题 
SmsCodeDO 主键类型为 Integer，使用雪花算法后 Long 转 Integer 精度丢失，system_sms_code 表数据入库后主键为负数
 2023-03-16 20:25:29 +08:00
joinfriend ede7aabb55
补充update分隔符 
Signed-off-by: joinfriend <277784977@163.com>
 2023-03-07 17:25:00 +00:00
芋道源码 6216b1190a
!416 用户详情不显示所属部门部门 
Merge pull request !416 from babylazsss/master
 2023-02-28 16:51:59 +00:00
jian.li c35d4f596a 缓存部门命名优化 2023-02-24 13:13:10 +08:00
chiwenda 5f47c00c51 fix:用户详情不显示所属部门 2023-02-20 22:05:28 +08:00
YunaiV 35ba9b36af 菜单新增 alwaysShow 总是展示、componentName 组件名 2023-02-10 23:03:10 +08:00
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
 2023-02-04 10:21:45 +08:00
YunaiV f770133854 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master_unit-sql 
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/test/resources/sql/clean.sql
 2023-02-04 10:06:31 +08:00
YunaiV b5b23b3d7c infra：完善 config 的单元测试 2023-02-04 00:57:09 +08:00
YunaiV 10f7352ef8 system：简化 mapper 的实现 2023-02-04 00:33:55 +08:00
YunaiV 67e1879a8f system：将 biz 的方法名的负数都换成 List 2023-02-04 00:26:48 +08:00
YunaiV 837345ed95 system：将 api 的方法名的负数都换成 List 2023-02-04 00:15:20 +08:00
YunaiV 245e557309 system：将 check 方法，统一成 validate 方法 2023-02-04 00:10:12 +08:00
YunaiV 2ba4dec0da 完善 notify 单元测试 2023-02-04 00:02:37 +08:00
YunaiV 62dc3296d6 完善 mail 单元测试 2023-02-03 23:39:47 +08:00
YunaiV 3d3c88dd4f 完善 AdminUserServiceImpl 单元测试 2023-02-03 22:10:05 +08:00
YunaiV 1d3ca8a990 完善 TenantServiceImpl 单元测试 2023-02-02 23:47:17 +08:00
YunaiV 83003021e1 完善 TenantPackageServiceImpl 单元测试 2023-02-02 23:35:56 +08:00
YunaiV d897f8fb10 完善 SmsCodeServiceImpl 单元测试 2023-02-02 23:16:35 +08:00
YunaiV a332d5f893 完善 SmsSendServiceImpl 单元测试 2023-02-02 21:15:23 +08:00
YunaiV e7d0b8da35 完善 SmsLogServiceImpl 单元测试 2023-02-02 21:08:33 +08:00
YunaiV 97fd7a7187 完善 SmsChannelServiceImpl 单元测试 2023-02-02 21:05:58 +08:00
YunaiV d7f86afd6c 完善 SensitiveWordServiceImpl 单元测试 2023-02-02 21:03:25 +08:00
YunaiV 96e8fa4216 完善 RoleServiceImpl 单元测试 2023-02-02 09:13:14 +08:00
YunaiV 3aeebef036 完善 MenuServiceImplTest 单元测试 2023-02-01 23:33:59 +08:00
YunaiV 7731b4f503 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/dev-yunai 2023-02-01 21:09:29 +08:00
YunaiV 3470b38de2 完善 OAuth2ClientServiceImpl、OAuth2GrantServiceImpl 单元测试 2023-02-01 21:05:40 +08:00
YunaiV 96e8df0398 完善 NoticeServiceImpl 单元测试 2023-02-01 21:04:18 +08:00
YunaiV aa37c2cd7c 完善 OperateLogServiceImpl 单元测试 2023-02-01 08:27:02 +08:00
YunaiV 987fcd366c 完善 LoginLogServiceImplTest 单元测试 2023-02-01 08:17:03 +08:00
YunaiV 9ca793919d 完善 ErrorCodeServiceImpl 单元测试 2023-02-01 08:04:36 +08:00
YunaiV fed9feb05f 完善 DictTypeServiceImpl 单元测试 2023-02-01 07:45:57 +08:00
YunaiV 0537421655 完善 DictDataServiceImpl 单元测试 2023-02-01 07:34:57 +08:00
YunaiV bef06ef940 完善 PostServiceImpl 单元测试 2023-02-01 00:42:38 +08:00
YunaiV 1011de3278 完善 DeptServiceImpl 单元测试 2023-02-01 00:07:34 +08:00
YunaiV ba78d9964a 完善 AdminAuthServiceImpl 单元测试 2023-01-31 22:43:50 +08:00
xingyu fa2977ae9e 适配springdoc 2023-01-30 10:24:29 +08:00
xingyu 08a4de37c2 Merge remote-tracking branch 'origin/master' into feature/springdoc 
# Conflicts:
#	README.md
 2023-01-30 10:08:31 +08:00
xingyu edbbb1a50a feat: mail springdoc 2023-01-29 16:24:24 +08:00
xingyu ffb0358ce2 Merge remote-tracking branch 'origin/master' into feature/springdoc 2023-01-29 16:11:51 +08:00
YunaiV 1943e71e3f 站内信模块：完善注释 2023-01-28 22:59:01 +08:00
YunaiV ae3ee95cdd 站内信模块：整体功能实现 2023-01-28 20:10:19 +08:00
YunaiV 143035d798 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/notify 
# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-ui-admin/src/utils/dict.js
 2023-01-27 23:25:08 +08:00
YunaiV 3783367605 邮箱模块：优化注释 + 方法名 2023-01-27 21:43:39 +08:00
YunaiV 7e65ede92d 邮箱模块：优化注释 + 方法名 2023-01-27 21:31:30 +08:00
YunaiV 28ba9a7456 邮箱模块：vue3 邮件日志的管理 2023-01-27 20:51:52 +08:00
YunaiV 5d1abd5f44 邮箱模块：完善 send 的单元测试 2023-01-27 10:14:15 +08:00
YunaiV f0d2c7a58a 邮箱模块：完善 log 的单元测试 2023-01-27 09:38:42 +08:00
YunaiV c0b029b244 邮箱模块：完善 template 的单元测试 2023-01-26 23:32:18 +08:00
YunaiV 0895ee7d98 邮箱模块：完善 account 的单元测试 2023-01-26 23:04:26 +08:00
YunaiV 525078abd3 邮箱模块：完善 log 相关的逻辑 2023-01-26 20:39:38 +08:00
YunaiV f9ab45df18 邮箱模块：完善 log 相关表结构 2023-01-26 01:57:57 +08:00
YunaiV afced9d420 邮箱模块：完善发送 send 逻辑 2023-01-25 21:32:32 +08:00
YunaiV ea39dcc5c8 邮箱模块：完善 template 模版的增删改查功能 2023-01-25 20:44:48 +08:00
YunaiV 0262fa5c15 邮箱模块：完善 account 账号的增删改查功能 2023-01-25 17:48:09 +08:00
YunaiV c9c5a818ec Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mail-1.6.1 2023-01-25 12:40:37 +08:00
YunaiV c744e115e3 简化本地缓存的实现，萌新更容易看懂！ 2023-01-25 10:11:16 +08:00
YunaiV 711a39b8e9 spring doc：增加模块分组 2023-01-19 15:03:46 +08:00
芋道源码 2a332a95f9
!376 重构 滑块验证码实现 vue3 自动引入 
Merge pull request !376 from xingyu/dev
 2023-01-19 01:24:20 +00: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
YunaiV 5e9706007e Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/wechat-mp 
# Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/DefaultDatabaseQueryTest.java
 2023-01-18 00:38:55 +08:00
xingyu 13afc3d57a feat: springdoc 2023-01-17 21:25:06 +08:00
xingyu 0ef05fba7c Merge remote-tracking branch 'origin/dev' into feature/springdoc 
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java
 2023-01-17 21:18:53 +08:00
xingyu e314a63ee9 feat: springdoc 代码生成适配 2023-01-17 21:18:10 +08:00
xingyu 8c4bc638a4 chore: captcha-plus 2023-01-17 16:57:10 +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 860b0301b7 refactor: captcha-plus 2023-01-16 11:12:30 +08:00
xingyu fffe3008b5 refactor: captcha-plus 2023-01-16 10:47:39 +08:00
xingyu aaf62982e2 feat: 优化 captcha 代码 2023-01-12 21:51:53 +08:00
YunaiV d6de233a47 mp：完成公众号的数据统计前端界面 2023-01-08 00:36:25 +08:00
xingyu 854ba3315c marge master 2023-01-04 10:57:19 +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 7912a54ebd 【修复】没有数据权限时，添加/修改用户的唯一手机、账号等字段的校验不正确 2022-12-31 17:31:06 +08:00
dengxiaobing df2c137fe2 清理单元测试 sql 脚本 2022-12-30 10:10:43 +08:00
YunaiV a83b8e8fbc 修复报错的单元测试 2022-12-30 00:27:14 +08:00
芋道源码 8690f2dddd
!341 修改注释中的错别字 
Merge pull request !341 from 王添翼/master
 2022-12-29 12:20:56 +00:00
YunaiV 1aee4ad00f 【修复】DeptService 的 getDeptsByParentIdFromCache 在获取部门列表时，未处理多租户场景 2022-12-29 20:18:59 +08:00
YunaiV 5a4cc55917 【修复】字典类型逻辑删除时，唯一索引冲突的问题 2022-12-29 12:52:37 +08:00
YunaiV 2c3aaa8d7e 修复字典数据(system_dict_data)查询操作有问题，会查出不属于本字典类型(dict_type)的数据 2022-12-29 00:16:32 +08:00
YunaiV 3443aa6f5f 优化本地缓存的刷新实现，数据变更时，强制刷新 2022-12-29 00:09:58 +08:00
芋道源码 30a4d7d954
!342 同步最新版本的商城进度 
Merge pull request !342 from 芋道源码/feature/1.8.0-uniapp
 2022-12-27 13:39:56 +00:00
王添翼 84b0f33944
update yudao-module-system-biz/system/controller/admin/user/UserController.java. 
修改注释中的错别字“  // 获用户门列表，只要开启状态的”改为“  // 获取用户列表，只要开启状态的”

Signed-off-by: 王添翼 <2100022743@stu.pku.edu.cn>
 2022-12-25 13:16:38 +00:00
王添翼 c0b8000dee
修复yudao-module-system-api/ErrorCodeConstants.java中错误码重复的问题 
// ========== OAuth2 授权 1002022000 =========
ErrorCode OAUTH2_CODE_NOT_EXISTS = new ErrorCode(1002022000, "code 不存在");
ErrorCode OAUTH2_CODE_EXPIRE = new ErrorCode(1002022000, "code 已过期");
二者错误码重复，现将OAUTH2_CODE_EXPIRE的错误码改为1002022001。

Signed-off-by: 王添翼 <2100022743@stu.pku.edu.cn>
 2022-12-25 02:20:50 +00:00
YunaiV 9a5c8a11f5 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mail-1.6.1 
# Conflicts:
#	yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
#	yudao-module-system/yudao-module-system-biz/pom.xml
 2022-12-23 19:38:00 +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
YunaiV 7a4a6a3046 product：优化管理后台相关的接口 
area：增加地区列表界面
 2022-12-23 18:47:59 +08:00