ff

src/main/java/com/ekexiu/console/service/Upload.java

@@ -128,6 +128,7 @@ public class Upload {
								}
							}
						}
						os.flush();
						ui.setSize(size);
						ui.setUri(uri);
						return ui;
@@ -157,7 +158,7 @@ public class Upload {
			}
			lastPathWithCreate.set(p);
		}
		sb.append("/").append(Long.toBinaryString(System.nanoTime()));
		sb.append("/").append(Long.toHexString(System.nanoTime()));
		if (ext != null)
			sb.append(".").append(ext);
		return sb.toString();

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

@@ -5,6 +5,7 @@ import java.sql.SQLException;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.Dynamic;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.IncludeFixSet;
import org.jfw.apt.orm.annotation.dao.method.Or;
@@ -40,8 +41,14 @@ public interface UserDao {
	User queryByLoginKey(Connection con, @Alias({ "mobile", "email" }) String key) throws SQLException;
	@Update
	@Dynamic
	int update(Connection con, User user) throws SQLException;
	@IncludeFixSet("modifyTime")
	@UpdateWith
	@From(User.class)
	int resetPassword(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

@@ -1,6 +1,5 @@
package com.ekexiu.console.system.service;
import java.io.File;
import java.io.IOException;
import java.sql.Connection;
import java.sql.SQLException;
@@ -9,13 +8,16 @@ import java.util.ArrayList;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.web.annotation.LoginUser;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.method.InvalidSession;
import org.jfw.apt.web.annotation.method.SetSession;
import org.jfw.apt.web.annotation.operate.Get;
import org.jfw.apt.web.annotation.operate.Post;
import org.jfw.apt.web.annotation.operate.Put;
import org.jfw.apt.web.annotation.param.FieldParam;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.apt.web.annotation.param.RequestBody;
import org.jfw.apt.web.annotation.param.RequestParam;
import org.jfw.util.PageQueryResult;
import org.jfw.util.StringUtil;
@@ -34,20 +36,12 @@ import com.ekexiu.console.system.vo.ConsoleAuthUser;
public class UserService extends Upload {
	public static final String DEFAULT_AUTH_STR=AuthUtil.serialAuth(new int[]{0});
	public static final String DEFAULT_PW_STR=StringUtil.md5("12345678");
	private File headPath;
	@Autowrie
	private UserDao userDao;
	@Autowrie
	RoleDao roleDao;
	public File getHeadPath() {
		return headPath;
	}
	public void setHeadPath(File headPath) {
		this.headPath = headPath;
	}
	public RoleDao getRoleDao() {
		return roleDao;
@@ -75,6 +69,8 @@ public class UserService extends Upload {
			cau.setHead(user.getHead());
			cau.setId(user.getId());
			cau.setName(user.getName());
			cau.setMobile(user.getMobile());
			cau.setEmail(user.getEmail());
			ArrayList<int[]> list = new ArrayList<int[]>(1);
			list.add(AuthUtil.deSerialAuth(user.getAuthinfo()));
			for (Role role : this.roleDao.queryByUser(con, user.getId())) {
@@ -85,6 +81,11 @@ public class UserService extends Upload {
		}
		return null;
	}
	@Get
	@Path
	public ConsoleAuthUser get(@LoginUser ConsoleAuthUser user){
		return user;
	}
	@Get
	@Path("/logout")
@@ -129,6 +130,12 @@ public class UserService extends Upload {
		user.setLoginPassword(DEFAULT_PW_STR);
		this.userDao.insert(con, user);
	}
	@Put
	@Path
	public void update(@JdbcConn(true) Connection con,@RequestBody User user)throws SQLException{
		this.userDao.update(con, user);
	}
	@Post
	@Path("/head")

src/main/java/com/ekexiu/console/system/vo/ConsoleAuthUser.java

@@ -10,6 +10,8 @@ public class ConsoleAuthUser implements AuthUser {
	private String id;
	private String name;
	private String head;
	private String mobile;
	private String email;
	
	private transient int[] auths;
@@ -20,9 +22,28 @@ public class ConsoleAuthUser implements AuthUser {
		this.id = user.getId();
		this.name = user.getName();
		this.head = user.getHead();
		this.email = user.getEmail();
		this.mobile =user.getMobile();
		//this.auths = AuthUtil.deSerialAuth(user.getAuthinfo());
	}
	
	public String getMobile() {
		return mobile;
	}
	public void setMobile(String mobile) {
		this.mobile = mobile;
	}
	public String getEmail() {
		return email;
	}
	public void setEmail(String email) {
		this.email = email;
	}
	public String getId() {
		return id;
	}