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

818 Commits

Author SHA1 Message Date
YunaiV 0631c51d93 mall + trade：review 配置管理列表 2023-05-28 23:16:11 +08:00
jason 55dbff7570 运费模板 review 修改. 运费模块可以选择多个区域 2023-05-27 11:20:43 +08:00
崔家辉 fbeaa06100 bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误 2023-05-19 10:47:23 +08:00
wfm 4faf61a475 增加日志 2023-05-16 10:22:46 +08:00
wfm 86be0bdf80 fix PR 2023-05-16 09:58:58 +08:00
芋道源码 12d6c14b1c
!469 修复 vue3 代码生成 api 模版错误 && 修复过期属性 
Merge pull request !469 from xingyu/fix/vue3_codegen
 2023-05-15 14:36:53 +00:00
芋道源码 61220cf44e
!471 修复两处错误 
Merge pull request !471 from Rundeepin/master
 2023-05-15 13:53:03 +00:00
芋道源码 5dab4ae2e2
!479 StrUtils.maxLength会强制给后面加三个点，哪怕长度没有超过，优化长度不超过不加... 
Merge pull request !479 from 重楼/jjjjjjjj/dev
 2023-05-15 13:37:09 +00:00
wfm 494928ed88 feat:重放消息判断过期时间 2023-05-12 17:23:21 +08:00
jian.li e4a5a5672f StrUtils.maxLength会强制给后面加三个点，哪怕长度没有超过，优化长度不超过不加... 2023-05-12 16:36:55 +08:00
LiuZijian 8ec0be01a8 新增：达梦数据库驱动，KeyGenerator 2023-05-09 14:03:45 +08:00
xingyu 0b3640a522 fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED 2023-05-08 10:06:17 +08:00
YunaiV da162853ec 商城：完善购物车的逻辑 2023-04-30 20:32:01 +08:00
崔家辉 1e3380d0a3 修复包名路径错误 2023-04-28 14:47:24 +08:00
YunaiV 91f63ff813 尝试修复项目第一次打包失败报Failed to execute goal org.apache.maven.plugins:maven-jar-plugin:3.3.0:jar 2023-04-22 19:44:03 +08:00
YunaiV 8ce8f4e3a8 尝试修复项目第一次打包失败报Failed to execute goal org.apache.maven.plugins:maven-jar-plugin:3.3.0:jar 2023-04-22 19:41:30 +08:00
YunaiV e5fcc7a387 boot3：适合 ServletUtils 2023-04-16 21:40:56 +08:00
YunaiV fdea0ae0ea 优化请求头的 tenant-id 的解析逻辑，避免前端传错类型 2023-04-15 09:48:21 +08:00
YunaiV d2ba90db5d 修复单元测试报错 2023-04-14 22:59:45 +08:00
xingyuv e3d74b1713 chore: 升级最新依赖 2023-04-13 15:44:20 +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
zhangxingjia bc6eaea2b4 fix xss请求Wrapper getAttribute方法 问题修复 2023-04-07 19:07:33 +08:00
shizhong 2b1e5f1a3a 解决登录时输入无效租户名称登录失败提示不友好问题，还原修改 2023-04-03 12:56:25 +08:00
YunaiV 09afdaafcf !24 【轻量级 PR】：PasswordEncoder 加密复杂度自定义 2023-04-02 19:12:32 +08:00
YunaiV b9ba17a477 !31 IP查询导致异常问题 2023-04-02 19:01:46 +08:00
芋道源码 bb0110656b
!440 test: job 租户单元测试 
Merge pull request !440 from 与或非/test/tenant-job
 2023-04-02 04:13:36 +00:00
冰是睡着的水 fbbd3bc66c
优化大陆手机号验证。以19013896321为例，原来的正则匹配结果为false。 
Signed-off-by: 冰是睡着的水 <850083043@qq.com>
 2023-04-01 03:34:22 +00:00
