From b2d360d9113b6955287108ca9e90d76a1f3c1419 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 15:05:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/service/src/main/java/com/doumee/service/business/UsersService.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/UsersService.java b/server/service/src/main/java/com/doumee/service/business/UsersService.java
index 49ff950..9347810 100644
--- a/server/service/src/main/java/com/doumee/service/business/UsersService.java
+++ b/server/service/src/main/java/com/doumee/service/business/UsersService.java
@@ -7,10 +7,12 @@
import com.doumee.dao.business.model.Users;
import com.doumee.dao.web.reqeust.ContentShareImgDto;
import com.doumee.dao.web.reqeust.EditUsersRequest;
+import com.doumee.dao.web.reqeust.GenerateQRCodeRequest;
import com.doumee.dao.web.reqeust.WxPhoneRequest;
import com.doumee.dao.web.response.AccountResponse;
import org.springframework.web.multipart.MultipartFile;
+import java.io.InputStream;
import java.util.List;
/**
@@ -103,11 +105,11 @@
*/
long count(Users users);
- AccountResponse phoneLogin(String phone, String code);
+ AccountResponse phoneLogin(String phone, String code,String openid);
AccountResponse wxLogin(String code);
- void bindingOpenid(String code,Long userId);
+ void bindingOpenid(String openid,Long userId);
String importBatch(MultipartFile file);
@@ -121,7 +123,9 @@
String getContentShareImg(Users loginUserInfo, ContentShareImgDto param);
- ZTBaseRequst logOff(Long userId);
+ ZTBaseRequst logOff(Long userId,String token);
AccountResponse getWxMiniPhoneLogin(WxPhoneRequest wxPhoneRequest);
+
+ InputStream getQrCode(GenerateQRCodeRequest generateQRCodeRequest);
}
--
Gitblit v1.9.3