Commit Graph

208 Commits

Author SHA1 Message Date
miozus
09d6dcfa1f 修复:mp+升级导致test用例找不到对象爆红
○ import com.baomidou.mybatisplus.IDatabaseQuery.DefaultDatabaseQuery
● import com.baomidou.mybatisplus.generator.query.DefaultQuery;
2023-01-10 11:08:29 +08:00
gaibu
df479f627e fix: 基础设施-代码生成-整个模块不能使用 2023-01-09 13:58:19 +08:00
xingyu
459640a222 revert: file 2023-01-05 09:53:45 +08:00
xingyu
c5f29f18d3 Merge remote-tracking branch 'origin/master' into dev 2023-01-05 09:41:54 +08:00
芋道源码
4c0275fbf4
!348 增加webSocket连接测试以及文件优化
Merge pull request !348 from 咱哥丶/dev
2023-01-04 14:30:40 +00:00
芋道源码
3dbe8cd279
!350 配置管理,配置是否可见判断写反了
Merge pull request !350 from kinlon92/master
2023-01-04 14:29:37 +00:00
芋道源码
661a20dc93
!351 升级最新依赖 && 修复树形 全部展开 全部关闭
Merge pull request !351 from xingyu/dev
2023-01-04 14:26:01 +00:00
咱哥丶
18622c5d06
删除文件 yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java 2023-01-04 12:02:46 +00:00
咱哥丶
ccc4cad1c8
删除文件 yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java 2023-01-04 12:02:26 +00:00
xingyu
050498a55a perf: vue3 代码生成 2023-01-04 16:35:09 +08:00
xingyu
7b98a3f3f3 Merge remote-tracking branch 'origin/master' into feature/springdoc
# Conflicts:
#	README.md
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyController.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyValueController.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyViewRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyAndValueRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyCreateReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyListReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyPageReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyUpdateReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueCreateReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValuePageReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueUpdateReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuCreateOrUpdateReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuDetailRespVO.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/app/spu/AppProductSpuController.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/property/AppProductPropertyValueDetailRespVO.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/controller/app/order/vo/AppTradeOrderPageReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderItemRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderRespVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/order/AppPayOrderController.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/vo/PayNotifyOrderReqVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/vo/PayRefundOrderReqVO.java
#	yudao-server/pom.xml
#	yudao-server/src/main/java/cn/iocoder/yudao/module/shop/controller/app/AppShopOrderController.java
2023-01-04 10:48:18 +08:00
芋道源码
427d031ba5
!346 file路径Bug
Merge pull request !346 from 与或非/issues/I5KG6T
2023-01-04 01:19:37 +00:00
kinlon92
29ac759c51
是否可见写反了
Signed-off-by: kinlon92 <zhangjinlong1211@126.com>
2023-01-03 07:36:15 +00:00
xingyu
df8a0768ea feat: vue3 代码生成 2023-01-03 11:23:41 +08:00
咱哥丶
c04ad317cf 支持文件上传时可增加追加自定义路径 如aaa/ ,aaa/bbb/
下载文件时可以重新命名文件真实名
2023-01-02 23:39:01 +08:00
咱哥丶
a9aaac39e8 commit 增加webSocket 2023-01-02 23:09:10 +08:00
咱哥丶
b77a52a4a8 commit 增加webSocket 2023-01-02 22:55:48 +08:00
咱哥丶
2d1ff0aff7 commit 增加webSocket 2023-01-02 22:53:55 +08:00
gaibu
906a3a2c50 fix: 重复 file 路径 Bug 2023-01-02 12:27:52 +08:00
gaibu
639c7820f9 fix: 重复 file 路径 Bug 2022-12-30 16:07:53 +08:00
gaibu
9a46860086 fix: 重复 file 路径 Bug 2022-12-30 15:04:28 +08:00
dengxiaobing
df2c137fe2 清理单元测试 sql 脚本 2022-12-30 10:10:43 +08:00
YunaiV
a83b8e8fbc 修复报错的单元测试 2022-12-30 00:27:14 +08:00
YunaiV
3443aa6f5f 优化本地缓存的刷新实现,数据变更时,强制刷新 2022-12-29 00:09:58 +08:00
YunaiV
9a5c8a11f5 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mail-1.6.1
# Conflicts:
#	yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
#	yudao-module-system/yudao-module-system-biz/pom.xml
2022-12-23 19:38:00 +08:00
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
2022-12-23 19:12:45 +08:00
xingyu
cacefb4eea feat: knife4j springdoc 2022-12-22 00:25:22 +08:00
xingyu
4f2c08f8db Merge remote-tracking branch 'origin/dev' into feature/springdoc 2022-12-21 22:46:52 +08:00
xingyu
9de323e09c perf: 完善上传组件 2022-12-20 15:15:10 +08:00
xingyu
85e9a17569 fix: 字典类型代码生成 2022-12-20 12:44:06 +08:00
supine-win
bed94aa341
update codegen/java/controller/vo/respVO.vm.
是不是缺少break

