diff --git a/.classpath b/.classpath index 4bf6e359..6d83d9ac 100644 --- a/.classpath +++ b/.classpath @@ -4,11 +4,7 @@ + - - - - - diff --git a/.project b/.project index dc6c707e..7844762f 100644 --- a/.project +++ b/.project @@ -16,12 +16,12 @@ - org.maven.ide.eclipse.maven2Builder + org.eclipse.m2e.core.maven2Builder - org.eclipse.m2e.core.maven2Builder + org.maven.ide.eclipse.maven2Builder diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..8ce45af9 --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,13 @@ +#Wed Apr 01 11:35:12 CST 2015 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/.settings/org.maven.ide.eclipse.prefs b/.settings/org.maven.ide.eclipse.prefs new file mode 100644 index 00000000..c229a877 --- /dev/null +++ b/.settings/org.maven.ide.eclipse.prefs @@ -0,0 +1,9 @@ +#Wed Apr 01 11:33:36 CST 2015 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 diff --git a/pom.xml b/pom.xml index 64db1d97..5f48aa18 100644 --- a/pom.xml +++ b/pom.xml @@ -102,7 +102,7 @@ 1.4.4 2.3.3 - 2.0.6 + 2.0.5 diff --git a/src/main/java/org/jeecgframework/core/aop/GZipFilter.java b/src/main/java/org/jeecgframework/core/aop/GZipFilter.java index 16b1678b..bcc85878 100644 --- a/src/main/java/org/jeecgframework/core/aop/GZipFilter.java +++ b/src/main/java/org/jeecgframework/core/aop/GZipFilter.java @@ -34,11 +34,11 @@ public class GZipFilter implements Filter { private static boolean isGZipEncoding(HttpServletRequest request){ boolean flag=false; String encoding=request.getHeader("Accept-Encoding"); - //update-begin--Author:JueYue Date:20140518 for：IE下Excel上传encode为空的bug-------------------- + if(encoding!=null&&encoding.indexOf("gzip")!=-1){ flag=true; } - //update-end--Author:JueYue Date:20140518 for：IE下Excel上传encode为空的bug-------------------- + return flag; } diff --git a/src/main/java/org/jeecgframework/core/common/dao/ICommonDao.java b/src/main/java/org/jeecgframework/core/common/dao/ICommonDao.java index 4829aaad..8442f8d8 100644 --- a/src/main/java/org/jeecgframework/core/common/dao/ICommonDao.java +++ b/src/main/java/org/jeecgframework/core/common/dao/ICommonDao.java @@ -55,7 +55,6 @@ public interface ICommonDao extends IGenericBaseCommonDao{ public void parserXml(String fileName); public List comTree(List all,ComboTree comboTree); -// update-begin--Author:zhangguoming Date:20140819 for：添加recuisive方法参数 /** * 根据模型生成ComboTree JSON * @@ -66,7 +65,7 @@ public interface ICommonDao extends IGenericBaseCommonDao{ * @return List */ public List ComboTree(List all, ComboTreeModel comboTreeModel, List in, boolean recursive); -// update-end--Author:zhangguoming Date:20140819 for：添加recuisive方法参数 + public List treegrid(List all,TreeGridModel treeGridModel); } diff --git a/src/main/java/org/jeecgframework/core/common/dao/impl/CommonDao.java b/src/main/java/org/jeecgframework/core/common/dao/impl/CommonDao.java index d22291ba..c7acd61c 100644 --- a/src/main/java/org/jeecgframework/core/common/dao/impl/CommonDao.java +++ b/src/main/java/org/jeecgframework/core/common/dao/impl/CommonDao.java @@ -466,16 +466,15 @@ public class CommonDao extends GenericBaseCommonDao implements ICommonDao, IGene for (Object inobj : in) { ReflectHelper reflectHelper2 = new ReflectHelper(inobj); String inId = oConvertUtils.getString(reflectHelper2.getMethodValue(comboTreeModel.getIdField())); - //update-begin--Author:JueYue Date:20140514 for：==不起作用-------------------- + if (inId.equals(id)) { tree.setChecked(true); } - //update-end--Author:JueYue Date:20140514 for：==不起作用-------------------- + } } } -// update-begin--Author:zhangguoming Date:20140819 for：递归子节点属性 List curChildList = (List) reflectHelper.getMethodValue(comboTreeModel.getChildField()); if (curChildList != null && curChildList.size() > 0) { tree.setState("closed"); @@ -491,7 +490,7 @@ public class CommonDao extends GenericBaseCommonDao implements ICommonDao, IGene tree.setChildren(children); } } -// update-end--Author:zhangguoming Date:20140819 for：递归子节点属性 + return tree; } @@ -587,12 +586,12 @@ public class CommonDao extends GenericBaseCommonDao implements ICommonDao, IGene tg.getFieldMap().put(entry.getKey(), fieldValue); } } - //update-begin--Author:anchao Date:20140822 for：[bugfree号]字段级权限（表单，列表）-------------------- + if (treeGridModel.getFunctionType() != null) { String functionType = oConvertUtils.getString(reflectHelper.getMethodValue(treeGridModel.getFunctionType())); tg.setFunctionType(functionType); } - //update-end--Author:anchao Date:20140822 for：[bugfree号]字段级权限（表单，列表）-------------------- + treegrid.add(tg); } return treegrid; diff --git a/src/main/java/org/jeecgframework/core/common/model/json/TreeGrid.java b/src/main/java/org/jeecgframework/core/common/model/json/TreeGrid.java index cc96981e..b8925aae 100644 --- a/src/main/java/org/jeecgframework/core/common/model/json/TreeGrid.java +++ b/src/main/java/org/jeecgframework/core/common/model/json/TreeGrid.java @@ -18,7 +18,7 @@ public class TreeGrid implements java.io.Serializable { private String state = "open";// 是否展开(open,closed) private String order;//排序 private Map fieldMap; // 存储实体字段信息容器： key-字段名称，value-字段值 - //update-begin--Author:anchao Date:20140822 for：[bugfree号]字段级权限（表单，列表）-------------------- + private String functionType;// 其他参数 public String getFunctionType() { @@ -27,7 +27,7 @@ public class TreeGrid implements java.io.Serializable { public void setFunctionType(String functionType) { this.functionType = functionType; } - //update-end--Author:anchao Date:20140822 for：[bugfree号]字段级权限（表单，列表）-------------------- + public String getOrder() { return order; } diff --git a/src/main/java/org/jeecgframework/core/common/service/CommonService.java b/src/main/java/org/jeecgframework/core/common/service/CommonService.java index c840141e..f8991d1a 100644 --- a/src/main/java/org/jeecgframework/core/common/service/CommonService.java +++ b/src/main/java/org/jeecgframework/core/common/service/CommonService.java @@ -248,7 +248,6 @@ public interface CommonService { public List comTree(List all, ComboTree comboTree); -// update-begin--Author:zhangguoming Date:20140819 for：添加recuisive方法参数 /** * 根据模型生成JSON * @@ -258,7 +257,7 @@ public interface CommonService { * @return List */ public List ComboTree(List all, ComboTreeModel comboTreeModel, List in, boolean recursive); -// update-end--Author:zhangguoming Date:20140819 for：添加recuisive方法参数 + /** * 构建树形数据表 diff --git a/src/main/java/org/jeecgframework/core/common/service/impl/CommonServiceImpl.java b/src/main/java/org/jeecgframework/core/common/service/impl/CommonServiceImpl.java index e3f36d53..6db88be4 100644 --- a/src/main/java/org/jeecgframework/core/common/service/impl/CommonServiceImpl.java +++ b/src/main/java/org/jeecgframework/core/common/service/impl/CommonServiceImpl.java @@ -415,11 +415,10 @@ public class CommonServiceImpl implements CommonService { return commonDao.getCountForJdbc(sql); } - //update-begin--Author:JueYue Date:20140514 for：调用方法错误-------------------- public Long getCountForJdbcParam(String sql, Object[] objs) { return commonDao.getCountForJdbcParam(sql,objs); } - //update-end--Author:JueYue Date:20140514 for：调用方法错误-------------------- + public void batchSave(List entitys) { diff --git a/src/main/java/org/jeecgframework/core/constant/Globals.java b/src/main/java/org/jeecgframework/core/constant/Globals.java index c55266d6..23bf1101 100644 --- a/src/main/java/org/jeecgframework/core/constant/Globals.java +++ b/src/main/java/org/jeecgframework/core/constant/Globals.java @@ -56,8 +56,7 @@ public final class Globals { */ public static String Function_Order_ONE="ofun";//一级权限 public static String Function_Order_TWO="tfun";//二级权限 - - //update-begin--Author:anchao Date:20140822 for：[bugfree号]字段级权限（表单，列表）-------------------- + /** * 权限类型 */ @@ -88,7 +87,7 @@ public final class Globals { * 数据权限 - 菜单数据规则sql */ public static String MENU_DATA_AUTHOR_RULE_SQL ="MENU_DATA_AUTHOR_RULE_SQL"; - //update-end--Author:anchao Date:20140822 for：[bugfree号]字段级权限（表单，列表）-------------------- + /** * 新闻法规 */ diff --git a/src/main/java/org/jeecgframework/core/extend/hqlsearch/HqlGenerateUtil.java b/src/main/java/org/jeecgframework/core/extend/hqlsearch/HqlGenerateUtil.java index 19e304cc..08cf1a5f 100644 --- a/src/main/java/org/jeecgframework/core/extend/hqlsearch/HqlGenerateUtil.java +++ b/src/main/java/org/jeecgframework/core/extend/hqlsearch/HqlGenerateUtil.java @@ -111,7 +111,7 @@ public class HqlGenerateUtil { // 根据类型分类处理 if (type.contains("class java.lang") || type.contains("class java.math")) { - // ------------update--Author:JueYue Date:2014-8-23 + // for：查询拼装的替换 if (value != null && !value.equals("")) { HqlRuleEnum rule = PageValueConvertRuleEnum @@ -125,7 +125,7 @@ public class HqlGenerateUtil { ObjectParseUtil.addCriteria(cq, aliasName, HqlRuleEnum.LE, endValue); } - // ------------update--Author:JueYue Date:2014-8-23 + // for：查询拼装的替换 } else if ("class java.util.Date".equals(type)) { QueryTimeFormat format = origDescriptors[i].getReadMethod() @@ -164,7 +164,7 @@ public class HqlGenerateUtil { if (isHaveRuleData(ruleMap, aliasName) ||( isNotEmpty(param) && itIsNotAllEmpty(param))) { // 如果是实体类,创建别名,继续创建查询条件 - // ------------update--Author:JueYue Date:20140521 + // for：用户反馈 cq.createAlias(aliasName, aliasName.replaceAll("\\.", "_")); diff --git a/src/main/java/org/jeecgframework/core/extend/swftools/SWFToolsSWFConverter.java b/src/main/java/org/jeecgframework/core/extend/swftools/SWFToolsSWFConverter.java index b1832b86..c8eec0a3 100644 --- a/src/main/java/org/jeecgframework/core/extend/swftools/SWFToolsSWFConverter.java +++ b/src/main/java/org/jeecgframework/core/extend/swftools/SWFToolsSWFConverter.java @@ -25,10 +25,10 @@ public class SWFToolsSWFConverter implements SWFConverter { return; } String command = ConStant.getSWFToolsPath(extend) + " \"" + inputFile - //---update-for--文件预览无效------ scott@2013/05/22 ADD START + + "\" -o " +" \""+ swfFile +" \""+ " -s languagedir=D:\\xpdf-chinese-simplified -T 9 -f"; // + "\" -o " + swfFile + " -s languagedir=D:\\xpdf-chinese-simplified -T 9 -f"; -// ---update-for--文件预览无效----- scott@2013/05/22 ADD END + try { // 开始转换文档 Process process = Runtime.getRuntime().exec(command); diff --git a/src/main/java/org/jeecgframework/core/interceptors/AuthInterceptor.java b/src/main/java/org/jeecgframework/core/interceptors/AuthInterceptor.java index ead88913..c7465bdc 100644 --- a/src/main/java/org/jeecgframework/core/interceptors/AuthInterceptor.java +++ b/src/main/java/org/jeecgframework/core/interceptors/AuthInterceptor.java @@ -95,7 +95,7 @@ public class AuthInterceptor implements HandlerInterceptor { } //String functionId=oConvertUtils.getString(request.getParameter("clickFunctionId")); String functionId=""; - //update-begin--Author:JueYue Date:20140831 for：onlinecodeing 的URL判断-------------------- + //onlinecoding的访问地址有规律可循，数据权限链接篡改 if(requestPath.equals("cgAutoListController.do?datagrid")) { requestPath += "&configId=" + request.getParameter("configId"); @@ -106,7 +106,7 @@ public class AuthInterceptor implements HandlerInterceptor { if(requestPath.equals("cgFormBuildController.do?ftlForm")) { requestPath += "&tableName=" + request.getParameter("tableName"); } - //update-end--Author:JueYue Date:20140831 for：onlinecodeing 的URL判断-------------------- + //这个地方用全匹配？应该是模糊查询吧 //TODO List functions = systemService.findByProperty(TSFunction.class, "functionUrl", requestPath); @@ -122,7 +122,7 @@ public class AuthInterceptor implements HandlerInterceptor { request.setAttribute(Globals.OPERATIONCODES, operationCodes); } if(!oConvertUtils.isEmpty(functionId)){ - //update-begin--Author:anchao Date:20140822 for：[bugfree号]字段级权限（表单，列表）-------------------- + //List allOperation=this.systemService.findListbySql("SELECT operationcode FROM t_s_operation WHERE functionid='"+functionId+"'"); List allOperation=this.systemService.findByProperty(TSOperation.class, "TSFunction.id", functionId); @@ -211,16 +211,15 @@ public class AuthInterceptor implements HandlerInterceptor { "ru.userid='"+userid+"' AND f.functionurl like '"+requestPath+"%'"; List list = this.systemService.findListbySql(sql); if(list.size()==0){ -// update-start--Author:zhangguoming Date:20140821 for：判断当前用户组织机构下角色所拥有的权限 -// update-start--Author:zhangguoming Date:20140825 for：获取当前用户登录时选择的组织机构代码 + String orgId = currLoginUser.getCurrentDepart().getId(); -// update-end--Author:zhangguoming Date:20140825 for：获取当前用户登录时选择的组织机构代码 + String functionOfOrgSql = "SELECT DISTINCT f.id from t_s_function f, t_s_role_function rf, t_s_role_org ro " + "WHERE f.ID=rf.functionid AND rf.roleid=ro.role_id " + "AND ro.org_id='" +orgId+ "' AND f.functionurl like '"+requestPath+"%'"; List functionOfOrgList = this.systemService.findListbySql(functionOfOrgSql); return functionOfOrgList.size() > 0; -// update-end--Author:zhangguoming Date:20140821 for：判断当前用户组织机构下角色所拥有的权限 + }else{ return true; } diff --git a/src/main/java/org/jeecgframework/core/util/DateUtils.java b/src/main/java/org/jeecgframework/core/util/DateUtils.java index 79f0c982..6caf9be4 100644 --- a/src/main/java/org/jeecgframework/core/util/DateUtils.java +++ b/src/main/java/org/jeecgframework/core/util/DateUtils.java @@ -65,7 +65,6 @@ public class DateUtils extends PropertyEditorSupport { */ public static Calendar getCalendar(long millis) { Calendar cal = Calendar.getInstance(); - // --------------------cal.setTimeInMillis(millis); cal.setTime(new Date(millis)); return cal; } @@ -256,7 +255,6 @@ public class DateUtils extends PropertyEditorSupport { * @return 指定日历的时间戳 */ public static Timestamp getCalendarTimestamp(Calendar cal) { - // ---------------------return new Timestamp(cal.getTimeInMillis()); return new Timestamp(cal.getTime().getTime()); } @@ -290,7 +288,6 @@ public class DateUtils extends PropertyEditorSupport { * @return 指定日历的毫秒数 */ public static long getMillis(Calendar cal) { - // --------------------return cal.getTimeInMillis(); return cal.getTime().getTime(); } diff --git a/src/main/java/org/jeecgframework/core/util/ListtoMenu.java b/src/main/java/org/jeecgframework/core/util/ListtoMenu.java index 34af2a89..0bf3dc74 100644 --- a/src/main/java/org/jeecgframework/core/util/ListtoMenu.java +++ b/src/main/java/org/jeecgframework/core/util/ListtoMenu.java @@ -206,7 +206,6 @@ public class ListtoMenu { return menuString.toString(); } -// update-start--Author:zhangguoming Date:20140622 for：左侧树调整：加大宽度、更换节点图标、修改选中颜色 /** * 拼装EASYUI 多级 菜单 下级菜单为树形 @@ -261,7 +260,7 @@ public class ListtoMenu { return menuString.toString(); } -// update-end--Author:zhangguoming Date:20140622 for：左侧树调整：加大宽度、更换节点图标、修改选中颜色 + /** * 获取顶级菜单的下级菜单-----面板式菜单 @@ -454,9 +453,7 @@ public class ListtoMenu { menuString.append(" "); return menuString.toString(); } - - - //update-start--Author:gaofeng Date:2014-02-14：新增webos头部菜单导航,多级菜单 + /** * 拼装webos头部菜单 * @param pFunctions @@ -588,10 +585,10 @@ public class ListtoMenu { dataString.append("'"+function.getId()+"':{ "); dataString.append("appid:'"+function.getId()+"',"); dataString.append("url:'"+function.getFunctionUrl()+"',"); - // update-begin--Author:zhangguoming Date:20140509 for：添加云桌面图标 + // dataString.append(getIconandName(function.getFunctionName())); dataString.append(getIconAndNameForDesk(function)); - // update-end--Author:zhangguoming Date:20140509 for：添加云桌面图标 + dataString.append("asc :"+function.getFunctionOrder()); dataString.append(" },"); } @@ -601,7 +598,6 @@ public class ListtoMenu { return data; } - // update-begin--Author:zhangguoming Date:20140512 for：添加云桌面图标管理 private static String getIconAndNameForDesk(TSFunction function) { StringBuffer dataString = new StringBuffer(); @@ -681,6 +677,5 @@ public class ListtoMenu { String lang_context = mutiLangService.getLang(functionName); return lang_context; } - // update-end--Author:zhangguoming Date:20140512 for：添加云桌面图标管理 - //update-start--Author:gaofeng Date:2014-02-14：新增Webos头部菜单导航，多级菜单 + } \ No newline at end of file diff --git a/src/main/java/org/jeecgframework/core/util/ResourceUtil.java b/src/main/java/org/jeecgframework/core/util/ResourceUtil.java index 945dde69..37654353 100644 --- a/src/main/java/org/jeecgframework/core/util/ResourceUtil.java +++ b/src/main/java/org/jeecgframework/core/util/ResourceUtil.java @@ -145,7 +145,6 @@ public class ResourceUtil { return DBTypeUtil.getDBType().toLowerCase(); } -// update-begin--Author:zhangguoming Date:20140226 for：添加验证码 /** * 获取随机码的长度 * @@ -163,7 +162,7 @@ public class ResourceUtil { public static String getRandCodeType() { return bundle.getString("randCodeType"); } -// update-end--Author:zhangguoming Date:20140226 for：添加验证码 + /** * 获取组织机构编码长度的类型 @@ -180,8 +179,7 @@ public class ResourceUtil { * @return */ public static String getUserSystemData(String key) { - //---------------------------------------------------------------- - //update-begin--Author:zhangdaihao Date:20140913 for：获取系统上下文变量 + //替换为系统的登录用户账号 // if (key.equals(DataBaseConstant.CREATE_BY) @@ -203,9 +201,6 @@ public class ResourceUtil { ) { return getSessionUserName().getRealName(); } - - //update-end--Author:zhangdaihao Date:20140913 for：获取系统上下文变量 - //---------------------------------------------------------------- //替换为系统登录用户的公司编码 if (key.equals(DataBaseConstant.SYS_COMPANY_CODE)|| key.equals(DataBaseConstant.SYS_COMPANY_CODE_TABLE)) { return getSessionUserName().getCurrentDepart().getOrgCode() diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/AuthFilterTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/AuthFilterTag.java index c34a57d2..de008408 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/AuthFilterTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/AuthFilterTag.java @@ -57,7 +57,7 @@ public class AuthFilterTag extends TagSupport{ protected void getAuthFilter(StringBuilder out) { out.append(""); } diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/BaseTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/BaseTag.java index 813ff5e5..9e2446f9 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/BaseTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/BaseTag.java @@ -42,14 +42,13 @@ public class BaseTag extends TagSupport { String lang = (String)((HttpServletRequest) this.pageContext.getRequest()).getSession().getAttribute("lang"); String langjs = StringUtil.replace("", "{0}", lang); sb.append(langjs); - -// update-begin--Author:zhangguoming Date:20140521 for：云桌面图标拖拽、用户自定义桌面 + if (oConvertUtils.isIn("jquery-webos", types)) { sb.append(""); } else if (oConvertUtils.isIn("jquery", types)) { sb.append(""); } -// update-end--Author:zhangguoming Date:20140521 for：云桌面图标拖拽、用户自定义桌面 + if (oConvertUtils.isIn("ckeditor", types)) { sb.append(""); sb.append(""); diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/DataGridColumnTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/DataGridColumnTag.java index 776e3fee..b9e67c04 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/DataGridColumnTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/DataGridColumnTag.java @@ -25,9 +25,9 @@ public class DataGridColumnTag extends TagSupport { protected boolean sortable=true; protected boolean checkbox; protected String formatter; -// update-start-Author:zhangguoming Date:20140921 for：TASK #458 列表hidden=false，才是隐藏好像有点问题 + protected boolean hidden=false; -// update-end-Author:zhangguoming Date:20140921 for：TASK #458 列表hidden=false，才是隐藏好像有点问题 + protected String replace; protected String treefield; protected boolean image; diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/DataGridTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/DataGridTag.java index 770eb82e..d0593bbb 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/DataGridTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/DataGridTag.java @@ -283,7 +283,7 @@ public class DataGridTag extends TagSupport { dataGridColumn.setAutocomplete(isAuto); dataGridColumn.setExtendParams(extendParams); columnList.add(dataGridColumn); - //update-begin--Author:anchao Date:20140826 for：[bugfree号]数据列权限控制-------------------- + Set operationCodes = (Set) super.pageContext.getRequest().getAttribute(Globals.OPERATIONCODES); if (null!=operationCodes) { for (String MyoperationCode : operationCodes) { @@ -297,7 +297,7 @@ public class DataGridTag extends TagSupport { } } } - //update-end--Author:anchao Date:20140826 for：[bugfree号]数据列权限控制-------------------- + @@ -476,9 +476,9 @@ public class DataGridTag extends TagSupport { sb.append(",\"mData\":\"" + column.getField() + "\""); sb.append(",\"sWidth\":\"" + colwidth + "\""); sb.append(",\"bSortable\":" + column.isSortable() + ""); -// update-start-Author:zhangguoming Date:20140921 for：TASK #458 列表hidden=false，才是隐藏好像有点问题 + sb.append(",\"bVisible\":" + !column.isHidden() + ""); -// update-end-Author:zhangguoming Date:20140921 for：TASK #458 列表hidden=false，才是隐藏好像有点问题 + sb.append(",\"bSearchable\":" + column.isQuery() + ""); } sb.append("}"); @@ -617,21 +617,19 @@ public class DataGridTag extends TagSupport { sb.append("function dosearch(params){"); sb.append("var jsonparams=$.parseJSON(params);"); sb.append("$(\'#" + name + "\')." + grid + "({url:'" + actionUrl + "&field=" + searchFields + "',queryParams:jsonparams});" + "}"); - - //update-begin chenxu 20140423 for:修改在弹出界面中使用single查询模式时，查询条件不起作用 + //searchbox框执行方法 searchboxFun(sb,grid); - //update-end chenxu 20140423 for:修改在弹出界面中使用single查询模式时，查询条件不起作用 + //生成重置按钮功能js - - //update-begin Robin 20140426 for:回车事件 + //回车事件 sb.append("function EnterPress(e){"); sb.append("var e = e || window.event;"); sb.append("if(e.keyCode == 13){ "); sb.append(name+"search();"); sb.append("}}"); - //update-begin Robin 20140426 for:回车事件 + sb.append("function searchReset(name){"); sb.append(" $(\"#\"+name+\"tb\").find(\":input\").val(\"\");"); @@ -698,7 +696,7 @@ public class DataGridTag extends TagSupport { }else if(col.isAutocomplete()){ sb.append(getAutoSpan(col.getField().replaceAll("_","\\."),extendAttribute(col.getExtend()))); }else{ - //update-begin Robin 20140426 for:回车事件 兼容IE,FF + sb.append(""); } }else if("group".equals(col.getQueryMode())){ @@ -1029,12 +1027,12 @@ public class DataGridTag extends TagSupport { sb.append(","+column.getExtendParams().substring(0, column.getExtendParams().length()-1)); } -// update-start-Author:zhangguoming Date:20140921 for：TASK #458 列表hidden=false，才是隐藏好像有点问题 + // 隐藏字段 if (column.isHidden()) { sb.append(",hidden:true"); } -// update-end-Author:zhangguoming Date:20140921 for：TASK #458 列表hidden=false，才是隐藏好像有点问题 + if (!treegrid) { // 字段排序 if ((column.isSortable()) && (field.indexOf("_") <= 0 && field != "opt")) { @@ -1181,7 +1179,7 @@ public class DataGridTag extends TagSupport { } public String getNoAuthOperButton(){ - //update-begin--Author:anchao Date:20140822 for：[bugfree号]字段级权限（表单，列表）-------------------- + StringBuffer sb = new StringBuffer(); if(ResourceUtil.getSessionUserName().getUserName().equals("admin")|| !Globals.BUTTON_AUTHORITY_CHECK){ }else{ @@ -1207,7 +1205,7 @@ public class DataGridTag extends TagSupport { } } - //update-end--Author:anchao Date:20140822 for：[bugfree号]字段级权限（表单，列表）-------------------- + org.jeecgframework.core.util.LogUtil.info("----getNoAuthOperButton-------"+sb.toString()); return sb.toString(); } diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/DictSelectTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/DictSelectTag.java index 57dc5282..c4e61c3b 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/DictSelectTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/DictSelectTag.java @@ -104,9 +104,9 @@ public class DictSelectTag extends TagSupport { sb.append(" id=\"" + id + "\""); } sb.append(">"); - //update-begin--Author:zhangdaihao Date:20140724 for：[bugfree号]默认选择项目-------------------- + select("common.please.select", "", sb); - //update-end--Author:zhangdaihao Date:20140724 for：[bugfree号]默认选择项目---------------------- + for (Map map : list) { select(map.get("text").toString(), map.get("field").toString(), sb); } @@ -153,9 +153,9 @@ public class DictSelectTag extends TagSupport { sb.append(" id=\"" + id + "\""); } sb.append(">"); - //update-begin--Author:zhangdaihao Date:20140724 for：[bugfree号]默认选择项目-------------------- + select("common.please.select", "", sb); - //update-end--Author:zhangdaihao Date:20140724 for：[bugfree号]默认选择项目---------------------- + for (TSType type : types) { select(type.getTypename(), type.getTypecode(), sb); } diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/FormValidationTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/FormValidationTag.java index a16b3458..21331d89 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/FormValidationTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/FormValidationTag.java @@ -168,7 +168,7 @@ public class FormValidationTag extends TagSupport { passsb.append("}");// trigger结尾 passsb.append("}");// passwordstrength结尾 } -// update-start--Author:gaofeng Date:20140711 for：修改在使用jptransform时的逗号","拼接错误 + sb.append("usePlugin:{"); if (usePlugin.indexOf("password") >= 0) { sb.append(passsb); @@ -180,7 +180,7 @@ public class FormValidationTag extends TagSupport { } jqsb.append("jqtransform :{selector:\"select\"}"); } -// update-end--Author:gaofeng Date:20140711 for：修改在使用jptransform时的逗号","拼接错误 + if (usePlugin.indexOf("jqtransform") >= 0) { sb.append(jqsb); } @@ -188,8 +188,8 @@ public class FormValidationTag extends TagSupport { } sb.append("callback:function(data){"); if (dialog) { - if(callback!=null&&callback.contains("@Override")){//复写默认callback - sb.append(callback.replaceAll("@Override", "") + "(data);"); + if(callback!=null&&callback.contains("")){//复写默认callback + sb.append(callback.replaceAll("", "") + "(data);"); }else{ sb.append("var win = frameElement.api.opener;"); //先判断是否成功，成功再刷新父页面，否则return false diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/MenuTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/MenuTag.java index 6e537bae..c650eaf1 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/MenuTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/MenuTag.java @@ -54,22 +54,22 @@ public class MenuTag extends TagSupport { public StringBuffer end() { StringBuffer sb = new StringBuffer(); -// update-begin--Author:zhangguoming Date:20140622 for：左侧树调整：加大宽度、更换节点图标、修改选中颜色 + if (style.equals("easyui")) { sb.append("
    "); sb.append(ListtoMenu.getEasyuiMultistageTree(menuFun, style)); sb.append("
