Merge remote-tracking branch 'origin/master'

doum

12 小时以前 f2b6fdd955f8ac6e5b351e0b5e3a9f583ed6da2e

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

@@ -18,11 +18,13 @@
import com.doumee.dao.dto.DriverVerifyRequest;
import com.doumee.dao.vo.AccountResponse;
import com.doumee.dao.dto.CancelOrderDTO;
import com.doumee.dao.dto.ChangePasswordDTO;
import com.doumee.dao.vo.DriverActiveOrderCountVO;
import com.doumee.dao.vo.DriverCancelLimitVO;
import com.doumee.dao.vo.DriverCenterVO;
import com.doumee.dao.vo.DriverGrabOrderVO;
import com.doumee.dao.vo.DriverOrderDetailVO;
import com.doumee.core.utils.jpush.JPushUtil;
import com.doumee.service.business.DriverInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -237,10 +239,9 @@
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse changePassword(@RequestParam String oldPassword,
                                       @RequestParam String newPassword) {
    public ApiResponse changePassword(@RequestBody @Valid ChangePasswordDTO dto) {
        String token = this.getRequest().getHeader(JwtTokenUtil.HEADER_KEY);
        driverInfoService.changePassword(this.getDriverId(), oldPassword, newPassword, token);
        driverInfoService.changePassword(this.getDriverId(), dto.getOldPassword(), dto.getNewPassword(), token);
        return ApiResponse.success("密码修改成功，请重新登录");
    }

@@ -286,4 +287,26 @@
        return ApiResponse.success(driverInfoService.checkDriverToken(token));
    }

    @LoginDriverRequired
    @ApiOperation("注册极光推送别名")
    @PostMapping("/registerJpushAlias")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "司机token值", required = true)
    })
    public ApiResponse registerJpushAlias(@RequestParam String jpushAlias) {
        driverInfoService.registerJpushAlias(this.getDriverId(), jpushAlias);
        return ApiResponse.success("操作成功");
    }

    @ApiOperation("极光推送测试")
    @GetMapping("/testJpush")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "title", value = "通知标题", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "content", value = "通知内容", required = true)
    })
    public ApiResponse<Boolean> testJpush(@RequestParam String telephone, @RequestParam String title, @RequestParam String content) {
        boolean result = JPushUtil.sendByAlias(org.springframework.util.DigestUtils.md5DigestAsHex(telephone.getBytes()), title, content, null);
        return ApiResponse.success("推送" + (result ? "成功" : "失败"), result);
    }

}