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

rk

3 小时以前 609a1931953b2298016bd2b0d6b410666b5ad7b9

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

@@ -7,6 +7,7 @@
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;
@@ -20,6 +21,7 @@
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.*;

@@ -105,16 +107,27 @@
        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() {
    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,systemDictData);
        wxMiniUtilService.generateWXMiniCode(locks, WxMiniConfig.wxMaService.getAccessToken(),"/usr/local/static_resources/bike/bike_file/","");
        return  ApiResponse.success("操作成功",locks);
    }