517 Commits (e0f96747caa7e85730680ff5eb8debc633e9fcd3)

Author SHA1 Message Date
owen 147091fa08 修复积木报表建表语句错误 3 years ago
zheng decan 5c6451f6aa fix: PostgreSQL的SQL脚本在非多租户模式下部份表tanant_id默认值缺失造成错误 3 years ago
YunaiV 35ba9b36af 菜单新增 alwaysShow 总是展示、componentName 组件名 3 years ago
xingyuv fe5f1c74a4 fix: router 3 years ago
YunaiV 1b6124a0db 集成 Go-View 大屏设计器 3 years ago
YunaiV f770133854 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master_unit-sql
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/test/resources/sql/clean.sql
3 years ago
xingyu 2ea9027031 mp user => mp mpuser 3 years ago
xingyu 227361661f fix: mp menu error 3 years ago
YunaiV f7762e646e 站内信模块:我的站内信 vue3 3 years ago
YunaiV 1a4bea8ca2 邮箱模块:同步最新的 SQL 脚本 3 years ago
YunaiV 3166cd7063 mp:同步 mp 公众号 SQL 3 years ago
芋道源码 9e40134355
!357 积木报表分享报错
Merge pull request !357 from 与或非/issues/I64GXA
3 years ago
gaibu 04287fa9d8 fix: 积木报表分享报错 3 years ago
xingyu 6a9244a707 feat: vue3 add websocket 3 years ago
咱哥丶 7879632cf5 commit 增加webSocket 菜单sql 3 years ago
dengxiaobing df2c137fe2 清理单元测试 sql 脚本 3 years ago
xingyu 17d9a4e4f2 perf: 优化数据库建表语句 3 years ago
xingyu 46c93b637f chore: update deps 3 years ago
gaibu 67435648b2 fix: 逻辑删除唯一索引冲突的问题 3 years ago
YunaiV ea95115ffd 移除云片短信渠道,解决云片的安全风险 3 years ago
YunaiV afc76973ce Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponBaseVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExcelVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExportReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponPageReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponRespVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteBaseVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExcelVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExportReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempletePageReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteRespVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/CouponTemplete/CouponTempleteDO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/coupon/CouponDO.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/admin/spu/vo/ProductSpuRespVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/discount/DiscountProductDO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/reward/RewardActivityDO.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/dal/dataobject/cart/TradeCartItemDO.java
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/UserInfoDTO.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
#	yudao-server/pom.xml
#	yudao-server/src/main/resources/application-local.yaml
#	yudao-server/src/main/resources/application.yaml
#	yudao-ui-admin/src/views/mall/CouponTemplete/index.vue
#	yudao-ui-admin/src/views/mall/product/property/index.vue
#	yudao-ui-admin/src/views/mall/product/spu/index.vue
#	yudao-ui-admin/src/views/mall/product/spu/save.vue
#	yudao-ui-admin/src/views/system/role/index.vue
3 years ago
芋道源码 ae0227c107
!276 阿里云OSS解析region时兼容带https的配置
Merge pull request !276 from huangyemin/master
3 years ago
YunaiV c51ab6ad73 优化 Vue3 SQL 导入脚本,避免误解 3 years ago
xingyu4j 2e2cd448bd chore: update devs 3 years ago
luowenfeng aea763e96e feature(单元测试): ProductSpuServiceImpl单元测试 3 years ago
huangyemin eb48817f7b sql脚本中banner菜单配置错误修改 3 years ago
huangyemin 29d302a901 sql脚本执行报错问题修改 3 years ago
ex_yang.li@ca-nio.com f21ce954ec Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into ly_uniapp
# Conflicts:
#	yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/api/price/PriceApiImpl.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/sku/ProductSkuApiImpl.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/spu/ProductSpuApiImpl.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderItemConvert.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java
#	yudao-server/src/main/resources/application.yaml
3 years ago
ex_yang.li@ca-nio.com 5889093a64 创建交易订单-单元测试 3 years ago
芋道源码 61b0624a59
!262 接口实现-交易订单创建(未完全实现)
Merge pull request !262 from LeeYan9/ly_uniapp
3 years ago
ex_yang.li@ca-nio.com 7bf20ec72e 创建订单接口定义 3 years ago
YunaiV 9632c33d27 mall:优化商品的分类、品牌的代码 3 years ago
YunaiV 833fd33844 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
 Conflicts:
	sql/optional/mall/mall.sql
