1、迁移初始提交

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

@@ -8,7 +8,7 @@
  *
  */
 
-package ccpit.base.controller;
+package org.ccpit.base.controller;
 
 import java.io.File;
 import java.io.IOException;
@@ -33,8 +33,8 @@ import org.apache.commons.fileupload.ProgressListener;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
 import org.apache.commons.lang.StringUtils;
-import ccpit.base.utils.OSinfoUtil;
-import ccpit.base.utils.ReadConfigUtil;
+import org.ccpit.base.utils.OSinfoUtil;
+import org.ccpit.base.utils.ReadConfigUtil;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;

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

-package ccpit.base.controller;
+package org.ccpit.base.controller;
 
 import org.apache.commons.lang.StringUtils;
-import ccpit.base.utils.ValidateCode;
+import org.ccpit.base.utils.ValidateCode;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 

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

-package ccpit.base.user;
+package org.ccpit.base.user;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -18,9 +18,9 @@ import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
 import javax.persistence.OneToOne;
 
-import ccpit.base.modol.BaseEntity;
-import ccpit.base.orgManage.OrgInfo;
-import ccpit.base.role.Role;
+import org.ccpit.base.modol.BaseEntity;
+import org.ccpit.base.orgManage.OrgInfo;
+import org.ccpit.base.role.Role;
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.annotations.Where;

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

-package ccpit.base.user;
+package org.ccpit.base.user;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -15,17 +15,17 @@ import javax.servlet.http.HttpSession;
 
 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.role.RoleDao;
-import ccpit.base.usergroup.UserGroupDao;
-import ccpit.base.utils.PasswordHash;
-import ccpit.base.utils.StringUtil;
-import ccpit.base.utils.mailUtil.Mail;
-import ccpit.base.utils.mailUtil.MailUtil;
+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.role.RoleDao;
+import org.ccpit.base.usergroup.UserGroupDao;
+import org.ccpit.base.utils.PasswordHash;
+import org.ccpit.base.utils.StringUtil;
+import org.ccpit.base.utils.mailUtil.Mail;
+import org.ccpit.base.utils.mailUtil.MailUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

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

-package ccpit.base.user;
+package org.ccpit.base.user;
 
 import java.util.Set;
 
-import ccpit.base.dao.BaseDao;
-import ccpit.base.role.Role;
-import ccpit.base.usergroup.UserGroupDao;
+import org.ccpit.base.dao.BaseDao;
+import org.ccpit.base.role.Role;
+import org.ccpit.base.usergroup.UserGroupDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Repository;
  * Created by sqp on 2015/9/5.
  */
 @Repository
