git-svn-id: https://192.168.57.71/svn/jsgkj@574 931142cf-59ea-a443-aa0e-51397b428577

gkaqv2/trunk/modules/web/pom.xml

@@ -126,6 +126,11 @@
 			<groupId>com.xt.js.gkaq</groupId>
 			<artifactId>gkaq-frame</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.xt.js.gkaq.common</groupId>
+			<artifactId>gkaq-common</artifactId>
+			<version>0.0.1-SNAPSHOT</version>
+		</dependency>
 	</dependencies>
 	<build>
 		<!-- 插件配置 -->
@@ -254,7 +259,7 @@
 		</dependencies>
 	</dependencyManagement>
 	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.build.sourceEncoding>GBK</project.build.sourceEncoding>
 		<!-- java 版本 -->
 		<jdk.version>1.7</jdk.version>
 	</properties>

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/BaseCtl.java

@@ -3,18 +3,18 @@ package com.xt.js.gkaq.web.ctl;
 import com.yuanxd.tools.utils.WebJsonResult;
 
 /**
- * 鎺у埗鍣ㄥ眰鍩虹被
+ * 控制器层基类
  * 
- * @author 琚佹檽鍐�
+ * @author 袁晓冬
  *
  */
 public abstract class BaseCtl {
 
-	/** 鏂板�璁板綍ID鏍囪瘑 */
+	/** 新增记录ID标识 */
 	public static final String BLANK_UUID = "00";
 
 	/**
-	 * 杩斿洖鎵ц�鎴愬姛瀵硅薄
+	 * 返回执行成功对象
 	 * 
 	 * @return
 	 */
@@ -25,10 +25,10 @@ public abstract class BaseCtl {
 	}
 
 	/**
-	 * 杩斿洖鎵ц�澶辫触瀵硅薄
+	 * 返回执行失败对象
 	 * 
 	 * @param msg
-	 *            澶辫触淇℃伅
+	 *            失败信息
 	 * @return
 	 */
 	protected WebJsonResult error(String msg) {

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/shiro/GkaqAuthorizingRealm.java

@@ -19,9 +19,9 @@ import com.xt.js.gkaq.frame.model.UserModel;
 import com.xt.js.gkaq.frame.service.UserService;
 
 /**
- * 瀹夊叏Realm
+ * 安全Realm
  * 
- * @author 琚佹檽鍐�
+ * @author 袁晓冬
  *
  */
 public class GkaqAuthorizingRealm extends AuthorizingRealm {
@@ -29,7 +29,7 @@ public class GkaqAuthorizingRealm extends AuthorizingRealm {
 	private UserService userService;
 
 	/**
-	 * 娓呴櫎鎵€鏈夌敤鎴锋巿鏉冧俊鎭�紦瀛�.
+	 * 清除所有用户授权信息缓存.
 	 */
 	public void clearAllCachedAuthorizationInfo() {
 		Cache<Object, AuthorizationInfo> cache = getAuthorizationCache();
@@ -41,7 +41,7 @@ public class GkaqAuthorizingRealm extends AuthorizingRealm {
 	}
 
 	/**
-	 * 鏇存柊鐢ㄦ埛鎺堟潈淇℃伅缂撳瓨.
+	 * 更新用户授权信息缓存.
 	 */
 	public void clearCachedAuthorizationInfo(UserModel user) {
 		SimplePrincipalCollection principals = new SimplePrincipalCollection(user, getName());
@@ -49,7 +49,7 @@ public class GkaqAuthorizingRealm extends AuthorizingRealm {
 	}
 
 	/**
-	 * 璁よ瘉鍥炶皟鍑芥暟, 鐧诲綍鏃惰皟鐢�.
+	 * 认证回调函数, 登录时调用.
 	 */
 	@Override
 	protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken authcToken)
@@ -63,14 +63,14 @@ public class GkaqAuthorizingRealm extends AuthorizingRealm {
 	}
 
 	/**
-	 * 鎺堟潈鏌ヨ�鍥炶皟鍑芥暟, 杩涜�閴存潈浣嗙紦瀛樹腑鏃犵敤鎴风殑鎺堟潈淇℃伅鏃惰皟鐢�.
+	 * 授权查询回调函数, 进行鉴权但缓存中无用户的授权信息时调用.
 	 */
 	@Override
 	protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {
 		UserModel loginUser = (UserModel) principals.fromRealm(getName()).iterator().next();
-		// 棣栧厛浠巗ession涓�幏鍙栨潈闄�
+		// 首先从session中获取权限
 		Session s = SecurityUtils.getSubject().getSession();
-		// 缂撳瓨涓�笉瀛樺湪锛屽垯浠庢暟鎹�簱鏌ヨ�
+		// 缓存中不存在，则从数据库查询
 		UserModel user = userService.findById(loginUser.getId());
 		if (user != null) {
 			SimpleAuthorizationInfo info = new SimpleAuthorizationInfo();

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/system/DataSourceFactory.java

@@ -30,7 +30,7 @@ public class DataSourceFactory implements FactoryBean<DataSource>, InitializingB
 		this.dsid = dsid;
 	}
 
-	/** 杩炴帴姹犳暟鎹�簮绫诲瀷 */
+	/** 连接池数据源类型 */
 	private String dsType = "com.alibaba.druid.pool.DruidDataSource";
 
 	public void close() {