xingyu4j
|
9fc6e0f00b
|
refactor: springdoc 替换 springfox
|
2022-12-09 13:43:15 +08:00 |
|
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
|
2022-11-13 12:07:59 +08:00 |
|
YunaiV
|
a539bc211d
|
1. 修复 MemberAuthServiceTest 单元测试
2. 修复 DataPermissionDatabaseInterceptorTest 单元测试
|
2022-11-11 08:55:28 +08:00 |
|
xingyu4j
|
632a132a6a
|
refactor: Date ==> LocalDateTime
|
2022-11-09 11:14:46 +08:00 |
|
YunaiV
|
01d10b518c
|
trade:优化创建订单接口的后端实现
|
2022-11-08 22:50:03 +08:00 |
|
YunaiV
|
a89d5a83db
|
promotion:增加优惠劵的后端分页接口
|
2022-11-03 22:40:19 +08:00 |
|
sfmind
|
f0e964f180
|
uni-app:个人信息修改
|
2022-10-19 10:47:58 +08:00 |
|
YunaiV
|
4ce76e82fc
|
mall:完善收件地址
|
2022-08-01 22:49:51 +08:00 |
|
YunaiV
|
96e2a27d07
|
mall:初始化 trade 表结构
|
2022-08-01 00:53:16 +08:00 |
|
YunaiV
|
022e5b8519
|
mall:完善商品模块的表设计
|
2022-07-31 22:26:26 +08:00 |
|
YunaiV
|
d9c2da7c91
|
1. 【新增】接口支持通过 @PermitAll 注解,允许匿名(未登录)进行访问
2. 【新增】`yudao.security.permit-all-urls` 配置项,允许匿名(未登录)进行访问
|
2022-07-06 21:45:25 +08:00 |
|
YunaiV
|
2b9b302368
|
同步最新的 master 代码
|
2022-07-04 20:01:04 +08:00 |
|
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
|
bdf579a20b
|
将 yudao-module-system-api 模块的 auth 包,重构成 oauth2 包
|
2022-06-05 16:44:50 +08:00 |
|
YunaiV
|
47753467ee
|
将 yudao-module-system-api 模块的 auth 包,重构成 oauth2 包
|
2022-06-03 09:53:13 +08:00 |
|
YunaiV
|
e1c08c4661
|
新增 member/auth/weixin-mini-app-login 接口,实现小程序的手机登录
|
2022-05-29 23:48:52 +08:00 |
|
YunaiV
|
1b7093f5c1
|
用户 app 的社交登录接口,合并到手机号 + 密码,手机号 + 验证码的 login 接口中,统一维护。
|
2022-05-29 22:03:46 +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
|
d322e78199
|
前端 Token、账号、密码等信息,统一使用 LocalStorage 替代 Cookie 存储
|
2022-05-22 20:09:48 +08:00 |
|
franky
|
9f9004624b
|
商品规格属性代码生成
|
2022-05-15 22:55:18 +08:00 |
|
YunaiV
|
9e10e0fd5d
|
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro into feature/1.6.2
|
2022-05-13 12:31:26 +08:00 |
|
YunaiV
|
97db4586a8
|
完成 OAuth2 的客户端模块
|
2022-05-12 01:09:16 +08:00 |
|
YunaiV
|
5cf68961e1
|
1. 修改在线会话的实现
2. 接入到会员管理 OAuth2.0
|
2022-05-10 23:20:15 +08:00 |
|
git
|
1fc5c3c71c
|
用户个人信息查询
|
2022-05-10 15:21:05 +08:00 |
|
YunaiV
|
8505873e1b
|
解决 UserController 冲突问题
|
2022-05-09 13:31:39 +08:00 |
|
yong
|
b30c39764d
|
用户信息
|
2022-05-08 21:20:47 +08:00 |
|
YunaiV
|
5e8648508e
|
去除 Spring Security 的 Member 的 loadUsername,使用自己定义的 login0 实现
|
2022-05-08 02:33:34 +08:00 |
|
YunaiV
|
3bd7e8e682
|
去除 Spring Security 的 Admin 的 loadUsername,使用自己定义的 login0 实现
|
2022-05-08 02:09:22 +08:00 |
|
YunaiV
|
3351ebbbb4
|
去除 Spring Security 的 logout handler,使用自己定义的 logout 接口
|
2022-05-08 00:38:55 +08:00 |
|
YunaiV
|
baadb5a937
|
简化 mock login 模拟登录的实现,由 TokenAuthenticationFilter 直接实现
|
2022-05-08 00:17:48 +08:00 |
|
YunaiV
|
73bf0b6f4f
|
去除 LoginUser 的 updateTime、username、password、status 字段,简化
|
2022-05-07 01:30:37 +08:00 |
|
YunaiV
|
8737674d74
|
去除 LoginUser 的 roleIds、deptId 字段,简化
|
2022-05-07 00:39:39 +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
|
7753bd4c44
|
1. code review 后台的短信验证码登陆
2. 解决 SQL Server LIMIT 1 存在报错的问题
|
2022-05-02 22:57:45 +08:00 |
|
YunaiV
|
8606f5c605
|
优化 UserSession 的实现,将 id 变成自增,额外增加 token 字段
|
2022-05-02 12:33:37 +08:00 |
|
YunaiV
|
6f18adb54a
|
适配 Oracle 数据库
1. 修复配置中心的 DAO 查询报错
2. 适配 LIMIT 1 的查询
|
2022-05-01 17:55:13 +08:00 |
|
YunaiV
|
e24c8c3425
|
修改实体和 Mapper,解决 PostgreSQL 查询报错的问题
|
2022-04-30 20:09:36 +08:00 |
|
YunaiV
|
7ce7baa2d2
|
增加数据源管理
|
2022-04-27 23:15:43 +08:00 |
|
YunaiV
|
c402077961
|
进一步重构社交登陆的实现
|
2022-04-27 00:35:59 +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
|
09103f310b
|
1. 【修复】单元测试报错
2. 【优化】yudao-module-xx-impl 调整成 yudao-module-xx-biz,更加符合定位
|
2022-04-22 00:07:54 +08:00 |
|
sfmind
|
0d08ed26a5
|
由于uni-app的上传图片uni.uploadFile目前仅支持POST方法,所以将PUT改为POST
|
2022-04-20 23:55:41 +08:00 |
|
shuaidawang
|
c38fadcae1
|
code review代码调整
|
2022-04-18 15:13:32 +08:00 |
|
YunaiV
|
20546a37cc
|
mall:code review 收件地址
|
2022-04-15 21:34:14 +08:00 |
|
shuaidawang
|
4a4097cfb9
|
用户收件地址接口开发调试
|
2022-04-14 15:47:37 +08:00 |
|
shuaidawang
|
1deb04d256
|
用户收件地址代码生成
|
2022-04-12 11:57:04 +08:00 |
|
YunaiV
|
d60be0bb53
|
优化 test 组件的封装,内置 Redis、DB 等多种快速测试的基类
|
2022-04-04 20:28:59 +08:00 |
|
gaibu
|
abb4756a33
|
fix 转换 ip 无效的问题
|
2022-04-03 09:51:09 +08:00 |
|
YunaiV
|
56ea65e53d
|
优化登录逻辑的实现,封装统一的登录成功方法,创建 Session + 记录登录日志
|
2022-03-30 00:02:55 +08:00 |
|
YunaiV
|
813069abf4
|
优化文件配置,去掉 region 的配置,通过自动识别
|
2022-03-19 18:02:20 +08:00 |
|