"); } if(style.equals("shortcut")) -// update-begin--Author:zhangguoming Date:20140429 for：在IE7下 导航显示问题 + // { sb.append("
"); { sb.append("
"); -// update-end--Author:zhangguoming Date:20140429 for：在IE7下 导航显示问题 + sb.append(ListtoMenu.getEasyuiMultistageTree(menuFun, style)); sb.append("
"); } -// update-end--Author:zhangguoming Date:20140622 for：左侧树调整：加大宽度、更换节点图标、修改选中颜色 + if(style.equals("bootstrap")) { sb.append(ListtoMenu.getBootMenu(parentFun, childFun)); diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/TagUtil.java b/src/main/java/org/jeecgframework/tag/core/easyui/TagUtil.java index 7d8a0f15..3144f66e 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/TagUtil.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/TagUtil.java @@ -73,7 +73,7 @@ public class TagUtil { } value = reflectHelper.getMethodValue(fieldName)==null?"":reflectHelper.getMethodValue(fieldName); if (value !=""&&value != null && (FiledName.indexOf("_") != -1||FiledName.indexOf(".") != -1)) { -// update-start--Author:zhangguoming Date:20140827 for：功能增强，添加处理对象中List属性字段的解析 + if(value instanceof List) { Object tempValue = ""; for (Object listValue : (List)value) { @@ -83,7 +83,7 @@ public class TagUtil { } else { value = fieldNametoValues(childFieldName, value); } -// update-end--Author:zhangguoming Date:20140827 for：功能增强，添加处理对象中List属性字段的解析 + } if(value != "" && value != null) { value = value.toString().replaceAll("\r\n", ""); diff --git a/src/main/java/org/jeecgframework/web/cgform/controller/autolist/CgAutoListController.java b/src/main/java/org/jeecgframework/web/cgform/controller/autolist/CgAutoListController.java index c494d309..bbfa9993 100644 --- a/src/main/java/org/jeecgframework/web/cgform/controller/autolist/CgAutoListController.java +++ b/src/main/java/org/jeecgframework/web/cgform/controller/autolist/CgAutoListController.java @@ -193,9 +193,9 @@ public class CgAutoListController extends BaseController{ // } for(DictEntity dictEntity:dicDataList){ if(value.equalsIgnoreCase(dictEntity.getTypecode())){ - //------------------update-begin------for:-国际化处理-----------------------author:zhagndaihao------------ + r.put(bean.getFieldName(),MutiLangUtil.getMutiLangInstance().getLang(dictEntity.getTypename())); - //------------------update-end-----for:-国际化处理----------------------------author:zhagndaihao--------- + } } } @@ -266,7 +266,7 @@ public class CgAutoListController extends BaseController{ List queryList = new ArrayList(); StringBuilder fileds = new StringBuilder(); StringBuilder initQuery = new StringBuilder(); - //------------------update-begin-------2014年9月3日----author:JueYue------for:-列表数据隐藏权限------------ + Set operationCodes = (Set) request.getAttribute(Globals.OPERATIONCODES); Map operationCodesMap = new HashMap(); if(operationCodes != null){ @@ -282,7 +282,7 @@ public class CgAutoListController extends BaseController{ if(operationCodesMap.containsKey(bean.getFieldName())) { continue; } - //------------------update-end---2014年9月3日----author:JueYue------for:-列表数据隐藏权限------------ + Map fm = new HashMap(); fm.put(CgAutoListConstant.FILED_ID, bean.getFieldName()); fm.put(CgAutoListConstant.FIELD_TITLE, bean.getContent()); diff --git a/src/main/java/org/jeecgframework/web/cgform/controller/build/CgFormBuildController.java b/src/main/java/org/jeecgframework/web/cgform/controller/build/CgFormBuildController.java index be754253..fc565a7d 100644 --- a/src/main/java/org/jeecgframework/web/cgform/controller/build/CgFormBuildController.java +++ b/src/main/java/org/jeecgframework/web/cgform/controller/build/CgFormBuildController.java @@ -71,10 +71,10 @@ public class CgFormBuildController extends BaseController { try { long start = System.currentTimeMillis(); String tableName =request.getParameter("tableName"); -// update-start--Author:zhangguoming Date:20140922 for：根据ftlVersion动态读取模板 + String ftlVersion =request.getParameter("ftlVersion"); Template template = templetContext.getTemplate(tableName, ftlVersion); -// update-end--Author:zhangguoming Date:20140922 for：根据ftlVersion动态读取模板 + StringWriter stringWriter = new StringWriter(); BufferedWriter writer = new BufferedWriter(stringWriter); Map data = new HashMap(); diff --git a/src/main/java/org/jeecgframework/web/cgform/controller/excel/ExcelTempletController.java b/src/main/java/org/jeecgframework/web/cgform/controller/excel/ExcelTempletController.java index 740a3b01..54e9c00f 100644 --- a/src/main/java/org/jeecgframework/web/cgform/controller/excel/ExcelTempletController.java +++ b/src/main/java/org/jeecgframework/web/cgform/controller/excel/ExcelTempletController.java @@ -306,9 +306,9 @@ public class ExcelTempletController extends BaseController { String value = String.valueOf(r.get(bean.getFieldName())); for(DictEntity dictEntity:dicDataList){ if(value.equalsIgnoreCase(dictEntity.getTypecode())){ - //------------------update-begin------for:-国际化处理-----------------------author:zhagndaihao------------ + r.put(bean.getFieldName(),MutiLangUtil.getMutiLangInstance().getLang(dictEntity.getTypename())); - //------------------update-end-----for:-国际化处理----------------------------author:zhagndaihao--------- + } } } diff --git a/src/main/java/org/jeecgframework/web/cgform/controller/trans/CgformTransController.java b/src/main/java/org/jeecgframework/web/cgform/controller/trans/CgformTransController.java index faca9318..83be9bd1 100644 --- a/src/main/java/org/jeecgframework/web/cgform/controller/trans/CgformTransController.java +++ b/src/main/java/org/jeecgframework/web/cgform/controller/trans/CgformTransController.java @@ -191,13 +191,13 @@ public class CgformTransController { cgFormField.setLength(Integer.valueOf(columnt .getPrecision())); } - //update-begin--Author:zhangdaihao Date:20140212 for：[001]oracle下number类型，数据库表导出表单，默认长度为0同步失败 + else{ if(cgFormField.getType().equals(DataBaseConst.INT)){ cgFormField.setLength(10); } } - //update-end--Author:zhangdaihao Date:20140212 for：[001]oracle下number类型，数据库表导出表单，默认长度为0同步失败 + if (StringUtil.isNotEmpty(columnt.getScale())) cgFormField.setPointLength(Integer.valueOf(columnt .getScale())); diff --git a/src/main/java/org/jeecgframework/web/cgform/engine/DBTempletLoader.java b/src/main/java/org/jeecgframework/web/cgform/engine/DBTempletLoader.java index 36957588..a081b735 100644 --- a/src/main/java/org/jeecgframework/web/cgform/engine/DBTempletLoader.java +++ b/src/main/java/org/jeecgframework/web/cgform/engine/DBTempletLoader.java @@ -67,14 +67,14 @@ public class DBTempletLoader implements TemplateLoader { } private Object getObject(String name) throws IOException { -// update-start--Author:zhangguoming Date:20140922 for：根据ftlVersion动态读取模板 + String ftlVersion = ""; String ftlVersionParam = "&ftlVersion="; if(name.contains(ftlVersionParam)) { ftlVersion = name.substring(name.indexOf(ftlVersionParam) + ftlVersionParam.length()); name = name.substring(0, name.indexOf(ftlVersionParam)); } -// update-end--Author:zhangguoming Date:20140922 for：根据ftlVersion动态读取模板 + PathMatchingResourcePatternResolver patternResolver = new PathMatchingResourcePatternResolver(); if(name.lastIndexOf(".ftl")==-1){//判断是否为include的模板 //如果是主表直接走一对多模板 @@ -90,14 +90,14 @@ public class DBTempletLoader implements TemplateLoader { } //1、根据table name 查询cgformftl 有则获取模板内容 //2、没有cgformftl 则查询cgformfield 根据cgformfield生成模板 -// update-start--Author:zhangguoming Date:20140922 for：根据ftlVersion动态读取模板 + Map cgformFtlEntity = new HashMap(); if (ftlVersion != null && ftlVersion.length() > 0) { cgformFtlEntity = cgformFtlService.getCgformFtlByTableName(name, ftlVersion); } else { cgformFtlEntity = cgformFtlService.getCgformFtlByTableName(name); } -// update-end--Author:zhangguoming Date:20140922 for：根据ftlVersion动态读取模板 + if(cgformFtlEntity!=null){ String content = (String) (cgformFtlEntity.get("ftl_content")==null?"":cgformFtlEntity.get("ftl_content")); content = initFormHtml( content, name); diff --git a/src/main/java/org/jeecgframework/web/cgform/engine/TempletContext.java b/src/main/java/org/jeecgframework/web/cgform/engine/TempletContext.java index f24a75c1..66d9644a 100644 --- a/src/main/java/org/jeecgframework/web/cgform/engine/TempletContext.java +++ b/src/main/java/org/jeecgframework/web/cgform/engine/TempletContext.java @@ -64,11 +64,11 @@ public class TempletContext { if (tableName == null) { return null; } -// update-start--Author:zhangguoming Date:20140922 for：根据ftlVersion动态读取模板 + if (ftlVersion != null && ftlVersion.length() > 0) { tableName = tableName + "&ftlVersion=" + ftlVersion; } -// update-end--Author:zhangguoming Date:20140922 for：根据ftlVersion动态读取模板 + try { if(CgAutoListConstant.SYS_MODE_DEV.equalsIgnoreCase(_sysMode)){//开发模式 template = freemarker.getTemplate(tableName,freemarker.getLocale(), ENCODING); diff --git a/src/main/java/org/jeecgframework/web/cgform/engine/tag/DictDataTag.java b/src/main/java/org/jeecgframework/web/cgform/engine/tag/DictDataTag.java index 791e7ac7..b40b7773 100644 --- a/src/main/java/org/jeecgframework/web/cgform/engine/tag/DictDataTag.java +++ b/src/main/java/org/jeecgframework/web/cgform/engine/tag/DictDataTag.java @@ -63,12 +63,12 @@ public class DictDataTag implements TemplateDirectiveModel { if (dataList == null) { dataList = new ArrayList(); } - //------------------update-begin------for:-国际化处理-----------------------author:zhagndaihao------------ + for(TSType s:dataList){ String names = s.getTypename(); s.setTypename(MutiLangUtil.getMutiLangInstance().getLang(names)); } - //------------------update-end-----for:-国际化处理----------------------------author:zhagndaihao--------- + env.setGlobalVariable(var, new SimpleCollection(dataList)); } else { // table表查询 diff --git a/src/main/java/org/jeecgframework/web/cgform/service/cgformftl/CgformFtlServiceI.java b/src/main/java/org/jeecgframework/web/cgform/service/cgformftl/CgformFtlServiceI.java index b08320a2..65980ef2 100644 --- a/src/main/java/org/jeecgframework/web/cgform/service/cgformftl/CgformFtlServiceI.java +++ b/src/main/java/org/jeecgframework/web/cgform/service/cgformftl/CgformFtlServiceI.java @@ -5,7 +5,7 @@ import org.jeecgframework.core.common.service.CommonService; import java.util.Map; public interface CgformFtlServiceI extends CommonService{ -// update-start--Author:zhangguoming Date:20140922 for：根据ftlVersion动态读取模板 + /** * 根据tableName获取form模板信息 *
  • 根据 ftlVersion 的值获取模板，如果该参数为空，则默认取第一个激活的模板
    • @@ -14,7 +14,7 @@ public interface CgformFtlServiceI extends CommonService{ * @return form模板信息 */ public Map getCgformFtlByTableName(String tableName, String ftlVersion); -// update-end--Author:zhangguoming Date:20140922 for：根据ftlVersion动态读取模板 + /** * 根据tableName获取form模板信息 diff --git a/src/main/java/org/jeecgframework/web/cgform/service/impl/autolist/CgTableServiceImpl.java b/src/main/java/org/jeecgframework/web/cgform/service/impl/autolist/CgTableServiceImpl.java index 81537367..a01d5b3b 100644 --- a/src/main/java/org/jeecgframework/web/cgform/service/impl/autolist/CgTableServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/cgform/service/impl/autolist/CgTableServiceImpl.java @@ -138,7 +138,7 @@ public class CgTableServiceImpl extends CommonServiceImpl implements CgTableServ } } } - //update-begin--Author:JueYue Date:20140831 for：onlinecoding 数据权限 + Object dataRuleSql = JeecgDataAutorUtils.loadDataSearchConditonSQLString();//ContextHolderUtils.getRequest().getAttribute(Globals.MENU_DATA_AUTHOR_RULE_SQL); if(dataRuleSql != null && !dataRuleSql.equals("")){ if(params.size() == 0) { @@ -146,7 +146,7 @@ public class CgTableServiceImpl extends CommonServiceImpl implements CgTableServ } sqlB.append(dataRuleSql); } - //update-end--Author:JueYue Date:20140831 for：onlinecoding 数据权限 + } diff --git a/src/main/java/org/jeecgframework/web/cgform/service/impl/build/DataBaseServiceImpl.java b/src/main/java/org/jeecgframework/web/cgform/service/impl/build/DataBaseServiceImpl.java index eb8ee803..dd27ef0d 100644 --- a/src/main/java/org/jeecgframework/web/cgform/service/impl/build/DataBaseServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/cgform/service/impl/build/DataBaseServiceImpl.java @@ -177,11 +177,11 @@ public class DataBaseServiceImpl extends CommonServiceImpl implements DataBaseSe data.put(String.valueOf(key), newV); } } - //update---start--author：JueYue---------date：20140824---------for：默认值无效 + } else if(oConvertUtils.isNotEmpty(fieldConfigs.get(key).getFieldDefault())) { data.remove(key.toString().toLowerCase()); } - //update---end--author：JueYue---------date：20140824---------for：默认值无效 + } return data; } @@ -298,10 +298,10 @@ public class DataBaseServiceImpl extends CommonServiceImpl implements DataBaseSe sql = sql.replace("#{UUID}", UUIDGenerator.generate()); } for (String key : params.keySet()) { - //update-begin--Author:JueYue Date:20140425 for：String不能强转 + // sql = sql.replace("${" + key + "}", "'"+String.valueOf(params.get(key))+"'"); sql = sql.replace("#{" + key + "}",String.valueOf(params.get(key))); - //update-end--Author:JueYue Date:20140425 for：String不能强转 + } return sql; } diff --git a/src/main/java/org/jeecgframework/web/cgform/service/impl/cgformftl/CgformFtlServiceImpl.java b/src/main/java/org/jeecgframework/web/cgform/service/impl/cgformftl/CgformFtlServiceImpl.java index 8793e8be..dde1c68b 100644 --- a/src/main/java/org/jeecgframework/web/cgform/service/impl/cgformftl/CgformFtlServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/cgform/service/impl/cgformftl/CgformFtlServiceImpl.java @@ -13,8 +13,8 @@ import java.util.Map; @Service("cgformFtlService") @Transactional public class CgformFtlServiceImpl extends CommonServiceImpl implements CgformFtlServiceI { -// update-start--Author:zhangguoming Date:20140922 for：根据ftlVersion动态读取模板 - @Override + + public Map getCgformFtlByTableName(String tableName, String ftlVersion) { StringBuilder sql = new StringBuilder(""); sql.append("select ftl.* from cgform_ftl ftl,cgform_head head"); @@ -27,7 +27,7 @@ public class CgformFtlServiceImpl extends CommonServiceImpl implements CgformFtl } return null; } -// update-end--Author:zhangguoming Date:20140922 for：根据ftlVersion动态读取模板 + /** * 根据tableName获取form模板信息 @@ -72,7 +72,7 @@ public class CgformFtlServiceImpl extends CommonServiceImpl implements CgformFtl return false; } - @Override + public String getUserFormFtl(String id) { CriteriaQuery cq = new CriteriaQuery(CgformFtlEntity.class); cq.eq("cgformId", id); diff --git a/src/main/java/org/jeecgframework/web/cgform/service/impl/config/util/DbTableProcess.java b/src/main/java/org/jeecgframework/web/cgform/service/impl/config/util/DbTableProcess.java index d033a8cc..1d837119 100644 --- a/src/main/java/org/jeecgframework/web/cgform/service/impl/config/util/DbTableProcess.java +++ b/src/main/java/org/jeecgframework/web/cgform/service/impl/config/util/DbTableProcess.java @@ -160,15 +160,14 @@ public class DbTableProcess { dbExport = new SchemaExport(newconf,SessionFactoryUtils.getDataSource( session.getSessionFactory()).getConnection()); dbExport.execute(true, true, false, true); - - //update-begin--Author:Robin Date:20140507 for：TASK #409 字段长度未注明时，显示同步数据库成功，但实则未创建数据表 + //抛出执行异常，抛出第一个即可 @SuppressWarnings("unchecked") List exceptionList = dbExport.getExceptions(); for (Exception exception : exceptionList) { throw new DBException(exception.getMessage()); } - //update-end--Author:Robin Date:20140507 for：TASK #409 字段长度未注明时，显示同步数据库成功，但实则未创建数据表 + } /** diff --git a/src/main/java/org/jeecgframework/web/demo/controller/test/JeecgEasyUIController.java b/src/main/java/org/jeecgframework/web/demo/controller/test/JeecgEasyUIController.java index c7fe64f1..91c3d42a 100644 --- a/src/main/java/org/jeecgframework/web/demo/controller/test/JeecgEasyUIController.java +++ b/src/main/java/org/jeecgframework/web/demo/controller/test/JeecgEasyUIController.java @@ -92,14 +92,10 @@ public class JeecgEasyUIController extends BaseController { this.jeecgJdbcService.getDatagrid1(jeecgJdbc, dataGrid); TagUtil.datagrid(response, dataGrid); // end of 方式1 ========================================= */ - - // 方式2, 取值自己处理(代码量多一些，但执行效率应该会稍高一些) ------------------------------- /* this.jeecgJdbcService.getDatagrid2(jeecgJdbc, dataGrid); TagUtil.datagrid(response, dataGrid); // end of 方式2 ========================================= */ - - // 方式3, 取值进一步自己处理(直接转换成easyUI的datagrid需要的东西，执行效率最高，最自由) ------------------------------- //* JSONObject jObject = this.jeecgJdbcService.getDatagrid3(jeecgJdbc, dataGrid); responseDatagrid(response, jObject); @@ -171,11 +167,7 @@ public class JeecgEasyUIController extends BaseController { req.setAttribute("departList", departList); return new ModelAndView("jeecg/demo/notag/jeecgEasyUI"); } - - - // ----------------------------------------------------------------------------------- // 以下各函数可以提成共用部件 (Add by Quainty) - // ----------------------------------------------------------------------------------- public void responseDatagrid(HttpServletResponse response, JSONObject jObject) { response.setContentType("application/json"); response.setHeader("Cache-Control", "no-store"); diff --git a/src/main/java/org/jeecgframework/web/demo/controller/test/JeecgJdbcController.java b/src/main/java/org/jeecgframework/web/demo/controller/test/JeecgJdbcController.java index 25fc1d9c..3f625d92 100644 --- a/src/main/java/org/jeecgframework/web/demo/controller/test/JeecgJdbcController.java +++ b/src/main/java/org/jeecgframework/web/demo/controller/test/JeecgJdbcController.java @@ -83,14 +83,10 @@ public class JeecgJdbcController extends BaseController { this.jeecgJdbcService.getDatagrid1(jeecgJdbc, dataGrid); TagUtil.datagrid(response, dataGrid); // end of 方式1 ========================================= */ - - // 方式2, 取值自己处理(代码量多一些，但执行效率应该会稍高一些) ------------------------------- /* this.jeecgJdbcService.getDatagrid2(jeecgJdbc, dataGrid); TagUtil.datagrid(response, dataGrid); // end of 方式2 ========================================= */ - - // 方式3, 取值进一步自己处理(直接转换成easyUI的datagrid需要的东西，执行效率最高，最自由) ------------------------------- //* JSONObject jObject = this.jeecgJdbcService.getDatagrid3(jeecgJdbc, dataGrid); responseDatagrid(response, jObject); @@ -160,11 +156,7 @@ public class JeecgJdbcController extends BaseController { } return new ModelAndView("jeecg/demo/test/jeecgJdbc"); } - - - // ----------------------------------------------------------------------------------- // 以下各函数可以提成共用部件 (Add by Quainty) - // ----------------------------------------------------------------------------------- public void responseDatagrid(HttpServletResponse response, JSONObject jObject) { response.setContentType("application/json"); response.setHeader("Cache-Control", "no-store"); diff --git a/src/main/java/org/jeecgframework/web/demo/controller/test/ReportDemoController.java b/src/main/java/org/jeecgframework/web/demo/controller/test/ReportDemoController.java index c1728625..ee3d3e47 100644 --- a/src/main/java/org/jeecgframework/web/demo/controller/test/ReportDemoController.java +++ b/src/main/java/org/jeecgframework/web/demo/controller/test/ReportDemoController.java @@ -114,9 +114,9 @@ public class ReportDemoController extends BaseController { Long count = systemService.getCountForJdbc("SELECT COUNT(1) FROM T_S_student WHERE 1=1"); List lt = new ArrayList(); hc = new Highchart(); - //update-begin--Author:JueYue Date:20140724 for：国际化-------------------- + hc.setName(mutiLangService.getLang(CLASS_STUDENT_COUNT_ANALYSIS)); - //update-end--Author:JueYue Date:20140724 for：国际化-------------------- + hc.setType(reportType); Map map; if (userBroswerList.size() > 0) { diff --git a/src/main/java/org/jeecgframework/web/demo/service/impl/test/JeecgJdbcServiceImpl.java b/src/main/java/org/jeecgframework/web/demo/service/impl/test/JeecgJdbcServiceImpl.java index 04935247..f5d066eb 100644 --- a/src/main/java/org/jeecgframework/web/demo/service/impl/test/JeecgJdbcServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/demo/service/impl/test/JeecgJdbcServiceImpl.java @@ -56,8 +56,6 @@ public class JeecgJdbcServiceImpl extends CommonServiceImpl implements JeecgJdbc } // end of 方式1 ========================================= */ - // 方式2, 取值自己处理(代码量多一些，但执行效率应该会稍高一些) ------------------------------- - public void getDatagrid2(JeecgJdbcEntity pageObj, DataGrid dataGrid) { String sqlWhere = getSqlWhere(pageObj); @@ -111,7 +109,6 @@ public class JeecgJdbcServiceImpl extends CommonServiceImpl implements JeecgJdbc // end of 方式2 ========================================= */ // 推荐方法 - // 方式3, 取值进一步自己处理(直接转换成easyUI的datagrid需要的东西，执行效率最高，最自由) ------------------------------- public JSONObject getDatagrid3(JeecgJdbcEntity pageObj, DataGrid dataGrid) { String sqlWhere = getSqlWhere(pageObj); @@ -164,10 +161,7 @@ public class JeecgJdbcServiceImpl extends CommonServiceImpl implements JeecgJdbc } return sqlWhere; } - - // ----------------------------------------------------------------------------------- // 以下各函数可以提成共用部件 (Add by Quainty) - // ----------------------------------------------------------------------------------- /** * 返回easyUI的DataGrid数据格式的JSONObject对象 * @param mapList : 从数据库直接取得的结果集列表 diff --git a/src/main/java/org/jeecgframework/web/sms/service/impl/TSSmsSqlServiceImpl.java b/src/main/java/org/jeecgframework/web/sms/service/impl/TSSmsSqlServiceImpl.java index 8cbc1f2a..74043974 100644 --- a/src/main/java/org/jeecgframework/web/sms/service/impl/TSSmsSqlServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/sms/service/impl/TSSmsSqlServiceImpl.java @@ -18,19 +18,19 @@ public class TSSmsSqlServiceImpl extends CommonServiceImpl implements TSSmsSqlSe @Resource private JdbcTemplate jdbcTemplate; - @Override + public boolean doAddSql(TSSmsSqlEntity t) { // TODO Auto-generated method stub return false; } - @Override + public boolean doDelSql(TSSmsSqlEntity t) { // TODO Auto-generated method stub return false; } - @Override + public boolean doUpdateSql(TSSmsSqlEntity t) { // TODO Auto-generated method stub return false; diff --git a/src/main/java/org/jeecgframework/web/system/controller/core/DepartController.java b/src/main/java/org/jeecgframework/web/system/controller/core/DepartController.java index e68ce201..a83b25ae 100644 --- a/src/main/java/org/jeecgframework/web/system/controller/core/DepartController.java +++ b/src/main/java/org/jeecgframework/web/system/controller/core/DepartController.java @@ -104,7 +104,6 @@ public class DepartController extends BaseController { TagUtil.datagrid(response, dataGrid); } - // update-start--Author:zhangguoming Date:20140825 for：添加业务逻辑；添加类注释； /** * 删除部门： *
      @@ -143,7 +142,7 @@ public class DepartController extends BaseController { j.setMsg(message); return j; } - // update-end--Author:zhangguoming Date:20140825 for：添加业务逻辑；添加类注释； + public void upEntity(TSDepart depart) { List users = systemService.findByProperty(TSUser.class, "TSDepart.id", depart.getId()); @@ -332,14 +331,14 @@ public class DepartController extends BaseController { org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, user); String departid = oConvertUtils.getString(request.getParameter("departid")); if (!StringUtil.isEmpty(departid)) { -// update-start--Author:zhangguoming Date:20140825 for：用户表字段变更后的查询字段修改 + DetachedCriteria dc = cq.getDetachedCriteria(); DetachedCriteria dcDepart = dc.createCriteria("userOrgList"); dcDepart.add(Restrictions.eq("tsDepart.id", departid)); // 这种方式也是可以的 // DetachedCriteria dcDepart = dc.createAlias("userOrgList", "userOrg"); // dcDepart.add(Restrictions.eq("userOrg.tsDepart.id", departid)); -// update-end--Author:zhangguoming Date:20140825 for：用户表字段变更后的查询字段修改 + } Short[] userstate = new Short[] { Globals.User_Normal, Globals.User_ADMIN }; cq.in("status", userstate); @@ -349,7 +348,6 @@ public class DepartController extends BaseController { } //---- -// update-start--Author:zhangguoming Date:20140826 for：获取机构树； /** * 获取机构树-combotree * @param request @@ -366,10 +364,7 @@ public class DepartController extends BaseController { comboTrees = systemService.ComboTree(departsList, comboTreeModel, null, true); return comboTrees; } -// update-end--Author:zhangguoming Date:20140826 for：获取机构树； - -// update-start--Author:zhangguoming Date:20140826 for：添加已有用户到组织机构； /** * 添加 用户到组织机构 的页面 跳转 * @param req request @@ -445,9 +440,7 @@ public class DepartController extends BaseController { systemService.batchSave(userOrgList); } } -// update-end--Author:zhangguoming Date:20140826 for：添加已有用户到组织机构 -// update-start--Author:zhangguoming Date:20140827 for：用户列表页面 组织机构查询条件：选择组织机构列表 相关操作 /** * 用户选择机构列表跳转页面 * @@ -469,5 +462,5 @@ public class DepartController extends BaseController { this.systemService.getDataGridReturn(cq, true); TagUtil.datagrid(response, dataGrid); } -// update-end--Author:zhangguoming Date:20140827 for：用户列表页面 组织机构查询条件：选择组织机构列表 相关操作 + } diff --git a/src/main/java/org/jeecgframework/web/system/controller/core/FunctionController.java b/src/main/java/org/jeecgframework/web/system/controller/core/FunctionController.java index 91981af9..6f0d0b60 100644 --- a/src/main/java/org/jeecgframework/web/system/controller/core/FunctionController.java +++ b/src/main/java/org/jeecgframework/web/system/controller/core/FunctionController.java @@ -87,11 +87,7 @@ public class FunctionController extends BaseController { */ @RequestMapping(params = "operation") public ModelAndView operation(HttpServletRequest request, String functionId) { - // ---------------------------------------------------------------- - // ---------------------------------------------------------------- request.setAttribute("functionId", functionId); - // ---------------------------------------------------------------- - // ---------------------------------------------------------------- return new ModelAndView("system/operation/operationList"); } @@ -103,11 +99,7 @@ public class FunctionController extends BaseController { @RequestMapping(params = "dataRule") public ModelAndView operationData(HttpServletRequest request, String functionId) { - // ---------------------------------------------------------------- - // ---------------------------------------------------------------- request.setAttribute("functionId", functionId); - // ---------------------------------------------------------------- - // ---------------------------------------------------------------- return new ModelAndView("system/dataRule/ruleDataList"); } @@ -139,14 +131,10 @@ public class FunctionController extends BaseController { public void opdategrid(HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) { CriteriaQuery cq = new CriteriaQuery(TSOperation.class, dataGrid); - // ---------------------------------------------------------------- - // ---------------------------------------------------------------- String functionId = oConvertUtils.getString(request .getParameter("functionId")); cq.eq("TSFunction.id", functionId); cq.add(); - // ---------------------------------------------------------------- - // ---------------------------------------------------------------- this.systemService.getDataGridReturn(cq, true); TagUtil.datagrid(response, dataGrid); } @@ -241,14 +229,10 @@ public class FunctionController extends BaseController { @ResponseBody public AjaxJson saveFunction(TSFunction function, HttpServletRequest request) { AjaxJson j = new AjaxJson(); - // ---------------------------------------------------------------- - // ---------------------------------------------------------------- String functionOrder = function.getFunctionOrder(); if (StringUtils.isEmpty(functionOrder)) { function.setFunctionOrder("0"); } - // ---------------------------------------------------------------- - // ---------------------------------------------------------------- if (function.getTSFunction().getId().equals("")) { function.setTSFunction(null); } else { @@ -262,18 +246,12 @@ public class FunctionController extends BaseController { userService.saveOrUpdate(function); systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO); - // update-end--Author:anchao Date:20140914 for：Jeecg bug 20140914 菜单更新级别后显示混乱 + List subFunction = systemService.findByProperty(TSFunction.class, "TSFunction.id", function.getId()); updateSubFunction(subFunction,function); - // update-end--Author:anchao Date:20140914 for：Jeecg bug 20140914 菜单更新级别后显示混乱 - // ---------------------------------------------------------------- - // ---------------------------------------------------------------- systemService.flushRoleFunciton(function.getId(), function); - // ---------------------------------------------------------------- - // ---------------------------------------------------------------- - } else { if (function.getFunctionLevel().equals(Globals.Function_Leave_ONE)) { List functionList = systemService.findByProperty( @@ -341,7 +319,7 @@ public class FunctionController extends BaseController { List fuinctionlist = systemService .getList(TSFunction.class); req.setAttribute("flist", fuinctionlist); - // update-begin--Author:zhangguoming Date:20140509 for：添加云桌面图标管理 + // List iconlist = systemService.getList(TSIcon.class); List iconlist = systemService .findByQueryString("from TSIcon where iconType != 3"); @@ -349,7 +327,7 @@ public class FunctionController extends BaseController { List iconDeskList = systemService .findByQueryString("from TSIcon where iconType = 3"); req.setAttribute("iconDeskList", iconDeskList); - // update-end--Author:zhangguoming Date:20140509 for：添加云桌面图标管理 + if (functionid != null) { function = systemService.getEntity(TSFunction.class, functionid); req.setAttribute("function", function); @@ -406,9 +384,9 @@ public class FunctionController extends BaseController { cq.addOrder("functionOrder", SortDirection.asc); cq.add(); List functionList = systemService.getListByCriteriaQuery(cq, false); -// update-start-Author:zhangguoming Date:20140914 for：菜单管理页面：菜单排序 + Collections.sort(functionList, new NumberComparator()); -// update-end-Author:zhangguoming Date:20140914 for：菜单管理页面：菜单排序 + List treeGrids = new ArrayList(); TreeGridModel treeGridModel = new TreeGridModel(); treeGridModel.setIcon("TSIcon_iconPath"); @@ -479,7 +457,6 @@ public class FunctionController extends BaseController { return comboTrees; } - // update-end--Author:gaofeng Date:20140619 for：修改云桌面的搜索功能中的系统中应用内搜索 /** * 菜单模糊检索功能 * @@ -548,7 +525,6 @@ public class FunctionController extends BaseController { return new ModelAndView("system/function/menuAppList"); } - // update-end--Author:gaofeng Date:20140619 for：修改云桌面的搜索功能中的系统中应用内搜索 /** * diff --git a/src/main/java/org/jeecgframework/web/system/controller/core/LogController.java b/src/main/java/org/jeecgframework/web/system/controller/core/LogController.java index bc5cf9cf..565c08c2 100644 --- a/src/main/java/org/jeecgframework/web/system/controller/core/LogController.java +++ b/src/main/java/org/jeecgframework/web/system/controller/core/LogController.java @@ -160,9 +160,9 @@ public class LogController extends BaseController { Long count = systemService.getCountForJdbc("SELECT COUNT(1) FROM T_S_Log WHERE 1=1"); List lt = new ArrayList(); hc = new Highchart(); - //update-begin--Author:JueYue Date:20140724 for：国际化-------------------- + hc.setName(MutiLangUtil.getMutiLangInstance().getLang(USER_BROWSER_ANALYSIS)); - //update-end--Author:JueYue Date:20140724 for：国际化-------------------- + hc.setType(reportType); Map map; if (userBroswerList.size() > 0) { diff --git a/src/main/java/org/jeecgframework/web/system/controller/core/LoginController.java b/src/main/java/org/jeecgframework/web/system/controller/core/LoginController.java index 0ffb6d36..ea7310c2 100644 --- a/src/main/java/org/jeecgframework/web/system/controller/core/LoginController.java +++ b/src/main/java/org/jeecgframework/web/system/controller/core/LoginController.java @@ -92,12 +92,11 @@ public class LoginController extends BaseController{ DataSourceContextHolder .setDataSourceType(DataSourceType.dataSource_jeecg); AjaxJson j = new AjaxJson(); - // update-begin--Author:ken Date:20140629 for：添加语言选择 + if (req.getParameter("langCode")!=null) { req.getSession().setAttribute("lang", req.getParameter("langCode")); } - // update-end--Author:ken Date:20140629 for：添加语言选择 -// update-begin--Author:zhangguoming Date:20140226 for：添加验证码 + String randCode = req.getParameter("randCode"); if (StringUtils.isEmpty(randCode)) { j.setMsg(mutiLangService.getLang("common.enter.verifycode")); @@ -107,7 +106,7 @@ public class LoginController extends BaseController{ j.setMsg(mutiLangService.getLang("common.verifycode.error")); j.setSuccess(false); } else { -// update-end--Author:zhangguoming Date:20140226 for：添加验证码 + int users = userService.getList(TSUser.class).size(); if (users == 0) { @@ -115,13 +114,13 @@ public class LoginController extends BaseController{ j.setSuccess(false); } else { TSUser u = userService.checkUserExits(user); -// update-begin--Author:zhangguoming Date:20140617 for：空指针bug + if(u == null) { j.setMsg(mutiLangService.getLang("common.username.or.password.error")); j.setSuccess(false); return j; } -// update-end--Author:zhangguoming Date:20140617 for：空指针bug + TSUser u2 = userService.getEntity(TSUser.class, u.getId()); if (u != null&&u2.getStatus()!=0) { @@ -129,7 +128,7 @@ public class LoginController extends BaseController{ if (true) { -// update-start-Author:zhangguoming Date:20140825 for：处理用户有多个组织机构的情况，以弹出框的形式让用户选择 + Map attrMap = new HashMap(); j.setAttributes(attrMap); @@ -148,7 +147,7 @@ public class LoginController extends BaseController{ saveLoginSuccessInfo(req, u2, orgId); } -// update-end-Author:zhangguoming Date:20140825 for：处理用户有多个组织机构的情况，以弹出框的形式让用户选择 + } else { j.setMsg(mutiLangService.getLang("common.check.shield")); j.setSuccess(false); @@ -158,13 +157,12 @@ public class LoginController extends BaseController{ j.setSuccess(false); } } -// update-begin--Author:zhangguoming Date:20140226 for：添加验证码 + } -// update-end--Author:zhangguoming Date:20140226 for：添加验证码 + return j; } -// update-start-Author:zhangguoming Date:20140825 for：记录用户登录的相关信息 /** * 保存用户登录的信息，并将当前登录用户的组织机构赋值到用户实体中； * @param req request @@ -187,7 +185,7 @@ public class LoginController extends BaseController{ // 添加登陆日志 systemService.addLog(message, Globals.Log_Type_LOGIN, Globals.Log_Leavel_INFO); } -// update-end-Author:zhangguoming Date:20140825 for：记录用户登录的相关信息 + /** * 用户登录 @@ -211,9 +209,9 @@ public class LoginController extends BaseController{ } modelMap.put("roleName", roles); modelMap.put("userName", user.getUserName()); - // update-start-Author:zhangguoming Date:20140914 for：获取当前登录用户的组织机构 + modelMap.put("currentOrgName", ClientManager.getInstance().getClient().getUser().getCurrentDepart().getDepartname()); - // update-end-Author:zhangguoming Date:20140914 for：获取当前登录用户的组织机构 + request.getSession().setAttribute("CKFinder_UserRole", "admin"); //request.getSession().setAttribute("lang", "en"); @@ -239,12 +237,11 @@ public class LoginController extends BaseController{ return "main/shortcut_main"; } -// update-start--Author:gaofeng Date:2014-01-24 for:新增首页风格按钮选项 if (StringUtils.isNotEmpty(indexStyle) && indexStyle.equalsIgnoreCase("sliding")) { return "main/sliding_main"; } -// update-start--Author:gaofeng Date:2014-01-24 for:新增首页风格按钮选项 + return "main/main"; } else { @@ -308,12 +305,12 @@ public class LoginController extends BaseController{ if (loginActionlist.size() > 0) { Collection allFunctions = loginActionlist.values(); for (TSFunction function : allFunctions) { - //update-begin--Author:anchao Date:20140913 for：菜单过滤-------------------- + if(function.getFunctionType().intValue()==Globals.Function_TYPE_FROM.intValue()){ //如果为表单或者弹出 不显示在系统菜单里面 continue; } - //update-end--Author:anchao Date:20140913 for：菜单过滤-------------------- + if (!functionMap.containsKey(function.getFunctionLevel() + 0)) { functionMap.put(function.getFunctionLevel() + 0, new ArrayList()); @@ -338,31 +335,30 @@ public class LoginController extends BaseController{ private Map getUserFunction(TSUser user) { HttpSession session = ContextHolderUtils.getSession(); Client client = ClientManager.getInstance().getClient(session.getId()); - //update-start--Author:JueYue Date:2014-5-28 for:风格切换,菜单懒加载失效的问题 + if (client.getFunctions() == null || client.getFunctions().size() == 0) { - //update-end--Author:JueYue Date:2014-5-28 for:风格切换,菜单懒加载失效的问题 + Map loginActionlist = new HashMap(); List rUsers = systemService.findByProperty(TSRoleUser.class, "TSUser.id", user.getId()); -// update-begin--Author:zhangguoming Date:20140821 for：重构方法体，并加载用户组织机构下角色所拥有的权限 + for (TSRoleUser ru : rUsers) { TSRole role = ru.getTSRole(); assembleFunctionsByRole(loginActionlist, role); } -// update-start-Author:zhangguoming Date:20140825 for：获取当前登录用户的组织机构主键 + String orgId = client.getUser().getCurrentDepart().getId(); -// update-end-Author:zhangguoming Date:20140825 for：获取当前登录用户的组织机构主键 + List orgRoleList = systemService.findByProperty(TSRoleOrg.class, "tsDepart.id", orgId); for (TSRoleOrg roleOrg : orgRoleList) { TSRole role = roleOrg.getTsRole(); assembleFunctionsByRole(loginActionlist, role); } -// update-end--Author:zhangguoming Date:20140821 for：重构方法体，并加载用户组织机构下角色所拥有的权限 + client.setFunctions(loginActionlist); } return client.getFunctions(); } -// update-begin--Author:zhangguoming Date:20140821 for：抽取方法，获取角色下的权限列表 /** * 根据 角色实体 组装 用户权限列表 * @param loginActionlist 登录用户的权限列表 @@ -372,16 +368,16 @@ public class LoginController extends BaseController{ List roleFunctionList = systemService.findByProperty(TSRoleFunction.class, "TSRole.id", role.getId()); for (TSRoleFunction roleFunction : roleFunctionList) { TSFunction function = roleFunction.getTSFunction(); - //update-begin--Author:anchao Date:20140822 for：[bugfree号]字段级权限（表单，列表）-------------------- + if(function.getFunctionType().intValue()==Globals.Function_TYPE_FROM.intValue()){ //如果为表单或者弹出 不显示在系统菜单里面 continue; } - //update-end--Author:anchao Date:20140822 for：[bugfree号]字段级权限（表单，列表）-------------------- + loginActionlist.put(function.getId(), function); } } -// update-end--Author:zhangguoming Date:20140821 for：抽取方法，获取角色下的权限列表 + /** * 首页跳转 @@ -463,11 +459,11 @@ public class LoginController extends BaseController{ public String getPrimaryMenu() { List primaryMenu = getFunctionMap(ResourceUtil.getSessionUserName()).get(0); String floor = ""; -// update-start--Author:zhangguoming Date:20140923 for：用户没有任何权限，首页没有退出按钮的bug + if (primaryMenu == null) { return floor; } -// update-end--Author:zhangguoming Date:20140923 for：用户没有任何权限，首页没有退出按钮的bug + for (TSFunction function : primaryMenu) { if(function.getFunctionLevel() == 0) { diff --git a/src/main/java/org/jeecgframework/web/system/controller/core/RoleController.java b/src/main/java/org/jeecgframework/web/system/controller/core/RoleController.java index 8c816599..fbed8520 100644 --- a/src/main/java/org/jeecgframework/web/system/controller/core/RoleController.java +++ b/src/main/java/org/jeecgframework/web/system/controller/core/RoleController.java @@ -108,9 +108,9 @@ public class RoleController extends BaseController { if (count == 0) { // 删除角色之前先删除角色权限关系 delRoleFunction(role); -// update-start--Author:zhangguoming Date:20140825 for：添加业务逻辑 + systemService.executeSql("delete from t_s_role_org where role_id=?", role.getId()); // 删除 角色-机构 关系信息 -// update-end--Author:zhangguoming Date:20140825 for：添加业务逻辑 + role = systemService.getEntity(TSRole.class, role.getId()); userService.delete(role); message = "角色: " + role.getRoleName() + "被删除成功"; @@ -202,7 +202,7 @@ public class RoleController extends BaseController { request.setAttribute("roleId", roleId); return new ModelAndView("system/role/roleSet"); } - // update-start--Author:gaofeng Date:20140822 for：查看角色的所有用户信息 + /** * 角色所有用户信息列表页面跳转 @@ -211,9 +211,9 @@ public class RoleController extends BaseController { */ @RequestMapping(params = "userList") public ModelAndView userList(HttpServletRequest request) { - // update-start--Author:zhangguoming Date:20140828 for：bug修复：角色列表，查看用户列表报错 + request.setAttribute("roleId", request.getParameter("roleId")); - // update-end--Author:zhangguoming Date:20140828 for：bug修复：角色列表，查看用户列表报错 + return new ModelAndView("system/role/roleUserList"); } @@ -226,7 +226,7 @@ public class RoleController extends BaseController { @RequestMapping(params = "roleUserDatagrid") public void roleUserDatagrid(TSUser user,HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) { CriteriaQuery cq = new CriteriaQuery(TSUser.class, dataGrid); -// update-start--Author:zhangguoming Date:20140828 for：bug修复：角色列表，查看用户列表报错 + //查询条件组装器 String roleId = request.getParameter("roleId"); List roleUser = systemService.findByProperty(TSRoleUser.class, "TSRole.id", roleId); @@ -239,7 +239,7 @@ public class RoleController extends BaseController { cq.add(Property.forName("id").in(subCq.getDetachedCriteria())); cq.add(); */ -// update-end--Author:zhangguoming Date:20140828 for：bug修复：角色列表，查看用户列表报错 + Criterion cc = null; if (roleUser.size() > 0) { for(int i = 0; i < roleUser.size(); i++){ @@ -287,8 +287,7 @@ public class RoleController extends BaseController { comboTrees = systemService.ComboTree(loginActionlist,comboTreeModel,loginActionlist, false); return comboTrees; } - // update-end--Author:gaofeng Date:20140822 for：查看角色的所有用户信息 - // update-start--Author:zhangguoming Date:20140821 for：为组织机构设置角色 + /** * 角色树列表页面跳转 * @@ -368,7 +367,6 @@ public class RoleController extends BaseController { return j; } - // update-end--Author:zhangguoming Date:20140821 for：为组织机构设置角色 /** * 设置权限 @@ -639,9 +637,9 @@ public class RoleController extends BaseController { String functionId, String roleId) { CriteriaQuery cq = new CriteriaQuery(TSOperation.class); cq.eq("TSFunction.id", functionId); - //update-begin--Author:anchao Date:20140822 for：[bugfree号]字段级权限（表单，列表）-------------------- + cq.eq("status", Short.valueOf("0")); - //update-end--Author:anchao Date:20140822 for：[bugfree号]字段级权限（表单，列表）-------------------- + cq.add(); List operationList = this.systemService .getListByCriteriaQuery(cq, false); @@ -665,7 +663,7 @@ public class RoleController extends BaseController { AjaxJson j = new AjaxJson(); String roleId = request.getParameter("roleId"); String functionId = request.getParameter("functionId"); - // update-begin--Author:chenxu Date:201403024 for：410 + String operationcodes = null; try { operationcodes = URLDecoder.decode( @@ -673,7 +671,7 @@ public class RoleController extends BaseController { } catch (UnsupportedEncodingException e) { e.printStackTrace(); } - // update-end--Author:chenxu Date:20140324 for：410 + CriteriaQuery cq1 = new CriteriaQuery(TSRoleFunction.class); cq1.eq("TSRole.id", roleId); cq1.eq("TSFunction.id", functionId); @@ -728,7 +726,7 @@ public class RoleController extends BaseController { AjaxJson j = new AjaxJson(); String roleId = request.getParameter("roleId"); String functionId = request.getParameter("functionId"); - // update-begin--Author:chenxu Date:201403024 for：410 + String dataRulecodes = null; try { dataRulecodes = URLDecoder.decode( @@ -736,7 +734,7 @@ public class RoleController extends BaseController { } catch (UnsupportedEncodingException e) { e.printStackTrace(); } - // update-end--Author:chenxu Date:20140324 for：410 + CriteriaQuery cq1 = new CriteriaQuery(TSRoleFunction.class); cq1.eq("TSRole.id", roleId); cq1.eq("TSFunction.id", functionId); diff --git a/src/main/java/org/jeecgframework/web/system/controller/core/SystemController.java b/src/main/java/org/jeecgframework/web/system/controller/core/SystemController.java index f082d5cb..d63e3b1e 100644 --- a/src/main/java/org/jeecgframework/web/system/controller/core/SystemController.java +++ b/src/main/java/org/jeecgframework/web/system/controller/core/SystemController.java @@ -596,13 +596,9 @@ public class SystemController extends BaseController { if (StringUtil.isNotEmpty(comboTree.getId())) { cq.eq("TSPDepart.id", comboTree.getId()); } - // ---------------------------------------------------------------- - // ---------------------------------------------------------------- if (StringUtil.isEmpty(comboTree.getId())) { cq.isNull("TSPDepart.id"); } - // ---------------------------------------------------------------- - // ---------------------------------------------------------------- cq.add(); List departsList = systemService.getListByCriteriaQuery(cq, false); List comboTrees = new ArrayList(); diff --git a/src/main/java/org/jeecgframework/web/system/controller/core/UserController.java b/src/main/java/org/jeecgframework/web/system/controller/core/UserController.java index ad0d3c55..9e91044d 100644 --- a/src/main/java/org/jeecgframework/web/system/controller/core/UserController.java +++ b/src/main/java/org/jeecgframework/web/system/controller/core/UserController.java @@ -338,7 +338,6 @@ public class UserController extends BaseController { Short[] userstate = new Short[]{Globals.User_Normal, Globals.User_ADMIN, Globals.User_Forbidden}; cq.in("status", userstate); -// update-start--Author:zhangguoming Date:20140827 for：添加 组织机构 查询条件 String orgIds = request.getParameter("orgIds"); List orgIdList = extractIdListByComma(orgIds); // 获取 当前组织机构的用户信息 @@ -350,11 +349,11 @@ public class UserController extends BaseController { cq.add(Property.forName("id").in(subCq.getDetachedCriteria())); } -// update-end--Author:zhangguoming Date:20140827 for：添加 组织机构 查询条件 + cq.add(); this.systemService.getDataGridReturn(cq, true); - // update-start--Author:gaofeng Date:20140822 for：添加用户的角色展示 + List cfeList = new ArrayList(); for (Object o : dataGrid.getResults()) { if (o instanceof TSUser) { @@ -373,7 +372,7 @@ public class UserController extends BaseController { cfeList.add(cfe); } } -// update-end--Author:gaofeng Date:20140822 for：添加用户的角色展示 + TagUtil.datagrid(response, dataGrid); } @@ -399,9 +398,9 @@ public class UserController extends BaseController { if (roleUser.size()>0) { // 删除用户时先删除用户和角色关系表 delRoleUser(user); -// update-start--Author:zhangguoming Date:20140825 for：添加业务逻辑 + systemService.executeSql("delete from t_s_user_org where user_id=?", user.getId()); // 删除 用户-机构 数据 -// update-end--Author:zhangguoming Date:20140825 for：添加业务逻辑 + userService.delete(user); message = "用户：" + user.getUserName() + "删除成功"; systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); @@ -467,11 +466,11 @@ public class UserController extends BaseController { users.setEmail(user.getEmail()); users.setOfficePhone(user.getOfficePhone()); users.setMobilePhone(user.getMobilePhone()); -// update-start--Author:zhangguoming Date:20140825 for：添加新的业务逻辑 + systemService.executeSql("delete from t_s_user_org where user_id=?", user.getId()); saveUserOrgList(req, user); // users.setTSDepart(user.getTSDepart()); -// update-end--Author:zhangguoming Date:20140825 for：添加新的业务逻辑 + users.setRealName(user.getRealName()); users.setStatus(Globals.User_Normal); users.setActivitiSync(user.getActivitiSync()); @@ -509,7 +508,6 @@ public class UserController extends BaseController { return j; } -// update-start--Author:zhangguoming Date:20140825 for：添加新的业务逻辑方法 /** * 保存 用户-组织机构 关系信息 * @param request request @@ -534,7 +532,7 @@ public class UserController extends BaseController { systemService.batchSave(userOrgList); } } -// update-end--Author:zhangguoming Date:20140825 for：添加新的业务逻辑方法 + protected void saveRoleUser(TSUser user, String roleidstr) { String[] roleids = roleidstr.split(","); @@ -590,7 +588,7 @@ public class UserController extends BaseController { departList.addAll((List)systemService.getList(TSDepart.class)); } req.setAttribute("departList", departList); -// update-start--Author:zhangguoming Date:20140825 for：往request作用域中添加数据：组装页面中组织机构combobox多选框的数据 + List orgIdList = new ArrayList(); if (StringUtil.isNotEmpty(user.getId())) { user = systemService.getEntity(TSUser.class, user.getId()); @@ -601,12 +599,11 @@ public class UserController extends BaseController { orgIdList = systemService.findHql("select d.id from TSDepart d,TSUserOrg uo where d.id=uo.tsDepart.id and uo.tsUser.id=?", new String[]{user.getId()}); } req.setAttribute("orgIdList", JSON.toJSON(orgIdList)); -// update-start--Author:zhangguoming Date:20140825 for：往request作用域中添加数据：组装页面中组织机构combobox多选框的数据 + return new ModelAndView("system/user/user"); } -// update-start--Author:zhangguoming Date:20140825 for：添加新的业务逻辑方法 /** * 用户的登录后的组织机构选择页面 * @param request request @@ -628,7 +625,7 @@ public class UserController extends BaseController { return new ModelAndView("system/user/userOrgSelect"); } -// update-end--Author:zhangguoming Date:20140825 for：添加新的业务逻辑方法 + public void idandname(HttpServletRequest req, TSUser user) { List roleUsers = systemService.findByProperty(TSRoleUser.class, "TSUser.id", user.getId()); @@ -897,9 +894,9 @@ public class UserController extends BaseController { j.setSuccess(Boolean.TRUE); j.setMsg("样式修改成功，请刷新页面"); } - //update-start--Author:JueYue Date:2014-5-28 for:风格切换,菜单懒加载失效的问题 + ClientManager.getInstance().getClient().getFunctions().clear(); - //update-end--Author:JueYue Date:2014-5-28 for:风格切换,菜单懒加载失效的问题 + }else{ j.setMsg("请登录后再操作"); } diff --git a/src/main/java/org/jeecgframework/web/system/pojo/base/TSBaseUser.java b/src/main/java/org/jeecgframework/web/system/pojo/base/TSBaseUser.java index afcd7c82..27249168 100644 --- a/src/main/java/org/jeecgframework/web/system/pojo/base/TSBaseUser.java +++ b/src/main/java/org/jeecgframework/web/system/pojo/base/TSBaseUser.java @@ -24,11 +24,11 @@ public class TSBaseUser extends IdEntity implements java.io.Serializable { private Short activitiSync;//是否同步工作流引擎 private Short status;// 状态1：在线,2：离线,0：禁用 private byte[] signature;// 签名文件 -// update-start--Author:zhangguoming Date:20140825 for：添加非表字段currentDepart 和 添加userOrgList属性 + // private TSDepart TSDepart = new TSDepart();// 部门 private List userOrgList = new ArrayList(); private TSDepart currentDepart = new TSDepart();// 当前部门 -// update-end--Author:zhangguoming Date:20140825 for：添加非表字段currentDepart 和 添加userOrgList属性 + @Column(name = "signature",length=3000) public byte[] getSignature() { @@ -108,7 +108,6 @@ public class TSBaseUser extends IdEntity implements java.io.Serializable { this.realName = realName; } -// update-start--Author:zhangguoming Date:20140825 for：添加非表字段currentDepart 和 添加userOrgList属性 @Transient public TSDepart getCurrentDepart() { return currentDepart; @@ -127,5 +126,5 @@ public class TSBaseUser extends IdEntity implements java.io.Serializable { public void setUserOrgList(List userOrgList) { this.userOrgList = userOrgList; } -// update-end--Author:zhangguoming Date:20140825 for：添加非表字段currentDepart 和 添加userOrgList属性 + } \ No newline at end of file diff --git a/src/main/java/org/jeecgframework/web/system/pojo/base/TSFunction.java b/src/main/java/org/jeecgframework/web/system/pojo/base/TSFunction.java index a6ce85b6..bef5c830 100644 --- a/src/main/java/org/jeecgframework/web/system/pojo/base/TSFunction.java +++ b/src/main/java/org/jeecgframework/web/system/pojo/base/TSFunction.java @@ -29,7 +29,7 @@ public class TSFunction extends IdEntity implements java.io.Serializable { private String functionOrder;//菜单排序 private Short functionType;//菜单类型 private TSIcon TSIcon = new TSIcon();//菜单图标 - // update-begin--Author:zhangguoming Date:20140509 for：添加云桌面图标实体 + private TSIcon TSIconDesk;//云桌面菜单图标 @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "desk_iconid") @@ -39,7 +39,7 @@ public class TSFunction extends IdEntity implements java.io.Serializable { public void setTSIconDesk(TSIcon TSIconDesk) { this.TSIconDesk = TSIconDesk; } - // update-end--Author:zhangguoming Date:20140509 for：添加云桌面图标实体 + private List TSFunctions = new ArrayList(); @ManyToOne(fetch = FetchType.LAZY) diff --git a/src/main/java/org/jeecgframework/web/system/pojo/base/TSOperation.java b/src/main/java/org/jeecgframework/web/system/pojo/base/TSOperation.java index dc1c2c27..8c8922ad 100644 --- a/src/main/java/org/jeecgframework/web/system/pojo/base/TSOperation.java +++ b/src/main/java/org/jeecgframework/web/system/pojo/base/TSOperation.java @@ -89,7 +89,7 @@ public class TSOperation extends IdEntity implements java.io.Serializable { TSFunction = tSFunction; } - @Override + public boolean equals(Object obj) { if(this == obj) return false; diff --git a/src/main/java/org/jeecgframework/web/system/service/impl/CategoryServiceImpl.java b/src/main/java/org/jeecgframework/web/system/service/impl/CategoryServiceImpl.java index 5952989e..9bb7a9bd 100644 --- a/src/main/java/org/jeecgframework/web/system/service/impl/CategoryServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/system/service/impl/CategoryServiceImpl.java @@ -15,7 +15,7 @@ public class CategoryServiceImpl extends CommonServiceImpl implements private static final String MAX_SQL = "SELECT MAX(code) FROM t_s_category WHERE parent_id"; - @Override + public void saveCategory(TSCategoryEntity category) { category.setCode(getCategoryCoade(category)); this.save(category); diff --git a/src/main/java/org/jeecgframework/web/system/service/impl/RepairServiceImpl.java b/src/main/java/org/jeecgframework/web/system/service/impl/RepairServiceImpl.java index da8c714c..ca2d5988 100644 --- a/src/main/java/org/jeecgframework/web/system/service/impl/RepairServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/system/service/impl/RepairServiceImpl.java @@ -213,9 +213,9 @@ public class RepairServiceImpl extends CommonServiceImpl implements private void repairJdbcEntity(){ JeecgJdbcEntity entity = new JeecgJdbcEntity(); entity.setAge(12); -// update-begin--Author:yangyong Date:20140214 for：[bugfree号]当前时间获取调整-------------------- + entity.setBirthday(DateUtils.str2Date("2014-02-14",new SimpleDateFormat("yyyy-MM-dd"))); -// update-end--Author:yangyong Date:20140214 for：[bugfree号]当前时间获取调整-------------------- + entity.setDepId("123"); entity.setEmail("demo@jeecg.com"); entity.setMobilePhone("13111111111"); @@ -3110,10 +3110,8 @@ public class RepairServiceImpl extends CommonServiceImpl implements */ private void repairDemo() { TSDemo demo = new TSDemo(); - // ------------------------------------------------- // 复杂字符串文本读取，采用文件方式存储 String html = new FreemarkerHelper().parseTemplate("/org/jeecgframework/web/system/txt/valid-code-demo.ftl", null); - // ------------------------------------------------- demo.setDemocode(html); demo.setDemotitle("表单验证"); commonDao.saveOrUpdate(demo); @@ -3130,7 +3128,6 @@ public class RepairServiceImpl extends CommonServiceImpl implements TSDepart RAndD = commonDao.findByProperty(TSDepart.class, "departname", "研发室").get(0); -// update-start--Author:zhangguoming Date:20140825 for：用户表字段修改后，用户与部门的关系为多对多，这里修改初始化数据 TSUser admin = new TSUser(); admin.setSignatureFile("images/renfang/qm/licf.gif"); admin.setStatus((short) 1); @@ -3186,7 +3183,7 @@ public class RepairServiceImpl extends CommonServiceImpl implements approverUserOrg.setTsUser(approver); approverUserOrg.setTsDepart(eiu); commonDao.save(approverUserOrg); -// update-end--Author:zhangguoming Date:20140825 for：用户表字段修改后，用户与部门的关系为多对多，这里修改初始化数据 + } /** @@ -3733,7 +3730,6 @@ public class RepairServiceImpl extends CommonServiceImpl implements commonDao.saveOrUpdate(folder); } -// update-begin--Author:zhangguoming Date:20140522 for：云桌面默认图标初始化 /** * 修复桌面默认图标 * @param iconName 图标名称 @@ -3752,7 +3748,7 @@ public class RepairServiceImpl extends CommonServiceImpl implements return deskIncon; } -// update-end--Author:zhangguoming Date:20140522 for：云桌面默认图标初始化 + /** * @Description 修复菜单权限 diff --git a/src/main/java/org/jeecgframework/web/system/service/impl/SystemServiceImpl.java b/src/main/java/org/jeecgframework/web/system/service/impl/SystemServiceImpl.java index c4ed99e6..abc54d3d 100644 --- a/src/main/java/org/jeecgframework/web/system/service/impl/SystemServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/system/service/impl/SystemServiceImpl.java @@ -134,9 +134,6 @@ public class SystemServiceImpl extends CommonServiceImpl implements SystemServic } } - // ---------------------------------------------------------------- - // ---------------------------------------------------------------- - /** * 根据角色ID 和 菜单Id 获取 具有操作权限的按钮Codes * @param roleId @@ -191,9 +188,6 @@ public class SystemServiceImpl extends CommonServiceImpl implements SystemServic } return operationCodes; } - - // ---------------------------------------------------------------- - // ---------------------------------------------------------------- public void flushRoleFunciton(String id, TSFunction newFunction) { TSFunction functionEntity = this.getEntity(TSFunction.class, id); @@ -214,12 +208,12 @@ public class SystemServiceImpl extends CommonServiceImpl implements SystemServic } public String generateOrgCode(String id, String pid) { -// update-start--Author:zhangguoming Date:20140901 for：修改编码长度的定义 + int orgCodeLength = 2; // 默认编码长度 if ("3".equals(ResourceUtil.getOrgCodeLengthType())) { // 类型2-编码长度为3，如001 orgCodeLength = 3; } -// update-end--Author:zhangguoming Date:20140901 for：修改编码长度的定义 + String newOrgCode = ""; if(!StringUtils.hasText(pid)) { // 第一级编码 diff --git a/src/main/java/org/jeecgframework/web/system/servlet/RandCodeImageServlet.java b/src/main/java/org/jeecgframework/web/system/servlet/RandCodeImageServlet.java index 5142efde..c3d5e0cb 100644 --- a/src/main/java/org/jeecgframework/web/system/servlet/RandCodeImageServlet.java +++ b/src/main/java/org/jeecgframework/web/system/servlet/RandCodeImageServlet.java @@ -48,7 +48,7 @@ public class RandCodeImageServlet extends HttpServlet { */ private static final int lineWidth = 2; - @Override + public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException { @@ -107,7 +107,7 @@ public class RandCodeImageServlet extends HttpServlet { ImageIO.write(image, "JPEG", response.getOutputStream()); } - @Override + public void doPost(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException { diff --git a/src/main/webapp/WEB-INF/lib/CKFinder-updateByAlexander-2.4.jar b/src/main/webapp/WEB-INF/lib/CKFinder-updateByAlexander-2.4.jar new file mode 100644 index 00000000..c8e51537 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/CKFinder-updateByAlexander-2.4.jar differ diff --git a/src/main/webapp/WEB-INF/lib/CKFinderPlugin-FileEditor-2.4.jar b/src/main/webapp/WEB-INF/lib/CKFinderPlugin-FileEditor-2.4.jar new file mode 100644 index 00000000..18dd5178 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/CKFinderPlugin-FileEditor-2.4.jar differ diff --git a/src/main/webapp/WEB-INF/lib/CKFinderPlugin-ImageResize-2.4.jar b/src/main/webapp/WEB-INF/lib/CKFinderPlugin-ImageResize-2.4.jar new file mode 100644 index 00000000..aa372c44 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/CKFinderPlugin-ImageResize-2.4.jar differ diff --git a/src/main/webapp/WEB-INF/lib/CKFinderPlugin-Watermark-2.4.jar b/src/main/webapp/WEB-INF/lib/CKFinderPlugin-Watermark-2.4.jar new file mode 100644 index 00000000..67042019 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/CKFinderPlugin-Watermark-2.4.jar differ diff --git a/src/main/webapp/WEB-INF/lib/activation-1.1.1.jar b/src/main/webapp/WEB-INF/lib/activation-1.1.1.jar new file mode 100644 index 00000000..1b703ab2 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/activation-1.1.1.jar differ diff --git a/src/main/webapp/WEB-INF/lib/ant-1.6.5.jar b/src/main/webapp/WEB-INF/lib/ant-1.6.5.jar new file mode 100644 index 00000000..3beb3b80 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/ant-1.6.5.jar differ diff --git a/src/main/webapp/WEB-INF/lib/antlr-2.7.7.jar b/src/main/webapp/WEB-INF/lib/antlr-2.7.7.jar new file mode 100644 index 00000000..5e5f14b3 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/antlr-2.7.7.jar differ diff --git a/src/main/webapp/WEB-INF/lib/antlr-3.3.jar b/src/main/webapp/WEB-INF/lib/antlr-3.3.jar new file mode 100644 index 00000000..42aed120 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/antlr-3.3.jar differ diff --git a/src/main/webapp/WEB-INF/lib/antlr-runtime-3.3.jar b/src/main/webapp/WEB-INF/lib/antlr-runtime-3.3.jar new file mode 100644 index 00000000..c516cb32 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/antlr-runtime-3.3.jar differ diff --git a/src/main/webapp/WEB-INF/lib/aopalliance-1.0.jar b/src/main/webapp/WEB-INF/lib/aopalliance-1.0.jar new file mode 100644 index 00000000..578b1a0c Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/aopalliance-1.0.jar differ diff --git a/src/main/webapp/WEB-INF/lib/asm-all-4.1.jar b/src/main/webapp/WEB-INF/lib/asm-all-4.1.jar new file mode 100644 index 00000000..f35daa63 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/asm-all-4.1.jar differ diff --git a/src/main/webapp/WEB-INF/lib/aspectjrt-1.6.9.jar b/src/main/webapp/WEB-INF/lib/aspectjrt-1.6.9.jar new file mode 100644 index 00000000..a7efd37c Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/aspectjrt-1.6.9.jar differ diff --git a/src/main/webapp/WEB-INF/lib/aspectjweaver-1.6.9.jar b/src/main/webapp/WEB-INF/lib/aspectjweaver-1.6.9.jar new file mode 100644 index 00000000..51fc8be1 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/aspectjweaver-1.6.9.jar differ diff --git a/src/main/webapp/WEB-INF/lib/avalon-framework-api-4.3.1.jar b/src/main/webapp/WEB-INF/lib/avalon-framework-api-4.3.1.jar new file mode 100644 index 00000000..b60000b3 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/avalon-framework-api-4.3.1.jar differ diff --git a/src/main/webapp/WEB-INF/lib/avalon-framework-api-4.3.jar b/src/main/webapp/WEB-INF/lib/avalon-framework-api-4.3.jar new file mode 100644 index 00000000..0c75529e Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/avalon-framework-api-4.3.jar differ diff --git a/src/main/webapp/WEB-INF/lib/avalon-framework-impl-4.3.1.jar b/src/main/webapp/WEB-INF/lib/avalon-framework-impl-4.3.1.jar new file mode 100644 index 00000000..d56e9881 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/avalon-framework-impl-4.3.1.jar differ diff --git a/src/main/webapp/WEB-INF/lib/avalon-logkit-2.1.jar b/src/main/webapp/WEB-INF/lib/avalon-logkit-2.1.jar new file mode 100644 index 00000000..02f07b33 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/avalon-logkit-2.1.jar differ diff --git a/src/main/webapp/WEB-INF/lib/batik-all-1.6.jar b/src/main/webapp/WEB-INF/lib/batik-all-1.6.jar new file mode 100644 index 00000000..7b59021d Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/batik-all-1.6.jar differ diff --git a/src/main/webapp/WEB-INF/lib/batik-anim-1.7.jar b/src/main/webapp/WEB-INF/lib/batik-anim-1.7.jar new file mode 100644 index 00000000..2a150b2b Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/batik-anim-1.7.jar differ diff --git a/src/main/webapp/WEB-INF/lib/batik-awt-util-1.7.jar b/src/main/webapp/WEB-INF/lib/batik-awt-util-1.7.jar new file mode 100644 index 00000000..f83b5bd4 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/batik-awt-util-1.7.jar differ diff --git a/src/main/webapp/WEB-INF/lib/batik-bridge-1.7.jar b/src/main/webapp/WEB-INF/lib/batik-bridge-1.7.jar new file mode 100644 index 00000000..872cf27a Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/batik-bridge-1.7.jar differ diff --git a/src/main/webapp/WEB-INF/lib/batik-css-1.7.jar b/src/main/webapp/WEB-INF/lib/batik-css-1.7.jar new file mode 100644 index 00000000..ef3013d0 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/batik-css-1.7.jar differ diff --git a/src/main/webapp/WEB-INF/lib/batik-dom-1.7.jar b/src/main/webapp/WEB-INF/lib/batik-dom-1.7.jar new file mode 100644 index 00000000..02064754 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/batik-dom-1.7.jar differ diff --git a/src/main/webapp/WEB-INF/lib/batik-ext-1.7.jar b/src/main/webapp/WEB-INF/lib/batik-ext-1.7.jar new file mode 100644 index 00000000..57fb2732 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/batik-ext-1.7.jar differ diff --git a/src/main/webapp/WEB-INF/lib/batik-gvt-1.7.jar b/src/main/webapp/WEB-INF/lib/batik-gvt-1.7.jar new file mode 100644 index 00000000..9aa96868 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/batik-gvt-1.7.jar differ diff --git a/src/main/webapp/WEB-INF/lib/batik-js-1.7.jar b/src/main/webapp/WEB-INF/lib/batik-js-1.7.jar new file mode 100644 index 00000000..ccad3cc1 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/batik-js-1.7.jar differ diff --git a/src/main/webapp/WEB-INF/lib/batik-parser-1.7.jar b/src/main/webapp/WEB-INF/lib/batik-parser-1.7.jar new file mode 100644 index 00000000..b84ad36e Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/batik-parser-1.7.jar differ diff --git a/src/main/webapp/WEB-INF/lib/batik-script-1.7.jar b/src/main/webapp/WEB-INF/lib/batik-script-1.7.jar new file mode 100644 index 00000000..a684f1c7 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/batik-script-1.7.jar differ diff --git a/src/main/webapp/WEB-INF/lib/batik-svg-dom-1.7.jar b/src/main/webapp/WEB-INF/lib/batik-svg-dom-1.7.jar new file mode 100644 index 00000000..463d0e01 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/batik-svg-dom-1.7.jar differ diff --git a/src/main/webapp/WEB-INF/lib/batik-svggen-1.7.jar b/src/main/webapp/WEB-INF/lib/batik-svggen-1.7.jar new file mode 100644 index 00000000..0feaf605 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/batik-svggen-1.7.jar differ diff --git a/src/main/webapp/WEB-INF/lib/batik-transcoder-1.7.jar b/src/main/webapp/WEB-INF/lib/batik-transcoder-1.7.jar new file mode 100644 index 00000000..3934ed0a Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/batik-transcoder-1.7.jar differ diff --git a/src/main/webapp/WEB-INF/lib/batik-util-1.7.jar b/src/main/webapp/WEB-INF/lib/batik-util-1.7.jar new file mode 100644 index 00000000..c50d1ff2 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/batik-util-1.7.jar differ diff --git a/src/main/webapp/WEB-INF/lib/batik-xml-1.7.jar b/src/main/webapp/WEB-INF/lib/batik-xml-1.7.jar new file mode 100644 index 00000000..45ba1570 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/batik-xml-1.7.jar differ diff --git a/src/main/webapp/WEB-INF/lib/cglib-nodep-2.2.jar b/src/main/webapp/WEB-INF/lib/cglib-nodep-2.2.jar new file mode 100644 index 00000000..ed07cb50 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/cglib-nodep-2.2.jar differ diff --git a/src/main/webapp/WEB-INF/lib/classmate-0.5.4.jar b/src/main/webapp/WEB-INF/lib/classmate-0.5.4.jar new file mode 100644 index 00000000..35d1c07f Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/classmate-0.5.4.jar differ diff --git a/src/main/webapp/WEB-INF/lib/codegenerate-3.4.6.jar b/src/main/webapp/WEB-INF/lib/codegenerate-3.4.6.jar new file mode 100644 index 00000000..e1d9cf22 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/codegenerate-3.4.6.jar differ diff --git a/src/main/webapp/WEB-INF/lib/com.springsource.org.junit-4.9.0.jar b/src/main/webapp/WEB-INF/lib/com.springsource.org.junit-4.9.0.jar new file mode 100644 index 00000000..8fc762f8 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/com.springsource.org.junit-4.9.0.jar differ diff --git a/src/main/webapp/WEB-INF/lib/commons-beanutils-1.7.0.jar b/src/main/webapp/WEB-INF/lib/commons-beanutils-1.7.0.jar new file mode 100644 index 00000000..b1b89c9c Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/commons-beanutils-1.7.0.jar differ diff --git a/src/main/webapp/WEB-INF/lib/commons-chain-1.2.jar b/src/main/webapp/WEB-INF/lib/commons-chain-1.2.jar new file mode 100644 index 00000000..20fa4c59 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/commons-chain-1.2.jar differ diff --git a/src/main/webapp/WEB-INF/lib/commons-codec-1.3.jar b/src/main/webapp/WEB-INF/lib/commons-codec-1.3.jar new file mode 100644 index 00000000..957b6752 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/commons-codec-1.3.jar differ diff --git a/src/main/webapp/WEB-INF/lib/commons-collections-3.2.1.jar b/src/main/webapp/WEB-INF/lib/commons-collections-3.2.1.jar new file mode 100644 index 00000000..c35fa1fe Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/commons-collections-3.2.1.jar differ diff --git a/src/main/webapp/WEB-INF/lib/commons-dbcp-1.4.jar b/src/main/webapp/WEB-INF/lib/commons-dbcp-1.4.jar new file mode 100644 index 00000000..c4c1c4f2 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/commons-dbcp-1.4.jar differ diff --git a/src/main/webapp/WEB-INF/lib/commons-digester-2.0.jar b/src/main/webapp/WEB-INF/lib/commons-digester-2.0.jar new file mode 100644 index 00000000..9c8bd13a Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/commons-digester-2.0.jar differ diff --git a/src/main/webapp/WEB-INF/lib/commons-email-1.2.jar b/src/main/webapp/WEB-INF/lib/commons-email-1.2.jar new file mode 100644 index 00000000..f0859759 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/commons-email-1.2.jar differ diff --git a/src/main/webapp/WEB-INF/lib/commons-fileupload-1.2.1.jar b/src/main/webapp/WEB-INF/lib/commons-fileupload-1.2.1.jar new file mode 100644 index 00000000..7db423ed Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/commons-fileupload-1.2.1.jar differ diff --git a/src/main/webapp/WEB-INF/lib/commons-io-1.3.2.jar b/src/main/webapp/WEB-INF/lib/commons-io-1.3.2.jar new file mode 100644 index 00000000..865c9e41 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/commons-io-1.3.2.jar differ diff --git a/src/main/webapp/WEB-INF/lib/commons-lang-2.6.jar b/src/main/webapp/WEB-INF/lib/commons-lang-2.6.jar new file mode 100644 index 00000000..98467d3a Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/commons-lang-2.6.jar differ diff --git a/src/main/webapp/WEB-INF/lib/commons-lang3-3.1.jar b/src/main/webapp/WEB-INF/lib/commons-lang3-3.1.jar new file mode 100644 index 00000000..a85e539b Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/commons-lang3-3.1.jar differ diff --git a/src/main/webapp/WEB-INF/lib/commons-logging-1.1.1.jar b/src/main/webapp/WEB-INF/lib/commons-logging-1.1.1.jar new file mode 100644 index 00000000..1deef144 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/commons-logging-1.1.1.jar differ diff --git a/src/main/webapp/WEB-INF/lib/commons-logging-api-1.1.jar b/src/main/webapp/WEB-INF/lib/commons-logging-api-1.1.jar new file mode 100644 index 00000000..d1abcbb4 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/commons-logging-api-1.1.jar differ diff --git a/src/main/webapp/WEB-INF/lib/commons-pool-1.6.jar b/src/main/webapp/WEB-INF/lib/commons-pool-1.6.jar new file mode 100644 index 00000000..72ca75a3 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/commons-pool-1.6.jar differ diff --git a/src/main/webapp/WEB-INF/lib/commons-validator-1.3.1.jar b/src/main/webapp/WEB-INF/lib/commons-validator-1.3.1.jar new file mode 100644 index 00000000..55b12b1a Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/commons-validator-1.3.1.jar differ diff --git a/src/main/webapp/WEB-INF/lib/dom4j-1.6.1.jar b/src/main/webapp/WEB-INF/lib/dom4j-1.6.1.jar new file mode 100644 index 00000000..c8c4dbb9 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/dom4j-1.6.1.jar differ diff --git a/src/main/webapp/WEB-INF/lib/druid-0.2.9.jar b/src/main/webapp/WEB-INF/lib/druid-0.2.9.jar new file mode 100644 index 00000000..bf04821f Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/druid-0.2.9.jar differ diff --git a/src/main/webapp/WEB-INF/lib/easypoi-base-2.0.5.jar b/src/main/webapp/WEB-INF/lib/easypoi-base-2.0.5.jar new file mode 100644 index 00000000..a21babbc Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/easypoi-base-2.0.5.jar differ diff --git a/src/main/webapp/WEB-INF/lib/easypoi-web-2.0.5.jar b/src/main/webapp/WEB-INF/lib/easypoi-web-2.0.5.jar new file mode 100644 index 00000000..82a951d8 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/easypoi-web-2.0.5.jar differ diff --git a/src/main/webapp/WEB-INF/lib/ehcache-core-2.4.3.jar b/src/main/webapp/WEB-INF/lib/ehcache-core-2.4.3.jar new file mode 100644 index 00000000..7a26318d Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/ehcache-core-2.4.3.jar differ diff --git a/src/main/webapp/WEB-INF/lib/ezmorph-1.0.3.jar b/src/main/webapp/WEB-INF/lib/ezmorph-1.0.3.jar new file mode 100644 index 00000000..179b8d6f Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/ezmorph-1.0.3.jar differ diff --git a/src/main/webapp/WEB-INF/lib/fastjson-1.1.37.jar b/src/main/webapp/WEB-INF/lib/fastjson-1.1.37.jar new file mode 100644 index 00000000..1b13b826 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/fastjson-1.1.37.jar differ diff --git a/src/main/webapp/WEB-INF/lib/fop-0.94.jar b/src/main/webapp/WEB-INF/lib/fop-0.94.jar new file mode 100644 index 00000000..00003698 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/fop-0.94.jar differ diff --git a/src/main/webapp/WEB-INF/lib/fop-1.0.jar b/src/main/webapp/WEB-INF/lib/fop-1.0.jar new file mode 100644 index 00000000..f7a3a2c7 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/fop-1.0.jar differ diff --git a/src/main/webapp/WEB-INF/lib/freemarker-2.3.19.jar b/src/main/webapp/WEB-INF/lib/freemarker-2.3.19.jar new file mode 100644 index 00000000..b13671da Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/freemarker-2.3.19.jar differ diff --git a/src/main/webapp/WEB-INF/lib/geronimo-spec-javamail-1.3.1-rc3.jar b/src/main/webapp/WEB-INF/lib/geronimo-spec-javamail-1.3.1-rc3.jar new file mode 100644 index 00000000..7615e517 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/geronimo-spec-javamail-1.3.1-rc3.jar differ diff --git a/src/main/webapp/WEB-INF/lib/geronimo-spec-jms-1.1-rc4.jar b/src/main/webapp/WEB-INF/lib/geronimo-spec-jms-1.1-rc4.jar new file mode 100644 index 00000000..584a7cea Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/geronimo-spec-jms-1.1-rc4.jar differ diff --git a/src/main/webapp/WEB-INF/lib/groovy-2.3.3.jar b/src/main/webapp/WEB-INF/lib/groovy-2.3.3.jar new file mode 100644 index 00000000..2f5c2ef5 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/groovy-2.3.3.jar differ diff --git a/src/main/webapp/WEB-INF/lib/gson-2.2.4.jar b/src/main/webapp/WEB-INF/lib/gson-2.2.4.jar new file mode 100644 index 00000000..75fe27c5 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/gson-2.2.4.jar differ diff --git a/src/main/webapp/WEB-INF/lib/guava-16.0.1.jar b/src/main/webapp/WEB-INF/lib/guava-16.0.1.jar new file mode 100644 index 00000000..2c8127d1 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/guava-16.0.1.jar differ diff --git a/src/main/webapp/WEB-INF/lib/hibernate-commons-annotations-4.0.2.Final.jar b/src/main/webapp/WEB-INF/lib/hibernate-commons-annotations-4.0.2.Final.jar new file mode 100644 index 00000000..c26aba4e Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/hibernate-commons-annotations-4.0.2.Final.jar differ diff --git a/src/main/webapp/WEB-INF/lib/hibernate-core-4.2.3.Final.jar b/src/main/webapp/WEB-INF/lib/hibernate-core-4.2.3.Final.jar new file mode 100644 index 00000000..d8253ca2 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/hibernate-core-4.2.3.Final.jar differ diff --git a/src/main/webapp/WEB-INF/lib/hibernate-ehcache-4.1.0.Final.jar b/src/main/webapp/WEB-INF/lib/hibernate-ehcache-4.1.0.Final.jar new file mode 100644 index 00000000..d5d9c299 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/hibernate-ehcache-4.1.0.Final.jar differ diff --git a/src/main/webapp/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar b/src/main/webapp/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar new file mode 100644 index 00000000..1e9f71b8 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar differ diff --git a/src/main/webapp/WEB-INF/lib/hibernate-proxool-4.1.0.Final.jar b/src/main/webapp/WEB-INF/lib/hibernate-proxool-4.1.0.Final.jar new file mode 100644 index 00000000..01689b09 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/hibernate-proxool-4.1.0.Final.jar differ diff --git a/src/main/webapp/WEB-INF/lib/hibernate-validator-4.2.0.Final.jar b/src/main/webapp/WEB-INF/lib/hibernate-validator-4.2.0.Final.jar new file mode 100644 index 00000000..dcc4e52d Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/hibernate-validator-4.2.0.Final.jar differ diff --git a/src/main/webapp/WEB-INF/lib/hibernate-validator-annotation-processor-4.2.0.Final.jar b/src/main/webapp/WEB-INF/lib/hibernate-validator-annotation-processor-4.2.0.Final.jar new file mode 100644 index 00000000..068581b6 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/hibernate-validator-annotation-processor-4.2.0.Final.jar differ diff --git a/src/main/webapp/WEB-INF/lib/jackson-1.84.jar b/src/main/webapp/WEB-INF/lib/jackson-1.84.jar new file mode 100644 index 00000000..dcc7aff8 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/jackson-1.84.jar differ diff --git a/src/main/webapp/WEB-INF/lib/jackson-core-asl-1.8.4.jar b/src/main/webapp/WEB-INF/lib/jackson-core-asl-1.8.4.jar new file mode 100644 index 00000000..4387223d Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/jackson-core-asl-1.8.4.jar differ diff --git a/src/main/webapp/WEB-INF/lib/jackson-mapper-asl-1.8.4.jar b/src/main/webapp/WEB-INF/lib/jackson-mapper-asl-1.8.4.jar new file mode 100644 index 00000000..77bbe00a Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/jackson-mapper-asl-1.8.4.jar differ diff --git a/src/main/webapp/WEB-INF/lib/jacob-1.0.0.jar b/src/main/webapp/WEB-INF/lib/jacob-1.0.0.jar new file mode 100644 index 00000000..35ce4fa9 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/jacob-1.0.0.jar differ diff --git a/src/main/webapp/WEB-INF/lib/jacob-1.14.3.jar b/src/main/webapp/WEB-INF/lib/jacob-1.14.3.jar new file mode 100644 index 00000000..28e0c41e Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/jacob-1.14.3.jar differ diff --git a/src/main/webapp/WEB-INF/lib/javassist-3.15.0-GA.jar b/src/main/webapp/WEB-INF/lib/javassist-3.15.0-GA.jar new file mode 100644 index 00000000..5af8eaeb Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/javassist-3.15.0-GA.jar differ diff --git a/src/main/webapp/WEB-INF/lib/javassist-3.7.ga.jar b/src/main/webapp/WEB-INF/lib/javassist-3.7.ga.jar new file mode 100644 index 00000000..44d16dac Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/javassist-3.7.ga.jar differ diff --git a/src/main/webapp/WEB-INF/lib/jboss-logging-3.1.0.CR2.jar b/src/main/webapp/WEB-INF/lib/jboss-logging-3.1.0.CR2.jar new file mode 100644 index 00000000..cd095e69 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/jboss-logging-3.1.0.CR2.jar differ diff --git a/src/main/webapp/WEB-INF/lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar b/src/main/webapp/WEB-INF/lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar new file mode 100644 index 00000000..b3bf81f6 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar differ diff --git a/src/main/webapp/WEB-INF/lib/jboss-vfs-3.1.0.Final.jar b/src/main/webapp/WEB-INF/lib/jboss-vfs-3.1.0.Final.jar new file mode 100644 index 00000000..6d9b9cd2 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/jboss-vfs-3.1.0.Final.jar differ diff --git a/src/main/webapp/WEB-INF/lib/jdbc2005-1.0.0.jar b/src/main/webapp/WEB-INF/lib/jdbc2005-1.0.0.jar new file mode 100644 index 00000000..0d9b52cb Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/jdbc2005-1.0.0.jar differ diff --git a/src/main/webapp/WEB-INF/lib/jodconverter-3.0-beta-4.jar b/src/main/webapp/WEB-INF/lib/jodconverter-3.0-beta-4.jar new file mode 100644 index 00000000..af626dac Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/jodconverter-3.0-beta-4.jar differ diff --git a/src/main/webapp/WEB-INF/lib/jodd-3.3.7.jar b/src/main/webapp/WEB-INF/lib/jodd-3.3.7.jar new file mode 100644 index 00000000..04cafef2 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/jodd-3.3.7.jar differ diff --git a/src/main/webapp/WEB-INF/lib/json-lib-2.1-jdk15.jar b/src/main/webapp/WEB-INF/lib/json-lib-2.1-jdk15.jar new file mode 100644 index 00000000..28880c41 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/json-lib-2.1-jdk15.jar differ diff --git a/src/main/webapp/WEB-INF/lib/jstl-1.2.jar b/src/main/webapp/WEB-INF/lib/jstl-1.2.jar new file mode 100644 index 00000000..0fd275e9 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/jstl-1.2.jar differ diff --git a/src/main/webapp/WEB-INF/lib/jtds-1.2.4.jar b/src/main/webapp/WEB-INF/lib/jtds-1.2.4.jar new file mode 100644 index 00000000..94b2e515 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/jtds-1.2.4.jar differ diff --git a/src/main/webapp/WEB-INF/lib/juh-3.2.1.jar b/src/main/webapp/WEB-INF/lib/juh-3.2.1.jar new file mode 100644 index 00000000..423a9070 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/juh-3.2.1.jar differ diff --git a/src/main/webapp/WEB-INF/lib/junit-4.7.jar b/src/main/webapp/WEB-INF/lib/junit-4.7.jar new file mode 100644 index 00000000..700ad695 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/junit-4.7.jar differ diff --git a/src/main/webapp/WEB-INF/lib/jurt-3.2.1.jar b/src/main/webapp/WEB-INF/lib/jurt-3.2.1.jar new file mode 100644 index 00000000..a71926b9 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/jurt-3.2.1.jar differ diff --git a/src/main/webapp/WEB-INF/lib/log4j-1.2.16.jar b/src/main/webapp/WEB-INF/lib/log4j-1.2.16.jar new file mode 100644 index 00000000..5429a903 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/log4j-1.2.16.jar differ diff --git a/src/main/webapp/WEB-INF/lib/mail-1.4.1.jar b/src/main/webapp/WEB-INF/lib/mail-1.4.1.jar new file mode 100644 index 00000000..1d15e793 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/mail-1.4.1.jar differ diff --git a/src/main/webapp/WEB-INF/lib/minidao-1.4.0.jar b/src/main/webapp/WEB-INF/lib/minidao-1.4.0.jar new file mode 100644 index 00000000..db331e4e Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/minidao-1.4.0.jar differ diff --git a/src/main/webapp/WEB-INF/lib/mybatis-3.1.1.jar b/src/main/webapp/WEB-INF/lib/mybatis-3.1.1.jar new file mode 100644 index 00000000..2801833e Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/mybatis-3.1.1.jar differ diff --git a/src/main/webapp/WEB-INF/lib/mybatis-spring-1.1.1.jar b/src/main/webapp/WEB-INF/lib/mybatis-spring-1.1.1.jar new file mode 100644 index 00000000..64ce2e07 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/mybatis-spring-1.1.1.jar differ diff --git a/src/main/webapp/WEB-INF/lib/mysql-connector-java-5.1.27.jar b/src/main/webapp/WEB-INF/lib/mysql-connector-java-5.1.27.jar new file mode 100644 index 00000000..8bed6a2c Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/mysql-connector-java-5.1.27.jar differ diff --git a/src/main/webapp/WEB-INF/lib/ognl-2.6.11.jar b/src/main/webapp/WEB-INF/lib/ognl-2.6.11.jar new file mode 100644 index 00000000..19cd379a Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/ognl-2.6.11.jar differ diff --git a/src/main/webapp/WEB-INF/lib/ognl-2.7.3.jar b/src/main/webapp/WEB-INF/lib/ognl-2.7.3.jar new file mode 100644 index 00000000..6517028b Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/ognl-2.7.3.jar differ diff --git a/src/main/webapp/WEB-INF/lib/ojdbc14-10.2.0.5.0.jar b/src/main/webapp/WEB-INF/lib/ojdbc14-10.2.0.5.0.jar new file mode 100644 index 00000000..05adfefa Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/ojdbc14-10.2.0.5.0.jar differ diff --git a/src/main/webapp/WEB-INF/lib/org-apache-batik-all-1.7-201003011305.jar b/src/main/webapp/WEB-INF/lib/org-apache-batik-all-1.7-201003011305.jar new file mode 100644 index 00000000..b86b3d91 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/org-apache-batik-all-1.7-201003011305.jar differ diff --git a/src/main/webapp/WEB-INF/lib/org-apache-commons-logging-1.0.4-201003011305.jar b/src/main/webapp/WEB-INF/lib/org-apache-commons-logging-1.0.4-201003011305.jar new file mode 100644 index 00000000..df955957 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/org-apache-commons-logging-1.0.4-201003011305.jar differ diff --git a/src/main/webapp/WEB-INF/lib/org.quartz-1.6.2.jar b/src/main/webapp/WEB-INF/lib/org.quartz-1.6.2.jar new file mode 100644 index 00000000..30dcee7b Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/org.quartz-1.6.2.jar differ diff --git a/src/main/webapp/WEB-INF/lib/pinyin4j-2.5.0.jar b/src/main/webapp/WEB-INF/lib/pinyin4j-2.5.0.jar new file mode 100644 index 00000000..e8ede137 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/pinyin4j-2.5.0.jar differ diff --git a/src/main/webapp/WEB-INF/lib/poi-3.9.jar b/src/main/webapp/WEB-INF/lib/poi-3.9.jar new file mode 100644 index 00000000..0f462880 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/poi-3.9.jar differ diff --git a/src/main/webapp/WEB-INF/lib/poi-ooxml-3.9.jar b/src/main/webapp/WEB-INF/lib/poi-ooxml-3.9.jar new file mode 100644 index 00000000..8792d463 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/poi-ooxml-3.9.jar differ diff --git a/src/main/webapp/WEB-INF/lib/poi-ooxml-schemas-3.9.jar b/src/main/webapp/WEB-INF/lib/poi-ooxml-schemas-3.9.jar new file mode 100644 index 00000000..eda4ef49 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/poi-ooxml-schemas-3.9.jar differ diff --git a/src/main/webapp/WEB-INF/lib/poi-scratchpad-3.9.jar b/src/main/webapp/WEB-INF/lib/poi-scratchpad-3.9.jar new file mode 100644 index 00000000..15208552 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/poi-scratchpad-3.9.jar differ diff --git a/src/main/webapp/WEB-INF/lib/postgresql-9.1-903.jdbc4.jar b/src/main/webapp/WEB-INF/lib/postgresql-9.1-903.jdbc4.jar new file mode 100644 index 00000000..10535cff Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/postgresql-9.1-903.jdbc4.jar differ diff --git a/src/main/webapp/WEB-INF/lib/proxool-0.8.3.jar b/src/main/webapp/WEB-INF/lib/proxool-0.8.3.jar new file mode 100644 index 00000000..c4f700cf Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/proxool-0.8.3.jar differ diff --git a/src/main/webapp/WEB-INF/lib/proxool-0.9.1.jar b/src/main/webapp/WEB-INF/lib/proxool-0.9.1.jar new file mode 100644 index 00000000..ffb163f2 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/proxool-0.9.1.jar differ diff --git a/src/main/webapp/WEB-INF/lib/proxool-cglib-0.9.1.jar b/src/main/webapp/WEB-INF/lib/proxool-cglib-0.9.1.jar new file mode 100644 index 00000000..4fe25c13 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/proxool-cglib-0.9.1.jar differ diff --git a/src/main/webapp/WEB-INF/lib/ridl-3.2.1.jar b/src/main/webapp/WEB-INF/lib/ridl-3.2.1.jar new file mode 100644 index 00000000..d2325145 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/ridl-3.2.1.jar differ diff --git a/src/main/webapp/WEB-INF/lib/slf4j-api-1.6.1.jar b/src/main/webapp/WEB-INF/lib/slf4j-api-1.6.1.jar new file mode 100644 index 00000000..f1f4fdd2 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/slf4j-api-1.6.1.jar differ diff --git a/src/main/webapp/WEB-INF/lib/slf4j-log4j12-1.6.1.jar b/src/main/webapp/WEB-INF/lib/slf4j-log4j12-1.6.1.jar new file mode 100644 index 00000000..64115995 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/slf4j-log4j12-1.6.1.jar differ diff --git a/src/main/webapp/WEB-INF/lib/spring-aop-3.1.1.RELEASE.jar b/src/main/webapp/WEB-INF/lib/spring-aop-3.1.1.RELEASE.jar new file mode 100644 index 00000000..73ba4049 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/spring-aop-3.1.1.RELEASE.jar differ diff --git a/src/main/webapp/WEB-INF/lib/spring-asm-3.1.1.RELEASE.jar b/src/main/webapp/WEB-INF/lib/spring-asm-3.1.1.RELEASE.jar new file mode 100644 index 00000000..20d79385 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/spring-asm-3.1.1.RELEASE.jar differ diff --git a/src/main/webapp/WEB-INF/lib/spring-aspects-3.1.1.RELEASE.jar b/src/main/webapp/WEB-INF/lib/spring-aspects-3.1.1.RELEASE.jar new file mode 100644 index 00000000..27b138d9 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/spring-aspects-3.1.1.RELEASE.jar differ diff --git a/src/main/webapp/WEB-INF/lib/spring-beans-3.1.1.RELEASE.jar b/src/main/webapp/WEB-INF/lib/spring-beans-3.1.1.RELEASE.jar new file mode 100644 index 00000000..a69bcb1f Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/spring-beans-3.1.1.RELEASE.jar differ diff --git a/src/main/webapp/WEB-INF/lib/spring-context-3.1.1.RELEASE.jar b/src/main/webapp/WEB-INF/lib/spring-context-3.1.1.RELEASE.jar new file mode 100644 index 00000000..a35e4869 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/spring-context-3.1.1.RELEASE.jar differ diff --git a/src/main/webapp/WEB-INF/lib/spring-context-support-3.1.1.RELEASE.jar b/src/main/webapp/WEB-INF/lib/spring-context-support-3.1.1.RELEASE.jar new file mode 100644 index 00000000..8e8fff4c Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/spring-context-support-3.1.1.RELEASE.jar differ diff --git a/src/main/webapp/WEB-INF/lib/spring-core-3.1.1.RELEASE.jar b/src/main/webapp/WEB-INF/lib/spring-core-3.1.1.RELEASE.jar new file mode 100644 index 00000000..bdd8944a Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/spring-core-3.1.1.RELEASE.jar differ diff --git a/src/main/webapp/WEB-INF/lib/spring-expression-3.1.1.RELEASE.jar b/src/main/webapp/WEB-INF/lib/spring-expression-3.1.1.RELEASE.jar new file mode 100644 index 00000000..0e445b97 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/spring-expression-3.1.1.RELEASE.jar differ diff --git a/src/main/webapp/WEB-INF/lib/spring-jdbc-3.1.1.RELEASE.jar b/src/main/webapp/WEB-INF/lib/spring-jdbc-3.1.1.RELEASE.jar new file mode 100644 index 00000000..82b836a1 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/spring-jdbc-3.1.1.RELEASE.jar differ diff --git a/src/main/webapp/WEB-INF/lib/spring-orm-3.1.1.RELEASE.jar b/src/main/webapp/WEB-INF/lib/spring-orm-3.1.1.RELEASE.jar new file mode 100644 index 00000000..5e5f16d5 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/spring-orm-3.1.1.RELEASE.jar differ diff --git a/src/main/webapp/WEB-INF/lib/spring-tx-3.1.1.RELEASE.jar b/src/main/webapp/WEB-INF/lib/spring-tx-3.1.1.RELEASE.jar new file mode 100644 index 00000000..824e3c3f Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/spring-tx-3.1.1.RELEASE.jar differ diff --git a/src/main/webapp/WEB-INF/lib/spring-web-3.1.1.RELEASE.jar b/src/main/webapp/WEB-INF/lib/spring-web-3.1.1.RELEASE.jar new file mode 100644 index 00000000..42ed92c7 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/spring-web-3.1.1.RELEASE.jar differ diff --git a/src/main/webapp/WEB-INF/lib/spring-webmvc-3.1.1.RELEASE.jar b/src/main/webapp/WEB-INF/lib/spring-webmvc-3.1.1.RELEASE.jar new file mode 100644 index 00000000..8e27a5bc Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/spring-webmvc-3.1.1.RELEASE.jar differ diff --git a/src/main/webapp/WEB-INF/lib/stax-api-1.0.1.jar b/src/main/webapp/WEB-INF/lib/stax-api-1.0.1.jar new file mode 100644 index 00000000..d9a16651 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/stax-api-1.0.1.jar differ diff --git a/src/main/webapp/WEB-INF/lib/stringtemplate-3.2.1.jar b/src/main/webapp/WEB-INF/lib/stringtemplate-3.2.1.jar new file mode 100644 index 00000000..d0e11b71 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/stringtemplate-3.2.1.jar differ diff --git a/src/main/webapp/WEB-INF/lib/thumbnailator-0.4.6.jar b/src/main/webapp/WEB-INF/lib/thumbnailator-0.4.6.jar new file mode 100644 index 00000000..39f745ba Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/thumbnailator-0.4.6.jar differ diff --git a/src/main/webapp/WEB-INF/lib/unoil-3.2.1.jar b/src/main/webapp/WEB-INF/lib/unoil-3.2.1.jar new file mode 100644 index 00000000..e5bd96c1 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/unoil-3.2.1.jar differ diff --git a/src/main/webapp/WEB-INF/lib/validation-api-1.0.0.GA.jar b/src/main/webapp/WEB-INF/lib/validation-api-1.0.0.GA.jar new file mode 100644 index 00000000..1ff2dd71 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/validation-api-1.0.0.GA.jar differ diff --git a/src/main/webapp/WEB-INF/lib/xalan-2.7.0.jar b/src/main/webapp/WEB-INF/lib/xalan-2.7.0.jar new file mode 100644 index 00000000..007be396 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/xalan-2.7.0.jar differ diff --git a/src/main/webapp/WEB-INF/lib/xercesImpl-2.7.1.jar b/src/main/webapp/WEB-INF/lib/xercesImpl-2.7.1.jar new file mode 100644 index 00000000..0b100e14 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/xercesImpl-2.7.1.jar differ diff --git a/src/main/webapp/WEB-INF/lib/xml-apis-1.3.04.jar b/src/main/webapp/WEB-INF/lib/xml-apis-1.3.04.jar new file mode 100644 index 00000000..d42c0ea6 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/xml-apis-1.3.04.jar differ diff --git a/src/main/webapp/WEB-INF/lib/xml-apis-ext-1.3.04.jar b/src/main/webapp/WEB-INF/lib/xml-apis-ext-1.3.04.jar new file mode 100644 index 00000000..a7869d68 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/xml-apis-ext-1.3.04.jar differ diff --git a/src/main/webapp/WEB-INF/lib/xmlbeans-2.3.0.jar b/src/main/webapp/WEB-INF/lib/xmlbeans-2.3.0.jar new file mode 100644 index 00000000..ccd81634 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/xmlbeans-2.3.0.jar differ diff --git a/src/main/webapp/WEB-INF/lib/xmlgraphics-commons-1.4.jar b/src/main/webapp/WEB-INF/lib/xmlgraphics-commons-1.4.jar new file mode 100644 index 00000000..01bc3916 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/xmlgraphics-commons-1.4.jar differ diff --git a/src/main/webapp/WEB-INF/lib/xmlpull-1.1.3.1.jar b/src/main/webapp/WEB-INF/lib/xmlpull-1.1.3.1.jar new file mode 100644 index 00000000..cbc149d0 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/xmlpull-1.1.3.1.jar differ diff --git a/src/main/webapp/WEB-INF/lib/xpp3_min-1.1.4c.jar b/src/main/webapp/WEB-INF/lib/xpp3_min-1.1.4c.jar new file mode 100644 index 00000000..813a9a83 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/xpp3_min-1.1.4c.jar differ diff --git a/src/main/webapp/WEB-INF/lib/xstream-1.4.4.jar b/src/main/webapp/WEB-INF/lib/xstream-1.4.4.jar new file mode 100644 index 00000000..dcedd5aa Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/xstream-1.4.4.jar differ diff --git a/src/main/webapp/WEB-INF/lib/xwork-core-2.1.6.jar b/src/main/webapp/WEB-INF/lib/xwork-core-2.1.6.jar new file mode 100644 index 00000000..bd5996bd Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/xwork-core-2.1.6.jar differ diff --git a/src/main/webapp/plug-in/Validform/js/datatype_en.js b/src/main/webapp/plug-in/Validform/js/datatype_en.js index d4d4bd3e..0f95b5b2 100644 --- a/src/main/webapp/plug-in/Validform/js/datatype_en.js +++ b/src/main/webapp/plug-in/Validform/js/datatype_en.js @@ -11,10 +11,9 @@ $.Datatype.need2 = function(gets, obj, curform, regxp) { }; $.Datatype.d=/^(\d*\.)?\d+$/; -//update-start--Author:zhangguoming Date:20140826 for：添加 下拉框、combotree 验证 $.Datatype.select1 = function(gets, obj, curform, regxp) { var name = obj.attr("name") != undefined ? "name" : "comboname"; // select 或 combotree var need = 1, numselected = curform.find("select[" + name + "='" + obj.attr(name) + "'] option[selected='selected']").length; return numselected >= need ? true : "Please only select" + need + "item!"; }; -//update-end--Author:zhangguoming Date:20140826 for：添加 下拉框、combotree 验证 + diff --git a/src/main/webapp/plug-in/Validform/js/datatype_zh-cn.js b/src/main/webapp/plug-in/Validform/js/datatype_zh-cn.js index 6bb16f4e..e30d0a92 100644 --- a/src/main/webapp/plug-in/Validform/js/datatype_zh-cn.js +++ b/src/main/webapp/plug-in/Validform/js/datatype_zh-cn.js @@ -11,10 +11,9 @@ $.Datatype.need2 = function(gets, obj, curform, regxp) { }; $.Datatype.d=/^(\d*\.)?\d+$/; -//update-start--Author:zhangguoming Date:20140826 for：添加 下拉框、combotree 验证 $.Datatype.select1 = function(gets, obj, curform, regxp) { var name = obj.attr("name") != undefined ? "name" : "comboname"; // select 或 combotree var need = 1, numselected = curform.find("select[" + name + "='" + obj.attr(name) + "'] option[selected='selected']").length; return numselected >= need ? true : "请至少选择" + need + "项！"; }; -//update-end--Author:zhangguoming Date:20140826 for：添加 下拉框、combotree 验证 + diff --git a/src/main/webapp/plug-in/accordion/js/left_shortcut_menu.js b/src/main/webapp/plug-in/accordion/js/left_shortcut_menu.js index 7568a248..ad44ab56 100644 --- a/src/main/webapp/plug-in/accordion/js/left_shortcut_menu.js +++ b/src/main/webapp/plug-in/accordion/js/left_shortcut_menu.js @@ -1,9 +1,9 @@ $(function() { $("#nav").hide(); //easy ui树加载会在文档加载完执行,所以初始化菜单要延迟一秒 by jueyue - // update-start--Author:gaofeng Date:2014-01-09：由于不需展示左侧的树，因此降低刷新的延迟时间 + setTimeout(InitLeftMenu,100); - //update-start--Author:gaofeng Date:2014-01-09：由于不需展示左侧的树，因此降低刷新的延迟时间 + tabClose(); tabCloseEven(); // 释放内存 @@ -39,7 +39,6 @@ function InitLeftMenu() { $(this).parent().removeClass("hover"); }); - // update-start--Author:gaofeng Date:2014-01-09 for:新增首页风格,一级菜单点击事件的切换操作 $(".shortcut li").live("click",function(){ $(this).find(".imag1").hide(); $(this).find(".imag2").show(); @@ -53,7 +52,7 @@ function InitLeftMenu() { var winheight = document.body.clientHeight - 157;//计算左侧二级菜单的行高度，以便自动判断是否需要滚动条 navaa.find(".panel-body").css("height",winheight); }); - // update-end--Author:gaofeng Date:2014-01-09 for:新增首页风格,一级菜单点击事件的切换操作 + // begin author：屈然博 2013-8-04 for：避免监听树自带三角点击事件 $('.easyui-tree').tree({ @@ -66,15 +65,15 @@ function InitLeftMenu() { url: "loginController.do?primaryMenu", async:false, success: function (data) { -// update-begin--Author:zhangguoming Date:20140429 for：一级菜单右侧有双引号，且在ie下样式错位 + // $(".shortcut").html(data); $(".shortcut").html(data.replaceAll("\"", "")); -// update-end--Author:zhangguoming Date:20140429 for：一级菜单右侧有双引号，且在ie下样式错位 + } }); - // update-start--Author:Peak Date:2014-01-09：新增首页风格,初始化第一个菜单的内容显示 + $(".shortcut li").eq(0).trigger("click"); - //update-end--Author:Peak Date:2014-01-09：新增首页风格,初始化第一个菜单的内容显示 + $("#nav").show(); } @@ -252,11 +251,11 @@ function tabCloseEven() { $('#mm-tabcloseall').click(function() { $('.tabs-inner span').each(function(i, n) { var t = $(n).text(); -// update-begin--Author:zhangguoming Date:20140905 for：不关闭首页 + if (t != '首页') { $('#maintabs').tabs('close', t); } -// update-end--Author:zhangguoming Date:20140905 for：不关闭首页 + }); }); // 关闭除当前之外的TAB @@ -287,11 +286,11 @@ function tabCloseEven() { } prevall.each(function(i, n) { var t = $('a:eq(0) span', $(n)).text(); -// update-begin--Author:zhangguoming Date:20140612 for：不关闭首页 + if (t != '首页') { $('#maintabs').tabs('close', t); } -// update-end--Author:zhangguoming Date:20140612 for：不关闭首页 + }); return false; }); diff --git a/src/main/webapp/plug-in/cgform/js/cgformField.js b/src/main/webapp/plug-in/cgform/js/cgformField.js index 83f02612..3de48ce7 100644 --- a/src/main/webapp/plug-in/cgform/js/cgformField.js +++ b/src/main/webapp/plug-in/cgform/js/cgformField.js @@ -58,12 +58,12 @@ function initData() { addTableHead(); $.get("cgFormHeadController.do?getColumnList&id=" + $("#id").val(), getDataHanlder); - //update---start--author：JueYue---------date：20140824---------for：table adapter size + $('.t_table').height($(window).height()-300); $(window).resize(function(){ $('.t_table').height($(window).height()-300); }); - //update---start--end：JueYue---------date：20140824---------for：table adapter size + } @@ -78,7 +78,7 @@ function addTableHead() { } } // 兼容不同浏览器获取iframe 内容 -//update-begin--Author:JueYue Date:20140213 for：因为Iframe获取失败,而导致详情看不到的情况 + //主要情况是ie11下的版本是火狐的标识倒是出差错 function getIframeDocument(id){ if(window.frames["iframe_" + id].contentDocument){ @@ -86,7 +86,7 @@ function getIframeDocument(id){ } return window.frames["iframe_" + id].document; } -//update-begin--Author:JueYue Date:20140213 for：因为Iframe获取失败,而导致详情看不到的情况 + /** * 获取数据的回调 diff --git a/src/main/webapp/plug-in/login/js/login.js b/src/main/webapp/plug-in/login/js/login.js index 473e0f09..d21b6402 100644 --- a/src/main/webapp/plug-in/login/js/login.js +++ b/src/main/webapp/plug-in/login/js/login.js @@ -48,7 +48,7 @@ $('.userload').click(function(e) { $('.userbox').hide(); }); }); -//update-begin--Author:zhangguoming Date:20140226 for：添加验证码 + $('#randCodeImage').click(function(){ reloadRandCodeImage(); }); @@ -60,7 +60,7 @@ function reloadRandCodeImage() { var img = document.getElementById("randCodeImage"); img.src='randCodeImage?a=' + date.getTime(); } -//update-end--Author:zhangguoming Date:20140226 for：添加验证码 + // 重置 $('#forgetpass').click(function(e) { $(":input").each(function() { @@ -112,9 +112,9 @@ function Login(orgId) { formData[this.name] =$("#"+this.name ).val(); }); formData['orgId'] = orgId ? orgId : ""; - // update-begin--Author:ken Date:20140629 for：添加语言选择 + formData['langCode']=$("#langCode").val(); - // update-end--Author:ken Date:20140629 for：添加语言选择 + formData['langCode'] = $("#langCode option:selected").val(); $.ajax({ async : false, @@ -128,7 +128,7 @@ function Login(orgId) { var d = $.parseJSON(data); if (d.success) { loginsuccess(); -// update-start--Author:zhangguoming Date:20140825 for：用户有多个组织机构，则弹出选择组织架构页面 + // todo zhanggm 没有处理多语言，暂时这样判断下吧 var title, okButton; if($("#langCode").val() == 'en') { @@ -165,7 +165,7 @@ function Login(orgId) { } else { setTimeout("window.location.href='"+actionurl+"'", 1000); } -// update-end--Author:zhangguoming Date:20140825 for：用户有多个组织机构，则弹出选择组织架构页面 + } else { if(d.msg == "a"){ $.dialog.confirm("数据库无数据,是否初始化数据?", function(){ @@ -201,14 +201,14 @@ function getCookie() if (COOKIE_NAME !=null) { $("input[iscookie='true']").each(function() { $($("#"+this.name).val( $.cookie(this.name))); -// update-begin--Author:zhangguoming Date:20140429 for：是否记住用户名优化 + if("admin" == $.cookie(this.name)) { $("#randCode").focus(); } else { $("#password").val(""); $("#password").focus(); } -// update-end--Author:zhangguoming Date:20140429 for：是否记住用户名优化 + }); $("#on_off").attr("checked", true); $("#on_off").val("1"); @@ -217,9 +217,9 @@ function getCookie() { $("#on_off").attr("checked", false); $("#on_off").val("0"); -// update-begin--Author:zhangguoming Date:20140429 for：是否记住用户名优化 + $("#randCode").focus(); -// update-end--Author:zhangguoming Date:20140429 for：是否记住用户名优化 + } } //点击消息关闭提示 diff --git a/src/main/webapp/plug-in/sliding/js/data.js b/src/main/webapp/plug-in/sliding/js/data.js index 360b38ed..7ceb5150 100644 --- a/src/main/webapp/plug-in/sliding/js/data.js +++ b/src/main/webapp/plug-in/sliding/js/data.js @@ -172,7 +172,7 @@ } }, sApp:{//侧边栏应用 -// update-begin--Author:zhangguoming Date:20140521 for：云桌面图标拖拽、用户自定义桌面 + /*'297e20104620167201462016b5fe001f':{ appid:'297e20104620167201462016b5fe001f', icon:'plug-in/accordion/images/desk/user.png', @@ -230,6 +230,6 @@ name:'互联网搜索', asc :6 }*/ -// update-end--Author:zhangguoming Date:20140521 for：云桌面图标拖拽、用户自定义桌面 + } }; diff --git a/src/main/webapp/plug-in/sliding/js/webos-core.js b/src/main/webapp/plug-in/sliding/js/webos-core.js index 1217cc40..1d4bf711 100644 --- a/src/main/webapp/plug-in/sliding/js/webos-core.js +++ b/src/main/webapp/plug-in/sliding/js/webos-core.js @@ -11,7 +11,7 @@ var menujson=null; var datajson=null; var iconjson=null; var totalnum =null; -//update-begin--Author:zhangguoming Date:20140521 for：云桌面图标拖拽、用户自定义桌面 + var iconCookieKey = "iconCookieKey"; var iconCookieKeyForSlider = "iconCookieKeyForSlider"; var cookieParam = {expires: 30}; @@ -20,7 +20,7 @@ var defaultIconForSlider = [ // '297e20104620167201462016b5fe001f',/*用户管理*/ // '297e20104620167201462016b6020021' /*角色管理*/ ]; -//update-end--Author:zhangguoming Date:20140521 for：云桌面图标拖拽、用户自定义桌面 + //增加数据动态处理的过程 ////这里使用menuString来替换掉每个一级二级菜单的数据 @@ -49,7 +49,6 @@ function dataFlush(){ }); } -//update-begin--Author:zhangguoming Date:20140521 for：云桌面图标拖拽、用户自定义桌面 /** * 转换用户的桌面 */ @@ -107,7 +106,7 @@ function calcuIconJson() { iconjson = tempIconJson; } } -//update-end--Author:zhangguoming Date:20140521 for：云桌面图标拖拽、用户自定义桌面 + $(function() { @@ -115,13 +114,13 @@ $(function() { // dataFlush(); Desktop.init(); //替换icon的数组内容 -// update-begin--Author:zhangguoming Date:20140521 for：云桌面图标拖拽、用户自定义桌面 + // Deskpanel.init(iconjson).refresh(); Deskpanel.init(iconjson, true); -// update-end--Author:zhangguoming Date:20140521 for：云桌面图标拖拽、用户自定义桌面 + Sidebar.init({ location:'left',//初始化sidebar的位置为左侧 -// update-begin--Author:zhangguoming Date:20140521 for：云桌面图标拖拽、用户自定义桌面 + Icon:defaultIconForSlider /*Icon:[ 'appmarket', @@ -131,7 +130,7 @@ $(function() { 'internet', 'qq' ]*/ -// update-end--Author:zhangguoming Date:20140521 for：云桌面图标拖拽、用户自定义桌面 + }); Navbar.init();//初始化导航条 BottomBar.init();//初始化下部栏 @@ -458,7 +457,7 @@ Deskpanel = function(me){ me.refreshIcon(firstLoad); }, -// update-begin--Author:zhangguoming Date:20140521 for：云桌面图标拖拽、用户自定义桌面 + refreshIcon:function(firstLoad){//刷新应用 var r = ~~(me.height/112); var curIndex = 1; @@ -495,7 +494,7 @@ Deskpanel = function(me){ $.cookie(iconCookieKeyForSlider, iconCookieDataForSlider, cookieParam); } }, -// update-end--Author:zhangguoming Date:20140521 for：云桌面图标拖拽、用户自定义桌面 + moveIconTo:function(icon,idx2){//目标位置 var ids=(Panel.getIdx(icon.box)); if(idx>idx2){//往前移 @@ -638,7 +637,7 @@ Sidebar=function(me){ }, createStartTool:function(){//开始设置 me.start = $(""); - //update-end--Author:JueYue Date:20140511 for：点击两次才才显示的bug + me.start.powerFloat({ eventType: "click", offsets:{x:getX,y:-100}, @@ -657,7 +656,7 @@ Sidebar=function(me){ return 60; } } - //update-end--Author:JueYue Date:20140511 for：点击两次才才显示的bug + }, createPinyinTool :function(){//输入法 me.pinyin =$(Util.formatmodel(tool_a,{ @@ -705,18 +704,18 @@ Sidebar=function(me){ content :document.getElementById("themeSetting_wrap") }); }); - //update-end--Author:gaofeng Date:20140615 for：云桌面主题功能修复 + $("a",themsSetting).live("click",function(){ - //update-end--Author:gaofeng Date:20140615 for：云桌面主题功能修复 + var a = $(this); var themeid = a.attr("themeid"); var src = themeid.substring(themeid.indexOf("_")+1,themeid.length); var h = $(window).height(); var w = $(window).width(); $("#zoomWallpaper").attr("src","plug-in/sliding/images/bg/"+src+".jpg").width(w).height(h); -// update-end--Author:gaofeng Date:20140617 for：保存主题背景到cookie中不消失 + $.cookie("myskin","plug-in/sliding/images/bg/"+src+".jpg",cookieParam); -// update-end--Author:gaofeng Date:20140617 for：保存主题背景到cookie中不消失 + $("#zoomWallpaperGrid").width(w).height(h); $("a",themsSetting).removeClass("themeSetting_selected"); a.addClass("themeSetting_selected"); @@ -947,11 +946,11 @@ Navbar =function(me){ }); var pagelet_search_suggest =$(""); var sb_resultbox = $("
        "); -// update-end--Author:gaofeng Date:20140615 for：云桌面搜索框屏蔽掉多余的展示内容 + var sb_app_item_1 =$("
        s-在“百度”搜索...
        "); var sb_app_item_2 = $("
        s-去系统应用搜搜...
        "); pagelet_search_suggest.append(sb_resultbox).append(sb_app_item_1).append(sb_app_item_2); -// update-end--Author:gaofeng Date:20140615 for：云桌面搜索框屏蔽掉多余的展示内容 + pagelet_search_bar.append(pageletSearchInput).append(pageletSearchButton); Body.addPanel(pagelet_search_bar); @@ -978,12 +977,12 @@ Navbar =function(me){ $(this).val(""); }).blur(function(){ toggleSearchSuggest(); - //update-end--Author:gaofeng Date:20140614 for：云桌面搜索菜单，点击进入功能,搜索可直接连接到百度 + var searchhtnl=$(this).val(); $(this).val("搜索功能模块和应用..."); $(".fsb_resultList").show(); - //update-end--Author:gaofeng Date:20140614 for：云桌面搜索菜单，点击进入功能,搜索可直接连接到百度 + }).keyup(function(){ var _this = $(this); var _val = _this.val(); @@ -1054,10 +1053,10 @@ appManagerPanel = function(me){ var aMg_line_y = "
        ";//y轴线 var aMg_App_container = "
        ";//应用容器 var folderitem ="
        "; -// update-begin--Author:zhangguoming Date:20140605 for：云桌面全局视图，菜单区内容的高度bug修复（有滚动条时，最后一个菜单被windows底部菜单栏遮盖的bug） + // var folderinner ="
        "; var folderinner ="
        "; -// update-end--Author:zhangguoming Date:20140605 for：云桌面全局视图，菜单区内容的高度bug修复（有滚动条时，最后一个菜单被windows底部菜单栏遮盖的bug） + var scrollBar =""; return me = { @@ -1371,7 +1370,7 @@ Windows = function(me){ var taskIds = BottomBar.getALLItemID(); var taskLen = taskIds.length; var api=array[id]; - //update-end--Author:JueYue Date:20140511 for：底下菜单点击不消失的bug + function changeLhgDialogFocus() { var foucsApi = null; for(var obj in $.dialog.list){ @@ -1419,7 +1418,7 @@ Windows = function(me){ } } - //update-end--Author:JueYue Date:20140511 for：底下菜单点击不消失的bug + }, hideWindow :function(id){//隐藏 $.dialog.list[id].hide(); @@ -1465,13 +1464,13 @@ Windows = function(me){ me.showWindow(id); BottomBar.setCurrent(task.box.attr("id")); }); - //update-end--Author:JueYue Date:20140425 for：统一弹出插件 + $.dialog({ id:id, lock : false, -// update-end--Author:gaofeng Date:20140616 for：云桌面修复弹窗的多重覆盖问题 + zIndex:1000+getDialogLength(), -// update-end--Author:gaofeng Date:20140616 for：云桌面修复弹窗的多重覆盖问题 + width:width, height:height, title:title, @@ -1482,7 +1481,7 @@ Windows = function(me){ me.closeMinTask(id); } }).zindex(); - //update-end--Author:JueYue Date:20140425 for：统一弹出插件 + /*art.dialog.open(url,*//** 弹出ART窗体*//* { @@ -1548,9 +1547,9 @@ appIcon_amg1 = appIcon_amg.extend({ appid:this.app.appid, fileid : this.app.appid, title:this.app.name, -// update-begin--Author:zhangguoming Date:20140605 for：云桌面全局视图，添加菜单点击功能（弹出菜单后，关闭全局视图并返回桌面） + url: this.app.url, -// update-end--Author:zhangguoming Date:20140605 for：云桌面全局视图，添加菜单点击功能（弹出菜单后，关闭全局视图并返回桌面） + uid :"app_"+this.app.appid }); @@ -1592,7 +1591,7 @@ appIcon_amg1 = appIcon_amg.extend({ this.box.append(appIcon).append(nameDiv).append(notify).append(deleteDiv); }, bindEvent:function(){ -// update-begin--Author:zhangguoming Date:20140605 for：云桌面全局视图，添加菜单点击功能（弹出菜单后，关闭全局视图并返回桌面） + this.box.click(function(e){ e.preventDefault(); e.stopPropagation(); @@ -1605,7 +1604,7 @@ appIcon_amg1 = appIcon_amg.extend({ appManagerPanel.hide(); Desktop.show(); -// update-end--Author:zhangguoming Date:20140605 for：云桌面全局视图，添加菜单点击功能（弹出菜单后，关闭全局视图并返回桌面） + }); } @@ -1705,10 +1704,10 @@ appIcon_t2 = appIcon_t0.extend({ appid:this.sApp.appid, fileid : this.sApp.appid, title:this.sApp.name, -// update-begin--Author:zhangguoming Date:20140521 for：云桌面图标拖拽、用户自定义桌面 + uid :"app_"+this.sApp.appid, url:this.sApp.url -// update-end--Author:zhangguoming Date:20140521 for：云桌面图标拖拽、用户自定义桌面 + }); var appIcon =$("
        ",{ @@ -1717,10 +1716,10 @@ appIcon_t2 = appIcon_t0.extend({ }); appIcon.append($("",{ alt:this.sApp.name , -// update-begin--Author:zhangguoming Date:20140521 for：云桌面图标拖拽、用户自定义桌面 + // src:'plug-in/sliding/icon/'+this.sApp.icon, src:this.sApp.icon, -// update-end--Author:zhangguoming Date:20140521 for：云桌面图标拖拽、用户自定义桌面 + "class":"appButton_appIconImg", id:'icon_app_'+this.sApp.appid+'_'+this.sApp.asc+'_img' @@ -1755,7 +1754,7 @@ appIcon_t2 = appIcon_t0.extend({ }); } }); -//update-end--Author:gaofeng Date:20140618 for：修改搜索的功能为两部分：一个是直接嵌入百度搜索，另一个为网站内的菜单搜索 + $(function(){ $(".fsb_resultList").live("click",function(){ @@ -1770,8 +1769,6 @@ $(function(){ $(".fsb_resultList").hide(); }) -// update-end--Author:gaofeng Date:20140618 for：修改搜索的功能为两部分：一个是直接嵌入百度搜索，另一个为网站内的菜单搜索 -// update-end--Author:gaofeng Date:20140617 for：保存主题背景到cookie中不消失 var mychangeskin=$.cookie("myskin"); if(mychangeskin) @@ -1779,7 +1776,7 @@ $(function(){ $("#zoomWallpaper").attr("src",mychangeskin); $.cookie("myskin",mychangeskin,cookieParam);//1为关掉浏览器不消失效果，0为消失 } -// update-end--Author:gaofeng Date:20140617 for：保存主题背景到cookie中不消失 + }) diff --git a/src/main/webapp/webpage/jeecg/demo/test/webOfficeEdit.jsp b/src/main/webapp/webpage/jeecg/demo/test/webOfficeEdit.jsp index 352b569d..ca85805c 100644 --- a/src/main/webapp/webpage/jeecg/demo/test/webOfficeEdit.jsp +++ b/src/main/webapp/webpage/jeecg/demo/test/webOfficeEdit.jsp @@ -35,7 +35,6 @@ function WebOffice1_NotifyCtrlReady() { document.all.WebOffice1.LoadOriginalFile("", sFileType); } } -// ---------------------== 关闭页面时调用此函数，关闭文件 ==---------------------- // function window_onunload() { document.all.WebOffice1.Close(); } @@ -49,15 +48,12 @@ function newDoc() { function docOpen() { document.all.WebOffice1.LoadOriginalFile("open", "doc"); } -// -----------------------------== 保存文档 ==------------------------------------ // function newSave() { document.all.WebOffice1.Save(); } -// -----------------------------== 另存为文档 ==------------------------------------ // function SaveAsTo() { document.all.WebOffice1.ShowDialog(84); } -// -----------------------------== 上传文档 ==------------------------------------ // function SaveDoc() { var returnValue; if(myform.DocTitle.value ==""){ diff --git a/src/main/webapp/webpage/main/sliding_main.jsp b/src/main/webapp/webpage/main/sliding_main.jsp index 126fe441..bd67b68d 100644 --- a/src/main/webapp/webpage/main/sliding_main.jsp +++ b/src/main/webapp/webpage/main/sliding_main.jsp @@ -39,12 +39,12 @@ // var $script = $("script[src='plug-in/jquery/jquery-1.8.3.js']"); // $($script).remove(); // alert($script.attr("src")); - //update-end--Author:gaofeng Date:20140615 for：云桌面主题功能修复 + $(".dock_tool_theme").live("click",function(){ $("#themeSetting_wrap2").append(""); $("#themeSetting_wrap").html($("#themeSetting_wrap1").html()); $("#themeSetting_wrap").show(); - //update-end--Author:gaofeng Date:20140615 for：云桌面主题功能修复 + }) }); diff --git a/src/main/webapp/webpage/system/depart/departList.jsp b/src/main/webapp/webpage/system/depart/departList.jsp index 99c06a59..d6c87bb2 100644 --- a/src/main/webapp/webpage/system/depart/departList.jsp +++ b/src/main/webapp/webpage/system/depart/departList.jsp @@ -41,7 +41,7 @@ \ No newline at end of file diff --git a/src/main/webapp/webpage/system/function/function.jsp b/src/main/webapp/webpage/system/function/function.jsp index 68b187dd..91d0f008 100644 --- a/src/main/webapp/webpage/system/function/function.jsp +++ b/src/main/webapp/webpage/system/function/function.jsp @@ -10,10 +10,10 @@ $(function() { $('#cc').combotree({ url : 'functionController.do?setPFunction&selfId=${function.id}', -// update-start--Author:zhangguoming Date:20140901 for：为combotree下拉框的添加滚动条 + panelHeight: 200, width: 157, -// update-end--Author:zhangguoming Date:20140901 for：为combotree下拉框的添加滚动条 + onClick: function(node){ $("#functionId").val(node.id); } diff --git a/src/main/webapp/webpage/system/function/menuAppList.jsp b/src/main/webapp/webpage/system/function/menuAppList.jsp index 0c9ef90e..6005c3e9 100644 --- a/src/main/webapp/webpage/system/function/menuAppList.jsp +++ b/src/main/webapp/webpage/system/function/menuAppList.jsp @@ -7,7 +7,7 @@ diff --git a/src/main/webapp/webpage/system/role/roleList.jsp b/src/main/webapp/webpage/system/role/roleList.jsp index 3f24d9f7..24987e4f 100644 --- a/src/main/webapp/webpage/system/role/roleList.jsp +++ b/src/main/webapp/webpage/system/role/roleList.jsp @@ -30,7 +30,7 @@ function setfunbyrole(id,roleName) { $('#function-panel').panel("refresh" ); } -//update-start--Author:gaofeng Date:20140822 for：查看角色的所有用户信息 + function userListbyrole(id,roleName) { $("#function-panel").panel( { @@ -41,7 +41,7 @@ function userListbyrole(id,roleName) { $('#function-panel').panel("refresh" ); } -//update-end--Author:gaofeng Date:20140822 for：查看角色的所有用户信息 + //删除角色 function delRole(id){ var tabName= 'roleList'; diff --git a/src/main/webapp/webpage/system/user/user.jsp b/src/main/webapp/webpage/system/user/user.jsp index 6a6f2a54..26047578 100644 --- a/src/main/webapp/webpage/system/user/user.jsp +++ b/src/main/webapp/webpage/system/user/user.jsp @@ -7,7 +7,7 @@ <%--update-start--Author:zhangguoming Date:20140825 for：添加组织机构combobox多选的处理方法--%> <%--update-end--Author:zhangguoming Date:20140825 for：添加组织机构combobox多选的处理方法--%>