--

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),

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;){
			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]);
	}
}