shizhong 8d2c33e9b0 解决字符串型字段等值查询条件前端传空字符串不能正常忽略问题 2023-03-29 21:19:18 +08:00
shizhong 37fcc5cbe7 解决登录时输入无效租户名称登录失败提示不友好问题 2023-03-29 21:14:05 +08:00
gaibu 348a0ff02a test: 修复 code view 存在的问题 2023-03-20 21:50:53 +08:00
gaibu b54c5eaa45 test: job 租户单元测试 2023-03-18 20:53:33 +08:00
YunaiV 467170d3de Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 2023-03-16 22:43:58 +08:00
wangzhs f9569f910f 切换 Mybatis-plus-join 依赖 2023-03-13 18:32:43 +08:00
wangzhs 95159b0257 调整Mybaits Plus Join的SQL注入器到YudaoMybatisAutoConfiguration 2023-03-13 09:52:27 +08:00
wangzhs 7e0fb6cb56 调整Mybaits Plus Join的SQL注入器到YudaoMybatisAutoConfiguration 2023-03-12 17:43:42 +08:00
YunaiV ef510f9478 增加 mybatis plus join 集成的修改建议 2023-03-11 18:23:07 +08:00
wangzhs 670f67e551 新增 mybatis-plus-join 2023-03-11 17:47:15 +08:00
Xuing eed3d8b18d
修复ContextHolder的NPE异常 2023-03-08 20:16:19 +08:00
芋道源码 a31887568a
!422 feat: 修改错误注释 
Merge pull request !422 from 与或非/feat/20230224
 2023-02-28 16:49:52 +00:00
zhangxingjia 911040492e fix: 去掉Swagger自动配置类中的冗余配置 2023-02-28 19:02:51 +08:00
gaibu 2083fb7846 test: 修改 code review 2023-02-27 22:29:40 +08:00
gaibu e5957f9133 test: 字典数据模块单元测试 2023-02-26 11:41:12 +08:00
gaibu 5d6e2725a8 feat: 修改错误注释 2023-02-24 21:59:01 +08:00
芋道源码 c419c1e107
!417 支付收银台，接入支付宝的 PC、Wap、二维码、条码、App 等支付方式 
Merge pull request !417 from 芋道源码/feature/dev-yunai
 2023-02-22 14:43:10 +00:00
YunaiV 14893c4cff pay: 优化回调的逻辑 2023-02-20 23:41:03 +08:00
YunaiV 4390e28eea pay: 新增支付宝 App 支付的接入 2023-02-19 23:37:29 +08:00
YunaiV 2093c3bdb5 pay: 重构支付客户端，移除 PayCommonResult 累 2023-02-19 22:16:15 +08:00
YunaiV 8e1be01451 pay: 增加支付宝的条形码支付的配置 2023-02-18 23:59:11 +08:00
YunaiV 379aeeae16 pay: 接入支付宝 App 支付 2023-02-18 23:18:10 +08:00
YunaiV e6f414b918 pay: 接入支付宝 Wap 支付 2023-02-18 22:40:56 +08:00
YunaiV ce8571e313 pay: 接入支付宝 PC 支付的表单 2023-02-18 21:39:09 +08:00
YunaiV b34801f303 pay: 接入支付宝 PC 支付的跳转模式 2023-02-18 20:59:18 +08:00
YunaiV df702e8d24 pay: 临时性的提交，准备 client 部分的重构 2023-02-18 10:39:48 +08:00
筱龙缘 edc52d5f4f
修复 Redis Pub/Sub 广播消费的容器 默认未启动的问题 
默认配置没有启动Redis Pub/Sub 广播消费的容器 导致发出消息后 消费者收不到消息

Signed-off-by: 筱龙缘 <794334212@qq.com>
 2023-02-17 09:58:38 +00:00
YunaiV fb45a70bce 集成 Go-View 大屏设计器 2023-02-07 23:08:14 +08:00
YunaiV 1b6124a0db 集成 Go-View 大屏设计器 2023-02-07 22:56:33 +08:00
yuanhang c3836ca98b 解决操作日志记录报错的问题 
javax.validation.ConstraintViolationException: createOperateLog.arg0.name: 操作名
 2023-02-05 15:41:53 +08:00
