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,356 Commits 8 Branches 31 Tags 233 MiB
Commit Graph

86 Commits

Author SHA1 Message Date
YunaiV 785fbeeb5b code review：限时折扣活动 2023-10-21 18:16:09 +08:00
YunaiV b30754a0a4 同步最新 mall 代码 2023-10-12 21:58:56 +08:00
owen 929ff4286a Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-29 21:08:49 +08:00
owen 171161e6c7 统计：交易统计 2023-09-29 21:08:15 +08:00
YunaiV 9cd36abf10 同步 master 分支代码 2023-09-28 15:28:40 +08:00
YunaiV 50371b3676 1. 禁用 member 模块 
2. 减少 mybatis 日志打印
3. 降低 local 环境的初始连接

目的：提升项目的启动速度
 2023-09-16 17:04:59 +08:00
YunaiV f2ee213caa 更新商城的演示地址 2023-09-11 16:42:38 +08:00
YunaiV bf92727b27 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 
 Conflicts:
	yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
 2023-09-06 21:40:53 +08:00
YunaiV fcca69d243 修复 revision 在 Maven install、deploy 时，不替换为版本号的问题 2023-09-06 20:41:52 +08:00
zhijiantianya@gmail.com beb385aab4 修复 revision 在 Maven install、deploy 时，不替换为版本号的问题 2023-09-06 20:04:29 +08:00
YunaiV 6a819da0b6 分佣：增加用户分销统计 API mock 2023-09-03 21:21:33 +08:00
YunaiV d82729e4c6 同步最新会员中心 SQL 2023-08-27 21:15:44 +08:00
YunaiV 0d1fc1138a 增加 app 的签到 mock 接口、积分记录分页、签到记录分页 2023-08-21 22:20:59 +08:00
YunaiV c3e4e23459 同步最新 Member 菜单 2023-08-20 20:01:18 +08:00
YunaiV 5fcd0a21da Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2023-08-11 22:44:20 +08:00
xingyu 402a3809a3 chore: up springboot 2.7.14 2023-07-29 11:23:13 +08:00
puhui999 446951bd11 fix：封装函数 convertCDUMap 作用：数据划分为需要新增的、还是删除的、还是更新的。 2023-07-28 16:30:38 +08:00
芋道源码 870873e480
!540 修复部分问题，升级依赖 
Merge pull request !540 from xingyu/feature/captcha
 2023-07-25 11:20:04 +00:00
YunaiV 7f0901e0bb 优化项目启动速度， 2023-07-25 08:39:28 +08:00
YunaiV 3a24d05bdc mall + pay： 
1. 修复单元测试的报错
 2023-07-24 07:04:11 +08:00
xingyu c95a1d0a7d chore: up springboot 2.10.13 2023-07-21 17:53:40 +08:00
YunaiV 2485a5ebc9 mall + pay： 
1. 将 amount 统一都修改成 price
2. 将 payed 统一改成 payStatus
 2023-07-10 17:35:26 +08:00
YunaiV 23e3c4d0d9 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2023-07-02 23:45:48 +08:00
芋道源码 11c4c950b7
回退 'Pull Request !518 : 添加华为云 maven 升级依赖' 2023-07-02 15:41:26 +00:00
xingyu bdb18b4ced chore: up springboot 2.7.13 2023-06-26 16:26:38 +08:00
YunaiV 6573849f56 mall + promotion：mock 拼团列表 2023-06-18 00:35:22 +08:00
xingyu cd33f68e2b chore: up springboot 2.10.12 2023-06-14 16:50:46 +08:00
xiaqing 73d0e9d08a 初始化积分模块 
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理
 2023-06-10 20:44:31 +08:00
xingyu 5b13c07e01 chore: up springboot 2.7.11 2023-05-06 16:28:53 +08:00
YunaiV 502fa11f1d Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2023-04-19 18:10:59 +08:00
YunaiV b30fc28021 商城：product：完善 ProductSpuDO 表 2023-04-19 10:55:43 +08:00
YunaiV 8eac97ae12 移除 Vue3 专属菜单，统一菜单！ 2023-04-13 23:38:27 +08:00
xingyuv e3d74b1713 chore: 升级最新依赖 2023-04-13 15:44:20 +08:00
xingyuv 5aff120d77 chore: reset 2023-04-13 15:11:44 +08:00
xingyuv 01902c4345 chore: up minio 8.5.2 2023-04-13 14:53:36 +08:00
YunaiV eefd9a71fc pay：默认禁用 pay 模块，进一步提升启动速度 2023-02-22 22:38:16 +08:00
YunaiV 1b6124a0db 集成 Go-View 大屏设计器 2023-02-07 22:56:33 +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
YunaiV 711a39b8e9 spring doc：增加模块分组 2023-01-19 15:03:46 +08:00
YunaiV 3166cd7063 mp：同步 mp 公众号 SQL 2023-01-17 23:56:27 +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 97330fd7b1 chore: 升级springboot 2.7.7 2023-01-05 10:01:49 +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
xingyu b079513dc8 chore: 升级springboot 2.7.6 2022-11-30 00:41:24 +08:00
xingyu4j b081bb8e71 chore: devs 2022-11-18 17:25:37 +08:00
YunaiV 38f67d4130 将 mall 使用到 Date 的部分，迁移到 LocalDateTime 中 2022-11-13 21:23:38 +08:00