Merge branch 'dev' of http://121.42.53.174:3000/jiapeng/jFrameWork.git into dev

jfwAptOrm/src/main/java/org/jfw/apt/orm/core/enums/DE.java

@@ -6,8 +6,8 @@ import org.jfw.apt.orm.core.defaultImpl.*;
public enum DE {
	invalid_de(AbstractColumnHandler.class, null, false,false,false, false, null, null),
	boolean_de(BooleanHandler.class, "CHAR",false,true,true,true,null,null),
	Boolean_de(WBooleanHandler.class, "CHAR", true,true,true,true,null,null),
	boolean_de(BooleanHandler.class, "CHAR(1)",false,true,true,true,null,null),
	Boolean_de(WBooleanHandler.class, "CHAR(1)", true,true,true,true,null,null),
	
	byte_de(ByteHandler.class, "BYTE",false,true,true,true,null,null),
	Byte_de(WByteHandler.class,"BYTE",true,true,true,true,null,null),

jfwAptWeb/src/main/java/org/jfw/apt/web/AptWebHandler.java

@@ -26,6 +26,7 @@ import org.jfw.apt.web.handlers.BuildParamHandler;
import org.jfw.apt.web.handlers.ChangeResultHandler;
import org.jfw.apt.web.handlers.CharacterEncodingHandler;
import org.jfw.apt.web.handlers.ExecuteHandler;
import org.jfw.apt.web.handlers.InvalidSessionHandler;
import org.jfw.apt.web.handlers.JdbcConnectionHandler;
import org.jfw.apt.web.handlers.LastScriptHandler;
import org.jfw.apt.web.handlers.LoginUserHandler;
@@ -363,6 +364,7 @@ public class AptWebHandler extends CodeGenHandler {
		supportedClass.add(ExecuteHandler.class);
		supportedClass.add(SetSessionHandler.class);
		supportedClass.add(SetCookieHandler.class);
		supportedClass.add(InvalidSessionHandler.class);
		supportedClass.add(ChangeResultHandler.class);
		supportedClass.add(LastScriptHandler.class);
		supportedClass.add(ResultToNullHandler.class);

jfwAptWeb/src/main/java/org/jfw/apt/web/annotation/method/InvalidSession.java

@@ -0,0 +1,11 @@
package org.jfw.apt.web.annotation.method;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.SOURCE)
public @interface InvalidSession {
}

jfwAptWeb/src/main/java/org/jfw/apt/web/handlers/InvalidSessionHandler.java

@@ -0,0 +1,21 @@
package org.jfw.apt.web.handlers;
import org.jfw.apt.exception.AptException;
import org.jfw.apt.out.ClassWriter;
import org.jfw.apt.web.RequestHandler;
import org.jfw.apt.web.annotation.method.InvalidSession;
public class InvalidSessionHandler  extends RequestHandler {
	@Override
	public void init() {
	}
	@Override
	public void appendBeforCode(ClassWriter cw) throws AptException {
		InvalidSession ss = this.aptWebHandler.getMe().getRef().getAnnotation(InvalidSession.class);
		if(ss!=null){
			this.aptWebHandler.readSession();
			cw.l("session.invalidate();");
		}
	}
}

jfwAptWeb/src/main/java/org/jfw/apt/web/handlers/buildParam/RequestParamHandler.java

@@ -56,7 +56,7 @@ public final class RequestParamHandler implements BuildParameter {
		private void initTargetType(MethodParamEntry mpe) throws AptException {
			this.mpe = mpe;
			TypeName tn = annotation.getRealClass();
			if (TypeName.OBJECT.equals(tn))
			if (null== tn || TypeName.OBJECT.equals(tn))
				tn = TypeName.get(this.mpe.getRef().asType());
			if (!tn.getClass().equals(ClassName.class)) {

jfwUtil/src/main/java/org/jfw/util/PageQueryResult.java

@@ -7,35 +7,72 @@ public class PageQueryResult<T> {
	private int total;
	private int pageNo = 1;
	private int pageSize;
	
	public int getTotal() {
		return total;
	}
	public void setTotal(int total) {
		this.total = total;
	}
	public int getPageNo() {
		return pageNo;
	}
	public void setPageNo(int pageNo) {
		this.pageNo = pageNo;
	}
	public int getPageSize() {
		return pageSize;
	}
	public void setPageSize(int pageSize) {
		this.pageSize = pageSize;
	}
	public List<T> getData() {
		return data;
	}
	public void setData(List<T> data) {
		this.data = data;
	}
	private List<T> data;
	
	public static void main(String[] args){
		new PageQueryResult<String>().setData(Collections.<String>emptyList());
		
	public static <T> PageQueryResult<T> build(List<T> list, int pageSize, int pageNo) {
		PageQueryResult<T> ret = new PageQueryResult<T>();
		ret.setTotal(list.size());
		pageSize = Math.max(1, pageSize);
		pageNo = Math.max(1, pageNo);
		if (list.isEmpty()) {
			ret.setData(list);
			ret.setPageNo(pageNo);
			ret.setPageSize(1);
		} else if (pageNo == 1) {
			ret.setPageNo(pageNo);
			ret.setPageSize(pageSize);
			ret.setData(list.subList(0,Math.min(list.size(), pageSize)));
		} else {
			int tps = list.size() / pageSize;
			if (list.size() % pageSize != 0) {
				++tps;
			}
			if (pageNo > tps) {
				pageNo = tps;
			}
			ret.setPageNo(pageNo);
			ret.setPageSize(pageSize);
			int begin = pageNo * pageSize - pageNo;
			ret.setData(list.subList(begin,Math.min(list.size(), begin + pageSize)));
		}
		return ret;
	}
	public static void main(String[] args) {
		new PageQueryResult<String>().setData(Collections.<String> emptyList());
	}
}

jfwUtil/src/main/java/org/jfw/util/auth/AuthUtil.java

@@ -1,7 +1,6 @@
package org.jfw.util.auth;
import java.util.Arrays;
import java.util.Random;
import org.jfw.util.codec.Base64;
@@ -27,6 +26,46 @@ public final class AuthUtil {
		int ind = auth % 32;
		return 0 != (auths[bIndex] & AUTH_BIT[ind]);
	}
	
	public static int[] compress(int[] auths){
		if(auths==null || auths.length ==0  ) return new int[]{0};		
		 Arrays.sort(auths);
		int max = auths[auths.length-1];
		int bIndex = max>>5;
		int[] ret = new int[bIndex+1];
		Arrays.fill(ret,0);
		for(int auth:auths){
			int ind = auth % 32;
			ret[bIndex] = ret[bIndex] | AUTH_BIT[ind];
		}
		return ret;
	}
	
	public static int[] unCompress(int[] auths){
		if(auths==null || auths.length ==0  ) return new int[]{0};		
		int[] ret = new int[16];
		int ina = 0;
		int max = auths.length*32;
		for(int i =1 ; i < max;++i){
			int bIndex = i >> 5;
			int ind = i % 32;
			if( 0 != (auths[bIndex] & AUTH_BIT[ind])){
				if(ina>= ret.length){
					int[] nret = new int[ret.length*2];
					System.arraycopy(ret,0,nret, 0,ret.length);
					ret = nret;
				}
				ret[ina]= i;
				++ina;
			}
		}
		if(ret.length> ina) {
			int[] nret = new int[ina];
			System.arraycopy(ret,0,nret, 0,ina);
			return nret;
		}
		return ret;
	}
	public static int[] grant(int[] auths, int auth) {
		if (auth < 1)
@@ -141,18 +180,28 @@ public final class AuthUtil {
	}
	
	public static void main(String main[]) {
		System.out.println(System.currentTimeMillis());
		int[] iss = new int[100];
		for (int i = 0; i < iss.length; ++i)
		{
			iss[i] = (new Random()).nextInt();
		}
		byte[] bs = conver(iss);
		int[] ins = conver(bs);
		for (int ii = 0; ii < ins.length; ++ii) {
			System.out.println("" + iss[ii] + ":" + ins[ii]);
//		System.out.println(System.currentTimeMillis());
//		int[] iss = new int[100];
//		for (int i = 0; i < iss.length; ++i)
//		{
//			iss[i] = (new Random()).nextInt();
//		}
//		byte[] bs = conver(iss);
//		int[] ins = conver(bs);
//		for (int ii = 0; ii < ins.length; ++ii) {
//			System.out.println("" + iss[ii] + ":" + ins[ii]);
//		}
//		System.out.println(System.currentTimeMillis());
		
		
		int[] ii = new int[5];
		for(int i = 0 ; i < ii.length;++i){
			ii[i]=5-i;
		}
		System.out.println(System.currentTimeMillis());
		for(int i = 0 ; i < ii.length;++i) System.out.println(ii[i]);
		
		Arrays.sort(ii);
		for(int i = 0 ; i < ii.length;++i) System.out.println(ii[i]);
	}
}

jfwUtil/src/main/java/org/jfw/util/exception/JfwBaseException.java

@@ -19,6 +19,8 @@ public class JfwBaseException extends Exception {
	 */
	private static final Map<Integer,String> reasons = new HashMap<Integer,String>();
	public static final int MIN_APP_ERROR_CODE=50000;
	public static final int MIN_LOGIC_ERROR_CODE = 60000;
	
	private static String convert(int code){
		String result = reasons .get(code);

jfwUtil/src/main/java/org/jfw/util/jdbc/JdbcTask.java

@@ -0,0 +1,7 @@
package org.jfw.util.jdbc;
import java.sql.SQLException;
public interface JdbcTask {
	void exec() throws SQLException;
}

jfwUtil/src/main/java/org/jfw/util/jdbc/JdbcUtil.java

@@ -24,6 +24,35 @@ public final class JdbcUtil {
	private JdbcUtil() {
	}
	public  static void executeAutoCommit(Connection con,JdbcTask task)throws SQLException{
		boolean old = con.getAutoCommit();
		try{
			con.setAutoCommit(false);
			task.exec();
			con.commit();
		}catch(SQLException e){
			rollback(con);
			throw e;
		}finally{
			con.setAutoCommit(old);
		}
	}
	public  static void executeAutoClose(Connection con,JdbcTask task,boolean commit)throws SQLException{
		boolean old = con.getAutoCommit();
		try{
		if(commit) 	con.setAutoCommit(false);
			task.exec();
		if(commit)	con.commit();
		}catch(SQLException e){
			rollback(con);
			throw e;
		}finally{
			if(commit)con.setAutoCommit(old);
			close(con);
		}
	}
	
	
	public static void close(Connection con) {
		try {
			con.close();

jfwWebUtil/src/main/java/org/jfw/util/web/WebUtil.java

@@ -71,7 +71,7 @@ public abstract class WebUtil {
    			begin=i+1;
    		}
    	}
    	if(clen - begin == 1){
    	if(clen == begin){
    		list.add(ConstData.EMPTY_STRING);
    	}else{
    		list.add(new String(cs,begin,clen - begin));