YunaiV 53767614fe 增加商城的提示 2023-02-04 20:38:51 +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 837345ed95 system：将 api 的方法名的负数都换成 List 2023-02-04 00:15:20 +08:00
YunaiV 3d3c88dd4f 完善 AdminUserServiceImpl 单元测试 2023-02-03 22:10:05 +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 987fcd366c 完善 LoginLogServiceImplTest 单元测试 2023-02-01 08:17:03 +08:00
YunaiV fed9feb05f 完善 DictTypeServiceImpl 单元测试 2023-02-01 07:45:57 +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 c0b029b244 邮箱模块：完善 template 的单元测试 2023-01-26 23:32:18 +08:00
YunaiV 0895ee7d98 邮箱模块：完善 account 的单元测试 2023-01-26 23:04:26 +08:00
YunaiV 179fdc8464 优化 xss 的代码实现，独立 xss 包 2023-01-25 11:17:52 +08:00
YunaiV c744e115e3 简化本地缓存的实现，萌新更容易看懂！ 2023-01-25 10:11:16 +08:00
YunaiV 0763c720d2 优化脱敏组件的注释 2023-01-21 13:17:08 +08:00
芋道源码 e7f8e0c507
!372 支持 vo 返回脱敏 
Merge pull request !372 from 与或非/issues/I3QPZV
 2023-01-19 13:59:34 +00:00
gaibu 729ec31dab feat: 修改脱敏注解名称 2023-01-19 20:16:03 +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
gaibu 2aa208f441 feat: 脱敏组件代码规范更新 2023-01-19 10:35:54 +08:00
YunaiV 6593ec4214 code review 脱敏组件的代码 2023-01-19 10:25:43 +08:00
芋道源码 2a332a95f9
!376 重构 滑块验证码实现 vue3 自动引入 
Merge pull request !376 from xingyu/dev
 2023-01-19 01:24:20 +00:00
xingyu ba65a864fa perf: 优化Springdoc配置 2023-01-18 17:40:49 +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 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 0ebba2eb81 移除springfox配置 2023-01-17 20:47:07 +08:00
xingyu 3d390d0d8f feat: knife4j 2023-01-17 20:42:18 +08:00
xingyu 8c4bc638a4 chore: captcha-plus 2023-01-17 16:57:10 +08:00
gaibu 42bc0d1519 feat: 脱敏组件增加单元测试 2023-01-17 11:28:33 +08:00
gaibu 7b3fca2844 feat: 脱敏组件代码规范更新 2023-01-17 10:52:37 +08:00
YunaiV 32d7d6ab29 code review 脱敏组件的代码 2023-01-17 08:11:57 +08:00
xingyu 4d35bcef65 feat: springdoc success 2023-01-16 22:58:56 +08:00
gaibu e5ab9b71b6 feat: 完善注释 2023-01-16 21:50:09 +08:00
gaibu c60f8d6da2 feat: 支持 vo 返回的脱敏 2023-01-16 21:45:18 +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 b4b23596a5 feat: 升级 knife4j 4.0 2023-01-16 14:22:39 +08:00
xingyu 55db35e31b chore: update deps 2023-01-16 13:43:05 +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
xingyu 865f101070 feat: 将aj-captcha换为源码导入 2023-01-12 20:57:11 +08:00
gaibu 61a34ddac5 feat: 支持 vo 返回的脱敏 2023-01-12 19:57:11 +08:00
gaibu 70f15ab60d feat: 增加注释 2023-01-12 15:43:31 +08:00
gaibu cd9bcda935 feat: 支持 vo 返回的脱敏 2023-01-12 15:31:44 +08:00
gaibu 5c8e41b847 feat: 支持 vo 返回的脱敏 2023-01-12 14:54:33 +08:00
xingyu 3df825034b chore: update deps 2023-01-12 13:58:32 +08:00
gaibu 099754c26e fix: xss 启用后编辑器上传图片错误 2023-01-10 19:27:24 +08:00
gaibu e637bff8cd feat: 支持 vo 返回的脱敏 2023-01-10 15:10:16 +08:00
gaibu d7bec143fd fix: xss 启用后编辑器上传图片错误 2023-01-09 13:23:45 +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 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
芋道源码 661a20dc93
!351 升级最新依赖 && 修复树形 全部展开 全部关闭 
Merge pull request !351 from xingyu/dev
 2023-01-04 14:26:01 +00:00