Signed-off-by: supine-win <supine.win@gmail.com>
2022-12-14 01:35:32 +00:00
xingyu4j
9fc6e0f00b refactor: springdoc 替换 springfox 2022-12-09 13:43:15 +08:00
xingyu4j
19c193cc1a fix: vue3 代码生成 2022-12-08 17:26:06 +08:00
xingyu4j
0a805483a9 代码生成 localDateTime 处理 2022-12-08 17:07:04 +08:00
xingyu4j
623f7124c6 fix: vue3 代码生成类型 2022-12-08 17:03:58 +08:00
xingyu
b46ac885d4 fix: 时间格式提交问题 2022-12-07 22:14:13 +08:00
xingyu
731e49d7b6 feat: add upload component 2022-12-06 23:45:35 +08:00
xingyu
ba6a2957fc fix: vue3 代码生成 bugs 2022-12-06 23:04:37 +08:00
xingyu4j
1bdde35dc9 fix: codegen 2022-12-06 14:12:43 +08:00
xingyu4j
4b5d15c05b fix: vue3 代码生成缺失日期格式化 2022-12-05 08:40:53 +08:00
xingyu4j
24439b70ea perf: vue3 代码生成 2022-11-30 15:21:29 +08:00
xingyu4j
a43b884c73 fix: warn 2022-11-30 10:30:58 +08:00
芋道源码
44249e43dd
!313 修复上传七牛云无mime type问题
Merge pull request !313 from 石溪/master
2022-11-29 13:12:54 +00:00
石溪
7f9fc41555 修复上传七牛云无mime type问题 2022-11-26 19:26:36 +08:00
xingyu
0d0f64e30a feat: 删除过期方法 2022-11-23 22:54:44 +08:00
xingyu
824c54088b perf: add view name 2022-11-23 22:26:25 +08:00
xingyu4j
886bc6eacd feat: vxe codegen 2022-11-22 14:39:00 +08:00
YunaiV
35528e8267 trade:【交易售后】查询分页列表 2022-11-19 20:43:59 +08:00
xingyu4j
f606bfb12b fix: inputnumber 2022-11-17 13:20:55 +08:00
xingyu4j
4d7ac3ebc8 fix: dict 2022-11-17 09:21:35 +08:00
xingyu4j
6360d43274 fix: codegen 2022-11-16 18:05:40 +08:00
xingyu4j
47f3c560fa feat: vue3 codegen 2022-11-16 18:01:36 +08:00
YunaiV
c5b547e0f3 优化,使用 @Configuration(proxyBeanMethods = false) 提升启动速度 2022-11-12 20:22:09 +08:00
YunaiV
92ace031fe 【修复】访问数据库存储的文件,path 多层级时,无法访问的问题 2022-11-12 19:37:21 +08:00
YunaiV
e757d17202 【修复】swagger上传文件没有 file 参数 2022-11-12 13:46:38 +08:00
YunaiV
3cd256f7f2 【修复】跨部门审核,当申请人与审批人不在同一部门,并且审批人的数据权限为“本部门数据权限”时,审批时有异常“手机号不存在” 2022-11-12 12:16:42 +08:00
YunaiV
a8cdf74120 【移除】Apollo 配置中心,简化学习成本 2022-11-12 09:52:36 +08:00
YunaiV
ce3aefadd7 移除 jasypt-spring-boot-starter 依赖,使用 hutool AES 替代 2022-11-12 09:15:02 +08:00
芋道源码
fb237423b8
!294 修复单元测试报错
Merge pull request !294 from 芋道源码/dev
2022-11-11 01:22:17 +00:00
YunaiV
cb4224af12 1. 修复 FileServiceTest 单元测试
2. 修复 FileConfigServiceImplTest 单元测试
2022-11-11 08:48:25 +08:00
芋道源码
15dd67d647
!287 fix:(同步失败,不存在改变)代码生成,修改字段注解都不能修改
Merge pull request !287 from halfninety/master
2022-11-10 14:33:19 +00:00
xingyu4j
632a132a6a refactor: Date ==> LocalDateTime 2022-11-09 11:14:46 +08:00
xingyu4j
2c1419fb1a vue3 代码生成 2022-11-08 13:59:16 +08:00
xingyu4j
0f40947721 升级部分依赖 2022-11-08 13:43:39 +08:00
xingyu4j
b5a4a5446e fix: vue3 代码生成错误 2022-11-03 17:01:37 +08:00
huyuehua
38161f05ac fix:(同步失败,不存在改变)代码生成,修改字段注解都不能修改
https://gitee.com/zhijiantianya/ruoyi-vue-pro/issues/I5WP5M
2022-11-01 14:50:27 +08:00
jueying
faea04546e 修复代码生成父菜单选择无效,前端代码缺少字段,格式错误 2022-10-31 17:13:05 +08:00
xingyu
855d23aec3 feat: 添加提交前验证 2022-10-17 11:24:22 +08:00
xingyu
020535ab3a Merge branch 'master' of gitee.com:zhijiantianya/ruoyi-vue-pro into master
Signed-off-by: xingyu <xingyu4j@vip.qq.com>
2022-08-22 00:57:43 +00:00
芋道源码
96b3cb23e2
!249 修复代码生成-同步功能删除存在的字段问题。
Merge pull request !249 from xrcoder/master
2022-08-19 12:02:28 +00:00
ycak47
74f12e0b9f 优化el-dialog
1.设置默认点击背景不关闭dialog(这个很容易误操作,体验较差)
2.el-dialog内容较多时,滚动条限定在内部而不撑开父页面的滚动条
3.代码生成的el-dialog默认添加 v-dialogDrag属性(可拖拽移动)
2022-08-16 17:07:07 +08:00
xingyu
e5bd517829 perf: final方法改为大写命名 2022-08-11 11:45:34 +08:00
xrcoder
5b2e6ebca9 修复代码生成-同步功能删除存在的字段问题。 2022-08-06 13:38:48 +08:00
wangzaikun
b6df0c336c fix:代码生成模板修改 2022-07-31 10:07:29 +08:00
芋道源码
e46286d18a
!239 fix: redis7.0 监控查询calls数值过大转Intger异常
Merge pull request !239 from lanyue52011/feature/visual
2022-07-29 11:15:07 +00:00
lanyue52011
eb037c963c fix: redis7.0 监控查询calls数值过大转Intger异常 2022-07-29 16:48:41 +08:00
芋道源码
35413b52c9
!237 集成积木报表
Merge pull request !237 from 芋道源码/feature/visual
2022-07-29 04:51:54 +00:00
xingyu
e16f8abc3a refactor:vue3 export function 2022-07-28 18:23:09 +08:00
xingyu
b167f54813 refactor: vue3 delete function 2022-07-28 15:56:38 +08:00
YunaiV
b2f5900abc Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/visual 2022-07-27 22:45:40 +08:00
YunaiV
26a094a710 refactor:优化时间范围查询 2022-07-27 00:15:59 +08:00
xingyu
b2c3ef12a6 vue3: 代码生成器添加download方法 2022-07-25 21:04:40 +08:00
xingyu
54efb34289 feat: add vue3 codegen(preview) 2022-07-25 18:46:04 +08:00
xingyu
a57f79cf90 fix: vue2代码生成模板 2022-07-25 16:53:36 +08:00
xingyu
f84f3a3631 refactor: 时间区间查询传入数组-测试模块 2022-07-22 10:24:59 +08:00
xingyu
dad10d858a refactor: 时间区间查询传入数组 2022-07-21 23:22:51 +08:00
jiangqiang
d00a88a75d 修改积木报表相关访问配置 2022-07-16 11:00:07 +08:00
YunaiV
33a31cfb0f 优化文件的 type 识别与存储 2022-07-10 00:02:21 +08:00
jiangqiang
2621f2195d 优化代码 2022-07-09 17:46:29 +08:00
jiangqiang
a5d16c11e8 优化获取mimetype方式,优化生成path方式 2022-07-09 11:27:45 +08:00
jiangqiang
c64295f432 合并fetch代码 2022-07-09 10:41:06 +08:00
jiangqiang
6a1c09ca42 Merge remote-tracking branch 'source/master'
# Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java
2022-07-09 10:32:15 +08:00
YunaiV
ed097e5ead 基于 tika 识别文件类型 2022-07-08 21:26:34 +08:00
YunaiV
2372c25e8d 完善 Redis 缓存的查询 2022-07-08 20:39:34 +08:00
luowenfeng
c0b1f62afd fix(Redis监控): fix review 2022-07-08 11:47:02 +08:00
jiangqiang
eb3228d4c7 文件列表会显示图片缩略图,点击缩略图可以预览大图。非图片文件在列表页面会显示下载按钮。点击即可下载。 2022-07-08 11:02:21 +08:00
jiangqiang
da0ba10503 修改mimetype字段为type,修改获取文件后缀名方式,目前图片文件预览还有些问题 2022-07-08 09:14:39 +08:00
luowenfeng
a8ebc56472 feature(Redis监控): 接口调整 2022-07-07 15:01:06 +08:00
luowenfeng
4263df3e93 feature(Redis监控): 复用权限 2022-07-07 14:54:45 +08:00
luowenfeng
a7067ea6fd feature(Redis监控): 添加缓存列表 2022-07-07 14:50:58 +08:00