Browse Source

Merge remote-tracking branch 'origin/dev' into dev

XMTT 8 years ago
parent
commit
6ae59393bc

+ 1 - 1
jfwAptWeb/src/main/java/org/jfw/apt/web/handlers/LoginUserHandler.java

@ -44,7 +44,7 @@ public class LoginUserHandler extends RequestHandler {
44 44
		}
45 45
		if (user.auth() > 0) {
46 46
			cw.bL("if(!").w(userName).w(".hasAuthority(").w(user.auth())
47
					.el(")throw new org.jfw.util.exception.JfwBaseException(100,\"Insufficient authority\");");
47
					.el("))throw new org.jfw.util.exception.JfwBaseException(100,\"Insufficient authority\");");
48 48
		}
49 49
50 50
	}

+ 7 - 1
jfwUtil/src/main/java/org/jfw/util/state/StateCode.java

@ -6,6 +6,7 @@ public class StateCode<K,V> {
6 6
	private long expiredTime;
7 7
	private K key;
8 8
	private V value;
9
	private String descp;
9 10
	
10 11
	public String getCode() {
11 12
		return code;
@ -37,6 +38,11 @@ public class StateCode<K,V> {
37 38
	public void setValue(V value) {
38 39
		this.value = value;
39 40
	}
40
	
41
	public String getDescp() {
42
		return descp;
43
	}
44
	public void setDescp(String descp) {
45
		this.descp = descp;
46
	}
41 47
42 48
}