-public class UserDao extends BaseDao<User>{
+public class UserDao extends BaseDao<User> {
     @Autowired
     private UserGroupDao userGroupDao;
 
@@ -43,7 +43,7 @@ public class UserDao extends BaseDao<User>{
      * @param role
      * @return
      */
-    public boolean canUserOrInGroup(User user,Role role){
+    public boolean canUserOrInGroup(User user, Role role){
         boolean can = canUser(user, role);
         if (!can){
             can = userGroupDao.canUserInGroup(user,role);

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

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

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

@@ -8,7 +8,7 @@
  *
 */
 
-package ccpit.base.user;
+package org.ccpit.base.user;
 
 import java.io.IOException;
 import java.util.Date;
@@ -21,10 +21,10 @@ 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.logManage.LogInfoService;
+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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;

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

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

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

@@ -8,7 +8,7 @@
  *
 */
 
-package ccpit.base.user;
+package org.ccpit.base.user;
 
 import java.text.SimpleDateFormat;
 import java.util.HashMap;
@@ -17,10 +17,10 @@ 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 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -58,7 +58,7 @@ public class UserEmailService {
 		return userEmailDao.query(hql, null);
 	}
 	
-	public Page<UserEmail> queryPage(PageRequest pr,String hql){
+	public Page<UserEmail> queryPage(PageRequest pr, String hql){
         Page<UserEmail> page = userEmailDao.findPage(pr, hql, new String[]{});
         return page;
     }

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

-package ccpit.base.user;
+package org.ccpit.base.user;
 
 import java.text.SimpleDateFormat;
 import java.util.HashMap;
@@ -9,12 +9,12 @@ import java.util.Set;
 
 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.role.Role;
-import ccpit.base.role.RoleDao;
+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.role.Role;
+import org.ccpit.base.role.RoleDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
@@ -75,7 +75,7 @@ public class UserService {
      * @param role
      * @return
      */
-    public boolean canUserOrInGroup(User user,Role role){
+    public boolean canUserOrInGroup(User user, Role role){
        return userDao.canUserOrInGroup(user, role);
     }
 

src/main/java/ccpit/base/usergroup/UserGroup.java → src/main/java/org/ccpit/base/usergroup/UserGroup.java

-package ccpit.base.usergroup;
+package org.ccpit.base.usergroup;
 
-import ccpit.base.modol.BaseEntity;
-import ccpit.base.role.Role;
-import ccpit.base.user.User;
+import org.ccpit.base.modol.BaseEntity;
+import org.ccpit.base.role.Role;
+import org.ccpit.base.user.User;
 import org.hibernate.annotations.*;
 import org.hibernate.annotations.Cache;
 

src/main/java/ccpit/base/usergroup/UserGroupDao.java → src/main/java/org/ccpit/base/usergroup/UserGroupDao.java

-package ccpit.base.usergroup;
+package org.ccpit.base.usergroup;
 
-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;
 
 import java.util.HashSet;

src/main/java/ccpit/base/usergroup/UserGroupService.java → src/main/java/org/ccpit/base/usergroup/UserGroupService.java

-package ccpit.base.usergroup;
+package org.ccpit.base.usergroup;
 
-import ccpit.base.role.Role;
-import ccpit.base.user.User;
+import org.ccpit.base.role.Role;
+import org.ccpit.base.user.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 

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

-package ccpit.base.utils;
+package org.ccpit.base.utils;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -7,9 +7,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import ccpit.base.role.Role;
-import ccpit.base.role.RoleService;
-import ccpit.base.role.RoleUrl;
+import org.ccpit.base.role.Role;
+import org.ccpit.base.role.RoleService;
+import org.ccpit.base.role.RoleUrl;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;

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

-package ccpit.base.utils;
+package org.ccpit.base.utils;
 
 import java.util.HashSet;
 import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 
-import ccpit.base.controller.BaseController;
-import ccpit.base.orgManage.OrgService;
-import ccpit.base.role.Role;
-import ccpit.base.user.User;
-import ccpit.base.user.UserService;
+import org.ccpit.base.controller.BaseController;
+import org.ccpit.base.orgManage.OrgService;
+import org.ccpit.base.role.Role;
+import org.ccpit.base.user.User;
+import org.ccpit.base.user.UserService;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;

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

-package ccpit.base.utils;
+package org.ccpit.base.utils;
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.Graphics2D;

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

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

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

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

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

@@ -8,7 +8,7 @@
  *
 */
 
-package ccpit.base.utils;
+package org.ccpit.base.utils;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;

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

@@ -7,7 +7,7 @@
  * Copyright (c) 2016, liyang@ccpit.org All Rights Reserved.
  *
  */
-package ccpit.base.utils;
+package org.ccpit.base.utils;
 
 import java.util.Iterator;
 import java.util.Map;

src/main/java/ccpit/business/visaAgencyManage/VisaAgency.java → src/main/java/org/ccpit/business/visaAgencyManage/VisaAgency.java

@@ -8,7 +8,7 @@
  *
 */
 
-package ccpit.business.visaAgencyManage;
+package org.ccpit.business.visaAgencyManage;
 
 import java.util.Date;
 
@@ -19,7 +19,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/visaAgencyManage/VisaAgencyController.java → src/main/java/org/ccpit/business/visaAgencyManage/VisaAgencyController.java

-package ccpit.business.visaAgencyManage;
+package org.ccpit.business.visaAgencyManage;
 
 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;
@@ -23,7 +23,7 @@ import org.springframework.web.servlet.ModelAndView;
  */
 @RestController
 @RequestMapping(value="/business/visaAgencyManage")
-public class VisaAgencyController extends BaseController{
+public class VisaAgencyController extends BaseController {
 	@Autowired
 	private VisaAgencyService visaAgencyService;
 	@Autowired

src/main/java/ccpit/business/visaAgencyManage/VisaAgencyDao.java → src/main/java/org/ccpit/business/visaAgencyManage/VisaAgencyDao.java

-package ccpit.business.visaAgencyManage;
+package org.ccpit.business.visaAgencyManage;
 
-import ccpit.base.dao.BaseDao;
+import org.ccpit.base.dao.BaseDao;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class VisaAgencyDao extends BaseDao<VisaAgency>{
+public class VisaAgencyDao extends BaseDao<VisaAgency> {
 
 }

src/main/java/ccpit/business/visaAgencyManage/VisaAgencyService.java → src/main/java/org/ccpit/business/visaAgencyManage/VisaAgencyService.java

-package ccpit.business.visaAgencyManage;
+package org.ccpit.business.visaAgencyManage;
 
 
 
@@ -17,15 +17,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;
 @Transactional

src/main/java/ccpit/ueditor/upload/Uploader.java → src/main/java/org/ccpit/ueditor/upload/Uploader.java

-package ccpit.ueditor.upload;
+package org.ccpit.ueditor.upload;
 
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
-import ccpit.ueditor.define.State;
+import org.ccpit.ueditor.define.State;
 
 public class Uploader {
 	private HttpServletRequest request = null;

src/main/webapp/WEB-INF/jsp/business/visaAgencyPage.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/urlrewrite.xml

-<!DOCTYPE urlrewrite
-        PUBLIC "-//tuckey.org//DTD UrlRewrite 3.0//EN"
-        "http://tuckey.org/res/dtds/urlrewrite3.0.dtd">
-<urlrewrite>
-	<rule>
-		<from>/front/*.html</from>
-		<to type="redirect">/front/*.do</to>
-	</rule>
-	<rule>
-		<from>^/front/invest/([0-9]+)</from>
-		<to type="forward">/front/query*.do/$1</to>
-	</rule>
-	<rule>
-		<from>/front/service/serviceSource/([0-9]+).html</from>
-		<to type="forward">/front/(w+)?type=$1</to>
-	</rule>
-</urlrewrite>
\ No newline at end of file

src/main/webapp/WEB-INF/web.xml

@@ -32,7 +32,7 @@
 
     <filter>
         <filter-name>loginFilter</filter-name>
-        <filter-class>ccpit.base.security.LoginFilter</filter-class>
+        <filter-class>org.ccpit.base.security.LoginFilter</filter-class>
         <init-param>
             <param-name>exceptPaths</param-name>
             <param-value>/admin/login,/admin/metadataManage/getMetadatasList_front,/admin/metadataManage/getMetadatasList</param-value>

src/main/webapp/resource/ueditor1_4_2/dialogs/video/video.css

@@ -136,7 +136,7 @@ span.view{display: inline-block;width: 30px;float: right;cursor: pointer;color:
     text-align: center;
     width: 97%;
     float: left;
-    background: url(images/image.png) center 70px no-repeat;
+    background: url(./images/image.png) center 70px no-repeat;
     color: #cccccc;
     font-size: 18px;
     position: relative;
@@ -212,7 +212,7 @@ span.view{display: inline-block;width: 30px;float: right;cursor: pointer;color:
 #upload .filelist li {
     width: 113px;
     height: 113px;
-    background: url(images/bg.png);
+    background: url(./images/bg.png);
     text-align: center;
     margin: 15px 0 0 20px;
     *margin: 15px 0 0 15px;
@@ -260,7 +260,7 @@ span.view{display: inline-block;width: 30px;float: right;cursor: pointer;color:
     overflow: hidden;
     width: 0;
     height: 100%;
-    background: #1483d8 url(images/progress.png) repeat-x;
+    background: #1483d8 url(./images/progress.png) repeat-x;
 
     -webit-transition: width 200ms linear;
     -moz-transition: width 200ms linear;
@@ -360,14 +360,14 @@ span.view{display: inline-block;width: 30px;float: right;cursor: pointer;color:
     height: 40px;
     width: 100%;
     z-index: 200;
-    background: url(images/success.png) no-repeat right bottom;
-    background-image: url(images/success.gif) \9;
+    background: url(./images/success.png) no-repeat right bottom;
+    background-image: url(./images/success.gif) \9;
 }
 
 #upload .filelist li.filePickerBlock {
     width: 113px;
     height: 113px;
-    background: url(images/image.png) no-repeat center 12px;
+    background: url(./images/image.png) no-repeat center 12px;
     border: 1px solid #eeeeee;
     border-radius: 0;
 }
@@ -400,8 +400,8 @@ span.view{display: inline-block;width: 30px;float: right;cursor: pointer;color:
     float: right;
     text-indent: -9999px;
     overflow: hidden;
-    background: url(images/icons.png) no-repeat;
-    background: url(images/icons.gif) no-repeat \9;
+    background: url(./images/icons.png) no-repeat;
+    background: url(./images/icons.gif) no-repeat \9;
     margin: 5px 1px 1px;
     cursor: pointer;
     -webkit-tap-highlight-color: rgba(0,0,0,0);
@@ -542,8 +542,8 @@ i.file-preview {
     margin: 10px auto;
     width: 70px;
     height: 70px;
-    background-image: url("images/file-icons.png");
-    background-image: url("images/file-icons.gif") \9;
+    background-image: url("./images/file-icons.png");
+    background-image: url("./images/file-icons.gif") \9;
     background-position: -140px center;
     background-repeat: no-repeat;
 }