xingyu d6fdd924e9 Merge remote-tracking branch 'origin/dev' into feature/springdoc 2023-01-04 10:58:34 +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
xingyu c98965cd55 chore: update spring boot 2.7.7 
hutool 5.8.11
mybaits-plus 3.5.3
flowable 6.8.0
 2023-01-04 10:12:00 +08:00
咱哥丶 2d1ff0aff7 commit 增加webSocket 2023-01-02 22:53:55 +08:00
gaibu 2fea3a8e83 fix: 腾讯 COS 异常，Region 必传 2023-01-02 22:31:15 +08:00
YunaiV a7e4ff0d76 mp：实现消息推送的处理接口 2023-01-02 17:44:37 +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 a83b8e8fbc 修复报错的单元测试 2022-12-30 00:27:14 +08:00
芋道源码 f469c5caaf
!332 redis mq消息丢失问题 
Merge pull request !332 from 与或非/issues/I5RFO2
 2022-12-29 12:27:38 +00:00
YunaiV ac3c751132 329 修改`支付模块>支付过期时间格式化异常（yyyy-MM-ddTHH:mm:ssXXX）` 2022-12-29 18:56:55 +08:00
YunaiV 5a4cc55917 【修复】字典类型逻辑删除时，唯一索引冲突的问题 2022-12-29 12:52:37 +08:00
YunaiV 3443aa6f5f 优化本地缓存的刷新实现，数据变更时，强制刷新 2022-12-29 00:09:58 +08:00
gaibu 604266d33c fix: 解决 redis mq 消息丢失问题 2022-12-27 22:52:19 +08:00
芋道源码 30a4d7d954
!342 同步最新版本的商城进度 
Merge pull request !342 from 芋道源码/feature/1.8.0-uniapp
 2022-12-27 13:39:56 +00:00
芋道源码 373eff605b
!329 修改`支付模块>支付过期时间格式化异常（yyyy-MM-ddTHH:mm:ssXXX）` 
Merge pull request !329 from 骑士梦/master
 2022-12-25 03:39:24 +00: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
gaibu 0e6b4e463f fix: 解决 redis mq 消息丢失问题 2022-12-23 10:33:38 +08:00
gaibu 2d7d3f1511 fix: 解决 redis mq 消息丢失问题 2022-12-23 10:32:18 +08:00
gaibu e9645d7054 fix: 解决 redis mq 消息丢失问题 2022-12-23 10:31:41 +08:00
gaibu 46f3790492 fix: 解决 redis mq 消息丢失问题 2022-12-23 10:28:59 +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
xingyu 4f2c08f8db Merge remote-tracking branch 'origin/dev' into feature/springdoc 2022-12-21 22:46:52 +08:00
xingyu 6c521fd5e0 chore: update deps 2022-12-19 22:21:36 +08:00
xingyu 46c93b637f chore: update deps 2022-12-19 10:51:36 +08:00
gaibu a6c92816f0 fix: 解决 redis mq 消息丢失问题 2022-12-15 15:33:15 +08:00
gaibu 0f31ce7ecf fix: 解决 redis mq 消息丢失问题 2022-12-15 14:36:17 +08:00
gaibu 766b74f040 fix: SQL 条件表达式缺少括号问题 2022-12-14 08:57:52 +08:00
YunaiV 5474ae876d Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 2022-12-13 20:20:04 +08:00
YunaiV 40ce481e2e ip：AreaUtils、IPUtils 优化 2022-12-13 20:19:54 +08:00
qs ec1a933d30 修改`支付模块>支付过期时间格式化异常（yyyy-MM-ddTHH:mm:ssXXX）` 2022-12-13 15:41:30 +08:00
qs 24ed7be5c5 修改`支付模块>解析订单通知V3>属性设置错误` 2022-12-13 15:21:55 +08:00
gaibu 453603b6ad fix: SQL 条件表达式缺少括号问题 2022-12-13 10:37:41 +08:00
芋道源码 f9b4874ee9
!320 秒杀活动相关 
Merge pull request !320 from halfninety/feature/1.8.0-uniapp
 2022-12-13 02:04:54 +00:00
