From 4fabfe4dbd2eb28d07a4350597d314958cc1c281 Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期四, 09 十月 2025 11:16:43 +0800 Subject: [PATCH] 优化 --- server/web/src/main/java/com/doumee/api/web/AccountApi.java | 78 +++++++++++++++++++++++++++++--------- 1 files changed, 59 insertions(+), 19 deletions(-) diff --git a/server/web/src/main/java/com/doumee/api/web/AccountApi.java b/server/web/src/main/java/com/doumee/api/web/AccountApi.java index 44011bc..47e9c8d 100644 --- a/server/web/src/main/java/com/doumee/api/web/AccountApi.java +++ b/server/web/src/main/java/com/doumee/api/web/AccountApi.java @@ -1,17 +1,27 @@ package com.doumee.api.web; +import com.doumee.biz.system.SystemDictDataBiz; +import com.doumee.core.Jwt.JwtPayLoad; +import com.doumee.core.Jwt.JwtTokenUtil; import com.doumee.core.annotation.LoginRequired; import com.doumee.core.annotation.trace.Trace; +import com.doumee.core.constants.Constants; import com.doumee.core.model.ApiResponse; +import com.doumee.core.wx.WxMiniConfig; +import com.doumee.core.wx.WxMiniUtilService; +import com.doumee.dao.business.model.Locks; import com.doumee.dao.business.web.request.RegisterRequest; +import com.doumee.dao.business.web.request.WxPhoneRequest; import com.doumee.dao.business.web.response.AccountResponse; import com.doumee.dao.business.web.response.UserResponse; +import com.doumee.dao.system.model.SystemDictData; import com.doumee.service.business.MemberService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import me.chanjar.weixin.common.error.WxErrorException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -32,37 +42,57 @@ @Autowired private MemberService memberService; - @ApiOperation(value = "鐢ㄦ埛娉ㄥ唽", notes = "灏忕▼搴忕") - @PostMapping("/userRegister") - public ApiResponse<AccountResponse> userRegister(@RequestBody RegisterRequest registerRequest) { - return ApiResponse.success("鎿嶄綔鎴愬姛",memberService.userRegister(registerRequest)); - } + @Autowired + private WxMiniUtilService wxMiniUtilService; - @Trace - @LoginRequired - @ApiOperation(value = "寰俊鎺堟潈锛堢櫥褰曞悗锛�", notes = "灏忕▼搴忕") - @GetMapping("/wxEmpower") - @ApiImplicitParams({ - @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true), - @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "寰俊code", required = true) - }) - public ApiResponse wxEmpower(@RequestParam String code) { - memberService.wxEmpower(code,getMemberId()); - return ApiResponse.success("鎿嶄綔鎴愬姛"); - } + @Autowired + private SystemDictDataBiz systemDictDataBiz; - +// @ApiOperation(value = "鐢ㄦ埛娉ㄥ唽", notes = "灏忕▼搴忕") +// @PostMapping("/userRegister") +// public ApiResponse<AccountResponse> userRegister(@RequestBody RegisterRequest registerRequest) { +// return ApiResponse.success("鎿嶄綔鎴愬姛",memberService.userRegister(registerRequest)); +// } +// +// @Trace +// @LoginRequired +// @ApiOperation(value = "寰俊鎺堟潈锛堢櫥褰曞悗锛�", notes = "灏忕▼搴忕") +// @GetMapping("/wxEmpower") +// @ApiImplicitParams({ +// @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true), +// @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "寰俊code", required = true) +// }) +// public ApiResponse wxEmpower(@RequestParam String code) { +// memberService.wxEmpower(code,getMemberId()); +// return ApiResponse.success("鎿嶄綔鎴愬姛"); +// } @Trace @ApiOperation(value = "寰俊鎺堟潈", notes = "灏忕▼搴忕") @GetMapping("/wxLogin") @ApiImplicitParams({ - @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true), @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "寰俊code", required = true) }) public ApiResponse<AccountResponse> wxLogin(@RequestParam String code) { return ApiResponse.success("鎿嶄綔鎴愬姛",memberService.wxLogin(code)); + } + + + public static void main(String[] args) { + JwtPayLoad payLoad = new JwtPayLoad("07a9f07178864e57bf1fb34e7a321f08"); + System.out.println(JwtTokenUtil.generateToken(payLoad)); + } + + @LoginRequired + @ApiOperation(value = "瑙f瀽寰俊鎵嬫満鍙�", notes = "灏忕▼搴忕") + @PostMapping("/wxPhone") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true) + }) + public ApiResponse<AccountResponse> wxPhone(@RequestBody WxPhoneRequest wxPhoneRequest) { + wxPhoneRequest.setMemberId(getMemberId()); + return ApiResponse.success("鎿嶄綔鎴愬姛",memberService.wxPhone(wxPhoneRequest)); } @@ -78,6 +108,16 @@ } + @ApiOperation(value = "娴嬭瘯鐢熸垚浜岀淮鐮�", notes = "灏忕▼搴忕") + @GetMapping("/generateWXMiniCode") + public ApiResponse<Locks> generateWXMiniCode() throws WxErrorException { + Locks locks = new Locks(); + locks.setCode(12); + locks.setSiteId("1005"); + SystemDictData systemDictData = systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.ACCESS_TOKEN); + wxMiniUtilService.generateWXMiniCode(locks, WxMiniConfig.wxMaService.getAccessToken(),"/usr/local/static_resources/bike/bike_file/",""); + return ApiResponse.success("鎿嶄綔鎴愬姛",locks); + } } -- Gitblit v1.9.3