Merge branch 'TT'

src/main/java/com/ekexiu/console/system/dao/UserDao.java

@@ -39,6 +39,10 @@ public interface UserDao {
	@From(User.class)
	int[] resetPassword(Connection con,@Batch  String[] id, @Set String loginPassword) throws SQLException;
	@UpdateWith
	@From(User.class)
	int changePassword(Connection con, String id,@Set String loginPassword)throws SQLException;
	@IncludeFixSet("modifyTime")
	@UpdateWith
	@From(User.class)

src/main/java/com/ekexiu/console/system/service/UserService.java

@@ -189,6 +189,12 @@ public class UserService extends Upload {
		this.userDao.resetPassword(con, ids, DEFAULT_PW_STR);
	}
	@Post
	@Path("/cp")
	public void changePassword(@JdbcConn(true) Connection con,@LoginUser ConsoleAuthUser cau,String pw)throws SQLException {
			this.userDao.changePassword(con, cau.getId(),StringUtil.md5(pw));
	}
	@Get
	@Path("/right/{id}")
	public int[] getRights(@JdbcConn Connection con, @PathVar String id) throws SQLException {
@@ -220,7 +226,12 @@ public class UserService extends Upload {
	@Get
	@Path("/id/{id}")
	public User query(@JdbcConn Connection con, @PathVar String id) throws SQLException {
		return this.userDao.queryById(con, id);
		User user =  this.userDao.queryById(con, id);
		if (user != null) {
			user.setLoginPassword(null);
			user.setAuthinfo(null);
		}
		return user;
	}
	@Get