Alawn/springboot-payment
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge

Browse Source
This commit is contained in:
xiangwbs
2017-11-05 20:15:43 +08:00
parent 3e8bdb04a0
commit f85d2a825c
11 changed files with 88 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boot-web/src/main/java/com/xwbing/controller/SysConfigControl.java
+6 -6
View File
@@ -34,7 +34,7 @@ public class SysConfigControl {
@ApiOperation(value = "新增", notes = "新增系统配置信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "code", value = "配置项的key，长度为1-50", paramType = "query", required = true, dataType = "string"),
@ApiImplicitParam(name = "key", value = "配置项的key，长度为1-50", paramType = "query", required = true, dataType = "string"),
@ApiImplicitParam(name = "value", value = "配置项的值", paramType = "query", required = true, dataType = "string"),
@ApiImplicitParam(name = "isEnable", value = "是否启用，格式为Y|N", paramType = "query", required = true, dataType = "string"),
@ApiImplicitParam(name = "name", value = "配置名称，长度为1-10", paramType = "query", required = true, dataType = "string")
@@ -48,11 +48,11 @@ public class SysConfigControl {
}
@ApiOperation(value = "删除", notes = "根据code删除系统配置信息")
@ApiImplicitParam(name = "code", value = "配置项的code", paramType = "query", required = true, dataType = "string")
@ApiImplicitParam(name = "key", value = "配置项的code", paramType = "query", required = true, dataType = "string")
@PostMapping("removeByCode/{code}")
public JSONObject removeByCode(@PathVariable String code) {
String logMsg = "删除系统配置信息";
log.info(logMsg + " code:{}", code);
log.info(logMsg + " key:{}", code);
if (StringUtils.isEmpty(code)) {
return JSONObjResult.toJSONObj("code不能为空");
}
@@ -61,15 +61,15 @@ public class SysConfigControl {
}
@ApiOperation(value = "查找", notes = "根据key查找系统配置信息")
@ApiImplicitParam(name = "code", value = "配置项的code", paramType = "query", required = true, dataType = "string")
@ApiImplicitParam(name = "key", value = "配置项的code", paramType = "query", required = true, dataType = "string")
@PostMapping("findByCode")
public JSONObject findByCode(@RequestParam String code) {
String logMsg = "根据code查找系统配置信息";
log.info(logMsg + " code:{}", code);
log.info(logMsg + " key:{}", code);
if (StringUtils.isEmpty(code)) {
return JSONObjResult.toJSONObj("code不能为空");
}
SysConfig one = sysConfigService.findByCode(code);
SysConfig one = sysConfigService.findByKey(code);
if (Objects.isNull(one)) {
return JSONObjResult.toJSONObj("该对象不存在");
}
boot-web/src/main/java/com/xwbing/controller/UserControl.java
+9 -11
View File
@@ -67,29 +67,27 @@ public class UserControl {
@GetMapping("findList")
public JSONObject findList() {
List<SysUser> list = userService.findList();
List<SysUser> list = userService.listAll();
return JSONObjResult.toJSONObj(list, true, "");
}
@GetMapping("login")
public JSONObject login(HttpServletRequest req, @RequestParam String userName, @RequestParam String passWord, String ckeckCode) {
if (StringUtils.isEmpty(userName))
return JSONObjResult.toJSONObj("用户名不能为空");
if (StringUtils.isEmpty(passWord))
return JSONObjResult.toJSONObj("密码不能为空");
RestMessage login = userService.login(req, userName, passWord, ckeckCode);
public JSONObject login(HttpServletRequest req, @RequestParam String userName, @RequestParam String passWord,@RequestParam String checkCode) {
if (StringUtils.isEmpty(userName) || StringUtils.isEmpty(passWord))
return JSONObjResult.toJSONObj("用户名或密码不能为空");
if (StringUtils.isEmpty(checkCode) )
return JSONObjResult.toJSONObj("请输入验证码");
RestMessage login = userService.login(req, userName, passWord, checkCode);
return JSONObjResult.toJSONObj(login);
}
@GetMapping("updatePassWord")
public JSONObject updatePassWord(@RequestParam String newPassWord, @RequestParam String oldPassWord, @RequestParam String loginUserId) {
public JSONObject updatePassWord(HttpServletRequest request, @RequestParam String newPassWord, @RequestParam String oldPassWord) {
if (StringUtils.isEmpty(newPassWord))
return JSONObjResult.toJSONObj("新密码不能为空");
if (StringUtils.isEmpty(oldPassWord))
return JSONObjResult.toJSONObj("旧密码不能为空");
if (StringUtils.isEmpty(newPassWord))
return JSONObjResult.toJSONObj("用户id不能为空");
RestMessage restMessage = userService.updatePassWord(newPassWord, oldPassWord, loginUserId);
RestMessage restMessage = userService.updatePassWord(request, newPassWord, oldPassWord);
return JSONObjResult.toJSONObj(restMessage);
}
}