3 years ago
ex_yang.li@ca-nio.com 19a703b8c9 创建订单接口定义 3 years ago
luowenfeng 4a39f2d9f8 feature(uniapp商品): 代码调整 3 years ago
luowenfeng 617573a59b feature(uniapp分类): 商品创建功能以及查询功能正常使用 4 years ago
xingyu 020535ab3a Merge branch 'master' of gitee.com:zhijiantianya/ruoyi-vue-pro into master
Signed-off-by: xingyu <xingyu4j@vip.qq.com>
4 years ago
ycak47 c53034a2dc 首次导入sql报错的问题。
1.积木报表菜单重复
2.Banner管理SQL注释错误及主键重复
4 years ago
xingyu a6a01fcb8e 增加升级sql文件说明 4 years ago
xingyu 5f6926d17c 增加升级sql文件 4 years ago
wuxiran d2a9a49dad mall:更新优惠券模板sql文件 4 years ago
wuxiran f0ee6467b3 mall:提交优惠券sql文件 4 years ago
YunaiV 75d2b9a19e mall:同步最新 SQL 4 years ago
xingyu 58cdc0be13 fix: fix menu active bug 4 years ago
xingyu 340790dec4 chore: update deps 4 years ago
YunaiV 2340f09c68 mall:调整部分 SPU、SKU 的表设计 4 years ago
YunaiV fa9823161e mall:完善商品品牌的前后端实现 4 years ago
YunaiV 969c387764 mall:完善商品分类的管理后台界面 4 years ago
芋道源码 35413b52c9
!237 集成积木报表
Merge pull request !237 from 芋道源码/feature/visual
4 years ago
YunaiV 74c9e68a0f 1. 修改 file 的 type 过短的问题
2. 修复 pgsql 脚本不正确的问题
4 years ago
YunaiV d872676748 完善积木报表的集成 4 years ago
YunaiV 40520b6c88 fix:降级 fastjson 版本,解决新版本的 jimu 报表在 2.0.10 会报错的问题 4 years ago
YunaiV b2f5900abc Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/visual 4 years ago
芋道源码 69a7b0de57
!220 vue3
Merge pull request !220 from xingyu/master
4 years ago
xingyu 87f4248e2f fix: Vue Router i18 warn 4 years ago
xingyu 74983d7b74 feat: vue3 menu sql 4 years ago
YunaiV b0cdfd7afc 完善工作流的注释 4 years ago
jiangqiang 5c58a377db 新增积木报表菜单 4 years ago
jiangqiang 653520d85b 积木报表SQL脚本,拦截配置,以及组件扫描包配置 4 years ago
jiangqiang dd726f7985 中英文之间加空格 4 years ago
jiangqiang 0ed3321719 修改文件表表结构 4 years ago
jiangqiang 36d7775171 1. 修改文件名和文件路径字段长度一致,因为如果不存在文件名的情况下,会使用文件路径作为字段名,防止数据库报错字段内容太长。
2. 修改type字段为ext_name,因为此字段本来就存的文件扩展名,并且新增mime_type字段,用来存储文件的类型。方便后期拓展网盘项目。
3. 修改文件路径生成方式:之前是md5,现在是sha256,降低文件碰撞概率。方便拓展网盘项目,实现秒传等功能。
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 d3fe187696 增加 file 的文件名的字段,同步最新 SQL 4 years ago
xiaxiaoYY 247d299cca Banner模块 for review 4 years ago
YunaiV 72019f727e Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 4 years ago
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
4 years ago
YunaiV 2105950321 同步 SSO 相关的 Oracle、PostgreSQL 的脚本 4 years ago
YunaiV 6566605da3 同步 SSO 相关的 MySQL、SQL Server 的脚本 4 years ago
shuaidawang 204a5ba284 规格增删改查接口及页面提交 4 years ago
shuaidawang bd944c4a8b 商品规格和spu前端代码生成 4 years ago
shuaidawang 0b087c84c6 规格和商品菜单提交 4 years ago
franky 2bbfa40265 调整商品代码生成模块 4 years ago
franky 657e4d035b spu,sku表结构同步 4 years ago
YunaiV 1f1970e6c8 提供最新的内嵌模式 4 years ago
YunaiV 09c8a91b6a 修复 MySQL 文件的编码错误 4 years ago
YunaiV db0fbcf3d9 同步最新的 MySQL、Oracle、PostgreSQL、SQLServer 的数据文件 4 years ago
YunaiV e1daeba5d3 同步最新的 SQL 脚本 4 years ago
jeromesoar ff307a4c86 fix: TODO pid 改成 parentId 字段 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
YunaiV 60f918da84 增加 SQLServer 的适配~ 4 years ago
YunaiV c845f3f012 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.6.2-postgresql 4 years ago
YunaiV 8606f5c605 优化 UserSession 的实现,将 id 变成自增,额外增加 token 字段 4 years ago
anzhen 18a3f4d3eb Merge branch 'upstream/master'
# Conflicts:
#	sql/ruoyi-vue-pro.sql
4 years ago
YunaiV 0f21b55e6d 解决 Oracle 关键字冲突的问题
导出最新的 SQL 脚本
4 years ago
YunaiV 7db1a58bfc 适配 Oracle 数据库
1. 去除关键字,避免数据库的查询冲突
4 years ago
YunaiV 72ad12344b 调整 Flowable、Activiti 提供的脚本,通过 db 自动生成 4 years ago
YunaiV adfe2926da 1. 同步 MySQL、PostgreSQL 最新的脚本
2. 修复单元测试的报错
4 years ago
YunaiV 45cbb56ea1 1. 同步 MySQL、PostgreSQL 最新的脚本
2. 修复单元测试的报错
4 years ago
YunaiV 30e886be6f 解决 PostgreSQL 集成 Quartz 时的报错 4 years ago
YunaiV 2367280d83 1. 同步最新 SQL
2. 生成内嵌的页面
4 years ago
shuaidawang 14a1d70cbb 【促销活动】-代码生成 4 years ago
YunaiV d04271b965 增加数据源管理 SQL 4 years ago
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
4 years ago
YunaiV 2d797ef3e8 同步最新社交登录的 SQL 脚本 4 years ago
JeromeSoar cc6c3d2759 品牌代码生成 4 years ago
JeromeSoar d3edaec2b1 商品分类维护 4 years ago
JeromeSoar 4e67b6bbcf 商品分类代码生成 4 years ago
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
4 years ago
YunaiV c703628940 【新增】菜单新增是否缓存、是否隐藏的字段 4 years ago
anzhen 17167c24d1 code review 编码规范统一 4 years ago
shuaidawang 57ea98b508 用户收件地址sql 4 years ago
YunaiV 2d5601be92 调整前端和环境的环境配置 4 years ago
YunaiV 076c7a4e3e 优化短信模块的代码 4 years ago
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
4 years ago
YunaiV 9d9836dea2 完善敏感词的单元测试 4 years ago
FinallySays 6fd52dfbb6 接入腾讯云短信 4 years ago
安贞 3cd135850e 新建一个关联表维护用户岗位关系 4 years ago
YunaiV 315be160a8 同步最新 SQL,准备发布 1.6.1 版本 4 years ago
YunaiV d23232aab0 完成新 File 的功能 4 years ago
YunaiV 5a2169b688 将 tool 合并到 infra 模块 4 years ago
HFwas 500f0a72ce fix://修复导入数据报错 4 years ago
YunaiV 120cbc9123 修改版本号为 1.6.0,准备 Flowable 工作流发版! 4 years ago
YunaiV d2636a7787 调整 DataScopeEnum 到 yudao-module-system-api 包下,合理~ 4 years ago
YunaiV 3201288036 review flowable 的代码实现,测试通过 4 years ago
YunaiV bf37095259 v.1.5.1 发布,优化多租户功能,支持自动创建用户、角色等信息 4 years ago
YunaiV ec8b356ba6 v.1.5.1 发布,优化多租户功能,支持自动创建用户、角色等信息 4 years ago
YunaiV f63d4e20b9 同步最新版本的 SQL 脚本 4 years ago
YunaiV 121fd0652d 1.5.0 版本准备发布,同步最新的 SQL 4 years ago
YunaiV 78fe38d687 v3.6.0 完成~ 4 years ago
YunaiV d649b93017 1. 同步最新的 SQL
2. 修复多租户的定时 Task 无法获取租户编号的问题
4 years ago
YunaiV 8d59384904 多模块重构 10:去除 Freemarker 依赖,修改字典的前缀,从 sys=》system、inf=》infra 见名知意 4 years ago
YunaiV 0f2031d0db 更新 Pay 相关的 README.md 4 years ago
YunaiV 2860108a7d Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into pay_extension
 Conflicts:
	sql/ruoyi-vue-pro.sql
	yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/enums/SysDictTypeConstants.java
	yudao-admin-server/src/main/resources/application-local.yaml
	yudao-admin-server/src/main/resources/application.yaml
	yudao-admin-server/src/test/resources/sql/clean.sql
	yudao-admin-server/src/test/resources/sql/create_tables.sql
	yudao-admin-ui/src/utils/dict.js
