Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/application.yml

src/main/java/com/ycwl/basic/controller/FileController.java

@@ -0,0 +1,50 @@
+package com.ycwl.basic.controller;
+
+
+import com.ycwl.basic.annotation.IgnoreToken;
+import com.ycwl.basic.enums.BizCodeEnum;
+import com.ycwl.basic.service.FileService;
+import com.ycwl.basic.utils.ApiResponse;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+
+/**
+ * @Author: songmingsong
+ * @CreateTime: 2024-12-05
+ * @Description: 文件接口
+ * @Version: 1.0
+ */
+@RestController
+@RequestMapping("/api/file/v1")
+@Slf4j
+@Api(tags = "文件接口")
+public class FileController {
+
+    @Autowired
+    private FileService fileService;
+
+    @ApiOperation(value = "上传文件")
+    @PostMapping("/upload")
+    @IgnoreToken
+    public ApiResponse<?> upload(@RequestParam(value = "file") MultipartFile file) throws IOException {
+        String url = fileService.uploadFile(file);
+        return ApiResponse.success(url);
+    }
+
+    @ApiOperation(value = "删除文件")
+    @PostMapping("/delete")
+    @IgnoreToken
+    public ApiResponse<?> delete(@RequestParam(value = "fileName") String fileName) throws IOException {
+        Boolean flag = fileService.delete(fileName);
+        return flag ? ApiResponse.success(BizCodeEnum.REQUEST_OK) : ApiResponse.fail(BizCodeEnum.FAIL.getMessage());
+    }
+}

src/main/java/com/ycwl/basic/controller/mobile/AppFaceController.java

@@ -17,7 +17,8 @@ import org.springframework.web.multipart.MultipartFile;
 @RestController
 @RequestMapping("/api/mobile/face/v1")
 @Api(tags = "用户人脸相关接口")
-public class AppFaceController {
+public class
+AppFaceController {
 
     @Autowired
     private FaceService faceService;

src/main/java/com/ycwl/basic/controller/mobile/AppMemberController.java

@@ -1,12 +1,16 @@
 package com.ycwl.basic.controller.mobile;
 
+import com.ycwl.basic.annotation.IgnoreToken;
+import com.ycwl.basic.model.mobile.DTO.WeChatUserInfoDTO;
+import com.ycwl.basic.model.mobile.DTO.WeChatUserInfoUpdateDTO;
+import com.ycwl.basic.model.pc.member.resp.MemberRespVO;
+import com.ycwl.basic.service.mobile.AppMemberService;
 import com.ycwl.basic.utils.ApiResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @Author：longbinbin
@@ -15,30 +19,67 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/api/mobile/member/v1")
 @Api(tags = "用户相关接口")
+@Slf4j
 public class AppMemberController {
 
+    @Autowired
+    private AppMemberService memberService;
+
+    /**
+     * 登录
+     *
+     * @param code
+     * @param userInfoDTO
+     * @return
+     * @throws Exception
+     */
+    @ApiOperation("登录")
     @PostMapping("/login")
-    public ApiResponse login() {
-        //TODO 登录逻辑
-        return ApiResponse.success("");
-    }
-
-    @PostMapping("/register")
-    public ApiResponse register() {
-        //TODO 注册逻辑
-        return ApiResponse.success("");
+    @IgnoreToken
+    public ApiResponse<?> login(@RequestParam(value = "code", required = false) String code,
+                                @RequestParam(value = "userInfoDTO", required = false) WeChatUserInfoDTO userInfoDTO) throws Exception {
+        return memberService.login(code, userInfoDTO);
     }
 
+    /**
+     * 获取用户信息
+     *
+     * @return
+     */
+    @ApiOperation("获取用户信息")
     @GetMapping("/getUserInfo")
-    public ApiResponse getUserInfo() {
-        //TODO 获取用户信息逻辑
-        return ApiResponse.success("");
+    public ApiResponse<MemberRespVO> getUserInfo() {
+        return memberService.getUserInfo();
     }
 
+    /**
+     * 修改用户信息
+     *
+     * @param userInfoUpdateDTO
+     * @return
+     */
+    @ApiOperation("修改用户信息")
+    @PostMapping("/update")
+    public ApiResponse<?> update(@RequestBody WeChatUserInfoUpdateDTO userInfoUpdateDTO) {
+        return memberService.update(userInfoUpdateDTO);
+    }
+
+    /**
+     * 同意用户协议
+     *
+     * @return
+     */
+    @ApiOperation("同意用户协议")
+    @GetMapping("/agreement")
+    public ApiResponse<?> agreement() {
+        return memberService.agreement();
+    }
+
+
     @ApiOperation("是否首次获取视频")
     @GetMapping("/isFirstObtainVideo")
     public ApiResponse isFirstTimeObtainingVideo() {
-        //TODO 判断是否首次获取视频逻辑
+        // TODO 判断是否首次获取视频逻辑
 
         return ApiResponse.success("");
     }

src/main/java/com/ycwl/basic/controller/mobile/AppWxPayController.java

@@ -0,0 +1,48 @@
+package com.ycwl.basic.controller.mobile;
+
+
+import com.ycwl.basic.annotation.IgnoreToken;
+import com.ycwl.basic.enums.BizCodeEnum;
+import com.ycwl.basic.model.wxPay.WXPayOrderReqVO;
+import com.ycwl.basic.model.wxPay.WxPayRespVO;
+import com.ycwl.basic.service.mobile.WxPayService;
+import com.ycwl.basic.utils.ApiResponse;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @Author: songmingsong
+ * @CreateTime: 2024-12-05
+ * @Description: 微信支付
+ * @Version: 1.0
+ */
+@RestController
+@RequestMapping("/api/mobile/wx/v1")
+@Api(tags = "微信支付相关接口")
+public class AppWxPayController {
+
+    @Autowired
+    private WxPayService wxPayService;
+
+    @ApiOperation(value = "微信预支付", notes = "微信预支付")
+    @PostMapping("/createOrder")
+    public ApiResponse<WxPayRespVO> createOrder(@RequestBody @Validated WXPayOrderReqVO req) throws Exception {
+        return ApiResponse.success(wxPayService.createOrder(req));
+    }
+
+    @ApiOperation(value = "微信支付回调", notes = "微信支付回调")
+    @PostMapping("/payNotify")
+    @IgnoreToken
+    public ApiResponse<?> payNotify(HttpServletRequest request) {
+        wxPayService.payNotify(request);
+        return ApiResponse.success(BizCodeEnum.REQUEST_OK);
+    }
+}