1、迁移初始提交

src/main/java/ccpit/admin/LoginController.java → src/main/java/org/ccpit/admin/LoginController.java

@@ -8,7 +8,7 @@
  *
 */
 
-package ccpit.admin;
+package org.ccpit.admin;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -17,13 +17,13 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
 import org.apache.commons.lang.StringUtils;
-import ccpit.base.controller.BaseController;
-import ccpit.base.controller.ValidateCodeController;
-import ccpit.base.logManage.LogInfoService;
-import ccpit.base.user.User;
-import ccpit.base.user.UserService;
-import ccpit.base.utils.PasswordHash;
-import ccpit.base.utils.UserRolesUtil;
+import org.ccpit.base.controller.BaseController;
+import org.ccpit.base.controller.ValidateCodeController;
+import org.ccpit.base.logManage.LogInfoService;
+import org.ccpit.base.user.User;
+import org.ccpit.base.user.UserService;
+import org.ccpit.base.utils.PasswordHash;
+import org.ccpit.base.utils.UserRolesUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +43,7 @@ import org.springframework.web.servlet.ModelAndView;
  */
 @Controller
 @RequestMapping("/admin")
-public class LoginController extends BaseController{
+public class LoginController extends BaseController {
 
 	private static final Logger log = LoggerFactory.getLogger(LoginController.class);
 	@Autowired

src/main/java/ccpit/base/controller/MyMultipartResolver.java → src/main/java/org/ccpit/base/controller/MyMultipartResolver.java

@@ -7,7 +7,7 @@
  * Copyright (c) 2016, liyang@ccpit.org All Rights Reserved.
  *
  */
-package ccpit.base.controller;
+package org.ccpit.base.controller;
 
 import javax.servlet.http.HttpServletRequest;
 

src/main/java/ccpit/base/controller/Page.java → src/main/java/org/ccpit/base/controller/Page.java

-package ccpit.base.controller;
+package org.ccpit.base.controller;
 
 import java.util.List;
 

src/main/java/ccpit/base/controller/PageBo.java → src/main/java/org/ccpit/base/controller/PageBo.java

-package ccpit.base.controller;
+package org.ccpit.base.controller;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/ccpit/base/controller/PageRequest.java → src/main/java/org/ccpit/base/controller/PageRequest.java

-package ccpit.base.controller;
+package org.ccpit.base.controller;
 
 /**
  * Created by Administrator on 2015/8/13.

src/main/java/ccpit/base/dao/JdbcDaoHelper.java → src/main/java/org/ccpit/base/dao/JdbcDaoHelper.java

@@ -8,17 +8,17 @@
  *
  */
 
-package ccpit.base.dao;
+package org.ccpit.base.dao;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import ccpit.base.controller.Page;
-import ccpit.base.controller.PageRequest;
-import ccpit.base.utils.AssertUtil;
-import ccpit.base.utils.ReadConfigUtil;
-import ccpit.base.utils.StringUtil;
+import org.ccpit.base.controller.Page;
+import org.ccpit.base.controller.PageRequest;
+import org.ccpit.base.utils.AssertUtil;
+import org.ccpit.base.utils.ReadConfigUtil;
+import org.ccpit.base.utils.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -263,9 +263,9 @@ public class JdbcDaoHelper<T> implements IJdbcDao<T> {
 	/**
 	 * 
 	 * TODO 查询结果分页显示，查询语句为sql
-	 * @see ccpit.base.dao.IJdbcDao#queryPage(ccpit.base.controller.PageRequest, String, Object[], Class)
+	 * @see IJdbcDao#queryPage(PageRequest, String, Object[], Class)
 	 */
-	public Page queryPage(PageRequest pageRequest, String sql, Object[] args,Class elementType) {
+	public Page queryPage(PageRequest pageRequest, String sql, Object[] args, Class elementType) {
 		AssertUtil.notNull(pageRequest, "pageRequest不能为空");
 
 		Page page = new Page(pageRequest);

src/main/java/ccpit/base/logManage/LogInfo.java → src/main/java/org/ccpit/base/logManage/LogInfo.java

@@ -8,7 +8,7 @@
  *
 */
 
-package ccpit.base.logManage;
+package org.ccpit.base.logManage;
 
 import java.io.Serializable;
 import java.util.Date;

src/main/java/ccpit/base/logManage/LogInfoController.java → src/main/java/org/ccpit/base/logManage/LogInfoController.java

@@ -8,7 +8,7 @@
  *
 */
 
-package ccpit.base.logManage;
+package org.ccpit.base.logManage;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -17,9 +17,9 @@ import javax.servlet.http.HttpServletRequest;
 
 import net.sf.json.JSONArray;
 
-import ccpit.base.controller.BaseController;
-import ccpit.base.controller.Page;
-import ccpit.base.controller.PageRequest;
+import org.ccpit.base.controller.BaseController;
+import org.ccpit.base.controller.Page;
+import org.ccpit.base.controller.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/ccpit/base/logManage/LogInfoDao.java → src/main/java/org/ccpit/base/logManage/LogInfoDao.java

@@ -8,9 +8,9 @@
  *
 */
 
-package ccpit.base.logManage;
+package org.ccpit.base.logManage;
 
-import ccpit.base.dao.BaseDao;
+import org.ccpit.base.dao.BaseDao;
 import org.springframework.stereotype.Repository;
 
 /**

src/main/java/ccpit/base/logManage/LogInfoService.java → src/main/java/org/ccpit/base/logManage/LogInfoService.java

@@ -8,7 +8,7 @@
  *
 */
 
-package ccpit.base.logManage;
+package org.ccpit.base.logManage;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -18,12 +18,12 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.transaction.Transactional;
 
-import ccpit.base.controller.BaseController;
-import ccpit.base.controller.Convert;
-import ccpit.base.controller.Page;
-import ccpit.base.controller.PageBo;
-import ccpit.base.controller.PageRequest;
-import ccpit.base.user.User;
+import org.ccpit.base.controller.BaseController;
+import org.ccpit.base.controller.Convert;
+import org.ccpit.base.controller.Page;
+import org.ccpit.base.controller.PageBo;
+import org.ccpit.base.controller.PageRequest;
+import org.ccpit.base.user.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 

src/main/java/ccpit/base/metadataManage/Metadata.java → src/main/java/org/ccpit/base/metadataManage/Metadata.java

@@ -8,7 +8,7 @@
  *
 */
 
-package ccpit.base.metadataManage;
+package org.ccpit.base.metadataManage;
 
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;

src/main/java/ccpit/base/metadataManage/MetadataController.java → src/main/java/org/ccpit/base/metadataManage/MetadataController.java

@@ -8,7 +8,7 @@
  *
 */
 
-package ccpit.base.metadataManage;
+package org.ccpit.base.metadataManage;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -34,10 +34,10 @@ import org.apache.commons.fileupload.servlet.ServletFileUpload;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import ccpit.base.controller.BaseController;
-import ccpit.base.controller.Page;
-import ccpit.base.controller.PageRequest;
-import ccpit.base.user.User;
+import org.ccpit.base.controller.BaseController;
+import org.ccpit.base.controller.Page;
+import org.ccpit.base.controller.PageRequest;
+import org.ccpit.base.user.User;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/ccpit/base/metadataManage/MetadataDao.java → src/main/java/org/ccpit/base/metadataManage/MetadataDao.java

@@ -8,9 +8,9 @@
  *
 */
 
-package ccpit.base.metadataManage;
+package org.ccpit.base.metadataManage;
 
-import ccpit.base.dao.BaseDao;
+import org.ccpit.base.dao.BaseDao;
 import org.springframework.stereotype.Repository;
 
 /**

src/main/java/ccpit/base/metadataManage/MetadataService.java → src/main/java/org/ccpit/base/metadataManage/MetadataService.java

@@ -8,7 +8,7 @@
  *
 */
 
-package ccpit.base.metadataManage;
+package org.ccpit.base.metadataManage;
 
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
@@ -18,11 +18,11 @@ import java.util.Map;
 
 import javax.transaction.Transactional;
 
-import ccpit.base.controller.Convert;
-import ccpit.base.controller.Page;
-import ccpit.base.controller.PageBo;
-import ccpit.base.controller.PageRequest;
-import ccpit.base.utils.TranslateDataUtil;
+import org.ccpit.base.controller.Convert;
+import org.ccpit.base.controller.Page;
+import org.ccpit.base.controller.PageBo;
+import org.ccpit.base.controller.PageRequest;
+import org.ccpit.base.utils.TranslateDataUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 

src/main/java/ccpit/base/orgManage/OrgController.java → src/main/java/org/ccpit/base/orgManage/OrgController.java

@@ -8,7 +8,7 @@
  *
  */
 
-package ccpit.base.orgManage;
+package org.ccpit.base.orgManage;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -23,13 +23,13 @@ import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import ccpit.base.controller.BaseController;
-import ccpit.base.controller.Page;
-import ccpit.base.controller.PageRequest;
-import ccpit.base.role.Role;
-import ccpit.base.role.RoleService;
-import ccpit.base.user.User;
-import ccpit.base.user.UserService;
+import org.ccpit.base.controller.BaseController;
+import org.ccpit.base.controller.Page;
+import org.ccpit.base.controller.PageRequest;
+import org.ccpit.base.role.Role;
+import org.ccpit.base.role.RoleService;
+import org.ccpit.base.user.User;
+import org.ccpit.base.user.UserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/ccpit/base/orgManage/OrgDao.java → src/main/java/org/ccpit/base/orgManage/OrgDao.java

@@ -8,15 +8,15 @@
  *
  */
 
-package ccpit.base.orgManage;
+package org.ccpit.base.orgManage;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import ccpit.base.dao.BaseDao;
-import ccpit.base.role.Role;
-import ccpit.base.user.User;
+import org.ccpit.base.dao.BaseDao;
+import org.ccpit.base.role.Role;
+import org.ccpit.base.user.User;
 import org.springframework.stereotype.Repository;
 
 /**

src/main/java/ccpit/base/orgManage/OrgInfo.java → src/main/java/org/ccpit/base/orgManage/OrgInfo.java

@@ -8,7 +8,7 @@
  *
 */
 
-package ccpit.base.orgManage;
+package org.ccpit.base.orgManage;
 
 import java.util.Date;
 import java.util.HashSet;
@@ -22,8 +22,8 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
 
-import ccpit.base.role.Role;
-import ccpit.base.user.User;
+import org.ccpit.base.role.Role;
+import org.ccpit.base.user.User;
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.annotations.Where;

src/main/java/ccpit/base/orgManage/OrgService.java → src/main/java/org/ccpit/base/orgManage/OrgService.java

@@ -8,7 +8,7 @@
  *
 */
 
-package ccpit.base.orgManage;
+package org.ccpit.base.orgManage;
 
 import java.util.HashSet;
 import java.util.List;
@@ -16,11 +16,11 @@ import java.util.Set;
 
 import javax.transaction.Transactional;
 
-import ccpit.base.controller.Page;
-import ccpit.base.controller.PageRequest;
-import ccpit.base.role.Role;
-import ccpit.base.role.RoleDao;
-import ccpit.base.user.User;
+import org.ccpit.base.controller.Page;
+import org.ccpit.base.controller.PageRequest;
+import org.ccpit.base.role.Role;
+import org.ccpit.base.role.RoleDao;
+import org.ccpit.base.user.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 

src/main/java/ccpit/base/privilegeManage/Operate.java → src/main/java/org/ccpit/base/privilegeManage/Operate.java

@@ -8,7 +8,7 @@
  *
 */
 
-package ccpit.base.privilegeManage;
+package org.ccpit.base.privilegeManage;
 
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;

src/main/java/ccpit/base/privilegeManage/OperateController.java → src/main/java/org/ccpit/base/privilegeManage/OperateController.java

@@ -8,7 +8,7 @@
  *
 */
 
-package ccpit.base.privilegeManage;
+package org.ccpit.base.privilegeManage;
 
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
@@ -20,11 +20,11 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import ccpit.base.role.Role;
-import ccpit.base.role.RoleService;
-import ccpit.base.role.RoleUrl;
-import ccpit.base.user.User;
-import ccpit.base.user.UserController;
+import org.ccpit.base.role.Role;
+import org.ccpit.base.role.RoleService;
+import org.ccpit.base.role.RoleUrl;
+import org.ccpit.base.user.User;
+import org.ccpit.base.user.UserController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/ccpit/base/privilegeManage/OperateDao.java → src/main/java/org/ccpit/base/privilegeManage/OperateDao.java

@@ -8,11 +8,11 @@
  *
 */
 
-package ccpit.base.privilegeManage;
+package org.ccpit.base.privilegeManage;
 
 import java.util.List;
 
-import ccpit.base.dao.BaseDao;
+import org.ccpit.base.dao.BaseDao;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -26,7 +26,7 @@ import org.springframework.stereotype.Repository;
  * @see 	 
  */
 @Repository
-public class OperateDao extends BaseDao<Operate>{
+public class OperateDao extends BaseDao<Operate> {
 
 	public List<Operate> getChildOrgById(long id) {
 		String hql = "from " + Operate.class.getName()+" where parentId=" + id;

src/main/java/ccpit/base/privilegeManage/OperateService.java → src/main/java/org/ccpit/base/privilegeManage/OperateService.java

@@ -8,7 +8,7 @@
  *
 */
 
-package ccpit.base.privilegeManage;
+package org.ccpit.base.privilegeManage;
 
 import java.util.List;
 

src/main/java/ccpit/base/role/IRole.java → src/main/java/org/ccpit/base/role/IRole.java

-package ccpit.base.role;
+package org.ccpit.base.role;
 
 import java.util.List;
 

src/main/java/ccpit/base/role/Role.java → src/main/java/org/ccpit/base/role/Role.java

-package ccpit.base.role;
+package org.ccpit.base.role;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -12,9 +12,9 @@ import javax.persistence.Id;
 import javax.persistence.ManyToMany;
 import javax.persistence.OneToMany;
 
-import ccpit.base.modol.BaseEntity;
-import ccpit.base.orgManage.OrgInfo;
-import ccpit.base.user.User;
+import org.ccpit.base.modol.BaseEntity;
+import org.ccpit.base.orgManage.OrgInfo;
+import org.ccpit.base.user.User;
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.annotations.Where;

src/main/java/ccpit/base/role/RoleController.java → src/main/java/org/ccpit/base/role/RoleController.java

-package ccpit.base.role;
+package org.ccpit.base.role;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -11,13 +11,13 @@ import javax.servlet.http.HttpServletResponse;
 
 import net.sf.json.JSONArray;
 
-import ccpit.base.controller.BaseController;
-import ccpit.base.controller.Page;
-import ccpit.base.controller.PageRequest;
-import ccpit.base.orgManage.OrgInfo;
-import ccpit.base.orgManage.OrgService;
-import ccpit.base.user.User;
-import ccpit.base.user.UserService;
+import org.ccpit.base.controller.BaseController;
+import org.ccpit.base.controller.Page;
+import org.ccpit.base.controller.PageRequest;
+import org.ccpit.base.orgManage.OrgInfo;
+import org.ccpit.base.orgManage.OrgService;
+import org.ccpit.base.user.User;
+import org.ccpit.base.user.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -30,7 +30,7 @@ import org.springframework.web.servlet.ModelAndView;
  */
 @Controller
 @RequestMapping("/admin/role")
-public class RoleController extends BaseController{
+public class RoleController extends BaseController {
     @Autowired
     private RoleService roleService;
     @Autowired

src/main/java/ccpit/base/role/RoleDao.java → src/main/java/org/ccpit/base/role/RoleDao.java

-package ccpit.base.role;
+package org.ccpit.base.role;
 
-import ccpit.base.dao.BaseDao;
+import org.ccpit.base.dao.BaseDao;
 import org.springframework.stereotype.Repository;
 
 /**

src/main/java/ccpit/base/role/RoleService.java → src/main/java/org/ccpit/base/role/RoleService.java

-package ccpit.base.role;
+package org.ccpit.base.role;
 
 import org.apache.commons.lang.StringUtils;
-import ccpit.base.controller.Convert;
-import ccpit.base.controller.Page;
-import ccpit.base.controller.PageBo;
-import ccpit.base.controller.PageRequest;
-import ccpit.base.user.UserDao;
-import ccpit.base.utils.UrlRolesMapper;
+import org.ccpit.base.controller.Convert;
+import org.ccpit.base.controller.Page;
+import org.ccpit.base.controller.PageBo;
+import org.ccpit.base.controller.PageRequest;
+import org.ccpit.base.utils.UrlRolesMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 

src/main/java/ccpit/base/role/RoleUrl.java → src/main/java/org/ccpit/base/role/RoleUrl.java

-package ccpit.base.role;
+package org.ccpit.base.role;
 
-import ccpit.base.modol.BaseEntity;
+import org.ccpit.base.modol.BaseEntity;
 import org.hibernate.annotations.*;
 
 import javax.persistence.*;

src/main/java/ccpit/base/security/LoginFilter.java → src/main/java/org/ccpit/base/security/LoginFilter.java

-package ccpit.base.security;
+package org.ccpit.base.security;
 
 
 import java.io.IOException;
@@ -16,7 +16,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
-import ccpit.base.controller.BaseController;
+import org.ccpit.base.controller.BaseController;
 
 /**
  * 用户登录Filter 拦截后台所有请求

src/main/java/ccpit/base/security/SecurityAllGroupTag.java → src/main/java/org/ccpit/base/security/SecurityAllGroupTag.java

-package ccpit.base.security;
+package org.ccpit.base.security;
 
 import org.apache.commons.lang.StringUtils;
-import ccpit.base.user.User;
-import ccpit.base.usergroup.UserGroup;
-import ccpit.base.usergroup.UserGroupService;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
+import org.ccpit.base.user.User;
+import org.ccpit.base.usergroup.UserGroup;
+import org.ccpit.base.usergroup.UserGroupService;
 
 /**
  * Created by Administrator on 2015/9/7.

src/main/java/ccpit/base/security/SecurityAllRoleTag.java → src/main/java/org/ccpit/base/security/SecurityAllRoleTag.java

-package ccpit.base.security;
+package org.ccpit.base.security;
 
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
-import ccpit.base.role.Role;
-import ccpit.base.user.UserService;
+import org.ccpit.base.role.Role;
+import org.ccpit.base.user.UserService;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;

src/main/java/ccpit/base/security/SecurityAnyGroupTag.java → src/main/java/org/ccpit/base/security/SecurityAnyGroupTag.java

-package ccpit.base.security;
+package org.ccpit.base.security;
 
 import org.apache.commons.lang.StringUtils;
-import ccpit.base.user.User;
-import ccpit.base.usergroup.UserGroup;
-import ccpit.base.usergroup.UserGroupService;
+import org.ccpit.base.user.User;
+import org.ccpit.base.usergroup.UserGroup;
+import org.ccpit.base.usergroup.UserGroupService;
 
 /**
  * Created by Administrator on 2015/9/7.

src/main/java/ccpit/base/security/SecurityAnyRoleTag.java → src/main/java/org/ccpit/base/security/SecurityAnyRoleTag.java

-package ccpit.base.security;
+package org.ccpit.base.security;
 
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
-import ccpit.base.role.Role;
-import ccpit.base.user.UserService;
+import org.ccpit.base.role.Role;
+import org.ccpit.base.user.UserService;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/ccpit/base/security/SecurityInterceptor.java → src/main/java/org/ccpit/base/security/SecurityInterceptor.java

-package ccpit.base.security;
+package org.ccpit.base.security;
 
 import org.apache.commons.collections.CollectionUtils;
-import ccpit.base.role.Role;
-import ccpit.base.user.User;
-import ccpit.base.utils.UrlRolesMapper;
-import ccpit.base.utils.UserRolesUtil;
+import org.ccpit.base.role.Role;
+import org.ccpit.base.user.User;
+import org.ccpit.base.utils.UrlRolesMapper;
+import org.ccpit.base.utils.UserRolesUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
+import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
 import javax.servlet.http.HttpServletRequest;

src/main/java/ccpit/base/security/SecurityUriTag.java → src/main/java/org/ccpit/base/security/SecurityUriTag.java

-package ccpit.base.security;
+package org.ccpit.base.security;
 
 import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.collections.CollectionUtils;
-import ccpit.base.role.Role;
-import ccpit.base.utils.UrlRolesMapper;
-import ccpit.base.utils.UserRolesUtil;
+import org.ccpit.base.role.Role;
+import org.ccpit.base.utils.UrlRolesMapper;
+import org.ccpit.base.utils.UserRolesUtil;
 import org.springframework.stereotype.Component;
 
 /**

src/main/java/ccpit/base/service/IService.java → src/main/java/org/ccpit/base/service/IService.java

-package ccpit.base.service;
+package org.ccpit.base.service;
 
 /**
  * Created by Administrator on 2015/8/18.

src/main/java/ccpit/base/user/IUser.java → src/main/java/org/ccpit/base/user/IUser.java

-package ccpit.base.user;
+package org.ccpit.base.user;
 
 /**
  * Created by Administrator on 2015/9/2.

src/main/java/ccpit/base/utils/MessageUtil.java → src/main/java/org/ccpit/base/utils/MessageUtil.java

@@ -8,7 +8,7 @@
  *
 */
 
-package ccpit.base.utils;
+package org.ccpit.base.utils;
 
 import java.io.BufferedReader;
 import java.io.IOException;

src/main/java/ccpit/base/utils/MethodInterface.java → src/main/java/org/ccpit/base/utils/MethodInterface.java

-package ccpit.base.utils;
+package org.ccpit.base.utils;
 
 import java.util.Map;
 

src/main/java/ccpit/base/utils/OSinfoUtil.java → src/main/java/org/ccpit/base/utils/OSinfoUtil.java

@@ -8,7 +8,7 @@
  *
 */
 
-package ccpit.base.utils;
+package org.ccpit.base.utils;
 /**
  * ClassName:OSinfoUtil <br/>
  * Function: TODO 判断当前系统类型工具类. <br/>

src/main/java/ccpit/base/utils/ObjectUtil.java → src/main/java/org/ccpit/base/utils/ObjectUtil.java

@@ -8,7 +8,7 @@
  *
  */
 
-package ccpit.base.utils;
+package org.ccpit.base.utils;
 
 import java.lang.reflect.Array;
 import java.util.Arrays;

src/main/java/ccpit/base/utils/PasswordHash.java → src/main/java/org/ccpit/base/utils/PasswordHash.java

@@ -8,7 +8,7 @@
  *
  */
 
-package ccpit.base.utils;
+package org.ccpit.base.utils;
 
 import java.math.BigInteger;
 import java.security.NoSuchAlgorithmException;

src/main/java/ccpit/base/utils/ReadConfigUtil.java → src/main/java/org/ccpit/base/utils/ReadConfigUtil.java

-package ccpit.base.utils;
+package org.ccpit.base.utils;
 
 import java.io.InputStream;
 import java.util.Enumeration;

src/main/java/ccpit/base/utils/lucene/LuceneConfig.java → src/main/java/org/ccpit/base/utils/lucene/LuceneConfig.java

-package ccpit.base.utils.lucene;
+package org.ccpit.base.utils.lucene;
 import java.io.File;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.FSDirectory;
-import ccpit.base.utils.ReadConfigUtil;
+import org.ccpit.base.utils.ReadConfigUtil;
 import org.springframework.stereotype.Service;
 import org.wltea.analyzer.lucene.IKAnalyzer;
 

src/main/java/ccpit/base/utils/lucene/LuceneUtil.java → src/main/java/org/ccpit/base/utils/lucene/LuceneUtil.java

@@ -7,7 +7,7 @@
  * Copyright (c) 2016, liyang@ccpit.org All Rights Reserved.
  *
  */
-package ccpit.base.utils.lucene;
+package org.ccpit.base.utils.lucene;
 
 import java.io.File;
 import java.io.IOException;

src/main/java/ccpit/base/utils/mailUtil/Mail.java → src/main/java/org/ccpit/base/utils/mailUtil/Mail.java

@@ -8,7 +8,7 @@
  *
 */
 
-package ccpit.base.utils.mailUtil;
+package org.ccpit.base.utils.mailUtil;
 
 import java.io.Serializable;
 

src/main/java/ccpit/base/utils/mailUtil/MailUtil.java → src/main/java/org/ccpit/base/utils/mailUtil/MailUtil.java

@@ -8,7 +8,7 @@
  *
 */
 
-package ccpit.base.utils.mailUtil;
+package org.ccpit.base.utils.mailUtil;
 
 import java.io.File;
 import java.io.UnsupportedEncodingException;

src/main/java/ccpit/base/utils/page/Order.java → src/main/java/org/ccpit/base/utils/page/Order.java

-package ccpit.base.utils.page;
+package org.ccpit.base.utils.page;
 
 /**
  * @author liyang 封装一个排序对象

src/main/java/ccpit/base/utils/page/Ordering.java → src/main/java/org/ccpit/base/utils/page/Ordering.java

-package ccpit.base.utils.page;
+package org.ccpit.base.utils.page;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/ccpit/base/utils/page/PageUtil.java → src/main/java/org/ccpit/base/utils/page/PageUtil.java

-package ccpit.base.utils.page;
+package org.ccpit.base.utils.page;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -12,13 +12,11 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
-import ccpit.base.controller.Convert;
-import ccpit.base.controller.Page;
-import ccpit.base.controller.PageBo;
-import ccpit.base.utils.CommonUtils;
-import ccpit.base.utils.MethodInterface;
-
-
+import org.ccpit.base.controller.Convert;
+import org.ccpit.base.controller.Page;
+import org.ccpit.base.controller.PageBo;
+import org.ccpit.base.utils.CommonUtils;
+import org.ccpit.base.utils.MethodInterface;
 
 
 /**
@@ -151,7 +149,7 @@ public  class PageUtil {
         	return map;
     }
 	
-	 public  static <T> PageBo<T> convert(Page<T> page,MethodInterface method){
+	 public  static <T> PageBo<T> convert(Page<T> page, MethodInterface method){
 	    	if(null == page){
 	    		return null;
 	    	}

src/main/java/ccpit/base/utils/page/SearchMethod.java → src/main/java/org/ccpit/base/utils/page/SearchMethod.java

-package ccpit.base.utils.page;
+package org.ccpit.base.utils.page;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/ccpit/business/newsManage/NewsInfo.java → src/main/java/org/ccpit/business/newsManage/NewsInfo.java

@@ -8,7 +8,7 @@
  *
  */
 
-package ccpit.business.newsManage;
+package org.ccpit.business.newsManage;
 
 import java.util.Date;
 
@@ -20,7 +20,7 @@ import javax.persistence.Id;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
-import ccpit.base.user.User;
+import org.ccpit.base.user.User;
 import org.hibernate.annotations.Where;
 
 /**

src/main/java/ccpit/business/newsManage/NewsInfoController.java → src/main/java/org/ccpit/business/newsManage/NewsInfoController.java

@@ -8,7 +8,7 @@
  *
 */
 
-package ccpit.business.newsManage;
+package org.ccpit.business.newsManage;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -16,11 +16,11 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import ccpit.base.controller.BaseController;
-import ccpit.base.controller.Page;
-import ccpit.base.controller.PageRequest;
-import ccpit.base.logManage.LogInfoService;
-import ccpit.base.user.User;
+import org.ccpit.base.controller.BaseController;
+import org.ccpit.base.controller.Page;
+import org.ccpit.base.controller.PageRequest;
+import org.ccpit.base.logManage.LogInfoService;
+import org.ccpit.base.user.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/ccpit/business/newsManage/NewsInfoDao.java → src/main/java/org/ccpit/business/newsManage/NewsInfoDao.java

@@ -8,9 +8,9 @@
  *
 */
 
-package ccpit.business.newsManage;
+package org.ccpit.business.newsManage;
 
-import ccpit.base.dao.BaseDao;
+import org.ccpit.base.dao.BaseDao;
 import org.springframework.stereotype.Repository;
 
 /**

src/main/java/ccpit/business/newsManage/NewsInfoService.java → src/main/java/org/ccpit/business/newsManage/NewsInfoService.java

@@ -8,7 +8,7 @@
  *
  */
 
-package ccpit.business.newsManage;
+package org.ccpit.business.newsManage;
 
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
@@ -24,15 +24,15 @@ import net.sf.json.JSONArray;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.Field.Index;
 import org.apache.lucene.document.Field.Store;
-import ccpit.base.controller.Convert;
-import ccpit.base.controller.Page;
-import ccpit.base.controller.PageBo;
-import ccpit.base.controller.PageRequest;
-import ccpit.base.logManage.LogInfoService;
-import ccpit.base.user.User;
-import ccpit.base.utils.DateConvert;
-import ccpit.base.utils.StringUtil;
-import ccpit.base.utils.page.PageUtil;
+import org.ccpit.base.controller.Convert;
+import org.ccpit.base.controller.Page;
+import org.ccpit.base.controller.PageBo;
+import org.ccpit.base.controller.PageRequest;
+import org.ccpit.base.logManage.LogInfoService;
+import org.ccpit.base.user.User;
+import org.ccpit.base.utils.DateConvert;
+import org.ccpit.base.utils.StringUtil;
+import org.ccpit.base.utils.page.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/ccpit/business/noticeManage/Notice.java → src/main/java/org/ccpit/business/noticeManage/Notice.java

@@ -8,7 +8,7 @@
  *
 */
 
-package ccpit.business.noticeManage;
+package org.ccpit.business.noticeManage;
 
 import java.util.Date;
 
@@ -20,7 +20,7 @@ import javax.persistence.Id;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
-import ccpit.base.user.User;
+import org.ccpit.base.user.User;
 import org.hibernate.annotations.Where;
 
 /**

src/main/java/ccpit/business/noticeManage/NoticeController.java → src/main/java/org/ccpit/business/noticeManage/NoticeController.java

@@ -8,7 +8,7 @@
  *
 */
 
-package ccpit.business.noticeManage;
+package org.ccpit.business.noticeManage;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -16,11 +16,11 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import ccpit.base.controller.BaseController;
-import ccpit.base.controller.Page;
-import ccpit.base.controller.PageRequest;
-import ccpit.base.logManage.LogInfoService;
-import ccpit.base.user.User;
+import org.ccpit.base.controller.BaseController;
+import org.ccpit.base.controller.Page;
+import org.ccpit.base.controller.PageRequest;
+import org.ccpit.base.logManage.LogInfoService;
+import org.ccpit.base.user.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -39,7 +39,7 @@ import org.springframework.web.servlet.ModelAndView;
  */
 @RestController
 @RequestMapping("/business/noticeManage")
-public class NoticeController extends BaseController{
+public class NoticeController extends BaseController {
 
 	@Autowired
 	private NoticeService noticeService;

src/main/java/ccpit/business/noticeManage/NoticeDao.java → src/main/java/org/ccpit/business/noticeManage/NoticeDao.java

@@ -8,9 +8,9 @@
  *
 */
 
-package ccpit.business.noticeManage;
+package org.ccpit.business.noticeManage;
 
-import ccpit.base.dao.BaseDao;
+import org.ccpit.base.dao.BaseDao;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -25,7 +25,7 @@ import org.springframework.stereotype.Repository;
  */
 
 @Repository
-public class NoticeDao extends BaseDao<Notice>{
+public class NoticeDao extends BaseDao<Notice> {
 
 }
 

src/main/java/ccpit/business/noticeManage/NoticeService.java → src/main/java/org/ccpit/business/noticeManage/NoticeService.java

@@ -8,7 +8,7 @@
  *
 */
 
-package ccpit.business.noticeManage;
+package org.ccpit.business.noticeManage;
 
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
@@ -21,14 +21,14 @@ import javax.transaction.Transactional;
 
 import net.sf.json.JSONArray;
 
-import ccpit.base.controller.Convert;
-import ccpit.base.controller.Page;
-import ccpit.base.controller.PageBo;
-import ccpit.base.controller.PageRequest;
-import ccpit.base.logManage.LogInfoService;
-import ccpit.base.user.User;
-import ccpit.base.utils.StringUtil;
-import ccpit.base.utils.page.PageUtil;
+import org.ccpit.base.controller.Convert;
+import org.ccpit.base.controller.Page;
+import org.ccpit.base.controller.PageBo;
+import org.ccpit.base.controller.PageRequest;
+import org.ccpit.base.logManage.LogInfoService;
+import org.ccpit.base.user.User;
+import org.ccpit.base.utils.StringUtil;
+import org.ccpit.base.utils.page.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -143,7 +143,7 @@ public class NoticeService {
 		map.put("id", notice.getId());
 		map.put("noticeTitle", notice.getNoticeTitle());
 		map.put("noticeType", null == notice.getNoticeType() ? "" : 1 == notice.getNoticeType() ? "通知公告" : "政策法规");
-		map.put("createTime",StringUtil.DATE_FORMATE.format(notice.getCreateTime()));
+		map.put("createTime", StringUtil.DATE_FORMATE.format(notice.getCreateTime()));
 		map.put("clickVolume", notice.getClickVolume());
 		map.put("creator", notice.getCreator().getUsername());
 

src/main/java/ccpit/business/questionsManage/Question.java → src/main/java/org/ccpit/business/questionsManage/Question.java

-package ccpit.business.questionsManage;
+package org.ccpit.business.questionsManage;
 
 import java.util.Date;
 
@@ -10,7 +10,7 @@ import javax.persistence.Id;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
-import ccpit.base.user.User;
+import org.ccpit.base.user.User;
 import org.hibernate.annotations.Where;
 @Entity
 @Where(clause = "deleted='false'")

src/main/java/ccpit/business/questionsManage/QuestionController.java → src/main/java/org/ccpit/business/questionsManage/QuestionController.java

-package ccpit.business.questionsManage;
+package org.ccpit.business.questionsManage;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -6,11 +6,11 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import ccpit.base.controller.BaseController;
-import ccpit.base.controller.Page;
-import ccpit.base.controller.PageRequest;
-import ccpit.base.logManage.LogInfoService;
-import ccpit.base.user.User;
+import org.ccpit.base.controller.BaseController;
+import org.ccpit.base.controller.Page;
+import org.ccpit.base.controller.PageRequest;
+import org.ccpit.base.logManage.LogInfoService;
+import org.ccpit.base.user.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,7 +19,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 @RestController
 @RequestMapping(value="/business/questionManage")
-public class QuestionController extends BaseController{
+public class QuestionController extends BaseController {
 
 	@Autowired
 	private QuestionService questionService;

src/main/java/ccpit/business/questionsManage/QuestionDao.java → src/main/java/org/ccpit/business/questionsManage/QuestionDao.java

-package ccpit.business.questionsManage;
+package org.ccpit.business.questionsManage;
 
-import ccpit.base.dao.BaseDao;
+import org.ccpit.base.dao.BaseDao;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class QuestionDao extends BaseDao<Question>{
+public class QuestionDao extends BaseDao<Question> {
 
 }

src/main/java/ccpit/business/questionsManage/QuestionService.java → src/main/java/org/ccpit/business/questionsManage/QuestionService.java

-package ccpit.business.questionsManage;
+package org.ccpit.business.questionsManage;
 
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
@@ -11,14 +11,14 @@ import javax.transaction.Transactional;
 
 import net.sf.json.JSONArray;
 
-import ccpit.base.controller.Convert;
-import ccpit.base.controller.Page;
-import ccpit.base.controller.PageBo;
-import ccpit.base.controller.PageRequest;
-import ccpit.base.logManage.LogInfoService;
-import ccpit.base.user.User;
-import ccpit.base.utils.StringUtil;
-import ccpit.base.utils.page.PageUtil;
+import org.ccpit.base.controller.Convert;
+import org.ccpit.base.controller.Page;
+import org.ccpit.base.controller.PageBo;
+import org.ccpit.base.controller.PageRequest;
+import org.ccpit.base.logManage.LogInfoService;
+import org.ccpit.base.user.User;
+import org.ccpit.base.utils.StringUtil;
+import org.ccpit.base.utils.page.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -115,7 +115,7 @@ public class QuestionService {
 		}
 		map.put("id", question.getId());
 		map.put("title", question.getTitle());
-		map.put("createTime",StringUtil.DATE_FORMATE.format(question.getCreateTime()));
+		map.put("createTime", StringUtil.DATE_FORMATE.format(question.getCreateTime()));
 		map.put("clickVolume", question.getClickVolume());
 		map.put("creator", question.getCreator().getUsername());
 

src/main/java/ccpit/business/serviceNetWork/ServiceNetWork.java → src/main/java/org/ccpit/business/serviceNetWork/ServiceNetWork.java

 /**
  * 
  */
-package ccpit.business.serviceNetWork;
+package org.ccpit.business.serviceNetWork;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;

src/main/java/ccpit/business/serviceNetWork/ServiceNetWorkDao.java → src/main/java/org/ccpit/business/serviceNetWork/ServiceNetWorkDao.java

 /**
  * 
  */
-package ccpit.business.serviceNetWork;
+package org.ccpit.business.serviceNetWork;
 
-import ccpit.base.dao.BaseDao;
+import org.ccpit.base.dao.BaseDao;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -16,6 +16,6 @@ import org.springframework.stereotype.Repository;
  *
  */
 @Repository
-public class ServiceNetWorkDao extends BaseDao<ServiceNetWork>{
+public class ServiceNetWorkDao extends BaseDao<ServiceNetWork> {
 
 }

src/main/java/ccpit/business/serviceNetWork/ServiceNetWorkService.java → src/main/java/org/ccpit/business/serviceNetWork/ServiceNetWorkService.java

 /**
  * 
  */
-package ccpit.business.serviceNetWork;
+package org.ccpit.business.serviceNetWork;
 
 import java.util.List;
 

src/main/java/ccpit/business/smsManage/SmsController.java → src/main/java/org/ccpit/business/smsManage/SmsController.java

@@ -8,7 +8,7 @@
  *
 */
 
-package ccpit.business.smsManage;
+package org.ccpit.business.smsManage;
 
 import java.io.IOException;
 import java.io.InputStream;

src/main/java/ccpit/front/newsInfo/NewsInfoFrontController.java → src/main/java/org/ccpit/front/newsInfo/NewsInfoFrontController.java

 /**
  * 
  */
-package ccpit.front.newsInfo;
+package org.ccpit.front.newsInfo;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -9,9 +9,9 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
-import ccpit.base.controller.BaseController;
-import ccpit.business.newsManage.NewsInfo;
-import ccpit.business.newsManage.NewsInfoService;
+import org.ccpit.base.controller.BaseController;
+import org.ccpit.business.newsManage.NewsInfo;
+import org.ccpit.business.newsManage.NewsInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/ccpit/ueditor/PathFormat.java → src/main/java/org/ccpit/ueditor/PathFormat.java

-package ccpit.ueditor;
+package org.ccpit.ueditor;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

src/main/java/ccpit/ueditor/define/MIMEType.java → src/main/java/org/ccpit/ueditor/define/MIMEType.java

-package ccpit.ueditor.define;
+package org.ccpit.ueditor.define;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/java/ccpit/ueditor/define/MultiState.java → src/main/java/org/ccpit/ueditor/define/MultiState.java

-package ccpit.ueditor.define;
+package org.ccpit.ueditor.define;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -6,7 +6,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import ccpit.ueditor.Encoder;
+import org.ccpit.ueditor.Encoder;
 
 
 /**

src/main/resources/spring-bean.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-        http://www.springframework.org/schema/beans     
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:task="http://www.springframework.org/schema/task"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
         http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context-3.2.xsd">
+        http://www.springframework.org/schema/context/spring-context-3.2.xsd http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd">
 
 	<!-- 发送邮件的线程池 -->
 	<bean id="taskExecutor"
@@ -15,11 +14,11 @@
 		<property name="maxPoolSize" value="10" />
 		<property name="queueCapacity" value="25" />
 	</bean>
-	<bean id="multipartResolver" class="ccpit.base.controller.MyMultipartResolver">
-		<!-- url中带有example的http请求就不会被multipartResolver先解析-->  
+	<!-- 	<bean id="multipartResolver" class="org.ccpit.base.controller.MyMultipartResolver">
+            url中带有example的http请求就不会被multipartResolver先解析
             <property name="excludeUrls" value="uploadFile"/>
             <property name="maxUploadSize" value="10485760"/>
-   </bean>
+       </bean> -->
 	<bean id="configProperties" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
 		<property name="locations">
 			<list>

src/main/webapp/WEB-INF/jsp/admin/metadataManage/metadataListPage.jsp

 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-
+<%@ taglib prefix="security" uri="http://www.ccpit.org/" %>
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">

src/main/webapp/WEB-INF/jsp/admin/orgManage/orgListPage.jsp

 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-
+<%@ taglib prefix="security" uri="http://www.ccpit.org/" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>

src/main/webapp/WEB-INF/jsp/admin/privilegeManage/privilegeListPage.jsp

 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-
+<%@ taglib prefix="security" uri="http://www.ccpit.org/" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>

src/main/webapp/WEB-INF/jsp/admin/privilegeManage/rolePriListPage.jsp

 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-
+<%@ taglib prefix="security" uri="http://www.ccpit.org/" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <html>
 <head> 

src/main/webapp/WEB-INF/jsp/admin/role/roleListPage.jsp

 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-
+<%@ taglib prefix="security" uri="http://www.ccpit.org/" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <html>
 <head>

src/main/webapp/WEB-INF/jsp/admin/user/manage.jsp

 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-
+<%@ taglib prefix="security" uri="http://www.ccpit.org/" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <html>
 <head>

src/main/webapp/WEB-INF/jsp/business/newsInfoPage.jsp

 <%@ page language="java" contentType="text/html; charset=UTF-8"
     pageEncoding="UTF-8"%>
  <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-
+<%@ taglib prefix="security" uri="http://www.ccpit.org/" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>

src/main/webapp/WEB-INF/jsp/business/noticePage.jsp

 <%@ page language="java" contentType="text/html; charset=UTF-8"
     pageEncoding="UTF-8"%>
  <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="security" uri="http://www.ccpit.org/" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
@@ -46,7 +47,7 @@
 			<table class="edittable" width="100%" border="0">  
 				<tr>
 				    <td align="right"><span>通知公告标题:</span></td>
-					<td  align="left">
+					<td  align="left" colspan="3">
 						<input id="titleId" name="noticeTitle" class="easyui-textbox" />  
 					</td>
 				</tr> 
@@ -55,30 +56,32 @@
 					<td  align="left">
 						<input id="noticeTypeId" name="noticeType" class="easyui-combobox" />  
 					</td>
+				    <td align="right"  class="infotatusClass"><span>置顶:</span></td>
+					<td  align="left"  class="infotatusClass">
+						<input id="infotatusId" name="infotatus" class="easyui-combobox"   />  
+					</td>
 				</tr>
 				<tr>
 				    <td width="15%" align="right"><span>通知公告内容:</span></td>
-					<td width="85%" align="left" >
+					<td width="85%" align="left" colspan="3">
 						<textarea id="noticeContentId" name="noticeContent" rows="15"></textarea>
 					</td>
 				</tr>
 				<tr>
 					<td>&nbsp;</td>
-					<td></td>
+					<td colspan="3"></td>
 				</tr>
 				<tr>
-					 <td colspan="2" align="center"> 
+					 <td colspan="4" align="center"> 
 					    <a id="buttonId01" href="#" class="easyui-linkbutton" iconCls="icon-ok" onclick="saveData()">保存</a>
 						<a id="buttonId02" href="#" class="easyui-linkbutton" iconCls="icon-cancel" onclick="closeWindow();">取消</a>
 					 </td>
 	  			</tr>
 	  			<tr>
-	  				<td ></td>
-	  				<td></td>
+	  				<td colspan="4"></td>
 	  			</tr>
 	  			<tr>
-	  				<td ></td>
-	  				<td></td>
+	  				<td colspan="4"></td>
 	  			</tr>
 			</table>
 		</form>

src/main/webapp/WEB-INF/jsp/business/questionPage.jsp

 <%@ page language="java" contentType="text/html; charset=UTF-8"
     pageEncoding="UTF-8"%>
  <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-
+<%@ taglib prefix="security" uri="http://www.ccpit.org/" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>

src/main/webapp/WEB-INF/jsp/front/netWorks.jsp

@@ -2,7 +2,7 @@
     pageEncoding="UTF-8"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-
+<%@ taglib prefix="security" uri="http://www.ccpit.org/"%>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
 <html lang="en">
 <head>

src/main/webapp/WEB-INF/jsp/front/noticeAnnouncement.jsp

 <%@ page language="java" contentType="text/html; charset=UTF-8"
-         pageEncoding="UTF-8" %>
+	pageEncoding="UTF-8"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="security" uri="http://www.ccpit.org/"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
 <html>
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>中国国际贸易促进委员会原产地证申报系统</title>
-    <link href="/resource/front/css/bootstrap.min.css" rel="stylesheet">
-    <link href="/resource/front/css/style.css" rel="stylesheet">
-    <link rel="stylesheet" type="text/css"
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title>中国国际贸易促进委员会原产地证申报系统</title>
+<link href="/resource/front/css/bootstrap.min.css" rel="stylesheet">
+<link href="/resource/front/css/style.css" rel="stylesheet">
+<link rel="stylesheet" type="text/css"
 	href="/resource/front/css/costom_css_tongzhigonggao.css">
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
+<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+<!--[if lt IE 9]>
   <script src="https://cdn.bootcss.com/html5shiv/3.7.3/html5shiv.min.js"></script>
   <script src="https://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
-    <![endif]-->
+<![endif]-->
 </head>
 <body>
-<jsp:include page="header.jsp"/>
-<div class="row content">
+	<jsp:include page="header.jsp" />
+	<div class="row content">
 		<div class="col-sm-12 col-md-12 ">
 			<!-- <div class="thumbnail"> -->
 			<!-- <div class="caption"> -->
@@ -32,18 +32,18 @@
 			<!-- </div> -->
 			<!-- </div> -->
 		</div>
-</div>
+	</div>
 
-<button type="button"
+	<button type="button"
 		class="btn  btn-lg costom_middle_button"
 		style="font-width: bold;cursor:default;color:#fff;">${id eq '1' ? '通知公告': '政策法规'}</button>
 
 
-<div class="row content">
+	<div class="row content">
 		<div class="col-sm-12 col-md-12">
 			<div class="thumbnail">
 				<div class="caption costom_table_captionDiv">
-                <input id="newsType" type="hidden" value="${id}"/>
+					<input id="newsType" type="hidden" value="${id}" />
 					<table class="table table-striped costom_table">
 						<thead class="costom_table_thead">
 							<tr>
@@ -60,39 +60,42 @@
 				</div>
 			</div>
 		</div>
-</div>
+	</div>
+
 
+<!-- 客服文件 -->
+<jsp:include page="customerService.jsp" />
 
-<jsp:include page="footer.jsp"/>
-<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<script src="/resource/front/js/jquery.min.js"></script>
-<script src="/resource/front/commonUtils.js"></script>
-<script src="/resource/front/jqPaginator.js"></script>
-<!-- Include all compiled plugins (below), or include individual files as needed -->
-<script src="/resource/front/js/bootstrap.min.js"></script>
+	<jsp:include page="footer.jsp" />
+	<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+	<script src="/resource/front/js/jquery.min.js"></script>
+	<script src="/resource/front/commonUtils.js"></script>
+	<script src="/resource/front/jqPaginator.js"></script>
+	<!-- Include all compiled plugins (below), or include individual files as needed -->
+	<script src="/resource/front/js/bootstrap.min.js"></script>
 
-<script rel="script" type="text/javascript">
+	<script rel="script" type="text/javascript">
 		/**
 		 * Created by Administrator on 2017/4/21.
 		 */
-    $(document).ready(function () {
-        $("#search").click(function () {
+		$(document).ready(function() {
+			$("#search").click(function() {
 				$("#popsearch").slideDown("slow");
 			});
-        $("#popsearch .gb_btn").click(function () {
+			$("#popsearch .gb_btn").click(function() {
 				$("#popsearch").slideUp("slow");
 			});
 			var param = "";
-        initData(function (param) {
+			initData(function(param) {
 				var newsType = $("#newsType").val();
 				param = '"noticeType":' + newsType;
 				return param;
 			}, '/front/aboutNotice', '/front/aboutNoticeContent');
 		});
-    $(function () {
+		$(function() {
 			$('[data-toggle="popover"]').popover()
 		})
-</script>
-<script src="/resource/front/js/aside_fade.js"></script>
+	</script>
+	<script src="/resource/front/js/aside_fade.js"></script>
 </body>
 </html>
\ No newline at end of file

src/main/webapp/WEB-INF/jsp/front/noticeContent.jsp

@@ -2,7 +2,7 @@
     pageEncoding="UTF-8"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-
+<%@ taglib prefix="security" uri="http://www.ccpit.org/"%>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
 <html>
 <head>
@@ -77,8 +77,8 @@
 </div>
 
 
-
-
+<!-- 客服文件 -->
+<jsp:include page="customerService.jsp" />
 <jsp:include page="footer.jsp" />
 
 <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->

src/main/webapp/WEB-INF/jsp/front/questionContent.jsp

@@ -2,7 +2,7 @@
     pageEncoding="UTF-8"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-
+<%@ taglib prefix="security" uri="http://www.ccpit.org/"%>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
 <html>
 <head>
@@ -70,8 +70,8 @@
 </div>
 
 
-
-
+<!-- 客服文件 -->
+<jsp:include page="customerService.jsp" />
 
 <jsp:include page="footer.jsp" />
 

src/main/webapp/WEB-INF/jsp/front/serviceNetWork.jsp

@@ -2,7 +2,7 @@
     pageEncoding="UTF-8"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-
+<%@ taglib prefix="security" uri="http://www.ccpit.org/"%>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
 <html lang="en">
 <head>

src/main/webapp/WEB-INF/jsp/login/login.jsp

 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib prefix="security" uri="http://www.ccpit.org/" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <html>
 <head>
@@ -11,7 +12,7 @@
 <script src="<c:url value='/resource/login/js/jquery.js'/>" type="text/javascript"></script>
 <script src="<c:url value='/resource/login/js/cloud.js '/>" type="text/javascript"></script>
 <script src="<c:url value='/resource/login/js/login.js'/>"></script>
-<title>中国贸促会原产地证官网系统</title>
+<title>中国贸促会臺港澳企業服務中心官网系统</title>
 <script language="javascript">
 </script>
 	<style type="text/css">
@@ -44,7 +45,7 @@
 		<div id="cloud2" class="cloud"></div>
 	</div>
 	<div class="logintop">
-		<span>欢迎登录中国贸促会原产地证官网系统官网系统</span>
+		<span>欢迎登录中国贸促会臺港澳企業服務中心官网系统</span>
 		<ul>
 			<li><a href="/">回首页</a></li>
 			<li><a href="#">帮助</a></li>

src/main/webapp/WEB-INF/tld/security.tld

 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
+        "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
 <taglib>
     <tlibversion>1.0</tlibversion>
     <jspversion>2.0</jspversion>
     <shortname>security</shortname>
     <tag>
         <name>url</name>
-        <tagclass>ccpit.base.security.SecurityUriTag</tagclass>
-        <bodycontent>jsp</bodycontent>
+        <tagclass>org.ccpit.base.security.SecurityUriTag</tagclass>
+        <bodycontent>JSP</bodycontent>
         <attribute>
             <name>uri</name>
             <required>true</required>
@@ -17,8 +18,8 @@
 
     <tag>
         <name>allRole</name>
-        <tagclass>ccpit.base.security.SecurityAllRoleTag</tagclass>
-        <bodycontent>jsp</bodycontent>
+        <tagclass>org.ccpit.base.security.SecurityAllRoleTag</tagclass>
+        <bodycontent>JSP</bodycontent>
         <attribute>
             <name>roles</name>
             <required>true</required>
@@ -28,8 +29,8 @@
 
     <tag>
         <name>anyRole</name>
-        <tagclass>ccpit.base.security.SecurityAnyRoleTag</tagclass>
-        <bodycontent>jsp</bodycontent>
+        <tagclass>org.ccpit.base.security.SecurityAnyRoleTag</tagclass>
+        <bodycontent>JSP</bodycontent>
         <attribute>
             <name>roles</name>
             <required>true</required>
@@ -39,8 +40,8 @@
 
     <tag>
         <name>allGroup</name>
-        <tagclass>ccpit.base.security.SecurityAllGroupTag</tagclass>
-        <bodycontent>jsp</bodycontent>
+        <tagclass>org.ccpit.base.security.SecurityAllGroupTag</tagclass>
+        <bodycontent>JSP</bodycontent>
         <attribute>
             <name>groups</name>
             <required>true</required>
@@ -50,8 +51,9 @@
 
     <tag>
         <name>anyGroup</name>
-    <tagclass>ccpit.base.security.SecurityAnyGroupTag</tagclass>
-    <bodycontent>jsp</bodycontent>
+        <tagclass>org.ccpit.base.security.SecurityAnyGroupTag</tagclass>
+        <bodycontent>JSP</bodycontent>
+
         <attribute>
             <name>groups</name>
             <required>true</required>