Commit Graph

59 Commits (master)

Author SHA1 Message Date
perry ca7f62f924 支付 2023-05-15 23:40:57 +08:00
perry 3e6f21dadd 商品管理 2023-05-10 22:49:41 +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
YunaiV 12d045ea58 修复部分单元测试报错的问题 2022-11-13 21:08:15 +08:00
YunaiV e6acdf7098 将 market 模块,调整成 promotion 模块 2022-10-30 17:37:07 +08:00
YunaiV 829bbf58b5 price:完成优惠劵的价格计算~ 2022-10-30 17:32:59 +08:00
wuxiran 02aede0417 1、修改coupon的页面、以及增加coupon的enum 2022-09-04 22:52:28 +08:00
YunaiV face9cae76 mall:调整 trade 的接口 2022-08-06 19:10:28 +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
YunaiV d872676748 完善积木报表的集成 2022-07-28 09:29:51 +08:00
jiangqiang b6bbd836a4 新增yudao-module-visualization模块以及积木报表相关依赖 2022-07-10 15:53:46 +08:00
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
2022-07-08 09:41:50 +08:00
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
2022-07-04 19:56:54 +08:00
YunaiV 69a3a835a5 新增 `yudao-spring-boot-starter-banner` 组件,用于项目启动时打印开发文档、接口文档等 2022-06-18 09:22:26 +08:00
YunaiV 7a86a61079 【重构】新增 `yudao-spring-boot-starter-biz-error-code` 错误码组件 2022-06-17 22:56:06 +08:00
fengdan 2aec04a888 yudao-module-wechat-mp 模块合并到 yudao-module-wechat 模块 中
weixin-java-mp 更新为 最新正式版本 4.3.0
2022-06-02 00:19:23 +08:00
YunaiV 6fd14b30c2 1. 升级 spring boot 到 2.6.8
2. 修复 Spring Fox 在 2.6.X 版本的兼容性
2022-06-01 22:18:02 +08:00
亚洲 1d935f58f8 微信公众号对接 2022-05-31 21:59:03 +08:00
YunaiV 741dda8d75 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm-back 2022-05-26 19:19:48 +08:00
YunaiV 5cf68961e1 1. 修改在线会话的实现
2. 接入到会员管理 OAuth2.0
2022-05-10 23:20:15 +08:00
YunaiV 4f52d1367b 实现管理后台登录时,使用 OAuth2 的 access token 2022-05-08 23:52:31 +08:00
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
2022-05-04 23:44:11 +08:00
YunaiV 60f918da84 增加 SQLServer 的适配~ 2022-05-02 18:04:34 +08:00
YunaiV 8606f5c605 优化 UserSession 的实现,将 id 变成自增,额外增加 token 字段 2022-05-02 12:33:37 +08:00
cuicui 3a4b0f4f75 合并bpm-base和bpm-flowable 为bpm-biz 2022-05-01 09:31:24 +08:00
YunaiV 30e886be6f 解决 PostgreSQL 集成 Quartz 时的报错 2022-04-30 22:52:55 +08:00
YunaiV 98c317f0e0 封装 IdTypeEnvironmentPostProcessor 组件,自动适配 id-type 策略,用于 Oracle、PostgreSQL 的自动适配 2022-04-30 11:38:21 +08:00
JeromeSoar 4e67b6bbcf 商品分类代码生成 2022-04-24 14:42:51 +08:00
shuaidawang ece6712d69 【营销模块】新建模块yudao-module-market 2022-04-23 23:22:47 +08:00