198 Commits (9315ac0becb7778adb77024d5d44f8b20c37df2e)

Author SHA1 Message Date
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