| 
							
							
								 YunaiV | fb45a70bce | 集成 Go-View 大屏设计器 | 2023-02-07 23:08:14 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 1b6124a0db | 集成 Go-View 大屏设计器 | 2023-02-07 22:56:33 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 53767614fe | 增加商城的提示 | 2023-02-04 20:38:51 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 6bf5eb0133 | 适配 mall 模块的 openapi | 2023-02-04 13:06:54 +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 | 3aeebef036 | 完善 MenuServiceImplTest 单元测试 | 2023-02-01 23:33:59 +08:00 |  | 
			
				
					| 
							
							
								 xingyu | c6f880bfc1 | up springboot 2.7.8 | 2023-01-31 09:28:07 +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 |  | 
			
				
					| 
							
							
								 YunaiV | 3166cd7063 | mp:同步 mp 公众号 SQL | 2023-01-17 23:56:27 +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 | 97330fd7b1 | chore: 升级springboot 2.7.7 | 2023-01-05 10:01:49 +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 |  | 
			
				
					| 
							
							
								 xingyu | cacefb4eea | feat: knife4j springdoc | 2022-12-22 00:25:22 +08:00 |  | 
			
				
					| 
							
							
								 xingyu4j | 9fc6e0f00b | refactor: springdoc 替换 springfox | 2022-12-09 13:43:15 +08:00 |  | 
			
				
					| 
							
							
								 xingyu4j | 9315ac0bec | Revert "feat: add search slots" This reverts commit 078249677b. | 2022-12-08 12:37:16 +08:00 |  | 
			
				
					| 
							
							
								 xingyu4j | 078249677b | feat: add search slots | 2022-12-08 12:36:40 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | ffab0b1d6a | 1. 优化 menu 本地缓存的刷新策略,在修改或删除菜单时,强制刷新缓存 2. 修复 pub/sub 未初始化的问题
3. 优化 Job 定时的 mybatis 日志输出,避免一直打印 | 2022-12-06 20:38:05 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 0b9ddddd18 | promotion:code review 秒杀的代码 | 2022-11-30 19:59:38 +08:00 |  | 
			
				
					| 
							
							
								 xingyu | b079513dc8 | chore: 升级springboot 2.7.6 | 2022-11-30 00:41:24 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 07f1681b50 | Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp | 2022-11-26 18:41:02 +08:00 |  | 
			
				
					| 
							
							
								 xingyu | 693288d33d | Merge remote-tracking branch 'origin/master' into feature/vue3 # Conflicts:
#	yudao-dependencies/pom.xml | 2022-11-26 13:07:51 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 2d78b02086 | 移除云片短信渠道,解决云片的安全风险 | 2022-11-25 21:04:40 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 1cd9085c59 | pay: PayNotifyJob 增加多租户的支持 | 2022-11-24 23:56:13 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 8798944069 | 优化 pay 支付成功后的回调逻辑 | 2022-11-23 21:09:16 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 73d847ae2e | 调整支付模块的回调地址 | 2022-11-22 19:54:52 +08:00 |  | 
			
				
					| 
							
							
								 xingyu4j | b081bb8e71 | chore: devs | 2022-11-18 17:25:37 +08:00 |  | 
			
				
					| 
							
							
								 xingyu | 7df72c4d85 | fix | 2022-11-17 23:24:50 +08:00 |  | 
			
				
					| 
							
							
								 xingyu | 6291a3d7d8 | refactor: dictData ==> dictClass | 2022-11-17 23:09:29 +08:00 |  |