Authored by zhaoyue

Merge branch 'zhaoyue-dev2' into 'master'

FIX some conflicts



See merge request !3
git add --all src/*
git add push.sh
git add pom.xml
git commit -m "Add json jar."
git push origin zhaoyue-dev
git commit -m "FIX some conflicts"
git push origin zhaoyue-dev2
git status
\ No newline at end of file
... ...
... ... @@ -49,7 +49,7 @@ public class ReportController {
})
public ResponseEntity<ResultModel> getReportList(HttpServletRequest request, @CurrentUser User user,
@RequestParam String sign, @RequestParam long t, @RequestParam int type) {
long member_id=user.getMember_id();
long member_id=user.getMemberId();
List<XklAmpReportEntity> xklAmpReportEntity=xklAmpReportRespository.findByMemberId(member_id);
return new ResponseEntity<>(ResultModel.ok(xklAmpReportEntity), HttpStatus.OK);
}
... ...
... ... @@ -100,17 +100,12 @@ public class UserInfoController {
@ApiImplicitParams({
@ApiImplicitParam(name = "authorization", value = "请输入登录返回信息:userId_tokens", required = true, dataType = "string", paramType = "header"),
})
<<<<<<< HEAD
public ResponseEntity<ResultModel> getUserInfo(HttpServletRequest request,@CurrentUser User user,
@RequestParam String sign,@RequestParam long t,@RequestParam int type) {
long member_id=user.getMember_id();
long member_id=user.getMemberId();
XklMemberEntity xklMemberEntity=xklMemberRespository.findOne(member_id);
return new ResponseEntity<>(ResultModel.ok(xklMemberEntity), HttpStatus.OK);
=======
public ResponseEntity<ResultModel> getUserNickName(@CurrentUser User user) {
String dickName=user.getLoginAccount();
return new ResponseEntity<>(ResultModel.ok(dickName), HttpStatus.OK);
>>>>>>> zhaoyue-dev
}
}
... ...
... ... @@ -38,6 +38,8 @@ public class UpSoftAccountController {
@Autowired
private ITokenManager tokenManager;
private static final String UPSOFT_TOKEN_PREFIX = "UPSOFT_TOKEN";
@RequestMapping(method = RequestMethod.POST)
@ApiOperation(value = "报告上传软件登录")
public ResponseEntity<ResultModel> login(@RequestParam String account, @RequestParam String password
... ... @@ -64,7 +66,7 @@ public class UpSoftAccountController {
}
//生成一个token,保存用户登录状态
TokenModel model = tokenManager.createToken(admin.getId());
TokenModel model = tokenManager.createToken(UPSOFT_TOKEN_PREFIX + admin.getId());
return new ResponseEntity<>(ResultModel.ok(model), HttpStatus.OK);
}
... ... @@ -75,7 +77,7 @@ public class UpSoftAccountController {
@ApiImplicitParam(name = "authorization", value = "请输入登录返回信息:userId_tokens", required = true, dataType = "string", paramType = "header"),
})
public ResponseEntity<ResultModel> logout(@CurrentAdmin Admin admin) {
tokenManager.deleteToken(admin.getId());
tokenManager.deleteToken(UPSOFT_TOKEN_PREFIX + admin.getId());
return new ResponseEntity<>(ResultModel.ok(), HttpStatus.OK);
}
... ...
... ... @@ -30,8 +30,8 @@ import java.util.List;
* 上传报告及删除报告接口。
*/
@RestController
@RequestMapping("/report")
public class ReportController {
@RequestMapping("/upsoftreport")
public class UpSoftReportController {
@Autowired
private UpSoftVersionRepository upSoftVersionRepository;
... ...