From f5e6133809c553cfd9fb28ee61019927c547c374 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 08 Dec 2021 15:58:33 +0800
Subject: [PATCH] 20211208  fish

---
 src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java |   34 +++++++++++++++++++++++-----------
 1 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
index ab0906c..770f0bb 100644
--- a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
+++ b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
@@ -3,11 +3,8 @@
 import javax.annotation.Resource;
 import javax.validation.Valid;
 
-import org.springframework.web.bind.annotation.GetMapping;
-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 org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
 import com.xcong.excoin.common.response.Result;
 import com.xcong.excoin.modules.member.parameter.dto.MemberAddCoinAddressDto;
@@ -22,7 +19,7 @@
 import com.xcong.excoin.modules.member.parameter.dto.MemberUpdatePwdDto;
 import com.xcong.excoin.modules.member.parameter.dto.MemberUpdateTradePwdDto;
 import com.xcong.excoin.modules.member.parameter.dto.MemberUpdateTradersPwdTimeDto;
-import com.xcong.excoin.modules.member.parameter.vo.AppVersionVo;
+import com.xcong.excoin.modules.member.parameter.vo.AppVersionListVo;
 import com.xcong.excoin.modules.member.parameter.vo.MemberAuthenticationInfoVo;
 import com.xcong.excoin.modules.member.parameter.vo.MemberAvivableCoinInfoVo;
 import com.xcong.excoin.modules.member.parameter.vo.MemberCoinAddressCountListVo;
@@ -50,6 +47,7 @@
  * @date 2020-05-18
  **/
 @Slf4j
+@CrossOrigin("*")
 @Api(value = "个人中心接口", tags = "个人中心接口")
 @RestController
 @RequestMapping(value = "/api/member")
@@ -61,13 +59,26 @@
 	/**
 	 *  获取当前版本号
 	 */
-	@ApiOperation(value="获取当前版本号", notes="获取当前版本号")
-	@ApiResponses({@ApiResponse( code = 200, message = "success", response = AppVersionVo.class)})
+	@ApiOperation(value="APP端获取当前版本号", notes="获取当前版本号")
+	@ApiResponses({@ApiResponse( code = 200, message = "success", response = AppVersionListVo.class)})
 	@GetMapping(value = "/getAppVersionInfo")
 	public Result  getAppVersionInfo() {
+		log.info("进入了getAppVersionInfo方法");
 		return memberService.getAppVersionInfo();
 	}
-	
+
+
+	/**
+	 *  获取当前版本号
+	 */
+	@ApiOperation(value="PC端获取当前版本号", notes="获取当前版本号")
+	@ApiResponses({@ApiResponse( code = 200, message = "success", response = AppVersionListVo.class)})
+	@GetMapping(value = "/getPcVersionInfo")
+	public Result  getPcVersionInfo() {
+		return memberService.getPcVersionInfo();
+	}
+
+
 	/**
 	 *  获取我的信息
 	 * @return
@@ -240,7 +251,7 @@
      */
 	@ApiOperation(value="绑定邮箱", notes="绑定邮箱")
 	@PostMapping(value="/memberBindEmail")
-    public Result memberBindEmail(@RequestBody @Valid MemberBindEmailDto memberBindEmailDto) {
+    public Result memberBindEmail(@RequestBody @Validated MemberBindEmailDto memberBindEmailDto) {
         return memberService.memberBindEmail(memberBindEmailDto);
     }
 	
@@ -347,7 +358,8 @@
     @ApiOperation(value="提交提币申请", notes="提交提币申请")
 	@PostMapping(value="/memberSubmitCoinApply")
 	public Result memberSubmitCoinApply(@RequestBody @Valid MemberSubmitCoinApplyDto memberSubmitCoinApplyDto) {
-		return memberService.memberSubmitCoinApply(memberSubmitCoinApplyDto);
+    	return Result.fail("暂未开放提币");
+//		return memberService.memberSubmitCoinApply(memberSubmitCoinApplyDto);
 	}
     
 }

--
Gitblit v1.9.1