p38192567
/
ruoyi-vue-pro1
mirror of https://gitee.com/zhijiantianya/ruoyi-vue-pro.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,188 Commits 8 Branches 31 Tags 233 MiB
Commit Graph

155 Commits

Author SHA1 Message Date
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 d3fe187696 增加 file 的文件名的字段，同步最新 SQL 2022-06-15 08:24:06 +08:00
xiaxiaoYY 247d299cca Banner模块 for review 2022-05-31 16:08:10 +08:00
YunaiV 72019f727e Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 2022-05-29 11:07:06 +08:00
YunaiV bb26bc4012 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 
 Conflicts:
	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/UserController.java
	yudao-ui-admin/src/components/ImageUpload/index.vue
 2022-05-29 11:05:33 +08:00
YunaiV 2105950321 同步 SSO 相关的 Oracle、PostgreSQL 的脚本 2022-05-26 01:03:57 +08:00
YunaiV 6566605da3 同步 SSO 相关的 MySQL、SQL Server 的脚本 2022-05-26 00:13:06 +08:00
shuaidawang 204a5ba284 规格增删改查接口及页面提交 2022-05-19 17:25:28 +08:00
shuaidawang bd944c4a8b 商品规格和spu前端代码生成 2022-05-18 17:12:03 +08:00
shuaidawang 0b087c84c6 规格和商品菜单提交 2022-05-18 16:53:55 +08:00
franky 2bbfa40265 调整商品代码生成模块 2022-05-17 22:16:48 +08:00
franky 657e4d035b spu，sku表结构同步 2022-05-17 21:18:56 +08:00
YunaiV 1f1970e6c8 提供最新的内嵌模式 2022-05-17 09:55:21 +08:00
YunaiV 09c8a91b6a 修复 MySQL 文件的编码错误 2022-05-13 19:24:07 +08:00
YunaiV db0fbcf3d9 同步最新的 MySQL、Oracle、PostgreSQL、SQLServer 的数据文件 2022-05-13 12:31:06 +08:00
YunaiV e1daeba5d3 同步最新的 SQL 脚本 2022-05-13 01:52:10 +08:00
jeromesoar ff307a4c86 fix: TODO pid 改成 parentId 字段 2022-05-12 16:57:33 +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 c845f3f012 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.6.2-postgresql 2022-05-02 15:24:24 +08:00
YunaiV 8606f5c605 优化 UserSession 的实现，将 id 变成自增，额外增加 token 字段 2022-05-02 12:33:37 +08:00
anzhen 18a3f4d3eb Merge branch 'upstream/master' 
# Conflicts:
#	sql/ruoyi-vue-pro.sql
 2022-05-02 11:50:35 +08:00
YunaiV 0f21b55e6d 解决 Oracle 关键字冲突的问题 
导出最新的 SQL 脚本
 2022-05-01 23:18:50 +08:00
YunaiV 7db1a58bfc 适配 Oracle 数据库 
1. 去除关键字，避免数据库的查询冲突
 2022-05-01 13:33:02 +08:00
YunaiV 72ad12344b 调整 Flowable、Activiti 提供的脚本，通过 db 自动生成 2022-04-30 23:26:43 +08:00
YunaiV adfe2926da 1. 同步 MySQL、PostgreSQL 最新的脚本 
2. 修复单元测试的报错
 2022-04-30 23:16:24 +08:00
YunaiV 45cbb56ea1 1. 同步 MySQL、PostgreSQL 最新的脚本 
2. 修复单元测试的报错
 2022-04-30 23:11:37 +08:00
YunaiV 30e886be6f 解决 PostgreSQL 集成 Quartz 时的报错 2022-04-30 22:52:55 +08:00
YunaiV 2367280d83 1. 同步最新 SQL 
2. 生成内嵌的页面
 2022-04-30 00:06:49 +08:00
shuaidawang 14a1d70cbb 【促销活动】-代码生成 2022-04-28 16:18:57 +08:00
YunaiV d04271b965 增加数据源管理 SQL 2022-04-27 23:26:03 +08:00
anzhen 1cd4338857 Merge branch 'upstream/master' 
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dept/UserPostDO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/UserPostMapper.java
 2022-04-27 22:17:43 +08:00
YunaiV 2d797ef3e8 同步最新社交登录的 SQL 脚本 2022-04-27 01:53:26 +08:00
JeromeSoar cc6c3d2759 品牌代码生成 2022-04-25 16:11:30 +08:00
JeromeSoar d3edaec2b1 商品分类维护 2022-04-24 17:01:10 +08:00
JeromeSoar 4e67b6bbcf 商品分类代码生成 2022-04-24 14:42:51 +08:00
YunaiV 3a0feef402 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-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/AppAddressController.http
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/AppAddressController.java
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/package-info.java
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressCreateReqVO.java
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressRespVO.java
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressUpdateReqVO.java
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/address/AddressConvert.java
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/address/AddressDO.java
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/address/package-info.java
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/address/AddressMapper.java
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/enums/AddressTypeEnum.java
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/address/AddressService.java
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/address/AddressServiceImpl.java
	yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/address/AddressServiceImplTest.java
 2022-04-22 20:18:50 +08:00
YunaiV c703628940 【新增】菜单新增是否缓存、是否隐藏的字段 2022-04-21 01:47:34 +08:00
anzhen 17167c24d1 code review 编码规范统一 2022-04-15 15:56:47 +08:00
shuaidawang 57ea98b508 用户收件地址sql 2022-04-14 15:49:57 +08:00
YunaiV 2d5601be92 调整前端和环境的环境配置 2022-04-13 12:24:08 +08:00
YunaiV 076c7a4e3e 优化短信模块的代码 2022-04-11 01:21:33 +08:00
YunaiV 65a86e8d75 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.6.2-qcloud 
 Conflicts:
	yudao-ui-admin/yarn.lock
 2022-04-09 11:27:47 +08:00
YunaiV 9d9836dea2 完善敏感词的单元测试 2022-04-09 11:18:07 +08:00
FinallySays 6fd52dfbb6 接入腾讯云短信 2022-04-04 17:30:58 +08:00
安贞 3cd135850e 新建一个关联表维护用户岗位关系 2022-03-30 17:21:24 +08:00
YunaiV 315be160a8 同步最新 SQL，准备发布 1.6.1 版本 2022-03-20 02:32:18 +08:00
YunaiV d23232aab0 完成新 File 的功能 2022-03-17 00:02:57 +08:00
YunaiV 5a2169b688 将 tool 合并到 infra 模块 2022-03-11 00:39:34 +08:00
HFwas 500f0a72ce fix://修复导入数据报错 2022-03-07 23:59:21 +08:00