tntdc 1 vuosi sitten
vanhempi
commit
8db43a3903

+ 4 - 4
taskman/pom.xml

@@ -434,12 +434,12 @@
 		<finalName>taskman</finalName>
 		<plugins>
 			<plugin>
-				<groupId>org.apache.tomcat.maven</groupId>
-				<artifactId>tomcat7-maven-plugin</artifactId>
-				<version>2.2</version>
+			    <groupId>org.opoo.maven</groupId>
+			    <artifactId>tomcat9-maven-plugin</artifactId>
+			    <version>3.0.0</version>
 				<configuration>
 					<url>http://localhost:8099/adm</url>
-					<server>tomcat</server>
+					<server>tomcat9</server>
 					<username>admin</username>
 					<password>password</password>
 					<path>/taskman</path>

+ 2 - 2
taskman/src/main/java/cacheParam.properties

@@ -2,7 +2,7 @@ isOpen=true
 isDebug=true
 redis_prefix=GM_DATA_REMOVE
 
-redis_Ip=47.94.16.252
+redis_Ip=172.16.128.210
 
 redis_Port=6379
 
@@ -16,6 +16,6 @@ redis_TimeOut=1000
 
 redis_TestOnBorrow=true
 
-redis_Auth=redismima
+redis_Auth=123456
 
 redis_TimeToLive=172800

+ 5 - 14
taskman/src/main/java/com/minpay/common/run/RunOnWaySave.java

@@ -36,8 +36,8 @@ public class RunOnWaySave {
 			
 			try {
 				String date = DateUtil.getCurrentDateString();
-				String url = "http://shanghai.keao.tech/adm/admin/reportManage/onTheWayStock.html";
-//				String url = "http://127.0.0.1:8089/adm/admin/reportManage/onTheWayStock.html";
+				String url = "http://127.0.0.1:8082/zdtAdm/admin/reportManage/onTheWayStock.html";
+//				String url = "http://127.0.0.1:8080/adm/admin/reportManage/onTheWayStock.html";
 				
 				//构造一个webClient 模拟Chrome 浏览器
 				WebClient webClient = new WebClient(BrowserVersion.CHROME);
@@ -100,16 +100,7 @@ public class RunOnWaySave {
 		}
 	}
 	
-	/*public static void main(String[] args) throws IOException, DocumentException{
-		String resString = HttpUtil.httpRequest("http://forex.ccb.com/cn/home/news/jshckpj_new.xml");
-		Document document = DocumentHelper.parseText(resString);
-		Element rootElement = document.getRootElement();
-		Iterator iter = rootElement.elementIterator("ReferencePriceSettlement");
-        while (iter.hasNext()) {
-            Element recordEle = (Element) iter.next();
-            String Ofrd_Ccy_CcyCd = recordEle.elementTextTrim("Ofrd_Ccy_CcyCd");
-            String BidRateOfCcy = recordEle.elementTextTrim("BidRateOfCcy");
-            System.out.println(Ofrd_Ccy_CcyCd + " " + BidRateOfCcy);
-        }
-	}*/
+	public static void main(String[] args) throws Exception {
+
+	}
 }

+ 2 - 2
taskman/src/main/java/com/minpay/common/service/impl/ICostServiceImpl.java

@@ -76,8 +76,8 @@ public class ICostServiceImpl implements ICostService {
 		if (CommonUtil.isEmpty(wareId)) {
 			warehouseDetailExample.createCriteria().andCostFlagEqualTo("0").andTypeIn(typeList).andBranchIdEqualTo("100002");
 		} else {
-			warehouseDetailExample.createCriteria().andCostFlagEqualTo("0").andTypeIn(typeList).andBranchIdEqualTo("100002").andWarehouseIdEqualTo(wareId);
-//			warehouseDetailExample.createCriteria().andCostFlagEqualTo("0").andTypeIn(typeList).andBranchIdEqualTo("100002").andIdEqualTo(wareId);
+//			warehouseDetailExample.createCriteria().andCostFlagEqualTo("0").andTypeIn(typeList).andBranchIdEqualTo("100002").andWarehouseIdEqualTo(wareId);
+			warehouseDetailExample.createCriteria().andCostFlagEqualTo("0").andTypeIn(typeList).andBranchIdEqualTo("100002").andIdEqualTo(wareId);
 		}
 		
 		List<ApWarehouseDetail> selectByExample = Service.lookup(IMINDataBaseService.class)

+ 3 - 3
taskman/src/main/webapp/WEB-INF/config.properties

@@ -10,9 +10,9 @@ dataSource.url=jdbc:mysql://127.0.0.1:3306/guomao?useUnicode=true&characterEncod
 dataSource.username=root
 dataSource.password=12345
 #shengchan
-#dataSource.url=jdbc:mysql://rm-bp1fic3mnw98q3149to.mysql.rds.aliyuncs.com:3306/guomaodb?useUnicode=true&characterEncoding=UTF8
-#dataSource.username=guomaouser
-#dataSource.password=Aa111111
+#dataSource.url=jdbc:mysql://172.16.128.210:3306/guomaodb?useUnicode=true&characterEncoding=UTF8
+#dataSource.username=root
+#dataSource.password=123456
 
 config.MINDebug=false
 config.MINTraceInvoker=true

+ 3 - 3
taskman/src/main/webapp/WEB-INF/spring.xml

@@ -79,10 +79,10 @@
     <bean id="springJobSchedulerFactoryBean" class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
         <property name="triggers">
             <list> 
-              	 <!-- <ref bean="batchTriggerFactoryBean"></ref>
+              	 <ref bean="batchTriggerFactoryBean"></ref>
               	 <ref bean="runWareStatisticsFactoryBean"></ref>
-              	 <ref bean="runExchangeRateFactoryBean"></ref> -->
-<!--               	 <ref bean="runOnWaySaveFactoryBean"></ref> -->
+              	<!--  <ref bean="runExchangeRateFactoryBean"></ref> -->
+               	 <ref bean="runOnWaySaveFactoryBean"></ref>
             </list>
         </property>
     </bean>