dark 0b5aa560b3 ip库引入，查询工具类 2022-12-11 22:20:43 +08:00
YunaiV fc48ab4928 trade：前端订单管理，联调接口 2022-12-10 17:06:34 +08:00
YunaiV fc49f000ce trade：前端订单管理，联调接口 2022-12-10 11:52:11 +08:00
YunaiV bddbedd781 增加城市库 2022-12-10 00:17:08 +08:00
xingyu 3937004d5b fix: mysql warn 2022-12-09 18:34:34 +08:00
xingyu4j 88ce5e540e refactor: springdoc 替换 springfox 2022-12-09 14:24:09 +08:00
xingyu4j 9fc6e0f00b refactor: springdoc 替换 springfox 2022-12-09 13:43:15 +08:00
xingyu4j 262ff34160 保证统一的版本号 2022-12-08 13:58:48 +08:00
xingyu4j 232c325608 升级版本，保证统一的版本号 2022-12-08 13:52:01 +08:00
YunaiV 7fc9689f07 trade：定义管理后台的订单分页接口 2022-12-08 00:07:14 +08:00
xingyu 2513bbf02d Merge remote-tracking branch 'origin/master' into dev 2022-12-06 20:53:09 +08:00
YunaiV ffab0b1d6a 1. 优化 menu 本地缓存的刷新策略，在修改或删除菜单时，强制刷新缓存 
2. 修复 pub/sub 未初始化的问题
3. 优化 Job 定时的 mybatis 日志输出，避免一直打印
 2022-12-06 20:38:05 +08:00
xingyu4j 4397d47da1 升级版本，保证统一的版本号 2022-12-06 17:04:43 +08:00
halfninety abbb076859 完成秒杀时段，秒杀活动相关todo 2022-12-02 22:33:07 +08:00
xingyu4j fea1ad8f8d 升级最新依赖 2022-12-02 11:37:36 +08:00
xingyu4j 9d3bbdd8c4 v 1.6.5 2022-12-01 09:39:20 +08:00
YunaiV 650133dda4 增加 NumberSerializer 注释 2022-11-30 20:17:05 +08:00
xingyu4j 1b3ff0e7d1 fix: WebSecurityConfigurerAdapter 过期 2022-11-30 14:04:47 +08:00
xingyu4j 2c8e2209e8 feat: 增加全局超长number序列化 2022-11-30 12:32:56 +08:00
xingyu4j a43b884c73 fix: warn 2022-11-30 10:30:58 +08:00
xingyu 0a8a41dea1 chore: update tencentcloud version 2022-11-30 01:29:26 +08:00
xingyu 283aae1da2 feat: 适配springboot 2.7 configuration ==> AutoConfiguration 2022-11-30 01:20:20 +08:00
xingyu 1aa05e0198 feat: 适配 springboot 2.7 2022-11-30 01:03:56 +08:00
xingyu b079513dc8 chore: 升级springboot 2.7.6 2022-11-30 00:41:24 +08:00
halfninety d6b426970b 序列化配置修改名称 2022-11-29 23:25:01 +08:00
halfninety cd62c4d220 秒杀时段相关 2022-11-29 23:25:00 +08:00
芋道源码 44249e43dd
!313 修复上传七牛云无mime type问题 
Merge pull request !313 from 石溪/master
 2022-11-29 13:12:54 +00:00
YunaiV 66abe4a84b trade：完成交易订单的发货逻辑 2022-11-27 19:42:49 +08:00
石溪 7f9fc41555 修复上传七牛云无mime type问题 2022-11-26 19:26:36 +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 ea95115ffd 移除云片短信渠道，解决云片的安全风险 2022-11-25 20:22:04 +08:00
YunaiV 1cd9085c59 pay: PayNotifyJob 增加多租户的支持 2022-11-24 23:56:13 +08:00
xingyu 0d0f64e30a feat: 删除过期方法 2022-11-23 22:54:44 +08:00
YunaiV 8798944069 优化 pay 支付成功后的回调逻辑 2022-11-23 21:09:16 +08:00
YunaiV 73d847ae2e 调整支付模块的回调地址 2022-11-22 19:54:52 +08:00
YunaiV 35528e8267 trade：【交易售后】查询分页列表 2022-11-19 20:43:59 +08:00
zy 9b667448ea fix: 加入异步注解配置后redis消费者不能正常消费 2022-11-18 09:51:19 +08:00
YunaiV 969b9c3458 修复 swagger 404 的问题 2022-11-16 21:52:33 +08:00
YunaiV 38f67d4130 将 mall 使用到 Date 的部分，迁移到 LocalDateTime 中 2022-11-13 21:23:38 +08:00
YunaiV 12d045ea58 修复部分单元测试报错的问题 2022-11-13 21:08:15 +08:00
YunaiV 89580e7903 合并 master 代码 2022-11-13 12:21:17 +08:00
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
 2022-11-13 12:07:59 +08:00
