From 73b750200f25df08aa64124da49e7461f9de6653 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 15:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel
---
UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java
index 61d0459..cecb57b 100644
--- a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java
+++ b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java
@@ -104,6 +104,24 @@
}
@ResponseBody
+ @PostMapping("/base/user/wechat")
+ @ApiOperation(value = "微信一键登录", tags = {"用户端-登录"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "code", name = "code", required = true, dataType = "String")
+ })
+ public ResultUtil<LoginWarpper> wechat(String code){
+ try {
+
+ String phone1 = weChatUtil.getPhone(code);
+ return userInfoService.captchaLogin1(phone1);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+
+ @ResponseBody
@PostMapping("/base/user/oneClickLogin")
@ApiOperation(value = "手机一键登录", tags = {"用户端-登录"}, notes = "")
@ApiImplicitParams({
@@ -708,11 +726,11 @@
public ResultUtil uploadImg(MultipartFile file, HttpServletRequest request, HttpServletResponse response){
try {
String name = file.getOriginalFilename();
- String type = name.substring(name.lastIndexOf(".") + 1).toLowerCase();
- List<String> types = Arrays.asList("jpg", "jpeg", "png");
- if(!types.contains(type)){
- return ResultUtil.error("请上传图片文件（jpg/jpeg/png）");
- }
+// String type = name.substring(name.lastIndexOf(".") + 1).toLowerCase();
+// List<String> types = Arrays.asList("jpg", "jpeg", "png");
+// if(!types.contains(type)){
+// return ResultUtil.error("请上传图片文件（jpg/jpeg/png）");
+// }
String s = OssUploadUtil.ossUpload(request, file);
return ResultUtil.success(s);
}catch (Exception e){
--
Gitblit v1.7.1