Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

k94314517

2025-02-28 25908f5bd4a2dae4625b49d325525849feb676a4

 server/web/src/main/java/com/doumee/api/web/AccountApi.java

@@ -1,18 +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,6 +41,12 @@

    @Autowired
    private MemberService memberService;

    @Autowired
    private WxMiniUtilService wxMiniUtilService;

    @Autowired
    private SystemDictDataBiz systemDictDataBiz;

//    @ApiOperation(value = "用户注册", notes = "小程序端")
//    @PostMapping("/userRegister")
@@ -64,6 +79,11 @@
    }


    public static void main(String[] args) {
        JwtPayLoad payLoad = new JwtPayLoad("07a9f07178864e57bf1fb34e7a321f08");
        System.out.println(JwtTokenUtil.generateToken(payLoad));
    }

    @LoginRequired
    @ApiOperation(value = "解析微信手机号", notes = "小程序端")
    @PostMapping("/wxPhone")
@@ -89,6 +109,17 @@



    @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);
    }

}