YunaiV 0e903df380 调整 YudaoDataPermissionAutoConfiguration 的自动配置 2022-11-13 10:06:33 +08:00
YunaiV 1819e0e1d6 异步化 Redis MQ 的初始化，提升启动速度 2022-11-12 20:57:28 +08:00
YunaiV c5b547e0f3 优化，使用 @Configuration(proxyBeanMethods = false) 提升启动速度 2022-11-12 20:22:09 +08:00
YunaiV f5ef87094d 优化，使用 @Configuration(proxyBeanMethods = false) 提升启动速度 2022-11-12 20:17:58 +08:00
YunaiV ff1379d454 优化 README 说明~ 2022-11-12 18:57:41 +08:00
YunaiV c9f6494bb4 【优化】修改短信模板的渠道为云片时，校验 API 模板编号为整数 2022-11-12 11:01:15 +08:00
芋道源码 ae0227c107
!276 阿里云OSS解析region时兼容带https的配置 
Merge pull request !276 from huangyemin/master
 2022-11-12 02:23:25 +00:00
YunaiV a8cdf74120 【移除】Apollo 配置中心，简化学习成本 2022-11-12 09:52:36 +08:00
YunaiV ce3aefadd7 移除 jasypt-spring-boot-starter 依赖，使用 hutool AES 替代 2022-11-12 09:15:02 +08:00
芋道源码 fb237423b8
!294 修复单元测试报错 
Merge pull request !294 from 芋道源码/dev
 2022-11-11 01:22:17 +00:00
YunaiV a539bc211d 1. 修复 MemberAuthServiceTest 单元测试 
2. 修复 DataPermissionDatabaseInterceptorTest 单元测试
 2022-11-11 08:55:28 +08:00
YunaiV 40ba456fde 1. 修复 MenuServiceTest 单元测试 2022-11-11 01:24:39 +08:00
芋道源码 e51dda6b68
!281 fix WXLitePayClient.java 中copy应忽略的字段 
Merge pull request !281 from chenlei65368/N/A
 2022-11-10 14:37:26 +00:00
YunaiV d3b6a0ca69 1. 修复 refund/index.vue 的报错 
2. 优化 DateUtils 的工具类的方法命名
 2022-11-10 12:55:26 +08:00
xingyu4j 9c033d0104 DateUtils ==> LocalDateTime 2022-11-09 12:43:54 +08:00
xingyu4j cb006ddf2b DateUtils.buildLocalDateTime ==> LocalDateTime.of 2022-11-09 12:38:01 +08:00
xingyu4j 632a132a6a refactor: Date ==> LocalDateTime 2022-11-09 11:14:46 +08:00
YunaiV edc5d0f1d0 promotion：增加获得优惠劵匹配结果的列表 2022-11-08 00:40:53 +08:00
YunaiV 3c10058dbd promotion：实现部分优惠劵模板的前端逻辑 2022-11-01 00:37:07 +08:00
chenlei65368 bb8204b5a7
fix WXLitePayClient.java 中copy应忽略的字段 
小程序支付，copy应忽略 "privateKeyContent","privateCertContent"，而不是“KeyContent”

Signed-off-by: chenlei65368 <chenlei65368@sohu.com>
 2022-10-24 10:43:04 +00:00
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
 2022-10-23 22:16:54 +08:00
