https://git.trustie.net/fhx569287825/aggregation-platform into web_backend_develope Conflicts: src/com/base/BaseController.java src/com/platform/controller/DataModelController.java src/com/platform/service/impl/MoveDataServiceImpl.java src/com/platform/service/impl/OracleExtractServiceImpl.java src/com/platform/utils/Constant.javaweb_backend_develope
commit
fead9d9371
@ -1,14 +1,10 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry kind="src" path="test"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0">
|
||||
<attributes>
|
||||
<attribute name="owner.project.facets" value="jst.web"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/Java"/>
|
||||
<classpathentry kind="output" path="build/classes"/>
|
||||
</classpath>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry kind="src" path="test"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0"/>
|
||||
<classpathentry kind="output" path="build/classes"/>
|
||||
</classpath>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/target
|
||||
/build
|
||||
/RemoteSystemsTempFiles
|
||||
/bin/
|
||||
.settings
|
||||
/target
|
||||
/build
|
||||
/RemoteSystemsTempFiles
|
||||
/bin/
|
||||
.settings
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
!SESSION 2016-09-13 08:39:40.662 -----------------------------------------------
|
||||
eclipse.buildId=4.3.0.I20130605-2000
|
||||
java.version=1.8.0_91
|
||||
java.vendor=Oracle Corporation
|
||||
BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=zh_CN
|
||||
Framework arguments: -product org.eclipse.epp.package.jee.product
|
||||
Command-line arguments: -os win32 -ws win32 -arch x86_64 -product org.eclipse.epp.package.jee.product
|
||||
|
||||
!ENTRY org.eclipse.egit.ui 2 0 2016-09-13 08:40:07.850
|
||||
!MESSAGE Warning: The environment variable HOME is not set. The following directory will be used to store the Git
|
||||
user global configuration and to define the default location to store repositories: 'C:\Users\wuming'. If this is
|
||||
not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and
|
||||
EGit might behave differently since they see different configuration options.
|
||||
This warning can be switched off on the Team > Git > Confirmations and Warnings preference page.
|
||||
!SESSION 2016-09-13 08:39:40.662 -----------------------------------------------
|
||||
eclipse.buildId=4.3.0.I20130605-2000
|
||||
java.version=1.8.0_91
|
||||
java.vendor=Oracle Corporation
|
||||
BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=zh_CN
|
||||
Framework arguments: -product org.eclipse.epp.package.jee.product
|
||||
Command-line arguments: -os win32 -ws win32 -arch x86_64 -product org.eclipse.epp.package.jee.product
|
||||
|
||||
!ENTRY org.eclipse.egit.ui 2 0 2016-09-13 08:40:07.850
|
||||
!MESSAGE Warning: The environment variable HOME is not set. The following directory will be used to store the Git
|
||||
user global configuration and to define the default location to store repositories: 'C:\Users\wuming'. If this is
|
||||
not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and
|
||||
EGit might behave differently since they see different configuration options.
|
||||
This warning can be switched off on the Team > Git > Confirmations and Warnings preference page.
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
#GitProjectData
|
||||
#Tue Sep 13 08:40:10 CST 2016
|
||||
.gitdir=../.git
|
||||
#GitProjectData
|
||||
#Tue Sep 13 08:40:10 CST 2016
|
||||
.gitdir=../.git
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1,2 +1,2 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<typeInfoHistroy/>
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<typeInfoHistroy/>
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<qualifiedTypeNameHistroy/>
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<qualifiedTypeNameHistroy/>
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1,41 +1,41 @@
|
||||
<configuration scan="true">
|
||||
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
|
||||
<pattern>%date [%thread] %-5level %logger{35} - %msg%n</pattern>
|
||||
</encoder>
|
||||
<filter class="org.eclipse.m2e.logback.appender.ConsoleAppenderFilter"/>
|
||||
</appender>
|
||||
|
||||
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||
<File>${org.eclipse.m2e.log.dir}/0.log</File>
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
|
||||
<FileNamePattern>${org.eclipse.m2e.log.dir}/%i.log</FileNamePattern>
|
||||
<MinIndex>1</MinIndex>
|
||||
<MaxIndex>10</MaxIndex>
|
||||
</rollingPolicy>
|
||||
<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
|
||||
<MaxFileSize>100MB</MaxFileSize>
|
||||
</triggeringPolicy>
|
||||
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
|
||||
<pattern>%date [%thread] %-5level %logger{35} - %msg%n</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<appender name="EclipseLog" class="org.eclipse.m2e.logback.appender.EclipseLogAppender">
|
||||
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
|
||||
<level>WARN</level>
|
||||
</filter>
|
||||
</appender>
|
||||
|
||||
<appender name="MavenConsoleLog" class="org.eclipse.m2e.logback.appender.MavenConsoleAppender">
|
||||
</appender>
|
||||
|
||||
<root level="INFO">
|
||||
<appender-ref ref="FILE" />
|
||||
<appender-ref ref="STDOUT" />
|
||||
<appender-ref ref="EclipseLog" />
|
||||
<appender-ref ref="MavenConsoleLog" />
|
||||
</root>
|
||||
|
||||
<logger name="com.ning.http.client" level="INFO" />
|
||||
</configuration>
|
||||
<configuration scan="true">
|
||||
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
|
||||
<pattern>%date [%thread] %-5level %logger{35} - %msg%n</pattern>
|
||||
</encoder>
|
||||
<filter class="org.eclipse.m2e.logback.appender.ConsoleAppenderFilter"/>
|
||||
</appender>
|
||||
|
||||
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||
<File>${org.eclipse.m2e.log.dir}/0.log</File>
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
|
||||
<FileNamePattern>${org.eclipse.m2e.log.dir}/%i.log</FileNamePattern>
|
||||
<MinIndex>1</MinIndex>
|
||||
<MaxIndex>10</MaxIndex>
|
||||
</rollingPolicy>
|
||||
<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
|
||||
<MaxFileSize>100MB</MaxFileSize>
|
||||
</triggeringPolicy>
|
||||
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
|
||||
<pattern>%date [%thread] %-5level %logger{35} - %msg%n</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<appender name="EclipseLog" class="org.eclipse.m2e.logback.appender.EclipseLogAppender">
|
||||
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
|
||||
<level>WARN</level>
|
||||
</filter>
|
||||
</appender>
|
||||
|
||||
<appender name="MavenConsoleLog" class="org.eclipse.m2e.logback.appender.MavenConsoleAppender">
|
||||
</appender>
|
||||
|
||||
<root level="INFO">
|
||||
<appender-ref ref="FILE" />
|
||||
<appender-ref ref="STDOUT" />
|
||||
<appender-ref ref="EclipseLog" />
|
||||
<appender-ref ref="MavenConsoleLog" />
|
||||
</root>
|
||||
|
||||
<logger name="com.ning.http.client" level="INFO" />
|
||||
</configuration>
|
||||
|
||||
@ -1,57 +1,57 @@
|
||||
# RSE DOM Node
|
||||
00-name=DESKTOP-65KJ4BV\:local.files
|
||||
01-type=FilterPool
|
||||
03-attr.default=true
|
||||
03-attr.deletable=true
|
||||
03-attr.id=local.files
|
||||
03-attr.nonRenamable=false
|
||||
03-attr.owningParentName=null
|
||||
03-attr.release=200
|
||||
03-attr.singleFilterStringOnly=false
|
||||
03-attr.singleFilterStringOnlyESet=false
|
||||
03-attr.stringsCaseSensitive=true
|
||||
03-attr.supportsDuplicateFilterStrings=false
|
||||
03-attr.supportsNestedFilters=true
|
||||
03-attr.type=default
|
||||
06-child.00000.00-name=My Home
|
||||
06-child.00000.01-type=Filter
|
||||
06-child.00000.03-attr.default=false
|
||||
06-child.00000.03-attr.filterType=default
|
||||
06-child.00000.03-attr.id=My Home
|
||||
06-child.00000.03-attr.nonChangable=false
|
||||
06-child.00000.03-attr.nonDeletable=false
|
||||
06-child.00000.03-attr.nonRenamable=false
|
||||
06-child.00000.03-attr.promptable=false
|
||||
06-child.00000.03-attr.relativeOrder=0
|
||||
06-child.00000.03-attr.release=200
|
||||
06-child.00000.03-attr.singleFilterStringOnly=false
|
||||
06-child.00000.03-attr.stringsCaseSensitive=false
|
||||
06-child.00000.03-attr.stringsNonChangable=false
|
||||
06-child.00000.03-attr.supportsDuplicateFilterStrings=false
|
||||
06-child.00000.03-attr.supportsNestedFilters=true
|
||||
06-child.00000.06-child.00000.00-name=C\:\\Users\\wuming\\*
|
||||
06-child.00000.06-child.00000.01-type=FilterString
|
||||
06-child.00000.06-child.00000.03-attr.default=false
|
||||
06-child.00000.06-child.00000.03-attr.string=C\:\\Users\\wuming\\*
|
||||
06-child.00000.06-child.00000.03-attr.type=default
|
||||
06-child.00001.00-name=Drives
|
||||
06-child.00001.01-type=Filter
|
||||
06-child.00001.03-attr.default=false
|
||||
06-child.00001.03-attr.filterType=default
|
||||
06-child.00001.03-attr.id=Drives
|
||||
06-child.00001.03-attr.nonChangable=false
|
||||
06-child.00001.03-attr.nonDeletable=false
|
||||
06-child.00001.03-attr.nonRenamable=false
|
||||
06-child.00001.03-attr.promptable=false
|
||||
06-child.00001.03-attr.relativeOrder=0
|
||||
06-child.00001.03-attr.release=200
|
||||
06-child.00001.03-attr.singleFilterStringOnly=false
|
||||
06-child.00001.03-attr.stringsCaseSensitive=false
|
||||
06-child.00001.03-attr.stringsNonChangable=false
|
||||
06-child.00001.03-attr.supportsDuplicateFilterStrings=false
|
||||
06-child.00001.03-attr.supportsNestedFilters=true
|
||||
06-child.00001.06-child.00000.00-name=*
|
||||
06-child.00001.06-child.00000.01-type=FilterString
|
||||
06-child.00001.06-child.00000.03-attr.default=false
|
||||
06-child.00001.06-child.00000.03-attr.string=*
|
||||
06-child.00001.06-child.00000.03-attr.type=default
|
||||
# RSE DOM Node
|
||||
00-name=DESKTOP-65KJ4BV\:local.files
|
||||
01-type=FilterPool
|
||||
03-attr.default=true
|
||||
03-attr.deletable=true
|
||||
03-attr.id=local.files
|
||||
03-attr.nonRenamable=false
|
||||
03-attr.owningParentName=null
|
||||
03-attr.release=200
|
||||
03-attr.singleFilterStringOnly=false
|
||||
03-attr.singleFilterStringOnlyESet=false
|
||||
03-attr.stringsCaseSensitive=true
|
||||
03-attr.supportsDuplicateFilterStrings=false
|
||||
03-attr.supportsNestedFilters=true
|
||||
03-attr.type=default
|
||||
06-child.00000.00-name=My Home
|
||||
06-child.00000.01-type=Filter
|
||||
06-child.00000.03-attr.default=false
|
||||
06-child.00000.03-attr.filterType=default
|
||||
06-child.00000.03-attr.id=My Home
|
||||
06-child.00000.03-attr.nonChangable=false
|
||||
06-child.00000.03-attr.nonDeletable=false
|
||||
06-child.00000.03-attr.nonRenamable=false
|
||||
06-child.00000.03-attr.promptable=false
|
||||
06-child.00000.03-attr.relativeOrder=0
|
||||
06-child.00000.03-attr.release=200
|
||||
06-child.00000.03-attr.singleFilterStringOnly=false
|
||||
06-child.00000.03-attr.stringsCaseSensitive=false
|
||||
06-child.00000.03-attr.stringsNonChangable=false
|
||||
06-child.00000.03-attr.supportsDuplicateFilterStrings=false
|
||||
06-child.00000.03-attr.supportsNestedFilters=true
|
||||
06-child.00000.06-child.00000.00-name=C\:\\Users\\wuming\\*
|
||||
06-child.00000.06-child.00000.01-type=FilterString
|
||||
06-child.00000.06-child.00000.03-attr.default=false
|
||||
06-child.00000.06-child.00000.03-attr.string=C\:\\Users\\wuming\\*
|
||||
06-child.00000.06-child.00000.03-attr.type=default
|
||||
06-child.00001.00-name=Drives
|
||||
06-child.00001.01-type=Filter
|
||||
06-child.00001.03-attr.default=false
|
||||
06-child.00001.03-attr.filterType=default
|
||||
06-child.00001.03-attr.id=Drives
|
||||
06-child.00001.03-attr.nonChangable=false
|
||||
06-child.00001.03-attr.nonDeletable=false
|
||||
06-child.00001.03-attr.nonRenamable=false
|
||||
06-child.00001.03-attr.promptable=false
|
||||
06-child.00001.03-attr.relativeOrder=0
|
||||
06-child.00001.03-attr.release=200
|
||||
06-child.00001.03-attr.singleFilterStringOnly=false
|
||||
06-child.00001.03-attr.stringsCaseSensitive=false
|
||||
06-child.00001.03-attr.stringsNonChangable=false
|
||||
06-child.00001.03-attr.supportsDuplicateFilterStrings=false
|
||||
06-child.00001.03-attr.supportsNestedFilters=true
|
||||
06-child.00001.06-child.00000.00-name=*
|
||||
06-child.00001.06-child.00000.01-type=FilterString
|
||||
06-child.00001.06-child.00000.03-attr.default=false
|
||||
06-child.00001.06-child.00000.03-attr.string=*
|
||||
06-child.00001.06-child.00000.03-attr.type=default
|
||||
|
||||
@ -1,25 +1,25 @@
|
||||
# RSE DOM Node
|
||||
00-name=Local
|
||||
01-type=Host
|
||||
03-attr.description=
|
||||
03-attr.hostname=LOCALHOST
|
||||
03-attr.offline=false
|
||||
03-attr.promptable=false
|
||||
03-attr.systemType=org.eclipse.rse.systemtype.local
|
||||
03-attr.type=Local
|
||||
06-child.00000.00-name=Local Connector Service
|
||||
06-child.00000.01-type=ConnectorService
|
||||
06-child.00000.03-attr.group=Local Connector Service
|
||||
06-child.00000.03-attr.port=0
|
||||
06-child.00000.03-attr.useSSL=false
|
||||
06-child.00000.06-child.00000.00-name=Local Files
|
||||
06-child.00000.06-child.00000.01-type=SubSystem
|
||||
06-child.00000.06-child.00000.03-attr.hidden=false
|
||||
06-child.00000.06-child.00000.03-attr.type=local.files
|
||||
06-child.00000.06-child.00000.06-child.00000.00-name=DESKTOP-65KJ4BV___DESKTOP-65KJ4BV\:local.files
|
||||
06-child.00000.06-child.00000.06-child.00000.01-type=FilterPoolReference
|
||||
06-child.00000.06-child.00000.06-child.00000.03-attr.refID=local.files
|
||||
06-child.00000.06-child.00001.00-name=Local Shells
|
||||
06-child.00000.06-child.00001.01-type=SubSystem
|
||||
06-child.00000.06-child.00001.03-attr.hidden=false
|
||||
06-child.00000.06-child.00001.03-attr.type=local.shells
|
||||
# RSE DOM Node
|
||||
00-name=Local
|
||||
01-type=Host
|
||||
03-attr.description=
|
||||
03-attr.hostname=LOCALHOST
|
||||
03-attr.offline=false
|
||||
03-attr.promptable=false
|
||||
03-attr.systemType=org.eclipse.rse.systemtype.local
|
||||
03-attr.type=Local
|
||||
06-child.00000.00-name=Local Connector Service
|
||||
06-child.00000.01-type=ConnectorService
|
||||
06-child.00000.03-attr.group=Local Connector Service
|
||||
06-child.00000.03-attr.port=0
|
||||
06-child.00000.03-attr.useSSL=false
|
||||
06-child.00000.06-child.00000.00-name=Local Files
|
||||
06-child.00000.06-child.00000.01-type=SubSystem
|
||||
06-child.00000.06-child.00000.03-attr.hidden=false
|
||||
06-child.00000.06-child.00000.03-attr.type=local.files
|
||||
06-child.00000.06-child.00000.06-child.00000.00-name=DESKTOP-65KJ4BV___DESKTOP-65KJ4BV\:local.files
|
||||
06-child.00000.06-child.00000.06-child.00000.01-type=FilterPoolReference
|
||||
06-child.00000.06-child.00000.06-child.00000.03-attr.refID=local.files
|
||||
06-child.00000.06-child.00001.00-name=Local Shells
|
||||
06-child.00000.06-child.00001.01-type=SubSystem
|
||||
06-child.00000.06-child.00001.03-attr.hidden=false
|
||||
06-child.00000.06-child.00001.03-attr.type=local.shells
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# RSE DOM Node
|
||||
00-name=DESKTOP-65KJ4BV
|
||||
01-type=Profile
|
||||
03-attr.defaultPrivate=true
|
||||
03-attr.isActive=true
|
||||
05-ref.00000=FP.local.files_0
|
||||
05-ref.00001=H.local_16
|
||||
# RSE DOM Node
|
||||
00-name=DESKTOP-65KJ4BV
|
||||
01-type=Profile
|
||||
03-attr.defaultPrivate=true
|
||||
03-attr.isActive=true
|
||||
05-ref.00000=FP.local.files_0
|
||||
05-ref.00001=H.local_16
|
||||
|
||||
@ -1,28 +1,28 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<section name="Workbench">
|
||||
<section name="org.eclipse.ui.internal.QuickAccess">
|
||||
<item value="759" key="dialogHeight"/>
|
||||
<item value="1440" key="dialogWidth"/>
|
||||
<list key="textEntries">
|
||||
</list>
|
||||
<list key="orderedElements">
|
||||
</list>
|
||||
<list key="orderedProviders">
|
||||
</list>
|
||||
<list key="textArray">
|
||||
</list>
|
||||
</section>
|
||||
<section name="ShowViewDialog">
|
||||
<item value="345" key="DIALOG_WIDTH"/>
|
||||
<item value="1|Microsoft YaHei UI|9.0|0|WINDOWS|1|-12|0|0|0|400|0|0|0|1|0|0|0|0|Microsoft YaHei UI" key="DIALOG_FONT_NAME"/>
|
||||
<item value="org.eclipse.jdt.ui.PackageExplorer" key="ShowViewDialog.STORE_SELECTED_VIEW_ID"/>
|
||||
<item value="452" key="DIALOG_HEIGHT"/>
|
||||
<item value="796" key="DIALOG_X_ORIGIN"/>
|
||||
<item value="227" key="DIALOG_Y_ORIGIN"/>
|
||||
<list key="ShowViewDialog.STORE_EXPANDED_CATEGORIES_ID">
|
||||
<item value="org.eclipse.jdt.ui.java"/>
|
||||
</list>
|
||||
</section>
|
||||
<section name="ImportExportAction">
|
||||
</section>
|
||||
</section>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<section name="Workbench">
|
||||
<section name="org.eclipse.ui.internal.QuickAccess">
|
||||
<item value="759" key="dialogHeight"/>
|
||||
<item value="1440" key="dialogWidth"/>
|
||||
<list key="textEntries">
|
||||
</list>
|
||||
<list key="orderedElements">
|
||||
</list>
|
||||
<list key="orderedProviders">
|
||||
</list>
|
||||
<list key="textArray">
|
||||
</list>
|
||||
</section>
|
||||
<section name="ShowViewDialog">
|
||||
<item value="345" key="DIALOG_WIDTH"/>
|
||||
<item value="1|Microsoft YaHei UI|9.0|0|WINDOWS|1|-12|0|0|0|400|0|0|0|1|0|0|0|0|Microsoft YaHei UI" key="DIALOG_FONT_NAME"/>
|
||||
<item value="org.eclipse.jdt.ui.PackageExplorer" key="ShowViewDialog.STORE_SELECTED_VIEW_ID"/>
|
||||
<item value="452" key="DIALOG_HEIGHT"/>
|
||||
<item value="796" key="DIALOG_X_ORIGIN"/>
|
||||
<item value="227" key="DIALOG_Y_ORIGIN"/>
|
||||
<list key="ShowViewDialog.STORE_EXPANDED_CATEGORIES_ID">
|
||||
<item value="org.eclipse.jdt.ui.java"/>
|
||||
</list>
|
||||
</section>
|
||||
<section name="ImportExportAction">
|
||||
</section>
|
||||
</section>
|
||||
|
||||
@ -1,41 +1,41 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<projectDescription>
|
||||
<name>data_manager_backend</name>
|
||||
<comment></comment>
|
||||
<projects>
|
||||
</projects>
|
||||
<buildSpec>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.jdt.core.javabuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.wst.common.project.facet.core.builder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.wst.validation.validationbuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>com.genuitec.eclipse.ast.deploy.core.DeploymentBuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
|
||||
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
|
||||
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
|
||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
|
||||
</natures>
|
||||
</projectDescription>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<projectDescription>
|
||||
<name>data_manager_backend</name>
|
||||
<comment></comment>
|
||||
<projects>
|
||||
</projects>
|
||||
<buildSpec>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.jdt.core.javabuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.wst.common.project.facet.core.builder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.wst.validation.validationbuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>com.genuitec.eclipse.ast.deploy.core.DeploymentBuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
|
||||
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
|
||||
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
|
||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
|
||||
</natures>
|
||||
</projectDescription>
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
Manifest-Version: 1.0
|
||||
Class-Path:
|
||||
|
||||
Manifest-Version: 1.0
|
||||
Class-Path:
|
||||
|
||||
|
||||
@ -1,50 +1,50 @@
|
||||
#=============================================================================================================
|
||||
# MySQL
|
||||
#=============================================================================================================
|
||||
# 驱动程序
|
||||
jdbc.mysql.driver=com.mysql.jdbc.Driver
|
||||
# 连接url
|
||||
jdbc.mysql.url=jdbc:mysql://192.168.0.101:3306/test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
|
||||
# 用户名
|
||||
jdbc.mysql.username=root
|
||||
# 密码
|
||||
jdbc.mysql.password=root
|
||||
|
||||
#=============================================================================================================
|
||||
# Oracle 连接配置
|
||||
#=============================================================================================================
|
||||
# hui用户名
|
||||
gather-user-name=system
|
||||
# 密码
|
||||
gather-user-password=oracle
|
||||
#
|
||||
gather-port=1521
|
||||
#
|
||||
gather-service-name=orcl
|
||||
#=============================================================================================================
|
||||
# 数据库公共配置
|
||||
#=============================================================================================================
|
||||
jdbc.initialSize=5
|
||||
jdbc.minIdle=5
|
||||
jdbc.maxIdle=20
|
||||
jdbc.maxActive=100
|
||||
jdbc.maxWait=100000
|
||||
jdbc.defaultAutoCommit=false
|
||||
jdbc.removeAbandoned=true
|
||||
jdbc.removeAbandonedTimeout=600
|
||||
jdbc.testWhileIdle=true
|
||||
jdbc.timeBetweenEvictionRunsMillis=60000
|
||||
jdbc.numTestsPerEvictionRun=20
|
||||
jdbc.minEvictableIdleTimeMillis=300000
|
||||
#==============================================================================================================
|
||||
#
|
||||
#==============================================================================================================
|
||||
table-suffix=_20152016
|
||||
extract-log-localtion=/home/log/
|
||||
gather-tablespace-name=TS_TTSSS
|
||||
gather-tablespace-path=
|
||||
gather-table-user-password=
|
||||
kubeMasterUrl=http://192.168.0.110:8080/
|
||||
collect-user-name=system
|
||||
collect-password=oracle
|
||||
collect-service-name=orcl
|
||||
#=============================================================================================================
|
||||
# MySQL
|
||||
#=============================================================================================================
|
||||
# 驱动程序
|
||||
jdbc.mysql.driver=com.mysql.jdbc.Driver
|
||||
# 连接url
|
||||
jdbc.mysql.url=jdbc:mysql://192.168.0.101:3306/test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
|
||||
# 用户名
|
||||
jdbc.mysql.username=root
|
||||
# 密码
|
||||
jdbc.mysql.password=root
|
||||
|
||||
#=============================================================================================================
|
||||
# Oracle 连接配置
|
||||
#=============================================================================================================
|
||||
# hui用户名
|
||||
gather-user-name=system
|
||||
# 密码
|
||||
gather-user-password=oracle
|
||||
#
|
||||
gather-port=1521
|
||||
#
|
||||
gather-service-name=orcl
|
||||
#=============================================================================================================
|
||||
# 数据库公共配置
|
||||
#=============================================================================================================
|
||||
jdbc.initialSize=5
|
||||
jdbc.minIdle=5
|
||||
jdbc.maxIdle=20
|
||||
jdbc.maxActive=100
|
||||
jdbc.maxWait=100000
|
||||
jdbc.defaultAutoCommit=false
|
||||
jdbc.removeAbandoned=true
|
||||
jdbc.removeAbandonedTimeout=600
|
||||
jdbc.testWhileIdle=true
|
||||
jdbc.timeBetweenEvictionRunsMillis=60000
|
||||
jdbc.numTestsPerEvictionRun=20
|
||||
jdbc.minEvictableIdleTimeMillis=300000
|
||||
#==============================================================================================================
|
||||
#
|
||||
#==============================================================================================================
|
||||
table-suffix=_20152016
|
||||
extract-log-localtion=/home/log/
|
||||
gather-tablespace-name=TS_TTSSS
|
||||
gather-tablespace-path=
|
||||
gather-table-user-password=
|
||||
kubeMasterUrl=http://192.168.0.110:8080/
|
||||
collect-user-name=system
|
||||
collect-password=oracle
|
||||
collect-service-name=orcl
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
#!/bin/bash
|
||||
function ergodic(){
|
||||
for file in `ls $1`
|
||||
do
|
||||
if [ "$file" != "app" -a -d $1"/"$file ]
|
||||
then
|
||||
ergodic $1"/"$file
|
||||
else
|
||||
local path=$1"/"$file
|
||||
echo $path
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
IFS=$'\n' #这个必须要,否则会在文件名中有空格时出错
|
||||
INIT_PATH=".";
|
||||
#!/bin/bash
|
||||
function ergodic(){
|
||||
for file in `ls $1`
|
||||
do
|
||||
if [ "$file" != "app" -a -d $1"/"$file ]
|
||||
then
|
||||
ergodic $1"/"$file
|
||||
else
|
||||
local path=$1"/"$file
|
||||
echo $path
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
IFS=$'\n' #这个必须要,否则会在文件名中有空格时出错
|
||||
INIT_PATH=".";
|
||||
ergodic $1
|
||||
@ -1,22 +1,22 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE configuration PUBLIC
|
||||
"-//mybatis.org//DTD Config 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-config.dtd">
|
||||
<configuration>
|
||||
<typeAliases>
|
||||
<typeAlias alias="EncodedInfoEntity" type="com.platform.entities.EncodedInfoEntity" />
|
||||
<typeAlias alias="DataInfoEntity" type="com.platform.entities.DataInfoEntity" />
|
||||
<typeAlias alias="PagerOptions" type="com.platform.entities.PagerOptions"/>
|
||||
<typeAlias alias="GatherOracleInfo" type="com.platform.entities.GatherOracleInfo"/>
|
||||
<typeAlias alias="DataInfoEntityMoveTmp" type="com.platform.entities.DataInfoEntityMoveTmp"/>
|
||||
<typeAlias alias="SystemEntity" type="com.platform.entities.SystemEntity"/>
|
||||
<typeAlias alias="RegionalismEntity" type="com.platform.entities.RegionalismEntity"/>
|
||||
</typeAliases>
|
||||
<mappers>
|
||||
<mapper resource="com/dao/mapper/data-details-mapper.xml" />
|
||||
<mapper resource="com/dao/mapper/config-details-mapper.xml"/>
|
||||
<mapper resource="com/dao/mapper/dataInfoMoveTmpmapper.xml"/>
|
||||
<mapper resource="com/dao/mapper/RegionalismMapper.xml"/>
|
||||
<mapper resource="com/dao/mapper/SystemCodeMapper.xml"/>
|
||||
</mappers>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE configuration PUBLIC
|
||||
"-//mybatis.org//DTD Config 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-config.dtd">
|
||||
<configuration>
|
||||
<typeAliases>
|
||||
<typeAlias alias="EncodedInfoEntity" type="com.platform.entities.EncodedInfoEntity" />
|
||||
<typeAlias alias="DataInfoEntity" type="com.platform.entities.DataInfoEntity" />
|
||||
<typeAlias alias="PagerOptions" type="com.platform.entities.PagerOptions"/>
|
||||
<typeAlias alias="GatherOracleInfo" type="com.platform.entities.GatherOracleInfo"/>
|
||||
<typeAlias alias="DataInfoEntityMoveTmp" type="com.platform.entities.DataInfoEntityMoveTmp"/>
|
||||
<typeAlias alias="SystemEntity" type="com.platform.entities.SystemEntity"/>
|
||||
<typeAlias alias="RegionalismEntity" type="com.platform.entities.RegionalismEntity"/>
|
||||
</typeAliases>
|
||||
<mappers>
|
||||
<mapper resource="com/dao/mapper/data-details-mapper.xml" />
|
||||
<mapper resource="com/dao/mapper/config-details-mapper.xml"/>
|
||||
<mapper resource="com/dao/mapper/dataInfoMoveTmpmapper.xml"/>
|
||||
<mapper resource="com/dao/mapper/RegionalismMapper.xml"/>
|
||||
<mapper resource="com/dao/mapper/SystemCodeMapper.xml"/>
|
||||
</mappers>
|
||||
</configuration>
|
||||
@ -1,93 +1,93 @@
|
||||
<?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:tx="http://www.springframework.org/schema/tx"
|
||||
xmlns:aop="http://www.springframework.org/schema/aop"
|
||||
xmlns:context="http://www.springframework.org/schema/context"
|
||||
xmlns:task="http://www.springframework.org/schema/task"
|
||||
xsi:schemaLocation="http://www.springframework.org/schema/beans
|
||||
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
|
||||
http://www.springframework.org/schema/tx
|
||||
http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
|
||||
http://www.springframework.org/schema/aop
|
||||
http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
|
||||
http://www.springframework.org/schema/context
|
||||
http://www.springframework.org/schema/context/spring-context-3.0.xsd
|
||||
http://www.springframework.org/schema/websocket
|
||||
http://www.springframework.org/schema/websocket/spring-websocket.xsd
|
||||
http://www.springframework.org/schema/beans
|
||||
http://www.springframework.org/schema/beans/spring-beans.xsd
|
||||
http://www.springframework.org/schema/task
|
||||
http://www.springframework.org/schema/task/spring-task-3.0.xsd">
|
||||
|
||||
<!-- 读取db.properties中的属性值 -->
|
||||
<bean
|
||||
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
|
||||
<property name="location" value="WEB-INF/config/config.properties"></property>
|
||||
</bean>
|
||||
|
||||
<bean id="messageCodeResolver"
|
||||
class="org.springframework.validation.DefaultMessageCodesResolver">
|
||||
<property name="prefix" value="validation."></property>
|
||||
</bean>
|
||||
|
||||
<!-- 连接MySQL数据库 -->
|
||||
<bean id="mySQLDataSource"
|
||||
class="org.springframework.jdbc.datasource.DriverManagerDataSource">
|
||||
<property name="driverClassName" value="${jdbc.mysql.driver}" />
|
||||
<property name="url" value="${jdbc.mysql.url}" />
|
||||
<property name="username" value="${jdbc.mysql.username}" />
|
||||
<property name="password" value="${jdbc.mysql.password}" />
|
||||
</bean>
|
||||
<bean id="mySQLSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
|
||||
<property name="configLocation" value="WEB-INF/config/mybatis-applicationConfig.xml" />
|
||||
<property name="dataSource" ref="mySQLDataSource" />
|
||||
</bean>
|
||||
<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
|
||||
<property name="basePackage" value="com.platform.dao,com.dao.mapper" />
|
||||
</bean>
|
||||
<!-- 配置声明式事物 事物管理器 -->
|
||||
<!-- 配置声明式事物 -->
|
||||
<bean id="mySQLTxManager"
|
||||
class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
|
||||
<property name="dataSource" ref="mySQLDataSource" />
|
||||
</bean>
|
||||
<tx:advice id="txAdvice" transaction-manager="mySQLTxManager">
|
||||
<tx:attributes>
|
||||
<tx:method name="delete*" propagation="REQUIRED" />
|
||||
<tx:method name="insert*" propagation="REQUIRED" />
|
||||
<tx:method name="update*" propagation="REQUIRED" />
|
||||
<tx:method name="select*" read-only="true" />
|
||||
</tx:attributes>
|
||||
</tx:advice>
|
||||
<aop:config>
|
||||
<aop:pointcut expression="execution(* com.platform.service.*.*(..))"
|
||||
id="pointcut" />
|
||||
<aop:advisor advice-ref="txAdvice" pointcut-ref="pointcut" />
|
||||
</aop:config>
|
||||
|
||||
<!-- 连接oracle数据库 -->
|
||||
<!-- <bean id="oracleDataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource"
|
||||
destroy-method="close"> <property name="driverClassName" value="${jdbc.oracle.driver}"
|
||||
/> <property name="url" value="${jdbc.oracle.url}" /> <property name="username"
|
||||
value="${jdbc.oracle.username}" /> <property name="password" value="${jdbc.oracle.password}"
|
||||
/> <property name="initialSize" value="${jdbc.initialSize}" /> <property
|
||||
name="minIdle" value="${jdbc.minIdle}" /> <property name="maxIdle" value="${jdbc.maxIdle}"
|
||||
/> <property name="maxActive" value="${jdbc.maxActive}" /> <property name="maxWait"
|
||||
value="${jdbc.maxWait}" /> <property name="defaultAutoCommit" value="${jdbc.defaultAutoCommit}"
|
||||
/> <property name="removeAbandoned" value="${jdbc.removeAbandoned}" /> <property
|
||||
name="removeAbandonedTimeout" value="${jdbc.removeAbandonedTimeout}" /> <property
|
||||
name="testWhileIdle" value="${jdbc.testWhileIdle}" /> <property name="timeBetweenEvictionRunsMillis"
|
||||
value="${jdbc.timeBetweenEvictionRunsMillis}" /> <property name="numTestsPerEvictionRun"
|
||||
value="${jdbc.numTestsPerEvictionRun}" /> <property name="minEvictableIdleTimeMillis"
|
||||
value="${jdbc.minEvictableIdleTimeMillis}" /> </bean> -->
|
||||
<context:component-scan base-package="com.platform.*">
|
||||
<context:exclude-filter type="annotation"
|
||||
expression="org.springframework.stereotype.Controller" />
|
||||
</context:component-scan>
|
||||
<!-- Enables the Spring Task @Scheduled programming model -->
|
||||
<task:executor id="executor" pool-size="5" />
|
||||
<task:scheduler id="scheduler" pool-size="10" />
|
||||
<task:annotation-driven executor="executor" scheduler="scheduler" />
|
||||
<?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:tx="http://www.springframework.org/schema/tx"
|
||||
xmlns:aop="http://www.springframework.org/schema/aop"
|
||||
xmlns:context="http://www.springframework.org/schema/context"
|
||||
xmlns:task="http://www.springframework.org/schema/task"
|
||||
xsi:schemaLocation="http://www.springframework.org/schema/beans
|
||||
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
|
||||
http://www.springframework.org/schema/tx
|
||||
http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
|
||||
http://www.springframework.org/schema/aop
|
||||
http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
|
||||
http://www.springframework.org/schema/context
|
||||
http://www.springframework.org/schema/context/spring-context-3.0.xsd
|
||||
http://www.springframework.org/schema/websocket
|
||||
http://www.springframework.org/schema/websocket/spring-websocket.xsd
|
||||
http://www.springframework.org/schema/beans
|
||||
http://www.springframework.org/schema/beans/spring-beans.xsd
|
||||
http://www.springframework.org/schema/task
|
||||
http://www.springframework.org/schema/task/spring-task-3.0.xsd">
|
||||
|
||||
<!-- 读取db.properties中的属性值 -->
|
||||
<bean
|
||||
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
|
||||
<property name="location" value="WEB-INF/config/config.properties"></property>
|
||||
</bean>
|
||||
|
||||
<bean id="messageCodeResolver"
|
||||
class="org.springframework.validation.DefaultMessageCodesResolver">
|
||||
<property name="prefix" value="validation."></property>
|
||||
</bean>
|
||||
|
||||
<!-- 连接MySQL数据库 -->
|
||||
<bean id="mySQLDataSource"
|
||||
class="org.springframework.jdbc.datasource.DriverManagerDataSource">
|
||||
<property name="driverClassName" value="${jdbc.mysql.driver}" />
|
||||
<property name="url" value="${jdbc.mysql.url}" />
|
||||
<property name="username" value="${jdbc.mysql.username}" />
|
||||
<property name="password" value="${jdbc.mysql.password}" />
|
||||
</bean>
|
||||
<bean id="mySQLSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
|
||||
<property name="configLocation" value="WEB-INF/config/mybatis-applicationConfig.xml" />
|
||||
<property name="dataSource" ref="mySQLDataSource" />
|
||||
</bean>
|
||||
<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
|
||||
<property name="basePackage" value="com.platform.dao,com.dao.mapper" />
|
||||
</bean>
|
||||
<!-- 配置声明式事物 事物管理器 -->
|
||||
<!-- 配置声明式事物 -->
|
||||
<bean id="mySQLTxManager"
|
||||
class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
|
||||
<property name="dataSource" ref="mySQLDataSource" />
|
||||
</bean>
|
||||
<tx:advice id="txAdvice" transaction-manager="mySQLTxManager">
|
||||
<tx:attributes>
|
||||
<tx:method name="delete*" propagation="REQUIRED" />
|
||||
<tx:method name="insert*" propagation="REQUIRED" />
|
||||
<tx:method name="update*" propagation="REQUIRED" />
|
||||
<tx:method name="select*" read-only="true" />
|
||||
</tx:attributes>
|
||||
</tx:advice>
|
||||
<aop:config>
|
||||
<aop:pointcut expression="execution(* com.platform.service.*.*(..))"
|
||||
id="pointcut" />
|
||||
<aop:advisor advice-ref="txAdvice" pointcut-ref="pointcut" />
|
||||
</aop:config>
|
||||
|
||||
<!-- 连接oracle数据库 -->
|
||||
<!-- <bean id="oracleDataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource"
|
||||
destroy-method="close"> <property name="driverClassName" value="${jdbc.oracle.driver}"
|
||||
/> <property name="url" value="${jdbc.oracle.url}" /> <property name="username"
|
||||
value="${jdbc.oracle.username}" /> <property name="password" value="${jdbc.oracle.password}"
|
||||
/> <property name="initialSize" value="${jdbc.initialSize}" /> <property
|
||||
name="minIdle" value="${jdbc.minIdle}" /> <property name="maxIdle" value="${jdbc.maxIdle}"
|
||||
/> <property name="maxActive" value="${jdbc.maxActive}" /> <property name="maxWait"
|
||||
value="${jdbc.maxWait}" /> <property name="defaultAutoCommit" value="${jdbc.defaultAutoCommit}"
|
||||
/> <property name="removeAbandoned" value="${jdbc.removeAbandoned}" /> <property
|
||||
name="removeAbandonedTimeout" value="${jdbc.removeAbandonedTimeout}" /> <property
|
||||
name="testWhileIdle" value="${jdbc.testWhileIdle}" /> <property name="timeBetweenEvictionRunsMillis"
|
||||
value="${jdbc.timeBetweenEvictionRunsMillis}" /> <property name="numTestsPerEvictionRun"
|
||||
value="${jdbc.numTestsPerEvictionRun}" /> <property name="minEvictableIdleTimeMillis"
|
||||
value="${jdbc.minEvictableIdleTimeMillis}" /> </bean> -->
|
||||
<context:component-scan base-package="com.platform.*">
|
||||
<context:exclude-filter type="annotation"
|
||||
expression="org.springframework.stereotype.Controller" />
|
||||
</context:component-scan>
|
||||
<!-- Enables the Spring Task @Scheduled programming model -->
|
||||
<task:executor id="executor" pool-size="5" />
|
||||
<task:scheduler id="scheduler" pool-size="10" />
|
||||
<task:annotation-driven executor="executor" scheduler="scheduler" />
|
||||
</beans>
|
||||
@ -1,57 +1,57 @@
|
||||
<?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:aop="http://www.springframework.org/schema/aop"
|
||||
xmlns:mvc="http://www.springframework.org/schema/mvc"
|
||||
xmlns:tx="http://www.springframework.org/schema/tx"
|
||||
xmlns:jdbc="http://www.springframework.org/schema/jdbc"
|
||||
xmlns:context="http://www.springframework.org/schema/context"
|
||||
xmlns:websocket="http://www.springframework.org/schema/websocket"
|
||||
xsi:schemaLocation="
|
||||
http://www.springframework.org/schema/context
|
||||
http://www.springframework.org/schema/context/spring-context-4.0.xsd
|
||||
http://www.springframework.org/schema/beans
|
||||
http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
|
||||
http://www.springframework.org/schema/jdbc
|
||||
http://www.springframework.org/schema/jdbc/spring-jdbc-4.0.xsd
|
||||
http://www.springframework.org/schema/tx
|
||||
http://www.springframework.org/schema/tx/spring-tx-4.0.xsd
|
||||
http://www.springframework.org/schema/aop
|
||||
http://www.springframework.org/schema/aop/spring-aop-4.0.xsd
|
||||
http://www.springframework.org/schema/mvc
|
||||
http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd
|
||||
http://www.springframework.org/schema/websocket
|
||||
http://www.springframework.org/schema/websocket/spring-websocket-4.0.xsd"
|
||||
default-autowire="byName">
|
||||
|
||||
<context:component-scan base-package="com.platform.controller,com.platform.test,com.platform.websocket;" >
|
||||
<context:include-filter type="annotation" expression="org.springframework.stereotype.Controller"/>
|
||||
<context:exclude-filter type="annotation" expression="org.springframework.stereotype.Service"/>
|
||||
</context:component-scan>
|
||||
|
||||
<context:annotation-config />
|
||||
|
||||
<mvc:annotation-driven/>
|
||||
|
||||
<!-- 用于将对象转换为JSON -->
|
||||
<bean id="stringConverter"
|
||||
class="org.springframework.http.converter.StringHttpMessageConverter">
|
||||
<property name="supportedMediaTypes">
|
||||
<list>
|
||||
<value>application/json;charset=UTF-8</value>
|
||||
<value>text/html;charset=UTF-8</value>
|
||||
</list>
|
||||
</property>
|
||||
</bean>
|
||||
<bean id="jsonConverter"
|
||||
class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter"/>
|
||||
<bean class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter">
|
||||
<property name="messageConverters">
|
||||
<list>
|
||||
<ref bean="stringConverter" />
|
||||
<ref bean="jsonConverter" />
|
||||
</list>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<?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:aop="http://www.springframework.org/schema/aop"
|
||||
xmlns:mvc="http://www.springframework.org/schema/mvc"
|
||||
xmlns:tx="http://www.springframework.org/schema/tx"
|
||||
xmlns:jdbc="http://www.springframework.org/schema/jdbc"
|
||||
xmlns:context="http://www.springframework.org/schema/context"
|
||||
xmlns:websocket="http://www.springframework.org/schema/websocket"
|
||||
xsi:schemaLocation="
|
||||
http://www.springframework.org/schema/context
|
||||
http://www.springframework.org/schema/context/spring-context-4.0.xsd
|
||||
http://www.springframework.org/schema/beans
|
||||
http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
|
||||
http://www.springframework.org/schema/jdbc
|
||||
http://www.springframework.org/schema/jdbc/spring-jdbc-4.0.xsd
|
||||
http://www.springframework.org/schema/tx
|
||||
http://www.springframework.org/schema/tx/spring-tx-4.0.xsd
|
||||
http://www.springframework.org/schema/aop
|
||||
http://www.springframework.org/schema/aop/spring-aop-4.0.xsd
|
||||
http://www.springframework.org/schema/mvc
|
||||
http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd
|
||||
http://www.springframework.org/schema/websocket
|
||||
http://www.springframework.org/schema/websocket/spring-websocket-4.0.xsd"
|
||||
default-autowire="byName">
|
||||
|
||||
<context:component-scan base-package="com.platform.controller,com.platform.test,com.platform.websocket;" >
|
||||
<context:include-filter type="annotation" expression="org.springframework.stereotype.Controller"/>
|
||||
<context:exclude-filter type="annotation" expression="org.springframework.stereotype.Service"/>
|
||||
</context:component-scan>
|
||||
|
||||
<context:annotation-config />
|
||||
|
||||
<mvc:annotation-driven/>
|
||||
|
||||
<!-- 用于将对象转换为JSON -->
|
||||
<bean id="stringConverter"
|
||||
class="org.springframework.http.converter.StringHttpMessageConverter">
|
||||
<property name="supportedMediaTypes">
|
||||
<list>
|
||||
<value>application/json;charset=UTF-8</value>
|
||||
<value>text/html;charset=UTF-8</value>
|
||||
</list>
|
||||
</property>
|
||||
</bean>
|
||||
<bean id="jsonConverter"
|
||||
class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter"/>
|
||||
<bean class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter">
|
||||
<property name="messageConverters">
|
||||
<list>
|
||||
<ref bean="stringConverter" />
|
||||
<ref bean="jsonConverter" />
|
||||
</list>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
</beans>
|
||||
@ -1,66 +1,66 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns="http://java.sun.com/xml/ns/javaee"
|
||||
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
|
||||
id="WebApp_ID" version="3.0">
|
||||
<display-name>javaBackend</display-name>
|
||||
<welcome-file-list>
|
||||
<welcome-file>/index.html</welcome-file>
|
||||
</welcome-file-list>
|
||||
<!-- 设置post请求字符编码:utf-8,get编码设置tomcat -->
|
||||
<filter>
|
||||
<filter-name>CharacterEncodingFilter</filter-name>
|
||||
<filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
|
||||
<init-param>
|
||||
<param-name>encoding</param-name>
|
||||
<param-value>UTF-8</param-value>
|
||||
</init-param>
|
||||
</filter>
|
||||
<filter-mapping>
|
||||
<filter-name>CharacterEncodingFilter</filter-name>
|
||||
<url-pattern>/</url-pattern>
|
||||
</filter-mapping>
|
||||
<!-- spring配置文件 -->
|
||||
|
||||
<context-param>
|
||||
<param-name>contextConfigLocation</param-name>
|
||||
<param-value>WEB-INF/config/spring-applicationContext.xml</param-value>
|
||||
</context-param>
|
||||
<listener>
|
||||
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
|
||||
</listener>
|
||||
|
||||
<listener>
|
||||
<listener-class>com.platform.utils.ConfigsLoader</listener-class>
|
||||
</listener>
|
||||
|
||||
<!-- springmv的配置文件 -->
|
||||
<servlet>
|
||||
<servlet-name>springmvc</servlet-name>
|
||||
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
|
||||
<init-param>
|
||||
<param-name>contextConfigLocation</param-name>
|
||||
<param-value>/WEB-INF/config/springmvc-applicationContext.xml</param-value>
|
||||
</init-param>
|
||||
<load-on-startup>1</load-on-startup>
|
||||
<async-supported>true</async-supported>
|
||||
</servlet>
|
||||
<servlet-mapping>
|
||||
<servlet-name>springmvc</servlet-name>
|
||||
<url-pattern>/</url-pattern>
|
||||
</servlet-mapping>
|
||||
|
||||
<!-- log4j配置文件 -->
|
||||
<context-param>
|
||||
<param-name>log4jConfigLocation</param-name>
|
||||
<param-value>/WEB-INF/config/log4j-config.xml</param-value>
|
||||
</context-param>
|
||||
<listener>
|
||||
<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
|
||||
</listener>
|
||||
|
||||
<!-- 防止Spring内存溢出监听器 -->
|
||||
<!-- <listener>
|
||||
<listener-class>org.springframework.web.util.IntrospectorCleanupListener</listener-class>
|
||||
</listener> -->
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns="http://java.sun.com/xml/ns/javaee"
|
||||
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
|
||||
id="WebApp_ID" version="3.0">
|
||||
<display-name>javaBackend</display-name>
|
||||
<welcome-file-list>
|
||||
<welcome-file>/index.html</welcome-file>
|
||||
</welcome-file-list>
|
||||
<!-- 设置post请求字符编码:utf-8,get编码设置tomcat -->
|
||||
<filter>
|
||||
<filter-name>CharacterEncodingFilter</filter-name>
|
||||
<filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
|
||||
<init-param>
|
||||
<param-name>encoding</param-name>
|
||||
<param-value>UTF-8</param-value>
|
||||
</init-param>
|
||||
</filter>
|
||||
<filter-mapping>
|
||||
<filter-name>CharacterEncodingFilter</filter-name>
|
||||
<url-pattern>/</url-pattern>
|
||||
</filter-mapping>
|
||||
<!-- spring配置文件 -->
|
||||
|
||||
<context-param>
|
||||
<param-name>contextConfigLocation</param-name>
|
||||
<param-value>WEB-INF/config/spring-applicationContext.xml</param-value>
|
||||
</context-param>
|
||||
<listener>
|
||||
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
|
||||
</listener>
|
||||
|
||||
<listener>
|
||||
<listener-class>com.platform.utils.ConfigsLoader</listener-class>
|
||||
</listener>
|
||||
|
||||
<!-- springmv的配置文件 -->
|
||||
<servlet>
|
||||
<servlet-name>springmvc</servlet-name>
|
||||
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
|
||||
<init-param>
|
||||
<param-name>contextConfigLocation</param-name>
|
||||
<param-value>/WEB-INF/config/springmvc-applicationContext.xml</param-value>
|
||||
</init-param>
|
||||
<load-on-startup>1</load-on-startup>
|
||||
<async-supported>true</async-supported>
|
||||
</servlet>
|
||||
<servlet-mapping>
|
||||
<servlet-name>springmvc</servlet-name>
|
||||
<url-pattern>/</url-pattern>
|
||||
</servlet-mapping>
|
||||
|
||||
<!-- log4j配置文件 -->
|
||||
<context-param>
|
||||
<param-name>log4jConfigLocation</param-name>
|
||||
<param-value>/WEB-INF/config/log4j-config.xml</param-value>
|
||||
</context-param>
|
||||
<listener>
|
||||
<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
|
||||
</listener>
|
||||
|
||||
<!-- 防止Spring内存溢出监听器 -->
|
||||
<!-- <listener>
|
||||
<listener-class>org.springframework.web.util.IntrospectorCleanupListener</listener-class>
|
||||
</listener> -->
|
||||
</web-app>
|
||||
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue