leoxxx
|
0913b82a4c
|
修正说明文字
|
2022-06-12 14:40:04 +08:00 |
|
YunaiV
|
b1aa9f484f
|
增加 SecurityProperties 和 WebProperties 默认值，简化配置
|
2022-06-11 23:54:30 +08:00 |
|
YunaiV
|
309ba2d3f1
|
修复 admin 退出时，判断 userType 不正确
|
2022-06-11 23:28:50 +08:00 |
|
YunaiV
|
a8bf397bb0
|
Merge remote-tracking branch 'origin/master'
|
2022-06-11 22:54:10 +08:00 |
|
YunaiV
|
61c80ad97b
|
统一 "tenant-id" 的枚举
|
2022-06-11 22:54:04 +08:00 |
|
芋道源码
|
7e81a964c6
|
!193 ui-admin 显示当前用户昵称,并缩小头像图标
Merge pull request !193 from supine-win/master
|
2022-06-11 13:27:59 +00:00 |
|
YunaiV
|
abbfbd5f25
|
code review：商品 spu、sku 的逻辑
|
2022-06-11 11:36:19 +08:00 |
|
supine-win
|
98f2722781
|
1.beautify user avatar image and show nickname
|
2022-06-11 06:01:53 +08:00 |
|
franky
|
1e0f197c35
|
spu 新增前端页面完成
|
2022-06-10 17:23:35 +08:00 |
|
YunaiV
|
1895a9e809
|
优化 AdminUserApi 的实现，和 Cloud 保持一致
|
2022-06-09 08:57:57 +08:00 |
|
franky
|
407cbb109f
|
spu 调整一波
|
2022-06-08 18:38:14 +08:00 |
|
franky-mgmg-pc
|
2382ddfb37
|
spu sku review调整一波
|
2022-06-07 18:04:21 +08:00 |
|
franky-mgmg-pc
|
c118d8198b
|
Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp
# Conflicts:
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
|
2022-06-07 17:18:32 +08:00 |
|
franky-mgmg-pc
|
4bcc6c374e
|
spu 保存，propertyValue合并到productProperty中
|
2022-06-07 17:16:58 +08:00 |
|
YunaiV
|
766afbacbf
|
code review：商品 spu、sku 的逻辑
|
2022-06-07 00:32:05 +08:00 |
|
franky
|
f07bf8b0fd
|
spu保存校验添加
|
2022-06-05 22:43:20 +08:00 |
|
YunaiV
|
bdf579a20b
|
将 yudao-module-system-api 模块的 auth 包，重构成 oauth2 包
|
2022-06-05 16:44:50 +08:00 |
|
franky
|
6dca8e082b
|
商品调整
|
2022-06-05 15:45:36 +08:00 |
|
YunaiV
|
421afab7b9
|
fix oauth2 swagger 用户信息的接口信息不全，因为 swagger @ApiModel 带 . 会导致跳转存在问题
|
2022-06-03 18:55:03 +08:00 |
|
YunaiV
|
a1a01cd117
|
fix swagger 的基础扫描路径不正确
|
2022-06-03 16:53:53 +08:00 |
|
YunaiV
|
47753467ee
|
将 yudao-module-system-api 模块的 auth 包，重构成 oauth2 包
|
2022-06-03 09:53:13 +08:00 |
|
YunaiV
|
c21e953114
|
升级 mybatis-plus from 3.4.3.4 to 3.5.2
|
2022-06-03 09:44:48 +08:00 |
|
sfmind
|
0e3cdda08d
|
Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp
|
2022-06-02 18:00:25 +08:00 |
|
sfmind
|
13b5ad127a
|
1.同步调整到OAuth2方式登录 2.微信小程序一键登录;
|
2022-06-02 17:59:57 +08:00 |
|
YunaiV
|
6fd14b30c2
|
1. 升级 spring boot 到 2.6.8
2. 修复 Spring Fox 在 2.6.X 版本的兼容性
|
2022-06-01 22:18:02 +08:00 |
|
YunaiV
|
b9f1eacf5c
|
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
|
2022-06-01 21:35:57 +08:00 |
|
芋道源码
|
1c89d3ba84
|
!179 fastjson漏洞处理
Merge pull request !179 from October/master
|
2022-06-01 13:34:33 +00:00 |
|
franky-hw
|
c6e901ebd9
|
Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp
|
2022-05-31 23:54:54 +08:00 |
|
franky-hw
|
8841ddd104
|
spu front
|
2022-05-31 23:54:43 +08:00 |
|
谢华宁
|
250db847f6
|
文件上传接口保留path参数，方便覆盖文件
|
2022-05-31 22:26:26 +08:00 |
|
YunaiV
|
7c3015a67a
|
code review banner 模块的代码
|
2022-05-31 19:25:24 +08:00 |
|
franky
|
b368a54b36
|
Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp
|
2022-05-31 18:39:57 +08:00 |
|
franky
|
eb5bdda344
|
SPU名字重构
|
2022-05-31 18:39:44 +08:00 |
|
xiaxiaoYY
|
bb0edc2a65
|
Banner app api for reveiew
|
2022-05-31 18:30:24 +08:00 |
|
xiaxiaoYY
|
247d299cca
|
Banner模块 for review
|
2022-05-31 16:08:10 +08:00 |
|
xiaxiaoYY
|
e31091c0df
|
Banner管理-for review
|
2022-05-31 15:57:30 +08:00 |
|
芋道源码
|
b76fd25cc6
|
!142 【支付宝通知回调BUG修复】 【微信支付 小程序支付功能添加】 【微信支付回调】
Merge pull request !142 from zwy/feature/1.6.2-pay
|
2022-05-30 01:41:02 +00:00 |
|
YunaiV
|
156a591070
|
code review 支付的提交，补充相关的注释
|
2022-05-30 09:39:00 +08:00 |
|
YunaiV
|
17483e8b36
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.6.2-pay
|
2022-05-30 01:36:17 +08:00 |
|
YunaiV
|
e1c08c4661
|
新增 member/auth/weixin-mini-app-login 接口，实现小程序的手机登录
|
2022-05-29 23:48:52 +08:00 |
|
谢华宁
|
20411fa6b5
|
文件表建加原文件名称字段name，相关代码修改
|
2022-05-29 22:40:03 +08:00 |
|
YunaiV
|
1b7093f5c1
|
用户 app 的社交登录接口，合并到手机号 + 密码，手机号 + 验证码的 login 接口中，统一维护。
|
2022-05-29 22:03:46 +08:00 |
|
谢华宁
|
0fd5de2d73
|
文件表建加原文件名称字段original_name，相关代码修改
|
2022-05-29 16:19:56 +08:00 |
|
YunaiV
|
75d34080df
|
1. 删除 yudao-ui-app-tmp 和 yudao-ui-app-v1，用户 app 以 yudao-ui-app 为准。
2. 修改 auth.js 的 /auth 路径
|
2022-05-29 11:32:30 +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 |
|
芋道源码
|
87a45795a4
|
Merge pull request #151 from longtai-cn/fix_20220522_docs
修复注释错别字
|
2022-05-28 23:25:51 +08:00 |
|
YunaiV
|
325a8d0a6e
|
工作流的编辑无法撤回、crtl 选中的问题
|
2022-05-28 23:23:13 +08:00 |
|
YunaiV
|
da4f300824
|
code review 工作流的驳回逻辑实现代码
|
2022-05-28 22:39:56 +08:00 |
|
YunaiV
|
5c3f30e60f
|
flowable 任务被取消（包括主动取消、会签取消）时，统一进行更新 task 状态。
|
2022-05-28 22:01:17 +08:00 |
|