1、迁移初始提交

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

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

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

-package ccpit.base.logManage;
+package org.ccpit.base.logManage;
 
 import java.lang.reflect.Method;
 import java.util.Date;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
@@ -12,8 +11,8 @@ import org.aspectj.lang.annotation.AfterThrowing;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
-import ccpit.base.controller.BaseController;
-import ccpit.base.user.User;
+import org.ccpit.base.controller.BaseController;
+import org.ccpit.base.user.User;
 import org.kopitubruk.util.json.JSONUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,7 +39,7 @@ public class SystemLogAspect {
 	private LogInfoService infoService;
 
      //Controller层切点    
-    @Pointcut("@annotation(ccpit.base.logManage.AutoWriteLog)")
+    @Pointcut("@annotation(org.ccpit.base.logManage.AutoWriteLog)")
      public  void controllerAspect() {   }    
     
     @Before("controllerAspect()")

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

-package ccpit.base.utils;
+package org.ccpit.base.utils;
 
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;

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

-package ccpit.base.utils;
+package org.ccpit.base.utils;
 
 /**
  * Created by Administrator on 2015/8/13.
@@ -6,7 +6,7 @@ package ccpit.base.utils;
 
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
-import ccpit.base.modol.EscapeSql;
+import org.ccpit.base.modol.EscapeSql;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;

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

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

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

@@ -8,7 +8,7 @@
  *
 */
 
-package ccpit.base.utils;
+package org.ccpit.base.utils;
 /**
  * ClassName:TranslateDataUtil <br/>
  * Function: 类型数据转换工具类 <br/>

src/main/java/ccpit/business/taxableGoods/TaxableGoods.java → src/main/java/org/ccpit/business/taxableGoods/TaxableGoods.java

@@ -8,7 +8,7 @@
  *
 */
 
-package ccpit.business.taxableGoods;
+package org.ccpit.business.taxableGoods;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

src/main/java/ccpit/business/taxableGoods/TaxableGoodsDao.java → src/main/java/org/ccpit/business/taxableGoods/TaxableGoodsDao.java

-package ccpit.business.taxableGoods;
+package org.ccpit.business.taxableGoods;
 
-import ccpit.base.dao.BaseDao;
-import ccpit.business.questionsManage.Question;
+import org.ccpit.base.dao.BaseDao;
 import org.springframework.stereotype.Repository;
 
 @Repository

src/main/java/ccpit/business/taxableGoods/TaxableGoodsService.java → src/main/java/org/ccpit/business/taxableGoods/TaxableGoodsService.java

-package ccpit.business.taxableGoods;
-
-import java.util.List;
+package org.ccpit.business.taxableGoods;
 
 import javax.transaction.Transactional;
 
-import ccpit.base.controller.Page;
-import ccpit.base.controller.PageRequest;
-import ccpit.base.logManage.LogInfoService;
+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.Service;
 
@@ -19,7 +17,7 @@ public class TaxableGoodsService {
 	private LogInfoService logInfoService;
 
 	public Page<TaxableGoods> queryTaxableGoodsList(PageRequest pageRequest,
-			String taxNumber) {
+                                                    String taxNumber) {
 		StringBuffer hql = new StringBuffer("from TaxableGoods where 1=1");
 		if (taxNumber != null && !"".equals(taxNumber)) {
 			hql.append(" and taxNumber like '%" + taxNumber + "%'");

src/main/java/ccpit/front/SSLClient.java → src/main/java/org/ccpit/front/SSLClient.java

 /**
  * 
  */
-package ccpit.front;
+package org.ccpit.front;
 
 import java.security.cert.CertificateException;  
 import java.security.cert.X509Certificate;  

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

-package ccpit.ueditor.define;
+package org.ccpit.ueditor.define;
 
 /**
  * 处理状态接口

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

-package ccpit.ueditor.upload;
+package org.ccpit.ueditor.upload;
 
 
 
@@ -10,9 +10,9 @@ import java.io.IOException;
 import java.io.InputStream;
 
 import org.apache.commons.io.FileUtils;
-import ccpit.ueditor.define.AppInfo;
-import ccpit.ueditor.define.BaseState;
-import ccpit.ueditor.define.State;
+import org.ccpit.ueditor.define.AppInfo;
+import org.ccpit.ueditor.define.BaseState;
+import org.ccpit.ueditor.define.State;
 
 public class StorageManager {
 	public static final int BUFFER_SIZE = 8192;

src/main/resources/spring-hibernate.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:mvc="http://www.springframework.org/schema/mvc"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:util="http://www.springframework.org/schema/util"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xsi:schemaLocation="
-        http://www.springframework.org/schema/beans     
+	   xmlns:context="http://www.springframework.org/schema/context"
+	   xmlns:mvc="http://www.springframework.org/schema/mvc"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:util="http://www.springframework.org/schema/util"
+	   xmlns:tx="http://www.springframework.org/schema/tx"
+	   xmlns:aop="http://www.springframework.org/schema/aop" xmlns:task="http://www.springframework.org/schema/task"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
         http://www.springframework.org/schema/context
         http://www.springframework.org/schema/context/spring-context-4.0.xsd
@@ -16,19 +15,18 @@
     	http://www.springframework.org/schema/aop/spring-aop-4.0.xsd
     	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.0.xsd
     	http://www.springframework.org/schema/tx
-    	http://www.springframework.org/schema/tx/spring-tx-4.0.xsd
-        ">
-    
-    <!-- Hibernate4 -->
+    	http://www.springframework.org/schema/tx/spring-tx-4.0.xsd http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd">
+
+	<!-- Hibernate4 -->
 	<!-- 加载资源文件  其中包含变量信息，必须在Spring配置文件的最前面加载，即第一个加载-->
-	<context:property-placeholder location="classpath:framework.properties" />    
-        
-   	<!-- 数据库连接池  Hikaricp -->
+	<context:property-placeholder location="classpath:framework.properties" />
+
+	<!-- 数据库连接池  Hikaricp -->
 	<bean id="dataSource" class="com.zaxxer.hikari.HikariDataSource" destroy-method="shutdown">
 		<property name="driverClassName" value="${jdbc.driverClassName}" />
-      	<property name="jdbcUrl" value="${jdbc.url}" />
-      	<property name="username" value="${jdbc.user}" />
-      	<property name="password" value="${jdbc.pass}" />
+		<property name="jdbcUrl" value="${jdbc.url}" />
+		<property name="username" value="${jdbc.user}" />
+		<property name="password" value="${jdbc.pass}" />
 		<!-- <property name="readOnly" value="true" /> -->  <!-- 连接只读数据库时配置为true， 保证安全 -->
 		<property name="connectionTimeout" value="30000"/> <!-- 等待连接池分配连接的最大时长（毫秒），超过这个时长还没可用的连接则发生SQLException， 缺省:30秒 -->
 		<property name="idleTimeout" value="60000"/> <!-- 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），缺省:10分钟 -->
@@ -36,15 +34,15 @@
 		<property name="maximumPoolSize" value="15" /><!-- 连接池中允许的最大连接数。缺省值：10；推荐的公式：((core_count * 2) + effective_spindle_count) -->
 	</bean >
 
-	
-	
-	<bean id="sessionFactory" 
-		class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">
+
+
+	<bean id="sessionFactory"
+		  class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">
 		<property name="dataSource" ref="dataSource" />
 		<property name="packagesToScan">
 			<list>
 				<!-- 可以加多个包 -->
-				<value>ccpit</value>
+				<value>org.ccpit</value>
 			</list>
 		</property>
 		<property name="hibernateProperties">
@@ -61,19 +59,19 @@
 		</property>
 	</bean>
 	<!-- hibernateTemplate配置，hibernate数据操作接口使用 -->
-	<bean id="hibernateTemplate" class="org.springframework.orm.hibernate4.HibernateTemplate">	
+	<bean id="hibernateTemplate" class="org.springframework.orm.hibernate4.HibernateTemplate">
 		<property name="sessionFactory" ref="sessionFactory"></property>
 	</bean>
 	<!-- jdbcTemplate配置，jdbc数据操作接口使用 -->
 	<bean id="jdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate">
 		<property name="dataSource" ref="dataSource" />
 	</bean>
-	
-	
-   
-   <!-- spring mvc 注解处理器配置 -->
+
+
+
+	<!-- spring mvc 注解处理器配置 -->
 	<bean
-		class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter">
+			class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter">
 		<property name="messageConverters">
 			<util:list id="beanList">
 				<ref bean="mappingJacksonHttpMessageConverter" />
@@ -83,23 +81,23 @@
 
 	<!-- json转换接口配置，spring mvc提供 -->
 	<bean id="mappingJacksonHttpMessageConverter"
-		class="org.springframework.http.converter.json.MappingJacksonHttpMessageConverter">
+		  class="org.springframework.http.converter.json.MappingJacksonHttpMessageConverter">
 		<property name="supportedMediaTypes">
 			<list>
 				<value>text/html;charset=UTF-8</value>
 			</list>
 		</property>
 	</bean>
-   
+
 	<!-- 配置Hibernate事务管理器 -->
 	<bean id="transactionManager"
-    	class="org.springframework.orm.hibernate4.HibernateTransactionManager">
-      <property name="sessionFactory" ref="sessionFactory" />
-   </bean>
+		  class="org.springframework.orm.hibernate4.HibernateTransactionManager">
+		<property name="sessionFactory" ref="sessionFactory" />
+	</bean>
 
 	<!-- 配置事务异常封装 -->
-   <bean id="persistenceExceptionTranslationPostProcessor" 
-   	class="org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor" />
-   
-   
+	<bean id="persistenceExceptionTranslationPostProcessor"
+		  class="org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor" />
+
+
 </beans>
\ No newline at end of file

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

@@ -113,7 +113,7 @@
                     <div class="tab-content">
                         <div role="tabpanel" class="tab-pane active" id="gaishu">     
                 	 		<div class="single-content" style="height:192px">
-                  				<span>网&emsp;&emsp;址：<a href="http://manage.ldforms.com/UserLogin.aspx" target="_blank">www.manage.ldforms.com/UserLogin.aspx</a></span></br>
+                  				<span>网&emsp;&emsp;址：<a href="http://manage.ldforms.com/UserLogin.aspx" target="_blank">manage.ldforms.com</a></span></br>
                   				<span>机构名称：乐单科技（福建）有限公司</span>
 							</div> 
                 		</div>
@@ -124,8 +124,8 @@
             
     </div>
 </div>
-
-
+<!-- 客服文件 -->
+<jsp:include page="customerService.jsp" />
 <jsp:include page="footer.jsp" />
 
 
@@ -153,4 +153,4 @@
     <script src="/resource/front/js/aside_fade.js"></script>
 </body>
 </body>
-</html>
+</html>
\ No newline at end of file

src/main/webapp/resource/ueditor1_4_2/dialogs/template/template.js

@@ -14,7 +14,7 @@
     var initPre = function () {
         var str = "";
         for ( var i = 0, tmp; tmp = tmps[i++]; ) {
-            str += '<div class="preitem" onclick="pre(' + i + '' + ")"><img src="images" " + tmp.pre + '' + (tmp.title ? "alt=" + tmp.title + " title=" + tmp.title + "" : "") + '></div>';
+            str += '<div class="preitem" onclick="pre(' + i + ')"><img src="' + "images/" + tmp.pre + '" ' + (tmp.title ? "alt=" + tmp.title + " title=" + tmp.title + "" : "") + '></div>';
         }
         preitem.innerHTML = str;
     };

target/classes/spring-hibernate.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:mvc="http://www.springframework.org/schema/mvc"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:util="http://www.springframework.org/schema/util"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xsi:schemaLocation="
-        http://www.springframework.org/schema/beans     
+	   xmlns:context="http://www.springframework.org/schema/context"
+	   xmlns:mvc="http://www.springframework.org/schema/mvc"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:util="http://www.springframework.org/schema/util"
+	   xmlns:tx="http://www.springframework.org/schema/tx"
+	   xmlns:aop="http://www.springframework.org/schema/aop" xmlns:task="http://www.springframework.org/schema/task"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
         http://www.springframework.org/schema/context
         http://www.springframework.org/schema/context/spring-context-4.0.xsd
@@ -16,19 +15,18 @@
     	http://www.springframework.org/schema/aop/spring-aop-4.0.xsd
     	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.0.xsd
     	http://www.springframework.org/schema/tx
-    	http://www.springframework.org/schema/tx/spring-tx-4.0.xsd
-        ">
-    
-    <!-- Hibernate4 -->
+    	http://www.springframework.org/schema/tx/spring-tx-4.0.xsd http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd">
+
+	<!-- Hibernate4 -->
 	<!-- 加载资源文件  其中包含变量信息，必须在Spring配置文件的最前面加载，即第一个加载-->
-	<context:property-placeholder location="classpath:framework.properties" />    
-        
-   	<!-- 数据库连接池  Hikaricp -->
+	<context:property-placeholder location="classpath:framework.properties" />
+
+	<!-- 数据库连接池  Hikaricp -->
 	<bean id="dataSource" class="com.zaxxer.hikari.HikariDataSource" destroy-method="shutdown">
 		<property name="driverClassName" value="${jdbc.driverClassName}" />
-      	<property name="jdbcUrl" value="${jdbc.url}" />
-      	<property name="username" value="${jdbc.user}" />
-      	<property name="password" value="${jdbc.pass}" />
+		<property name="jdbcUrl" value="${jdbc.url}" />
+		<property name="username" value="${jdbc.user}" />
+		<property name="password" value="${jdbc.pass}" />
 		<!-- <property name="readOnly" value="true" /> -->  <!-- 连接只读数据库时配置为true， 保证安全 -->
 		<property name="connectionTimeout" value="30000"/> <!-- 等待连接池分配连接的最大时长（毫秒），超过这个时长还没可用的连接则发生SQLException， 缺省:30秒 -->
 		<property name="idleTimeout" value="60000"/> <!-- 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），缺省:10分钟 -->
@@ -36,15 +34,15 @@
 		<property name="maximumPoolSize" value="15" /><!-- 连接池中允许的最大连接数。缺省值：10；推荐的公式：((core_count * 2) + effective_spindle_count) -->
 	</bean >
 
-	
-	
-	<bean id="sessionFactory" 
-		class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">
+
+
+	<bean id="sessionFactory"
+		  class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">
 		<property name="dataSource" ref="dataSource" />
 		<property name="packagesToScan">
 			<list>
 				<!-- 可以加多个包 -->
-				<value>ccpit</value>
+				<value>org.ccpit</value>
 			</list>
 		</property>
 		<property name="hibernateProperties">
@@ -61,19 +59,19 @@
 		</property>
 	</bean>
 	<!-- hibernateTemplate配置，hibernate数据操作接口使用 -->
-	<bean id="hibernateTemplate" class="org.springframework.orm.hibernate4.HibernateTemplate">	
+	<bean id="hibernateTemplate" class="org.springframework.orm.hibernate4.HibernateTemplate">
 		<property name="sessionFactory" ref="sessionFactory"></property>
 	</bean>
 	<!-- jdbcTemplate配置，jdbc数据操作接口使用 -->
 	<bean id="jdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate">
 		<property name="dataSource" ref="dataSource" />
 	</bean>
-	
-	
-   
-   <!-- spring mvc 注解处理器配置 -->
+
+
+
+	<!-- spring mvc 注解处理器配置 -->
 	<bean
-		class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter">
+			class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter">
 		<property name="messageConverters">
 			<util:list id="beanList">
 				<ref bean="mappingJacksonHttpMessageConverter" />
@@ -83,23 +81,23 @@
 
 	<!-- json转换接口配置，spring mvc提供 -->
 	<bean id="mappingJacksonHttpMessageConverter"
-		class="org.springframework.http.converter.json.MappingJacksonHttpMessageConverter">
+		  class="org.springframework.http.converter.json.MappingJacksonHttpMessageConverter">
 		<property name="supportedMediaTypes">
 			<list>
 				<value>text/html;charset=UTF-8</value>
 			</list>
 		</property>
 	</bean>
-   
+
 	<!-- 配置Hibernate事务管理器 -->
 	<bean id="transactionManager"
-    	class="org.springframework.orm.hibernate4.HibernateTransactionManager">
-      <property name="sessionFactory" ref="sessionFactory" />
-   </bean>
+		  class="org.springframework.orm.hibernate4.HibernateTransactionManager">
+		<property name="sessionFactory" ref="sessionFactory" />
+	</bean>
 
 	<!-- 配置事务异常封装 -->
-   <bean id="persistenceExceptionTranslationPostProcessor" 
-   	class="org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor" />
-   
-   
+	<bean id="persistenceExceptionTranslationPostProcessor"
+		  class="org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor" />
+
+
 </beans>
\ No newline at end of file