huangyemin 93135363c6 阿里云OSS解析region时兼容带https的配置 2022-10-12 11:33:29 +08:00
xingyu 72ee1206e6 Merge remote-tracking branch 'origin/master' into dev 2022-09-29 14:13:16 +08:00
xingyu 1aca24b636 feat: 升级依赖 2022-09-28 21:04:13 +08:00
YunaiV 034de50999 完善多租户的注释与代码 2022-09-24 21:54:03 +08:00
YunaiV b73cdd15b5 同步 Master 最新代码 2022-09-24 18:25:18 +08:00
YunaiV 25e7c8dceb 同步 Master 最新代码 2022-09-24 18:16:27 +08:00
YunaiV 1be09d092b ♻️优化“通过注解增加多租户缓存”的代码 2022-09-24 12:26:01 +08:00
芋道源码 597a923828
!257 通过注解增加多租户缓存 
Merge pull request !257 from CrazyAirhead/master
 2022-09-24 04:11:50 +00:00
xingyu 9054a772b0 feat: 升级依赖 2022-09-20 18:00:43 +08:00
YunaiV 38e88b02f5 🐛修复数据权限，不支持隐式内连接的问题 2022-09-10 21:37:16 +08:00
airhead 6b429584bf fix(tenant): 租户缓存增加注释 2022-09-09 22:56:26 +08:00
airhead 0e1babd7f4 feat(redis): 注解支持多租户缓存 
1.增加多租户Cache
2.修复Mac M1启动报错
 2022-09-09 22:56:25 +08:00
芋道源码 61b0624a59
!262 接口实现-交易订单创建(未完全实现) 
Merge pull request !262 from LeeYan9/ly_uniapp
 2022-09-05 13:16:11 +00:00
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
 2022-09-04 21:06:28 +08:00
YunaiV 9715087b54 管理后台的 uniapp 验证码，增加开关 2022-09-04 17:44:26 +08:00
YunaiV a484cd5193 优化图片验证码的后端实现 2022-09-04 12:44:02 +08:00
YunaiV 926c75d29a 优化图片验证码的后端实现 2022-09-04 11:26:37 +08:00
ex_yang.li@ca-nio.com 19a703b8c9 创建订单接口定义 2022-08-26 17:47:43 +08:00
luowenfeng 0bc2ef1d39 feature(uniapp商品): 商品业务代码调整 2022-08-24 14:08:32 +08:00
xingyu e5bd517829 perf: final方法改为大写命名 2022-08-11 11:45:34 +08:00
xingyu e1b8ae09c9 增加手机号正则验证 2022-08-11 11:32:38 +08:00
xingyu4j 40f730033f 压缩图片尺寸 2022-08-07 23:26:17 +08:00
YunaiV cfde3dcacb mall：优化订单表的设计 2022-08-05 00:28:40 +08:00
xingyu 2bf09cbfc2 升级部分依赖，存在高危漏洞报错问题 2022-08-03 13:38:02 +08:00
xingyu a8ea50a059 update hutool 5.8.5 2022-08-03 13:38:02 +08:00
xingyu 4a92081937 vue2 新增行为验证码 2022-08-03 13:38:01 +08:00
YunaiV 2866b58741 1. 默认不开启 bpm 工作流模块，按需启动，提升启动速度 
2. 完整移除 activiti 遗留的东东
 2022-07-29 22:51:52 +08:00
YunaiV 39ac59efee 默认禁用报表模块， 2022-07-29 20:57:18 +08:00
xgd 8c5681f4f9 [新增]接入支付宝【PC网站支付】 2022-07-29 17:31:35 +08:00
芋道源码 35413b52c9
!237 集成积木报表 
Merge pull request !237 from 芋道源码/feature/visual
 2022-07-29 04:51:54 +00:00
YunaiV e5a7b8474f fix：短信验证码的每日发送条数不正确 2022-07-29 00:56:17 +08:00
xingyu 88fc7ed39b 删除未引用 2022-07-28 12:18:14 +08:00
YunaiV d872676748 完善积木报表的集成 2022-07-28 09:29:51 +08:00
YunaiV 62dc600c51 reactor：完善多租户的配置类 2022-07-27 09:08:56 +08:00