4 years ago
YunaiV e487e31961 同步最新的 SQL 4 years ago
YunaiV e01b33bc78 同步最新的表结构 4 years ago
YunaiV 9734eacf01 完成 bpm 已办任务列表 4 years ago
jason 5bf3045544 优化退款逻辑 4 years ago
YunaiV c4003396a5 1. 同步最新的 SQL
2. 同步最新的配置到 dev 文件
4 years ago
YunaiV c84a9dd67e 优化流程 Model 的部署代码 4 years ago
YunaiV ff7b9d9d26 增加 Bpm Field 的 vModel 重复的问题 4 years ago
jason 08103685f1 重构退款逻辑,去掉退款后处理 4 years ago
YunaiV d49ce4c81f 同步最新 SQL 4 years ago
YunaiV 4b5c185608 code review 支付商户逻辑 4 years ago
chen quan aad85337ce Merge remote-tracking branch 'origin/pay_extension' into pay_extension
# Conflicts:
#	yudao-admin-server/src/test/resources/sql/create_tables.sql
4 years ago
chen quan d1a20bf259 1、完成代付订单后台模块
2、将pay模块的 PayRefundMapper 更名为 PayRefundCoreMapper 避免冲突
3、将支付订单 UI 界面进行调整优化
4 years ago
YunaiV c916b30fa1 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into pay_extension
 Conflicts:
	sql/ruoyi-vue-pro.sql
	yudao-admin-server/src/main/resources/application.yaml
	yudao-admin-server/src/test/resources/sql/clean.sql
	yudao-admin-server/src/test/resources/sql/create_tables.sql
	yudao-admin-ui/src/utils/dict.js
	yudao-user-server/src/main/resources/application-local.yaml
