|
|
@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import com.fuzamei.constant.HintMSG;
|
|
|
+import com.fuzamei.constant.RegexConstant;
|
|
|
import com.fuzamei.entity.User;
|
|
|
import com.fuzamei.entity.UserDetail;
|
|
|
import com.fuzamei.service.LoginService;
|
|
|
@@ -42,8 +43,8 @@ public class LoginAction {
|
|
|
@RequestMapping(path="/login",method=RequestMethod.POST)
|
|
|
public Map<String,Object> loginUserName(@RequestBody User u){
|
|
|
try {
|
|
|
- String username = ValidationUtil.checkBlankAndAssignString(u.getUsername());
|
|
|
- String password = ValidationUtil.checkBlankAndAssignString(u.getPassword());
|
|
|
+ String username = ValidationUtil.checkBlankAndAssignString(u.getUsername(),RegexConstant.USERNAME_REGEX);
|
|
|
+ String password = ValidationUtil.checkBlankAndAssignString(u.getPassword(),RegexConstant.PWD_REGEX);
|
|
|
String token = UUID.randomUUID().toString().replaceAll("-", "");
|
|
|
|
|
|
UserDetail admin = loginService.queryAdminExistence();//查询数据库是否有账号存在
|
