Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-05 f1e25082a58c8cb57dd45d226d3a94f4af4a0677

 src/main/java/com/moral/service/impl/AccountServiceImpl.java

@@ -50,7 +50,7 @@
      Map<String, Object> result = new HashMap<String, Object>();

      Account account = new Account();

      account.setAccountName((String) parameters.get("account"));

      account.setPassword(md5((String) parameters.get("password")));

      account.setPassword(encoder.encode((String) parameters.get("password")));

      account = accountMapper.selectOne(account);

      if (isEmpty(account)) {

         result.put("msg", "用户名及密码输入错误！");

@@ -170,8 +170,7 @@


   @Override

   public Optional<Account> queryAccountByName(String accountName) {

      Account account = new Account();

      account.setAccountName(accountName);

      return Optional.ofNullable(accountMapper.selectOne(account));

      Account account = accountMapper.getByAccountName(accountName);

      return Optional.ofNullable(account);

   }

}