4 years ago
YunaiV abf61bfdea 修复引入多租户后,前端 <img /> 读取图片报错的问题 4 years ago
YunaiV 72dc28a639 同步最新的 SQL 脚本 4 years ago
chen quan 98dfa48ced 1:优化商户管理页面BUG
2:优化应用关闭页面
3:完成支付订单CURD 以及单元测试
4:将 Element UI 从 2.15.0 升级至 2.15.6
4 years ago
aquan 6069a387ea 优化完善支付应用和支付渠道代码逻辑,完善单元测试,基于validator完成手动校验config 4 years ago
jason 7d6f205dc0 支付退款申请,支付宝手机wap 相应实现 4 years ago
aquan e46a27b937 完成支付模块支付应用信息和微信类型的支付渠道配置。 4 years ago
ouyang 87d8b55b41 Merge branch 'pay_extension' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into pay_extension 4 years ago
ouyang 461c6a0007 tina提交支付宝扫码支付 4 years ago
aquan 38f1d6428f Merge remote-tracking branch 'origin/pay_extension' into pay_extension 4 years ago
jason a1105ffdc7 调整表 pay_order_extension,字段 channel_notify_data,长度 4 years ago
aquan 1a721ceb5f 完成支付模块的商户管理开发以及单元测试 4 years ago
YunaiV 742125ed99 code review 工作流的代码
合并最新的 SQL
4 years ago
YunaiV 31c4a52858 Merge branch 'feature/activiti' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/activiti 4 years ago
YunaiV 0050b1e46d Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/activiti
 Conflicts:
	yudao-dependencies/pom.xml
	yudao-framework/pom.xml
