| 
							
							
								 Rex | de8f8b450a | 缺陷-修复代码生成器的同步报错问题 | 2023-02-14 21:33:13 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 71cb5fdcb8 | 合并最新 master 代码 | 2023-02-04 10:24:41 +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 | ba4e90b529 | infra:完善 DatabaseTableServiceImpl 单元测试 | 2023-02-04 09:57:18 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 0ff786d0ea | infra:标准化代码 | 2023-02-04 09:15:46 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | ec913adb20 | infra:完善 logger 的单元测试 | 2023-02-04 09:10:09 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | ebf441ef13 | infra:完善 job 的单元测试 | 2023-02-04 08:42:29 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 3070392ecd | infra:完善 file 的单元测试 | 2023-02-04 07:50:36 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | cc1fa54ea5 | infra:完善 dataSource 的单元测试 | 2023-02-04 01:14:59 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | b5b23b3d7c | infra:完善 config 的单元测试 | 2023-02-04 00:57:09 +08:00 |  | 
			
				
					| 
							
							
								 xingyu | ffb0358ce2 | Merge remote-tracking branch 'origin/master' into feature/springdoc | 2023-01-29 16:11:51 +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 | f6f99de795 | Merge branch 'dev' into feature/springdoc | 2023-01-18 15:38:54 +08:00 |  | 
			
				
					| 
							
							
								 xingyu | db914c9758 | 适配最新 vue3 代码生成 | 2023-01-18 14:26:52 +08:00 |  | 
			
				
					| 
							
							
								 xingyu | e314a63ee9 | feat: springdoc 代码生成适配 | 2023-01-17 21:18:10 +08:00 |  | 
			
				
					| 
							
							
								 gaibu | fcbcb28304 | feat: 优化代码生成列表加载速度 | 2023-01-17 11:35:22 +08:00 |  | 
			
				
					| 
							
							
								 gaibu | 4f5dbb2288 | feat: 优化代码生成列表加载速度 | 2023-01-16 16:35:58 +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 |  | 
			
				
					| 
							
							
								 gaibu | b8c728aef8 | feat: 优化代码生成列表加载速度 | 2023-01-16 13:10:02 +08:00 |  | 
			
				
					| 
							
							
								 芋道源码 | f246428bef | !370 fix: 代码生成字段转换错误 Merge pull request !370 from 与或非/issues/202 | 2023-01-11 14:41:28 +00:00 |  | 
			
				
					| 
							
							
								 gaibu | 215a3767ae | fix: 代码生成字段转换错误 | 2023-01-11 18:36:01 +08:00 |  | 
			
				
					| 
							
							
								 芋道源码 | 3df24e11d2 | !363 基础设施-代码生成-整个模块不能使用 Merge pull request !363 from 与或非/issues/202 | 2023-01-11 00:15:58 +00:00 |  | 
			
				
					| 
							
							
								 gaibu | 431c029b60 | fix: 基础设施-代码生成-整个模块不能使用 | 2023-01-10 17:51:52 +08:00 |  | 
			
				
					| 
							
							
								 miozus | 09d6dcfa1f | 修复:mp+升级导致test用例找不到对象爆红 ○ import com.baomidou.mybatisplus.IDatabaseQuery.DefaultDatabaseQuery
● import com.baomidou.mybatisplus.generator.query.DefaultQuery; | 2023-01-10 11:08:29 +08:00 |  | 
			
				
					| 
							
							
								 gaibu | df479f627e | fix: 基础设施-代码生成-整个模块不能使用 | 2023-01-09 13:58:19 +08:00 |  | 
			
				
					| 
							
							
								 xingyu | 459640a222 | revert: file | 2023-01-05 09:53:45 +08:00 |  | 
			
				
					| 
							
							
								 xingyu | c5f29f18d3 | Merge remote-tracking branch 'origin/master' into dev | 2023-01-05 09:41:54 +08:00 |  | 
			
				
					| 
							
							
								 芋道源码 | 4c0275fbf4 | !348 增加webSocket连接测试以及文件优化 Merge pull request !348 from 咱哥丶/dev | 2023-01-04 14:30:40 +00:00 |  | 
			
				
					| 
							
							
								 芋道源码 | 3dbe8cd279 | !350 配置管理,配置是否可见判断写反了 Merge pull request !350 from kinlon92/master | 2023-01-04 14:29:37 +00:00 |  | 
			
				
					| 
							
							
								 芋道源码 | 661a20dc93 | !351 升级最新依赖 && 修复树形 全部展开 全部关闭 Merge pull request !351 from xingyu/dev | 2023-01-04 14:26:01 +00:00 |  | 
			
				
					| 
							
							
								 咱哥丶 | 18622c5d06 | 删除文件 yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java | 2023-01-04 12:02:46 +00:00 |  | 
			
				
					| 
							
							
								 咱哥丶 | ccc4cad1c8 | 删除文件 yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java | 2023-01-04 12:02:26 +00:00 |  | 
			
				
					| 
							
							
								 xingyu | 050498a55a | perf: vue3 代码生成 | 2023-01-04 16:35:09 +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 |  | 
			
				
					| 
							
							
								 芋道源码 | 427d031ba5 | !346 file路径Bug Merge pull request !346 from 与或非/issues/I5KG6T | 2023-01-04 01:19:37 +00:00 |  | 
			
				
					| 
							
							
								 kinlon92 | 29ac759c51 | 是否可见写反了 Signed-off-by: kinlon92 <zhangjinlong1211@126.com> | 2023-01-03 07:36:15 +00:00 |  | 
			
				
					| 
							
							
								 xingyu | df8a0768ea | feat: vue3 代码生成 | 2023-01-03 11:23:41 +08:00 |  | 
			
				
					| 
							
							
								 咱哥丶 | c04ad317cf | 支持文件上传时可增加追加自定义路径 如aaa/ ,aaa/bbb/ 下载文件时可以重新命名文件真实名 | 2023-01-02 23:39:01 +08:00 |  | 
			
				
					| 
							
							
								 咱哥丶 | a9aaac39e8 | commit  增加webSocket | 2023-01-02 23:09:10 +08:00 |  | 
			
				
					| 
							
							
								 咱哥丶 | b77a52a4a8 | commit  增加webSocket | 2023-01-02 22:55:48 +08:00 |  | 
			
				
					| 
							
							
								 咱哥丶 | 2d1ff0aff7 | commit  增加webSocket | 2023-01-02 22:53:55 +08:00 |  | 
			
				
					| 
							
							
								 gaibu | 906a3a2c50 | fix: 重复 file 路径 Bug | 2023-01-02 12:27:52 +08:00 |  | 
			
				
					| 
							
							
								 gaibu | 639c7820f9 | fix: 重复 file 路径 Bug | 2022-12-30 16:07:53 +08:00 |  | 
			
				
					| 
							
							
								 gaibu | 9a46860086 | fix: 重复 file 路径 Bug | 2022-12-30 15:04:28 +08:00 |  | 
			
				
					| 
							
							
								 dengxiaobing | df2c137fe2 | 清理单元测试 sql 脚本 | 2022-12-30 10:10:43 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | a83b8e8fbc | 修复报错的单元测试 | 2022-12-30 00:27:14 +08:00 |  |