3378 Commits (f0cdc8d296b4c3fdd91627e60ac54327b9346ee2)
 

Author SHA1 Message Date
YunaiV f0cdc8d296 mp:增加消息推送的接口 3 years ago
YunaiV c671b01b0a mp:增加公众号的校验签名回调 3 years ago
YunaiV 275a1b10f6 mp:增加 MpServiceFactory 管理创建的 MpService~ 3 years ago
YunaiV 627cb39517 mp:完善公众号的账号管理 3 years ago
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
3 years ago
YunaiV 52e055aba2 移除 yudao-module-work 模块,用途不大 3 years ago
YunaiV 6f8384af70 增加《敏感词》《地区 & IP》文档 3 years ago
YunaiV 7912a54ebd 【修复】没有数据权限时,添加/修改用户的唯一手机、账号等字段的校验不正确 3 years ago
YunaiV b7380019ba 完善项目 README 说明 3 years ago
YunaiV a83b8e8fbc 修复报错的单元测试 3 years ago
芋道源码 f469c5caaf
!332 redis mq消息丢失问题
Merge pull request !332 from 与或非/issues/I5RFO2
3 years ago
芋道源码 75b3a297ce
!344 update yudao-ui-admin/src/components/FileUpload/index.vue.
Merge pull request !344 from plimlips/N/A
3 years ago
芋道源码 8690f2dddd
!341 修改注释中的错别字
Merge pull request !341 from 王添翼/master
3 years ago
芋道源码 e646386603
!326 fix typo in uni-swiper-dot.vue
Merge pull request !326 from Ikko Ashimine/N/A
3 years ago
YunaiV 1aee4ad00f 【修复】DeptService 的 getDeptsByParentIdFromCache 在获取部门列表时,未处理多租户场景 3 years ago
YunaiV ac3c751132 329 修改`支付模块>支付过期时间格式化异常(yyyy-MM-ddTHH:mm:ssXXX)` 3 years ago
YunaiV 5a4cc55917 【修复】字典类型逻辑删除时,唯一索引冲突的问题 3 years ago
YunaiV 2c3aaa8d7e 修复字典数据(system_dict_data)查询操作有问题,会查出不属于本字典类型(dict_type)的数据 3 years ago
YunaiV 3afa09bd98 Merge remote-tracking branch 'origin/master' 3 years ago
YunaiV 3443aa6f5f 优化本地缓存的刷新实现,数据变更时,强制刷新 3 years ago
plimlips 2c02159384
update yudao-ui-admin/src/components/FileUpload/index.vue.
后台一直使用 0 作为成功,所以前端也不应该使用200

Signed-off-by: plimlips <156839224@qq.com>
3 years ago
gaibu 604266d33c fix: 解决 redis mq 消息丢失问题 3 years ago
芋道源码 258c1ddb70
!343 同步dev分支
Merge pull request !343 from xingyu/dev
3 years ago
YunaiV 2706463e49 修复 local 环境的配置文件 3 years ago
芋道源码 30a4d7d954
!342 同步最新版本的商城进度
Merge pull request !342 from 芋道源码/feature/1.8.0-uniapp
3 years ago
YunaiV aa74df4e5a uniapp:增加部分 confirm 下单确认页 3 years ago
xingyu d86c36a151 vue2 圆角标签栏 3 years ago
YunaiV 4aeaa21854 uniapp:【商品列表】样式 review 3 years ago
YunaiV d4ceceee8c uniapp:【商品详情】对接后端接口 3 years ago
xingyu ab67540d5f fix: crud bug 3 years ago
王添翼 84b0f33944
update yudao-module-system-biz/system/controller/admin/user/UserController.java.
修改注释中的错别字“  // 获用户门列表,只要开启状态的”改为“  // 获取用户列表,只要开启状态的”

Signed-off-by: 王添翼 <2100022743@stu.pku.edu.cn>
3 years ago
芋道源码 373eff605b
!329 修改`支付模块>支付过期时间格式化异常(yyyy-MM-ddTHH:mm:ssXXX)`
Merge pull request !329 from 骑士梦/master
3 years ago
芋道源码 9d5a821610
!340 修复yudao-module-system-api/ErrorCodeConstants.java中错误码重复的问题
Merge pull request !340 from 王添翼/master
3 years ago
王添翼 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>
3 years ago
芋道源码 79f77e61ba
!339 修复 vue3 部分问题
Merge pull request !339 from xingyu/dev
3 years ago
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
3 years ago
YunaiV 7a4a6a3046 product:优化管理后台相关的接口
area:增加地区列表界面
3 years ago
xingyu 6481663c42 chore: update deps 3 years ago
xingyu faa6f05d9b fix: vxe 暗黑模式刷新丢失 3 years ago
xingyu fc2b62714c fix: menu error 3 years ago
xingyu 31760d9572 Merge remote-tracking branch 'origin/master' into dev 3 years ago
xingyu c8f4ba66d1 fix: 部门更新 log 错误 3 years ago
gaibu 0e6b4e463f fix: 解决 redis mq 消息丢失问题 3 years ago
gaibu 2d7d3f1511 fix: 解决 redis mq 消息丢失问题 3 years ago
gaibu e9645d7054 fix: 解决 redis mq 消息丢失问题 3 years ago
gaibu 46f3790492 fix: 解决 redis mq 消息丢失问题 3 years ago
芋道源码 893b6cf4f2
!338 vue3 重构头像上传
Merge pull request !338 from xingyu/dev
3 years ago
xingyu 1bb1da5838 fix: 代码生成日期类型 LocalDateTime 3 years ago
xingyu bdd8229c97 perf: message 3 years ago
xingyu 664c6258de chore: update deps 3 years ago