66 Commits (3a24d05bdcea2ca846a54324121e85e4be02b2da)

Author SHA1 Message Date
YunaiV 3a24d05bdc mall + pay:
1. 修复单元测试的报错
3 years ago
YunaiV 2485a5ebc9 mall + pay:
1. 将 amount 统一都修改成 price
2. 将 payed 统一改成 payStatus
3 years ago
YunaiV 23e3c4d0d9 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 3 years ago
芋道源码 11c4c950b7
回退 'Pull Request !518 : 添加华为云 maven 升级依赖' 3 years ago
xingyu bdb18b4ced chore: up springboot 2.7.13 3 years ago
YunaiV 6573849f56 mall + promotion:mock 拼团列表 3 years ago
xingyu cd33f68e2b chore: up springboot 2.10.12 3 years ago
xiaqing 73d0e9d08a 初始化积分模块
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理
3 years ago
xingyu 5b13c07e01 chore: up springboot 2.7.11 3 years ago
YunaiV 502fa11f1d Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 3 years ago
YunaiV b30fc28021 商城:product:完善 ProductSpuDO 表 3 years ago
YunaiV 8eac97ae12 移除 Vue3 专属菜单,统一菜单! 3 years ago
xingyuv e3d74b1713 chore: 升级最新依赖 3 years ago
xingyuv 5aff120d77 chore: reset 3 years ago
xingyuv 01902c4345 chore: up minio 8.5.2 3 years ago
YunaiV eefd9a71fc pay:默认禁用 pay 模块,进一步提升启动速度 3 years ago
YunaiV 1b6124a0db 集成 Go-View 大屏设计器 3 years ago
YunaiV 6bf5eb0133 适配 mall 模块的 openapi 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
YunaiV 3aeebef036 完善 MenuServiceImplTest 单元测试 3 years ago
xingyu c6f880bfc1 up springboot 2.7.8 3 years ago
YunaiV 711a39b8e9 spring doc:增加模块分组 3 years ago
YunaiV 3166cd7063 mp:同步 mp 公众号 SQL 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
xingyu 97330fd7b1 chore: 升级springboot 2.7.7 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 2706463e49 修复 local 环境的配置文件 3 years ago
xingyu b079513dc8 chore: 升级springboot 2.7.6 3 years ago
xingyu4j b081bb8e71 chore: devs 3 years ago
YunaiV 38f67d4130 将 mall 使用到 Date 的部分,迁移到 LocalDateTime 中 3 years ago
YunaiV 12d045ea58 修复部分单元测试报错的问题 3 years ago
YunaiV e6acdf7098 将 market 模块,调整成 promotion 模块 3 years ago
YunaiV 829bbf58b5 price:完成优惠劵的价格计算~ 3 years ago
wuxiran 02aede0417 1、修改coupon的页面、以及增加coupon的enum 3 years ago
YunaiV face9cae76 mall:调整 trade 的接口 4 years ago
YunaiV 2866b58741 1. 默认不开启 bpm 工作流模块,按需启动,提升启动速度
2. 完整移除 activiti 遗留的东东
4 years ago
YunaiV 39ac59efee 默认禁用报表模块, 4 years ago
YunaiV d872676748 完善积木报表的集成 4 years ago
jiangqiang b6bbd836a4 新增yudao-module-visualization模块以及积木报表相关依赖 4 years ago
YunaiV 9270924597 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm-back
 Conflicts:
	README.md
	yudao-framework/pom.xml
	yudao-framework/yudao-spring-boot-starter-biz-error-code/pom.xml
	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSwaggerAutoConfiguration.java
	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/security/config/SecurityConfiguration.java
4 years ago
YunaiV b69b74b770 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
 Conflicts:
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java
4 years ago
YunaiV 69a3a835a5 新增 `yudao-spring-boot-starter-banner` 组件,用于项目启动时打印开发文档、接口文档等 4 years ago
YunaiV 7a86a61079 【重构】新增 `yudao-spring-boot-starter-biz-error-code` 错误码组件 4 years ago
fengdan 2aec04a888 yudao-module-wechat-mp 模块合并到 yudao-module-wechat 模块 中
weixin-java-mp 更新为 最新正式版本 4.3.0
4 years ago
YunaiV 6fd14b30c2 1. 升级 spring boot 到 2.6.8
2. 修复 Spring Fox 在 2.6.X 版本的兼容性
4 years ago
亚洲 1d935f58f8 微信公众号对接 4 years ago
YunaiV 741dda8d75 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm-back 4 years ago
YunaiV 5cf68961e1 1. 修改在线会话的实现
2. 接入到会员管理 OAuth2.0
4 years ago
YunaiV 4f52d1367b 实现管理后台登录时,使用 OAuth2 的 access token 4 years ago
YunaiV a233ab1395 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
 Conflicts:
	sql/ruoyi-vue-pro.sql
	yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
4 years ago