674 Commits (f8ed0e15f0a860d32107f2238e7ea7b2823fff42)

Author SHA1 Message Date
YunaiV de7d26129c Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/vue3-bpm
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveBaseVO.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageReqVO.java
3 years ago
YunaiV 53767614fe 增加商城的提示 3 years ago
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
3 years ago
芋道源码 ee150702b7
!369 解决只有一个菜单时无法显示目录
Merge pull request !369 from zhang.xionghui/master
3 years ago
xingyu 0bd0bbd536 fix: slot-scope 已过期 ==》 v-slot 3 years ago
xingyu 2ea9027031 mp user => mp mpuser 3 years ago
xingyu 227361661f fix: mp menu error 3 years ago
YunaiV 5bedff605a Merge branch 'feature/vue3-bpm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/vue3-bpm 3 years ago
xingyu 08a4de37c2 Merge remote-tracking branch 'origin/master' into feature/springdoc
# Conflicts:
#	README.md
3 years ago
YunaiV c04ef59e81 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/vue3-bpm 3 years ago
YunaiV ca8bb72417 版本 1.7.0 发布:增加微信公众号、站内信、邮箱、数据脱敏! 3 years ago
xingyu 68bdaa7854 feat: swagger-ui 3 years ago
YunaiV 91dd4a32b1 站内信模块:vue3 站内信弹板 3 years ago
YunaiV 1943e71e3f 站内信模块:完善注释 3 years ago
YunaiV ae3ee95cdd 站内信模块:整体功能实现 3 years ago
gexinzhineng/gxzn27 a03f702fa1 修改数据弹出层 3 years ago
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
3 years ago
YunaiV 86a884e3d2 邮箱模块:vue3 邮件模版的管理 3 years ago
YunaiV 4cbf7398e8 邮箱模块:vue3 邮箱账号的管理 3 years ago
YunaiV 2c55d29411 邮箱模块:完善前端的界面 3 years ago
YunaiV c0b029b244 邮箱模块:完善 template 的单元测试 3 years ago
YunaiV 0895ee7d98 邮箱模块:完善 account 的单元测试 3 years ago
YunaiV 525078abd3 邮箱模块:完善 log 相关的逻辑 3 years ago
YunaiV ea39dcc5c8 邮箱模块:完善 template 模版的增删改查功能 3 years ago
YunaiV 0262fa5c15 邮箱模块:完善 account 账号的增删改查功能 3 years ago
YunaiV e9814b129b 492919d:升级element-ui到最新版本2.15.12 3 years ago
YunaiV 9b47dd4a67 b4bdd4f:开启TopNav没有子菜单隐藏侧边栏 3 years ago
YunaiV b6d90b2244 bpm:流程详情的转派审批人 3 years ago
YunaiV 0aa72b3200 bpm:流程详情的时间轴 3 years ago
YunaiV 2d6fe27b43 bpm:完成流程实例的列表界面 3 years ago
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
3 years ago
YunaiV 3166cd7063 mp:同步 mp 公众号 SQL 3 years ago
YunaiV 68ef11ee87 mp:完善微信公众号的消息 3 years ago
YunaiV 6fc0b3fc54 mp:增加【自动回复】的后端新增、修改、删除接口 3 years ago
YunaiV 1e402d8063 mp:增加【自动回复】的前端实现 3 years ago
YunaiV ab41c96641 mp:增加【自动回复】的分页接口 3 years ago
YunaiV 26ca97d2f6 mp:初始化【自动回复】菜单 3 years ago
YunaiV 0e75a67f28 mp:菜单的清空处理 3 years ago
YunaiV b5815a62fc mp:自定义菜单的图文选择 3 years ago
YunaiV 64fa3a7e47 mp:修复 wx-reply 组件的 tab 切换存在问题 3 years ago
YunaiV 8600214532 mp:优化【菜单】其它类型的处理 3 years ago
YunaiV 3654afedcc mp:修复 WxMaterialSelect 组件的音乐 tab,无法选择图片素材报错 3 years ago
YunaiV 0499226c3d mp:完善【菜单】的回复功能 3 years ago
YunaiV 141e4e4c8b mp:移除 less 使用 scss 适配 3 years ago
YunaiV 2173cf0364 mp:menu 前端接入菜单的保存、清空操作 3 years ago
YunaiV c0b950257f mp:menu 前端的新增、删除操作的完善 3 years ago
YunaiV 02ec5d455c mp:1)引入 less-loader,解决 menu 的 less 样式;2)接入菜单列表接口 3 years ago
YunaiV f271ef8c47 mp:初始化菜单的前端 3 years ago
YunaiV bf5dcdd582 mp:素材管理,增加【语音】【视频】 3 years ago
YunaiV 5a1d02dffd mp:素材管理,增加【图片】 3 years ago
YunaiV d1cbe0c3fd mp:增加图文草稿箱的删除、发布功能 3 years ago
YunaiV 90ffe5adb7 mp:增加图文草稿箱的修改;优化前端代码 3 years ago
YunaiV 28884ee638 mp:优化 wx-editor 图片的上传 3 years ago
YunaiV 73fac5235f mp:实现 wx-editor 图片的上传 3 years ago
YunaiV f48276d2bc mp:引入 wx-editor 组件 3 years ago
YunaiV c0bd3471d5 mp:初步实现【草稿】的前端新增(优化,减少冗余代码) 3 years ago
YunaiV 4080d2de9b mp:初步实现【草稿】的前端新增 3 years ago
YunaiV bc870434c2 mp:初始化【图文草稿箱】前端界面 3 years ago
YunaiV 1e63198f4a mp:完善【发布功能】的相关代码 3 years ago
YunaiV 9f7b646f6c mp:增加发送【图文】消息 3 years ago
YunaiV 02ccf52d6c mp:增加发送【图文】消息 3 years ago
YunaiV 5901ab6664 mp:增加 server 草稿箱的分页、添加;已发布的分页、提交 3 years ago
YunaiV 267b1790ec mp:支持发送【视频】消息时,支持新建视频 3 years ago
YunaiV 858b4e81a5 mp:优化前端消息发送的缓存逻辑 3 years ago
YunaiV 7ba6a2e385 mp:增加【视频】消息的发送 3 years ago
YunaiV 331af28fe7 mp:增加【语音】【视频】的素材选择 3 years ago
YunaiV 188d880239 mp:增加【图片】素材的选择 3 years ago
YunaiV 431569fd09 mp:后端增加上传永久素材的接口 3 years ago
YunaiV 32f152cc27 mp:支持 wx-reply 发送音乐消息 3 years ago
YunaiV 90e0ebc20f mp:支持 wx-reply 发送音频消息 3 years ago
YunaiV 29cf770457 mp:支持 wx-reply 发送图片消息 3 years ago
YunaiV ec872c702c mp:增加上传临时素材的接口 3 years ago
zhang.xionghui c9d242c7e1
fix:
解决只有一个菜单时无法显示目录

