修复错误代码;
This commit is contained in:
parent
5bb3cfe375
commit
27ebd6205a
@ -30,15 +30,9 @@ import java.util.Optional;
|
|||||||
@Slf4j
|
@Slf4j
|
||||||
public class ASEJSONTokenAuthenticationFilter extends OncePerRequestFilter {
|
public class ASEJSONTokenAuthenticationFilter extends OncePerRequestFilter {
|
||||||
|
|
||||||
@Resource
|
|
||||||
private JSONParameter jsonParameter;
|
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
private JSONRandomCodeGenerator randomCodeGenerator;
|
private JSONRandomCodeGenerator randomCodeGenerator;
|
||||||
|
|
||||||
@Resource
|
|
||||||
private AJAXRequestChecker ajaxRequestChecker;
|
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
private AuthService authService;
|
private AuthService authService;
|
||||||
|
|
||||||
|
@ -3,8 +3,6 @@ package com.codesdream.ase.controller;
|
|||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.codesdream.ase.component.datamanager.JSONParameter;
|
import com.codesdream.ase.component.datamanager.JSONParameter;
|
||||||
import com.codesdream.ase.component.json.request.UserLeaveRequest;
|
import com.codesdream.ase.component.json.request.UserLeaveRequest;
|
||||||
import com.codesdream.ase.component.json.respond.FailedSONRespond;
|
|
||||||
import com.codesdream.ase.component.json.respond.JSONBaseRespondObject;
|
|
||||||
import com.codesdream.ase.component.permission.ASEUsernameEncoder;
|
import com.codesdream.ase.component.permission.ASEUsernameEncoder;
|
||||||
import com.codesdream.ase.service.LeavesService;
|
import com.codesdream.ase.service.LeavesService;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@ -35,13 +33,13 @@ public class LeavesController {
|
|||||||
@Resource
|
@Resource
|
||||||
private ASEUsernameEncoder usernameEncoder;
|
private ASEUsernameEncoder usernameEncoder;
|
||||||
|
|
||||||
@RequestMapping(value = "/")
|
@RequestMapping(value = "/leave")
|
||||||
String printLeave(Model model) {
|
String printLeave(Model model) {
|
||||||
return "Leave";
|
return "Leave";
|
||||||
}
|
}
|
||||||
|
|
||||||
//提交请假申请
|
//提交请假申请
|
||||||
@RequestMapping(value = "/Leave/check", method = RequestMethod.POST)
|
@RequestMapping(value = "/leave/check", method = RequestMethod.POST)
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
String requestLeave(HttpServletRequest request){
|
String requestLeave(HttpServletRequest request){
|
||||||
|
|
||||||
|
@ -37,8 +37,6 @@ public class LoginController {
|
|||||||
@Resource
|
@Resource
|
||||||
private IUserService userService;
|
private IUserService userService;
|
||||||
|
|
||||||
@Resource
|
|
||||||
private ASEUsernameEncoder usernameEncoder;
|
|
||||||
|
|
||||||
@RequestMapping(value = "/login")
|
@RequestMapping(value = "/login")
|
||||||
String printLogin(Model model) {
|
String printLogin(Model model) {
|
||||||
|
@ -4,9 +4,10 @@ import com.codesdream.ase.model.permission.User;
|
|||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import javax.persistence.*;
|
import javax.persistence.*;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@Entity
|
@Entity
|
||||||
@Table(name = "leave")
|
@Table(name = "leaves")
|
||||||
public class Leave {
|
public class Leave {
|
||||||
@Id
|
@Id
|
||||||
@GeneratedValue(strategy = GenerationType.AUTO)
|
@GeneratedValue(strategy = GenerationType.AUTO)
|
||||||
@ -23,15 +24,15 @@ public class Leave {
|
|||||||
|
|
||||||
|
|
||||||
//请假类型 病假,事假等
|
//请假类型 病假,事假等
|
||||||
@Column(name = "type", nullable = false)
|
@Column(nullable = false)
|
||||||
private String type;
|
private String type;
|
||||||
//批准状态
|
//批准状态
|
||||||
@Column(name = "Authentication", nullable = false)
|
@Column(nullable = false)
|
||||||
private String Authentication;
|
private String authentication;
|
||||||
|
|
||||||
//审核备注
|
//审核备注
|
||||||
@Column
|
@Column
|
||||||
private String Comment;
|
private String comment;
|
||||||
//开始时间
|
//开始时间
|
||||||
@Column(nullable = false)
|
@Column(nullable = false)
|
||||||
private Date startTime;
|
private Date startTime;
|
||||||
|
@ -7,6 +7,5 @@ import java.util.Optional;
|
|||||||
|
|
||||||
public interface LeaveRepository extends CrudRepository<Leave, Integer>{
|
public interface LeaveRepository extends CrudRepository<Leave, Integer>{
|
||||||
|
|
||||||
Optional<Leave> findByTitle(String title) ;
|
|
||||||
Optional<Leave> findByCreator(String creatorName);
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user