4 years ago
YunaiV 0e209d9cfc 同步最新的表结构 4 years ago
jason d16185f87d 修改表单为外置表单 4 years ago
YunaiV 72b64dc526 同步最新的支付表结构 4 years ago
jason 436781507e merge master change 4 years ago
YunaiV 6dc65234ef 增加支付相关表的 SQL,调整相关的实体 4 years ago
jason ee8dcd0888 1.实现了工作流引擎 中 请假流程demo(定义在 resources/leave.bpmn)
2.增加一个一级菜单 OA 办公 下面两个菜单: 请假申请,待办任务
3.暂时不知如何找部门领导, 暂时写死为 admin
4.activity 用户组使用 用户岗位来代替。
5.新增一个用户 hradmin, 密码 123456  岗位是 人力资源
6.演示流程。
  a. admin 登陆 申请请假
  b. admin 待办任务(审批)
  c. hradmin 登陆 待办任务(审批)
  d. admin 登陆 待办任务 (确认)
4 years ago
YunaiV 5133cd0fdf Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into pay_extension 4 years ago
YunaiV 4909342d7e 同步最新的 SQL 脚本 4 years ago
QingChen 0effbc513c 支付表结构 4 years ago
wangwenbin10 b139107717 初始化 c 端的用户相关的表 4 years ago
YunaiV 4a23a696f4 1. 修复“登陆”=》“登录”
2. 增加社交平台的绑定与解绑
4 years ago
YunaiV 79f9f7b93d 优化登陆日志,增加 userId、userType,更多的 loginType 4 years ago
YunaiV 7b3a283074 增加三方登陆相关的表结构 4 years ago
weir 133cb49c42 接入第三方登录(已接入Gitee[理论justAuth支持都可以接入]--抢先预览版 5 years ago
YunaiV bbfa4783d4 同步最新表结构与数据 5 years ago
YunaiV 6f6e8777e7 1. SQL 同步最新
2. 优化 trace 相关的逻辑
5 years ago
YunaiV 49a386d7be 错误码模块完成 5 years ago
YunaiV 2e27a4244c 同步新的 sql 5 years ago
YunaiV fbbcd2717a 短信模板的创建 Test 单元测试 5 years ago
YunaiV 162d604644 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into sms_temp_zzf_0127 5 years ago
YunaiV 64b085ae0d 1. 修复所有的单元测试
2. 最新的 sql 脚本
5 years ago
芋道源码 d5fb438f59 !20 Job 模块单元测试
Merge pull request !20 from neilz/feature/ut-job
5 years ago
YunaiV f4818d26d6 整理 permission、user 模块的 url 5 years ago
neilz ca9458088c Merge branch 'master' of gitee.com:zhijiantianya/ruoyi-vue-pro into feature/ut-job 5 years ago
YunaiV 2e58e8585e Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into sms_temp_zzf_0127
 Conflicts:
	pom.xml
	src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyDefine.java
	src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyRegistry.java
	src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityConfiguration.java
	src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/RedisController.java
	src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/RedisKeyConstants.java
	src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java
	src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysPermissionServiceImpl.java
5 years ago
YunaiV 11b8afc4c7 补下 sql 脚本 5 years ago
neilz 0775e85aac Quartz 相关表新增初始化任务sql sysUserSessionTimeoutJob 5 years ago
YunaiV cee1aa3e60 增加文件服务的展示 5 years ago
zengzefeng 225664550f 实现短信通过redis stream异步发送,实现短信callback处理 5 years ago
YunaiV 28d9ecee3b 1. 处理 Job 日志导出的 excel 名字错误的问题 5 years ago
YunaiV eb3ad70071 1. 上传最新 sql 脚本
2. 修改 readme
3. 优化 config 模块的排版
5 years ago
YunaiV 0b34694a64 1. 上传最新 sql 脚本
2. 修改 readme
3. 优化 config 模块的排版
5 years ago
Lyon ea34197dd7 SysUserSessionServiceImplTest 测试父类替换
SysUserSessionDO.java 表结构新增字段 username;
create_tables.sql 修改
ruoyi-vue-pro.sql 修改
移除超时的在线用户-
5 years ago
Lyon bcb6a68b80 Merge branch 'master' into feature_user-session-timeout
# Conflicts:
#	sql/ruoyi-vue-pro.sql
5 years ago
zengzefeng 767cd90279 批量发送半成品 5 years ago
YunaiV 01be94a7a0 简化 config 的单元测试,将新增、修改、删除涉及的公用方法,单独测试 5 years ago
Lyon 2cb7302d30 移除超时的在线用户-完成
修改ruoyi-vue-pro.sql
新增表字段SysUserSessionDO.java#sessionTimeout
5 years ago
YunaiV 4120084cef 完成 dict type 的单元测试 5 years ago
YunaiV 99855e7cdc 开始搭建 unit test 的示例。
1. 禁用 spring security 的自动配置
2. 禁用 quartz 的自动配置
5 years ago
YunaiV 8605cc35c9 完成一部分 xss 的功能,准备先午睡~~~ 5 years ago
YunaiV 74f2c8a879 1. 同步最新的表结构
2. 记录执行日志
5 years ago
YunaiV f60855faa0 1. 完成 Job 的 CRUD 功能 5 years ago
YunaiV dadb66c8e9 初始化 Quartz 的整体代码 5 years ago
YunaiV 2f66829a41 完成代码生成器~ 5 years ago
YunaiV 95757db6be 增加基于 SQL 导入表结构 5 years ago
YunaiV 18b6dfa068 同步最新的 sql 脚本
编写 mapper 的代码模板
5 years ago
zengzefeng 009f332106 重构短信功能 5 years ago
zengzefeng 37c39365ec 重构短信功能 5 years ago
YunaiV 46706eb069 完成 Redis 监控的功能 5 years ago
zefeng_java df8bda53e8 增加短信功能实现 5 years ago
YunaiV 8e67753a4b 优化配置中心,增加 ConfigFrameworkDAO 的抽象,进一步解耦 framework 5 years ago
YunaiV 1768d27e11 完善新操作日志的页面修改 5 years ago
YunaiV 30076f6472 完成操作日志的存储 5 years ago
YunaiV 00935f7d69 提交最新的表结构 5 years ago
YunaiV cdaa0d9195 初始化 User 模块的代码 5 years ago
RuoYi a69cc94f35 三级菜单自动配置组件 5 years ago
RuoYi 90ac416e02 新增缓存监控功能 5 years ago
RuoYi c9f25cb34e 调整sql默认时间 5 years ago
RuoYi 28bceda630 修正文字错误 5 years ago
RuoYi abeb8d7fd8 菜单新增是否缓存keep-alive 5 years ago
RuoYi 478fae0d28 菜单&数据权限新增(展开/折叠 全选/全不选 父子联动) 5 years ago
RuoYi 4f86b6d9ca 修改公告内容字段类型 6 years ago
RuoYi eb30fc4b1a 修改公告内容字段类型 6 years ago
RuoYi 6e7d7aba93 代码生成支持自定义路径 6 years ago
RuoYi 5c6adb25fc 代码生成支持复选框 6 years ago
RuoYi cee572f237 若依 3.0 6 years ago