From 8a2d76ba583eae69c74e5ac3ae03cccd91bb3e5b Mon Sep 17 00:00:00 2001
From: zenghao <zenghao2010@sina.com>
Date: Thu, 4 Aug 2016 15:36:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0maven=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                        | 14 ++++++++++++++
 .../src/main/resources/spring-context.xml      | 17 +----------------
 roncoo-pay-common-core/pom.xml                 |  9 +++++++--
 roncoo-pay-service/pom.xml                     |  1 +
 .../service/impl/PmsOperatorServiceImpl.java   |  5 ++---
 .../trade/utils/alipay/util/AliPayUtil.java    |  1 -
 roncoo-pay-web-boss/pom.xml                    | 13 +++++++++++++
 roncoo-pay-web-gateway/pom.xml                 | 18 ++++++++++++++++++
 8 files changed, 56 insertions(+), 22 deletions(-)

diff --git a/pom.xml b/pom.xml
index ded4c7f..918320d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,6 +69,9 @@
 		<commons-io.version>2.5</commons-io.version>
 		<jdom.version>2.0.2</jdom.version>
 		<activeMQ.version>5.11.4</activeMQ.version>
+		<javassist.version>3.12.1.GA</javassist.version>
+		<transaction.version>1.1</transaction.version>
+		
 	</properties>
 
 	<dependencyManagement>
@@ -221,6 +224,17 @@
 				<artifactId>log4j</artifactId>
 				<version>${log4j_version}</version>
 			</dependency>
+			
+			<dependency>
+				<groupId>javassist</groupId>
+				<artifactId>javassist</artifactId>
+				<version>${javassist.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.transaction</groupId>
+				<artifactId>jta</artifactId>
+				<version>${transaction.version}</version>
+			</dependency>
 
 			<!-- Log libs End -->
 
diff --git a/roncoo-pay-app-settlement/src/main/resources/spring-context.xml b/roncoo-pay-app-settlement/src/main/resources/spring-context.xml
index a16832b..ad491ed 100644
--- a/roncoo-pay-app-settlement/src/main/resources/spring-context.xml
+++ b/roncoo-pay-app-settlement/src/main/resources/spring-context.xml
@@ -1,19 +1,4 @@
-<!-- 
- * Copyright 2015-2102 RonCoo(http://www.roncoo.com) Group.
- *  
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *  
- *      http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p" xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:cache="http://www.springframework.org/schema/cache"
 	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
diff --git a/roncoo-pay-common-core/pom.xml b/roncoo-pay-common-core/pom.xml
index 80bb66c..df77bca 100644
--- a/roncoo-pay-common-core/pom.xml
+++ b/roncoo-pay-common-core/pom.xml
@@ -133,9 +133,14 @@
 		<!-- Mysql libs End -->
 
 		<!-- Other Common libs Begin -->
+		
 		<dependency>
-			<groupId>javax</groupId>
-			<artifactId>javaee-api</artifactId>
+			<groupId>javassist</groupId>
+			<artifactId>javassist</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.transaction</groupId>
+			<artifactId>jta</artifactId>
 		</dependency>
 
 		<dependency>
diff --git a/roncoo-pay-service/pom.xml b/roncoo-pay-service/pom.xml
index 49948e4..a58ddec 100644
--- a/roncoo-pay-service/pom.xml
+++ b/roncoo-pay-service/pom.xml
@@ -48,6 +48,7 @@
 			<artifactId>shiro-web</artifactId>
 			<version>1.2.5</version>
 		</dependency>
+		
 
 	</dependencies>
 
diff --git a/roncoo-pay-service/src/main/java/com/roncoo/pay/permission/service/impl/PmsOperatorServiceImpl.java b/roncoo-pay-service/src/main/java/com/roncoo/pay/permission/service/impl/PmsOperatorServiceImpl.java
index 6c29897..3fe1ba3 100644
--- a/roncoo-pay-service/src/main/java/com/roncoo/pay/permission/service/impl/PmsOperatorServiceImpl.java
+++ b/roncoo-pay-service/src/main/java/com/roncoo/pay/permission/service/impl/PmsOperatorServiceImpl.java
@@ -20,11 +20,10 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import javax.transaction.Transactional;
-
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.roncoo.pay.common.core.page.PageBean;
 import com.roncoo.pay.common.core.page.PageParam;
@@ -148,7 +147,7 @@ public class PmsOperatorServiceImpl implements PmsOperatorService {
 	 *            .
 	 */
 
-	@Transactional(rollbackOn = Exception.class)
+	@Transactional
 	public void saveOperator(PmsOperator pmsOperator, String roleOperatorStr) {
 		// 保存操作员信息
 		pmsOperatorDao.insert(pmsOperator);
diff --git a/roncoo-pay-service/src/main/java/com/roncoo/pay/trade/utils/alipay/util/AliPayUtil.java b/roncoo-pay-service/src/main/java/com/roncoo/pay/trade/utils/alipay/util/AliPayUtil.java
index ce7c1f1..13b88be 100644
--- a/roncoo-pay-service/src/main/java/com/roncoo/pay/trade/utils/alipay/util/AliPayUtil.java
+++ b/roncoo-pay-service/src/main/java/com/roncoo/pay/trade/utils/alipay/util/AliPayUtil.java
@@ -1,6 +1,5 @@
 package com.roncoo.pay.trade.utils.alipay.util;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
diff --git a/roncoo-pay-web-boss/pom.xml b/roncoo-pay-web-boss/pom.xml
index 1fddb33..424edf1 100644
--- a/roncoo-pay-web-boss/pom.xml
+++ b/roncoo-pay-web-boss/pom.xml
@@ -81,6 +81,19 @@
 			<version>4.5.2</version>
 		</dependency>
 		<!-- Shiro libs End -->
+		
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>6.0.37</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>jsp-api</artifactId>
+			<version>6.0.37</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 	<!-- 打包插件 -->
diff --git a/roncoo-pay-web-gateway/pom.xml b/roncoo-pay-web-gateway/pom.xml
index 5eb7f1b..b2f8a78 100644
--- a/roncoo-pay-web-gateway/pom.xml
+++ b/roncoo-pay-web-gateway/pom.xml
@@ -32,6 +32,12 @@
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/javax.validation/validation-api -->
+		
+		<dependency>
+		    <groupId>javax.json</groupId>
+		    <artifactId>javax.json-api</artifactId>
+		    <version>1.0</version>
+		</dependency>
 
         <dependency>
             <groupId>junit</groupId>
@@ -39,6 +45,18 @@
             <!-- 表示开发的时候引入，发布的时候不会加载此包 -->
             <scope>test</scope>
         </dependency>
+        <dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>6.0.37</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>jsp-api</artifactId>
+			<version>6.0.37</version>
+			<scope>provided</scope>
+		</dependency>
     </dependencies>
 
     <!-- 打包插件 -->