Signed-off-by: zhang.xionghui <13834222683@163.com>
3 years ago
YunaiV 541ee81300 mp:前端接入发送消息 3 years ago
YunaiV 6325dd288c mp:前端增加 message 消息的展示 3 years ago
YunaiV 9cf88d1929 mp:后端增加发送客服消息接口 3 years ago
zhang.xionghui 5bc61e4858
update yudao-ui-admin/src/styles/index.scss.
修复tags页签超过屏幕后无法滚动导致无法选择后面的页签

Signed-off-by: zhang.xionghui <13834222683@163.com>
3 years ago
YunaiV f8eed5dd3f mp:初始化回复组件 3 years ago
YunaiV b0386429fe mp:支持 wx-news、wx-location 类型的消息 3 years ago
YunaiV 9e4a978f85 mp:解决 wx-msg 的 css 问题 3 years ago
YunaiV cc23ca2dcc mp:解决 wx-msg 的 css 问题 3 years ago
YunaiV 2b477a4dfb mp:实现 wx-msg 的消息列表的适配 3 years ago
YunaiV df5e6161aa mp:重构 wx-msg 前的提交 3 years ago
YunaiV 94178998e5 mp:前端 message 增加 voice 语音的播放 3 years ago
YunaiV 8a5db8c1eb mp:前端 message 增加文本、图片、事件等的展示 3 years ago
YunaiV 18bf098a1a mp:前端 message 增加视频播放的逻辑 3 years ago
YunaiV 9ec2f8b60f mp:梳理 message 的前端和后端代码 3 years ago
YunaiV 2ac2af64d4 mp:实现 user 的 ui 界面 3 years ago
YunaiV a341c44c4d mp:实现 tag 模块的前端界面 3 years ago
YunaiV acee075260 mp:调整 tag 模块的整体结构 3 years ago
YunaiV d6de233a47 mp:完成公众号的数据统计前端界面 3 years ago
YunaiV d0934510af mp:完成公众号统计的用户累计数据、消息概况数据 3 years ago
YunaiV 09e200c364 mp:完成公众号统计的用户增减数据 3 years ago
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
3 years ago
YunaiV 39b2afd506 mp:完成的公众号的管理界面 3 years ago
芋道源码 c499165fe5
!353 同步 增加webSocket
Merge pull request !353 from xingyu/dev
3 years ago
zy 38f9284593 fix:redis监控echarts图表不显示 3 years ago
xingyu c5f29f18d3 Merge remote-tracking branch 'origin/master' into dev 3 years ago
YunaiV 24f0e4dd1f 1.6.6 发版:完善 Vue3 管理后台、新增 IP & 地区库 3 years ago
芋道源码 4c0275fbf4
!348 增加webSocket连接测试以及文件优化
Merge pull request !348 from 咱哥丶/dev
3 years ago
gaibu 29d2aad176 fix: 上传视频无法预览 3 years ago
咱哥丶 2d1ff0aff7 commit 增加webSocket 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 6f8384af70 增加《敏感词》《地区 & IP》文档 3 years ago
YunaiV a83b8e8fbc 修复报错的单元测试 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
芋道源码 258c1ddb70
!343 同步dev分支
Merge pull request !343 from xingyu/dev
3 years ago
xingyu d86c36a151 vue2 圆角标签栏 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 1bb1da5838 fix: 代码生成日期类型 LocalDateTime 3 years ago
luowenfeng 826a564abd 站内信开发 3 years ago
芋道源码 f9b4874ee9
!320 秒杀活动相关
Merge pull request !320 from halfninety/feature/1.8.0-uniapp
3 years ago
YunaiV 4a2cb33cd7 product:优化商品属性值的代码 3 years ago
YunaiV 98ca807d4b product:优化商品属性项的代码 3 years ago
YunaiV 7f131a3853 trade:增加用户 App 的订单分页和详情接口 3 years ago
YunaiV b7d78a24a4 trade:完成管理后台的订单详情的简单对接 3 years ago
YunaiV c5408965eb trade:增加管理后台的订单详情接口 3 years ago
YunaiV fc48ab4928 trade:前端订单管理,联调接口 3 years ago
YunaiV fc49f000ce trade:前端订单管理,联调接口 3 years ago
YunaiV fac3e7c726 product:商品规格,调整成商品属性,避免和 sku 概念冲突 3 years ago
xingyu 57bfef8d24 修复 vue2 文字点选验证码 bug 3 years ago
xingyu bfea385cc1 fix: 恢复默认端口80 3 years ago
xingyu af0974cfb3 fix: import 3 years ago
xingyu c720b1dff9 fix: 三方登录未携带租户 3 years ago
halfninety 6808d3c163 完成秒杀时段todo,秒杀时段商品添加timeIds 3 years ago
YunaiV 03c7e60092 发布 v1.6.5 版本! 3 years ago
xingyu 314323f1ea chore: update vue 2.7.14 3 years ago
xingyu 50f96651c2 feat: 更换为let const 3 years ago
xingyu b100d41da1 Merge remote-tracking branch 'origin/master' into feature/vue3 3 years ago
halfninety 61c4053cbb 前端修改秒杀相关文件存放地址 3 years ago
halfninety 54baad165d 秒杀时段新增修改时间段冲突校验。
秒杀活动新增,修改,删除时对秒杀时段的秒杀活动数量进行修改
3 years ago
halfninety 7bc1ae5f35 秒杀活动增删改查 3 years ago
halfninety cd62c4d220 秒杀时段相关 3 years ago
halfninety ea2a57f0a0 修改秒杀时段id 3 years ago
halfninety 83ee1c6129 秒杀活动,添加商品,分页查询 3 years ago
YunaiV 53dbf8d82e !290 修复三级及以上菜单路由缓存失效问题 3 years ago
xingyu 4e860eb254 perf: 完善类型 3 years ago
YunaiV d884303df6 trade:【交易售后】查询分页列表 3 years ago
YunaiV 00e66216c5 trade:【交易售后】查询分页列表的前端 3 years ago
YunaiV af71a19241 trade:【商品】sku 表增加 spu_name 字段,冗余 3 years ago
LAPTOP-CNV4CMCJ\cheng b3cea2d4bf Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 3 years ago
LAPTOP-CNV4CMCJ\cheng 78ae018320 新增退款列表页 调整商品列表页的tab切换 3 years ago
xingyu4j 7083d991fe refactor: verify 3 years ago
xingyu4j 042c4e8390 Merge remote-tracking branch 'origin/master' into feature/vue3 3 years ago
YunaiV 38d6b51fcc v3.8.4:优化页面内嵌iframe切换tab不刷新数据 3 years ago
xingyu4j 89bd2f6d9e Merge remote-tracking branch 'origin/master' into feature/vue3 3 years ago
xingyu4j bdc988e5b7 fix: search 3 years ago
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
3 years ago