diff --git a/pom.xml b/pom.xml index b10da2e..6fee57e 100644 --- a/pom.xml +++ b/pom.xml @@ -122,6 +122,14 @@ wechatpay-apache-httpclient 0.4.8 + + + org.webjars.npm + spark-md5 + 3.0.0 + test + + diff --git a/sky-server/src/main/java/com/sky/controller/admin/EmployeeController.java b/sky-server/src/main/java/com/sky/controller/admin/EmployeeController.java index 5857f07..dc4b01e 100644 --- a/sky-server/src/main/java/com/sky/controller/admin/EmployeeController.java +++ b/sky-server/src/main/java/com/sky/controller/admin/EmployeeController.java @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; import java.util.HashMap; import java.util.Map; @@ -26,9 +27,9 @@ import java.util.Map; @Slf4j public class EmployeeController { - @Autowired + @Resource private EmployeeService employeeService; - @Autowired + @Resource private JwtProperties jwtProperties; /** diff --git a/sky-server/src/main/java/com/sky/service/impl/EmployeeServiceImpl.java b/sky-server/src/main/java/com/sky/service/impl/EmployeeServiceImpl.java index cc98c98..e56eee3 100644 --- a/sky-server/src/main/java/com/sky/service/impl/EmployeeServiceImpl.java +++ b/sky-server/src/main/java/com/sky/service/impl/EmployeeServiceImpl.java @@ -13,17 +13,19 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.DigestUtils; +import javax.annotation.Resource; + @Service public class EmployeeServiceImpl implements EmployeeService { - @Autowired + @Resource private EmployeeMapper employeeMapper; /** * 员工登录 * - * @param employeeLoginDTO - * @return + * @param employeeLoginDTO 登录信息 + * @return Employee */ public Employee login(EmployeeLoginDTO employeeLoginDTO) { String username = employeeLoginDTO.getUsername(); @@ -34,23 +36,25 @@ public class EmployeeServiceImpl implements EmployeeService { //2、处理各种异常情况(用户名不存在、密码不对、账号被锁定) if (employee == null) { - //账号不存在 + // 账号不存在 throw new AccountNotFoundException(MessageConstant.ACCOUNT_NOT_FOUND); } - //密码比对 + // 密码比对 // TODO 后期需要进行md5加密,然后再进行比对 if (!password.equals(employee.getPassword())) { - //密码错误 + // 密码错误 throw new PasswordErrorException(MessageConstant.PASSWORD_ERROR); } + // 账号被锁定 if (employee.getStatus() == StatusConstant.DISABLE) { - //账号被锁定 throw new AccountLockedException(MessageConstant.ACCOUNT_LOCKED); } - //3、返回实体对象 + + + // 3、返回实体对象 return employee; } diff --git a/sky-server/src/main/resources/application-dev.yml b/sky-server/src/main/resources/application-dev.yml index 0339477..2b96013 100644 --- a/sky-server/src/main/resources/application-dev.yml +++ b/sky-server/src/main/resources/application-dev.yml @@ -1,8 +1,8 @@ sky: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - host: localhost - port: 3306 + host: 106.15.251.123 + port: 3305 database: sky_take_out username: root - password: root + password: "02120212"