single jbpm6 done

blank/src/main/java/com/datalook/action/base/BaseAction.java

@@ -21,12 +21,12 @@
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.datalook.dao.base.HqlFilter;
-import com.datalook.filter.FastjsonFilter;
+import com.datalook.filter.base.FastjsonFilter;
 import com.datalook.model.sys.easyui.ComboTree;
 import com.datalook.model.sys.easyui.Grid;
 import com.datalook.model.sys.easyui.Json;
 import com.datalook.model.sys.web.SessionInfo;
-import com.datalook.service.base.IBaseService;
+import com.datalook.service.base.BaseService;
 import com.datalook.util.base.BeanUtils;
 import com.datalook.util.base.GenericsUtils;
 import com.datalook.util.base.LogUtil;
@@ -62,18 +62,18 @@ public class BaseAction<T> extends ActionSupport{
 	protected Boolean closed= false;//下拉列表树子节点折叠属性，设置true后，展开所有节点
 
 	protected List<ComboTree> comboTrees = new ArrayList<ComboTree>();//通用下拉列表对象
-	protected IBaseService<T> service;// 业务逻辑
+	protected BaseService<T> service;// 业务逻辑
 
 	/**
-	 * @see com.datalook.action.base.IBaseAction#setService(com.datalook.service.base.IBaseService)
+	 * @see com.datalook.action.base.IBaseAction#setService(com.datalook.service.base.BaseService)
 	 * 
 	 * 功能描述：
 	 * 时间：2014年9月29日
 	 * @author: lirenbo
 	 * @param service
 	 */
 
-	public void setService(IBaseService<T> service) {
+	public void setService(BaseService<T> service) {
 		this.service = service;
 	}
 
@@ -331,7 +331,7 @@ public void writeJsonByFilter(Object object, String[] includesProperties, String
 			if (includesProperties != null && includesProperties.length > 0) {
 				filter.getIncludes().addAll(Arrays.<String> asList(includesProperties));
 			}
-			LogUtil.trace("对象转JSON：要排除的属性[" + excludesProperties + "]要包含的属性[" + includesProperties + "]");
+			LogUtil.trace("[JSON准备]：(+)[" + excludesProperties + "]  (-)[" + includesProperties + "]");
 			String json;
 			String User_Agent = getRequest().getHeader("User-Agent");
 			if (StringUtils.indexOfIgnoreCase(User_Agent, "MSIE 6") > -1) {
@@ -342,7 +342,7 @@ public void writeJsonByFilter(Object object, String[] includesProperties, String
 				// 使用SerializerFeature.DisableCircularReferenceDetect特性关闭引用检测和生成
 				json = JSON.toJSONString(object, filter,SerializerFeature.WriteDateUseDateFormat, SerializerFeature.DisableCircularReferenceDetect);// 
 			}
-			LogUtil.trace("转换后的JSON字符串：" + json);
+			LogUtil.trace("[JSON数据]：" + json);
 			getResponse().setContentType("text/html;charset=utf-8");
 			getResponse().getWriter().write(json);
 			getResponse().getWriter().flush();

blank/src/main/java/com/datalook/action/base/TestAction.java

@@ -60,13 +60,10 @@ public void noSySn_upload(){
 	public void noSySn_ueditor(){
 		System.out.println(content);
 	}
-	public void noSySn_jbpm(){
+	public void noSySn_noSe_jbpm(){
 		RuntimeEngine engine = runtimeManager.getRuntimeEngine(null);
 		KieSession ksession = engine.getKieSession();
 
 		ProcessInstance processInstance = ksession.startProcess("com.sample.bpmn.hello");
-
-		runtimeManager.disposeRuntimeEngine(engine);
-		runtimeManager.close();
 	}
 }

blank/src/main/java/com/datalook/action/sys/SysDictAction.java

@@ -8,23 +8,23 @@
 import com.datalook.action.base.BaseAction;
 import com.datalook.dao.base.HqlFilter;
 import com.datalook.model.sys.SysDict;
-import com.datalook.service.base.IBaseService;
-import com.datalook.service.sys.interfaces.ISysDictService;
+import com.datalook.service.base.BaseService;
+import com.datalook.service.sys.SysDictService;
 
 @Action("sysDict")
 public class SysDictAction extends BaseAction<SysDict>{
 
 	@Resource(name="sysDictService")
-	public void setService(IBaseService<SysDict> service) {
+	public void setService(BaseService<SysDict> service) {
 		this.service = service;
 	}
 
 	public void noSy_find(){
 		HqlFilter hqlFilter = new HqlFilter(getRequest());
 		if(!StringUtils.isBlank(hqlFilter.getSqltable())){
-			writeJson(((ISysDictService)service).findValus(hqlFilter));
+			writeJson(((SysDictService)service).findValus(hqlFilter));
 		}else{
-			writeJson(((ISysDictService)service).findValus(hqlFilter));
+			writeJson(((SysDictService)service).findValus(hqlFilter));
 		}
 	}
 

blank/src/main/java/com/datalook/action/sys/SysFunctionAction.java

@@ -14,8 +14,8 @@
 import com.datalook.exception.base.ToWebException;
 import com.datalook.model.sys.SysFunction;
 import com.datalook.model.sys.web.SessionInfo;
-import com.datalook.service.base.IBaseService;
-import com.datalook.service.sys.ISysFunctionService;
+import com.datalook.service.base.BaseService;
+import com.datalook.service.sys.SysFunctionService;
 
 /**
  * 
@@ -36,7 +36,7 @@ public class SysFunctionAction extends BaseAction<SysFunction>{
 	List<SysFunction> functions=new ArrayList<SysFunction>();
 
 	@Resource(name="sysFunctionService")
-	public void setService(IBaseService<SysFunction> service) {
+	public void setService(BaseService<SysFunction> service) {
 		this.service = service;
 	}
 
@@ -71,6 +71,6 @@ public void noSy_getAllMenuWithRoot(){
 	}
 
 	public void noSySn_test() throws ToWebException{
-		((ISysFunctionService)service).test("params");
+		((SysFunctionService)service).test("params");
 	}
 }

blank/src/main/java/com/datalook/action/sys/SysRoleAction.java

@@ -14,18 +14,18 @@
 import com.datalook.model.sys.SysFunction;
 import com.datalook.model.sys.SysRole;
 import com.datalook.model.sys.easyui.Json;
-import com.datalook.service.base.IBaseService;
-import com.datalook.service.sys.interfaces.ISysRoleService;
+import com.datalook.service.base.BaseService;
+import com.datalook.service.sys.SysRoleService;
 
 @Action("sysRole")
 public class SysRoleAction extends BaseAction<SysRole>{
 
 	private static final long serialVersionUID = 1L;
 	@Resource(name="sysFunctionService")
-	IBaseService<SysFunction> sysFunctionService;
+	BaseService<SysFunction> sysFunctionService;
 
 	@Resource(name="sysRoleService")
-	public void setService(IBaseService<SysRole> service) {
+	public void setService(BaseService<SysRole> service) {
 		this.service = service;
 	}
 
@@ -56,7 +56,7 @@ public void grant(){
 		}
 		re.setSuccess(true);
 		try {
-			((ISysRoleService)service).grant(id.toString(), grantids, inSomeSysFunctionIds);
+			((SysRoleService)service).grant(id.toString(), grantids, inSomeSysFunctionIds);
 
 		} catch (Exception e) {
 			e.printStackTrace();

blank/src/main/java/com/datalook/action/sys/SysUserAction.java

@@ -17,7 +17,7 @@
 import com.datalook.model.sys.SysUser;
 import com.datalook.model.sys.easyui.Json;
 import com.datalook.model.sys.web.SessionInfo;
-import com.datalook.service.sys.interfaces.ISysUserService;
+import com.datalook.service.sys.SysUserService;
 import com.datalook.util.base.CookieUtil;
 import com.datalook.util.base.MD5Util;
 
@@ -33,8 +33,6 @@ public class SysUserAction extends BaseAction<SysUser> {
 
 	private static final long serialVersionUID = 1L;
 
-	private static final Logger logger = Logger.getLogger(SysUserAction.class);
-
 	private File image;
 	private String imageFileName;
 	private String imageContentType;
@@ -70,7 +68,7 @@ public void setImageContentType(String imageContentType) {
 
 
 	@Resource(name="sysUserService")
-	public void setService(ISysUserService service) {
+	public void setService(SysUserService service) {
 		this.service = service;
 	}
 
@@ -99,14 +97,11 @@ public void noSnSy_logout() {
 	 * @author: lirenbo
 	 */
 	public void noSnSy_login() {
-		System.out.println(data);
 		data.setPassword(MD5Util.md5(data.getPassword()));
 		SysUser sysUser = service.getByProperties(data);
-		logger.info("用户登陆"+sysUser);
 		Json json = new Json();
 		if (sysUser != null&&"1".equals(sysUser.getStatus())) {
 			json.setSuccess(true);
-			logger.info("用户登陆成功"+sysUser);
 			SessionInfo sessionInfo = new SessionInfo();
 			Hibernate.initialize(sysUser.getSysRoles());
 			for (SysRole role : sysUser.getSysRoles()) {
@@ -165,7 +160,7 @@ public void noSy_checkCurrentUserPassword() {
 	 */
 	public void grantSysRole() {
 		Json json = new Json();
-		((ISysUserService) service).grantSysRole(id, ids);
+		((SysUserService) service).grantSysRole(id, ids);
 		json.setSuccess(true);
 		writeJson(json);
 	}

blank/src/main/java/com/datalook/aop/base/ExceptionAspect.java

@@ -16,15 +16,15 @@
 import com.datalook.exception.base.ToWebException;
 import com.datalook.model.sys.SysDict;
 import com.datalook.model.sys.easyui.Json;
-import com.datalook.service.sys.interfaces.ISysDictService;
+import com.datalook.service.sys.SysDictService;
 import com.datalook.util.base.LogUtil;
 
 @Aspect
 @Component
 public class ExceptionAspect {
 
 	@Resource(name="sysDictService")
-	private ISysDictService sysDictService;
+	private SysDictService sysDictService;
 
 	@Order(2000)
 	@AfterThrowing(value = "com.datalook.aop.base.SystemArchitecture.inActionLayer()", throwing = "t")

blank/src/main/java/com/datalook/filter/FastjsonFilter.java → blank/src/main/java/com/datalook/filter/base/FastjsonFilter.java

@@ -1,4 +1,4 @@
-package com.datalook.filter;
+package com.datalook.filter.base;
 
 import java.util.HashSet;
 import java.util.Set;

blank/src/main/java/com/datalook/filter/base/web/EntityManagerFilter.java

@@ -0,0 +1,14 @@
+package com.datalook.filter.base.web;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.orm.jpa.support.OpenEntityManagerInViewFilter;
+
+public class EntityManagerFilter extends OpenEntityManagerInViewFilter{
+
+	@Override
+	protected boolean shouldNotFilter(HttpServletRequest request) throws ServletException {
+		return request.getRequestURI().contains("_noSe_");
+	}
+}

blank/src/main/java/com/datalook/filter/StrutsFilter.java → blank/src/main/java/com/datalook/filter/base/web/StrutsFilter.java

@@ -1,4 +1,4 @@
-package com.datalook.filter;
+package com.datalook.filter.base.web;
 
 import java.io.IOException;
 import java.util.ArrayList;

blank/src/main/java/com/datalook/filter/SessionFilter.java → blank/src/main/java/com/datalook/filter/base/web/UserSessionFilter.java

@@ -1,4 +1,4 @@
-package com.datalook.filter;
+package com.datalook.filter.base.web;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -17,16 +17,16 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 
+import com.datalook.util.base.LogUtil;
+
 /**
  * 
  * 功能描述：用于过滤需要拦截的JSP文件
  * 时间：2014年9月12日
  * @author ：lirenbo
  *
  */
-public class SessionFilter implements Filter {
-
-	private static final Logger logger = Logger.getLogger(SessionFilter.class);
+public class UserSessionFilter implements Filter {
 
 	private List<String> list = new ArrayList<String>();
 
@@ -38,8 +38,7 @@ public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
 
 		for (String url : list) {
 			if (servletPath.indexOf(url) > -1) {// 需要过滤
-				logger.info("进入session过滤器->访问路径为[" + servletPath + "]");
-
+				LogUtil.trace("[Filter] UserSession -> [" + servletPath + "]");
 				if (request.getSession().getAttribute("sessionInfo") == null) {// session不存在需要拦截
 					request.setAttribute("msg", "您还没有登录或登录已超时，请重新登录，然后再刷新本功能！");
 					request.getRequestDispatcher("/error/noSession.jsp").forward(request, response);

blank/src/main/java/com/datalook/interceptor/base/SecurityInterceptor.java

@@ -25,7 +25,7 @@ public class SecurityInterceptor extends MethodFilterInterceptor {
 	protected String doIntercept(ActionInvocation actionInvocation) throws Exception {
 		SessionInfo sessionInfo = (SessionInfo) ServletActionContext.getRequest().getSession().getAttribute("sessionInfo");
 		String servletPath = ServletActionContext.getRequest().getServletPath();
-		LogUtil.trace("进入权限拦截器->访问的资源为：[" + servletPath + "]");
+		LogUtil.trace("[Interceptor] Security -> [" + servletPath + "]");
 
 		servletPath = StringUtils.substringBeforeLast(servletPath, ".");// 去掉后面的后缀*.action之类的
 

blank/src/main/java/com/datalook/interceptor/base/SessionInterceptor.java

@@ -21,7 +21,7 @@ public class SessionInterceptor extends MethodFilterInterceptor {
 
 	protected String doIntercept(ActionInvocation actionInvocation) throws Exception {
 		SessionInfo sessionInfo = (SessionInfo) ServletActionContext.getRequest().getSession().getAttribute("sessionInfo");
-		LogUtil.trace("进入session拦截器->访问路径为[" + ServletActionContext.getRequest().getServletPath() + "]");
+		LogUtil.trace("[Interceptor] Session -> [" + ServletActionContext.getRequest().getServletPath() + "]");
 		if (sessionInfo == null) {
 			String errMsg = "您还没有登录或登录已超时，请重新登录，然后再刷新本功能！";
 			LogUtil.trace(errMsg);