From 86bc9e35e69acc60916a72e7bd3566de884a510c Mon Sep 17 00:00:00 2001
From: xinyb <574600396@qq.com>
Date: 星期四, 11 七月 2024 11:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
eCoWorksV3.iml | 183 +++------------------------------------------
1 files changed, 14 insertions(+), 169 deletions(-)
diff --git a/eCoWorksV3.iml b/eCoWorksV3.iml
index 025ea8b..624dcbf 100644
--- a/eCoWorksV3.iml
+++ b/eCoWorksV3.iml
@@ -1,180 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="EclipseModuleManager">
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/activemq-all-5.4.3.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/alipay-sdk-java20170615110434.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/ant.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/antlr-runtime-3.4.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/aopalliance-1.0.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/aspectjweaver-1.5.3.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/barbecue-1.5-beta1.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/batik-anim.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/batik-ext.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/batik-parser.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/batik-xml.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/bcel-5.2.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/bcpkix-jdk15on-1.59.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/bcprov-jdk15on-1.59.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/c3p0-0.9.1.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/cglib-nodep-2.1_3.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/commons-beanutils-1.8.0.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/commons-betwixt-0.8.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/commons-codec-1.10.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/commons-collections-3.2.1.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/commons-dbcp-1.4.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/commons-digester-1.7.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/commons-fileupload-1.2.1.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/commons-httpclient-3.1.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/commons-io-2.5.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/commons-lang-2.5.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/commons-lang3-3.5.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/commons-logging-1.2.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/commons-pool2-2.4.2.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/commontemplate-0.8.1.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/connector-api-1.5.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/dom4j-1.6.1.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/druid-1.0.15.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/ezmorph-1.0.6.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/groovy-2.4.6.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/groovy-xml-2.4.6.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/gson-2.7.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/guava-19.0.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/hamcrest-core-1.3.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/hasp-srm-api.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/httpclient-4.5.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/httpcore-4.4.1.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/httpmime-4.5.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/iReport.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/item-helper-2.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/iText-2.1.7.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/iTextAsian.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/jackson-annotations-2.9.0.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/jackson-core-2.9.0.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/jackson-databind-2.6.5.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/jackson-dataformat-xml-2.9.0.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/jackson-module-jaxb-annotations-2.9.0.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/jasperreports-5.1.0.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/jasperreports-applet-5.1.0.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/jasperreports-fonts-5.1.0.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/jasperreports-javaflow-5.1.0.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/java-unrar-0.3.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/javabase64-1.3.1.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/javax.ws.rs.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/javax.xml.bind.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/jaxen-1.1.6.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/jaybird-2.2.5.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/jdom.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/jdt-compiler-3.1.1.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/jedis-2.8.1.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/jiguang-common-0.1.4.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/jodd-all-3.8.5.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/jpush-client-3.2.10.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/json-lib-2.4-jdk15.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/jsoup-1.8.3.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/jstl-1.1.2.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/jtds-1.3.1.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/junit-4.11.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/jwebap_0.6.1.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/jxl-2.6.10.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/kryo-4.0.1.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/log4j-1.2.16.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/log4j-core.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/lombok.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/mailapi.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/minlog-1.3.0.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/net.sf.cglib.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/objenesis-2.1.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/ojdbc6.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/okhttp-3.8.1.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/okio-1.13.0.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/org.apache.commons.logging.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/org.apache.velocity.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/org.codehaus.jackson.core.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/org.codehaus.jackson.mapper.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/org.freemarker.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/org.json.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/org.restlet.ext.freemarker.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/org.restlet.ext.jackson.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/org.restlet.ext.jaxb.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/org.restlet.ext.jaxrs.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/org.restlet.ext.json.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/org.restlet.ext.rdf.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/org.restlet.ext.servlet.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/org.restlet.ext.spring.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/org.restlet.ext.velocity.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/org.restlet.ext.wadl.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/org.restlet.ext.xml.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/org.restlet.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/png-encoder-1.5.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/poi-3.10-FINAL-20140208.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/pop3.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/qrcode-utils-1.0.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/QRCode.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/Qrcodejp.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/quartz-2.2.1.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/quartz-jobs-2.2.1.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/reflectasm-1.10.1-shaded.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/rest-assured-common-3.0.1.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/Sdk4J.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/slf4j-api-1.7.7.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/slf4j-log4j12-1.7.7.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/smtp.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/spring-aop-4.2.1.RELEASE.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/spring-aspects-4.2.1.RELEASE.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/spring-beans-4.2.1.RELEASE.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/spring-context-4.2.1.RELEASE.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/spring-context-support-4.2.1.RELEASE.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/spring-core-4.2.1.RELEASE.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/spring-expression-4.2.1.RELEASE.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/spring-instrument-4.2.1.RELEASE.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/spring-instrument-tomcat-4.2.1.RELEASE.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/spring-jdbc-4.2.1.RELEASE.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/spring-jms-4.2.1.RELEASE.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/spring-messaging-4.2.1.RELEASE.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/spring-orm-4.2.1.RELEASE.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/spring-oxm-4.2.1.RELEASE.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/spring-test-4.2.1.RELEASE.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/spring-tx-4.2.1.RELEASE.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/spring-web-4.2.1.RELEASE.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/spring-webmvc-4.2.1.RELEASE.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/spring-webmvc-portlet-4.2.1.RELEASE.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/spring-websocket-4.2.1.RELEASE.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/sqljdbc41.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/standard-1.1.2.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/stax-api-1.0.1.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/stax2-api-3.1.1.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/tagsoup-1.2.1.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/taobao-sdk-java-auto_1416460582369-20141220-source.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/taobao-sdk-java-auto_1416460582369-20141220.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/tracer_0.6.1.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/UserAgentUtils-1.21.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/woodstox-core-5.0.3.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/xml-path-3.0.1.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/xmlbeans-2.3.0.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/xmlpull-1.1.3.1.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/xpp3_min-1.1.4c.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/xstream-1.4.7.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/zxing-j2se.jar!/" />
- <libelement value="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/zxing2.3.0.jar!/" />
- <src_description expected_position="0">
- <src_folder value="file://$MODULE_DIR$/src" expected_position="0" />
- </src_description>
+ <component name="FacetManager">
+ <facet type="web" name="Web">
+ <configuration>
+ <descriptors>
+ <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/WebRoot/WEB-INF/web.xml" />
+ </descriptors>
+ <webroots>
+ <root url="file://$MODULE_DIR$/WebRoot" relative="/" />
+ </webroots>
+ </configuration>
+ </facet>
</component>
- <component name="NewModuleRootManager">
- <output url="file://$MODULE_DIR$/WebRoot/WEB-INF/classes" />
- <output-test url="file://$MODULE_DIR$/out/test/eCoWorksV3" />
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/mapperxml" isTestSource="false" />
- <excludeFolder url="file://$MODULE_DIR$/WebRoot" />
- <excludeFolder url="file://$MODULE_DIR$/WebRoot/app" />
- <excludeFolder url="file://$MODULE_DIR$/WebRoot/uploads" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
</content>
- <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="lib" level="project" />
- <orderEntry type="library" name="tomcatLib" level="project" />
+ <orderEntry type="library" name="tomcat" level="project" />
</component>
</module>
\ No newline at end of file
--
Gitblit v1.8.0