From 609a1931953b2298016bd2b0d6b410666b5ad7b9 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 02 七月 2026 09:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/3.0.1' into 3.0.1
---
server/web/src/main/java/com/doumee/api/web/AccountApi.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 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 db5c45b..ea8afae 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,20 +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.*;
@@ -34,6 +41,12 @@
@Autowired
private MemberService memberService;
+
+ @Autowired
+ private WxMiniUtilService wxMiniUtilService;
+
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
// @ApiOperation(value = "鐢ㄦ埛娉ㄥ唽", notes = "灏忕▼搴忕")
// @PostMapping("/userRegister")
@@ -67,7 +80,7 @@
public static void main(String[] args) {
- JwtPayLoad payLoad = new JwtPayLoad("d0a92489d26d43e182a1b8b75e1d9836");
+ JwtPayLoad payLoad = new JwtPayLoad("07a9f07178864e57bf1fb34e7a321f08");
System.out.println(JwtTokenUtil.generateToken(payLoad));
}
@@ -94,8 +107,30 @@
return ApiResponse.success("鏌ヨ鎴愬姛",userResponse);
}
+ @LoginRequired
+ @ApiOperation(value = "閫�鍑虹櫥褰�", notes = "娓呯┖褰撳墠浼氬憳鎵嬫満鍙�,涓嬫杩涘叆闇�閲嶆柊鎺堟潈")
+ @PostMapping("/logout")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
+ public ApiResponse logout() {
+ // JWT 鏃犵姸鎬�,鏃犳硶鍚婇攢 token;姝ゅ娓呯┖浼氬憳鎵嬫満鍙�,浣垮叾鍥炲埌鏈巿鏉冩墜鏈哄彿鐘舵��
+ memberService.clearPhone(getMemberId());
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+ @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