Merge branch 'web_backend_develope' of

https://git.trustie.net/fhx569287825/aggregation-platform

Conflicts:
	src/com/platform/controller/DataModelController.java
web_backend_develope
chenlw 9 years ago
commit 172b1b512b

@ -0,0 +1,14 @@
<?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"/>
<classpathentry kind="output" path="build/classes"/>
</classpath>

10
.gitignore vendored

@ -1,5 +1,5 @@
/target /target
/build /build
.classpath .classpath
/bin/ /bin/

@ -0,0 +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.

@ -0,0 +1,2 @@
GitRepositoriesView.GitDirectories=C\:\\Users\\wuming\\workspace\\data_manager_backend\\.git;
eclipse.preferences.version=1

@ -0,0 +1,14 @@
content_assist_proposals_background=255,255,255
content_assist_proposals_foreground=0,0,0
eclipse.preferences.version=1
fontPropagated=true
org.eclipse.jdt.internal.ui.navigator.layout=2
org.eclipse.jdt.ui.editor.tab.width=
org.eclipse.jdt.ui.formatterprofiles.version=12
org.eclipse.jdt.ui.javadoclocations.migrated=true
org.eclipse.jface.textfont=1|Courier New|10.0|0|WINDOWS|1|0|0|0|0|0|0|0|0|1|0|0|0|0|Courier New;
proposalOrderMigrated=true
spelling_locale_initialized=true
tabWidthPropagated=true
useAnnotationsPrefPage=true
useQuickDiffPrefPage=true

@ -0,0 +1,2 @@
eclipse.preferences.version=1
org.eclipse.m2e.discovery.pref.projects=

@ -0,0 +1,2 @@
eclipse.preferences.version=1
mylyn.attention.migrated=true

@ -0,0 +1,2 @@
eclipse.preferences.version=1
org.eclipse.mylyn.monitor.activity.tracking.enabled.checked=true

@ -0,0 +1,3 @@
eclipse.preferences.version=1
org.eclipse.mylyn.tasks.ui.filters.nonmatching=true
org.eclipse.mylyn.tasks.ui.filters.nonmatching.encouraged=true

@ -0,0 +1,3 @@
activeuserprofiles=DESKTOP-65KJ4BV;Team
eclipse.preferences.version=1
org.eclipse.rse.systemtype.local.systemType.defaultUserId=wuming

@ -0,0 +1,2 @@
eclipse.preferences.version=1
org.eclipse.rse.preferences.order.connections=DESKTOP-65KJ4BV.Local

@ -0,0 +1,2 @@
eclipse.preferences.version=1
pref_first_startup=false

@ -0,0 +1,2 @@
eclipse.preferences.version=1
org.eclipse.team.ui.first_time=false

@ -0,0 +1,2 @@
browsers=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<web-browsers current\="0">\r\n<system/>\r\n<external location\="C\:\\Program Files\\Internet Explorer\\iexplore.exe" name\="Internet Explorer"/>\r\n</web-browsers>
eclipse.preferences.version=1

@ -0,0 +1,5 @@
PROBLEMS_FILTERS_MIGRATE=true
eclipse.preferences.version=1
platformState=1470357608478
quickStart=false
tipsAndTricks=true

@ -0,0 +1,2 @@
eclipse.preferences.version=1
showIntro=false

@ -0,0 +1,4 @@
//org.eclipse.ui.commands/state/org.eclipse.wst.xml.views.XPathView.processor.xpathprocessor/org.eclipse.ui.commands.radioState=xpath10
ENABLED_DECORATORS=org.eclipse.jst.ws.jaxws.dom.integration.navigator.WebServiceDecorator\:true,org.eclipse.m2e.core.mavenVersionDecorator\:false,org.eclipse.wst.server.ui.decorator\:false,org.eclipse.datatools.connectivity.sqm.core.internal.ui.explorer.DependencyDecoration\:true,org.eclipse.datatools.connectivity.sqm.core.internal.ui.explorer.ColumnDecoration\:true,org.eclipse.datatools.connectivity.sqm.core.internal.ui.explorer.ForeignKeyDecoration\:true,org.eclipse.datatools.connectivity.sqm.core.internal.ui.explorer.IndexTriggerDecoration\:true,org.eclipse.datatools.connectivity.internal.core.ui.bookmarkDecoration\:true,org.eclipse.datatools.connectivity.internal.core.ui.FilterNodeDecoration\:true,org.eclipse.datatools.connectivity.ui.decorator.contentextension\:false,org.eclipse.datatools.enablement.ingres.ui.providers.decorators.SynonymDecorationService\:true,org.eclipse.datatools.enablement.ingres.internal.ui.providers.decorators.ParameterDecorationService\:true,org.eclipse.datatools.enablement.sybase.asa.proxytabledecorator\:true,org.eclipse.datatools.enablement.sybase.ase.webservicetabledecorator\:true,org.eclipse.datatools.enablement.sybase.systemtabledecorator\:true,org.eclipse.egit.ui.internal.decorators.GitLightweightDecorator\:true,org.eclipse.jdt.ui.override.decorator\:true,org.eclipse.jdt.ui.interface.decorator\:false,org.eclipse.jdt.ui.buildpath.decorator\:true,org.eclipse.jst.j2ee.internal.ui.util.AnnotationIconDecorator_ejb\:true,org.eclipse.jst.j2ee.navigator.internal.J2EEProjectDecorator\:true,org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanDecorator\:true,org.eclipse.jst.jee.navigator.internal.JEEProjectDecorator\:true,org.eclipse.jst.j2ee.internal.ui.util.AnnotationIconDecorator_servlet\:true,org.eclipse.m2e.core.maven2decorator\:true,org.eclipse.mylyn.context.ui.decorator.interest\:true,org.eclipse.mylyn.tasks.ui.decorators.task\:true,org.eclipse.mylyn.team.ui.changeset.decorator\:true,org.eclipse.pde.ui.binaryProjectDecorator\:false,org.eclipse.rse.core.virtualobject.decorator\:true,org.eclipse.rse.core.binary.executable.decorator\:true,org.eclipse.rse.core.script.executable.decorator\:true,org.eclipse.rse.core.java.executable.decorator\:true,org.eclipse.rse.core.library.decorator\:true,org.eclipse.rse.core.link.decorator\:true,org.eclipse.rse.subsystems.error.decorator\:true,org.eclipse.team.cvs.ui.decorator\:true,org.eclipse.ui.LinkedResourceDecorator\:true,org.eclipse.ui.SymlinkDecorator\:true,org.eclipse.ui.VirtualResourceDecorator\:true,org.eclipse.ui.ContentTypeDecorator\:true,org.eclipse.ui.ResourceFilterDecorator\:false,org.eclipse.wst.jsdt.ui.override.decorator\:true,org.eclipse.wst.server.ui.navigatorDecorator\:true,
PLUGINS_NOT_ACTIVATED_ON_STARTUP=org.eclipse.m2e.discovery;
eclipse.preferences.version=1

File diff suppressed because it is too large Load Diff

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<typeInfoHistroy/>

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<qualifiedTypeNameHistroy/>

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<section name="Workbench">
<section name="org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart">
<item value="2" key="layout"/>
<item value="true" key="group_libraries"/>
<item value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#x0D;&#x0A;&lt;packageExplorer group_libraries=&quot;1&quot; layout=&quot;2&quot; linkWithEditor=&quot;0&quot; rootMode=&quot;1&quot; workingSetName=&quot;&quot;&gt;&#x0D;&#x0A;&lt;customFilters userDefinedPatternsEnabled=&quot;false&quot;&gt;&#x0D;&#x0A;&lt;xmlDefinedFilters&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.StaticsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer_patternFilterId_RemoteSystemsConnections&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.mylyn.java.ui.MembersFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonSharedProjectsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.EmptyInnerPackageFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.m2e.MavenModuleFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ClosedProjectsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.EmptyLibraryContainerFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.PackageDeclarationFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.pde.ui.BinaryProjectFilter1&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.LocalTypesFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.pde.ui.ExternalPluginLibrariesFilter1&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.FieldsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer_patternFilterId_RemoteSystemsTempFiles&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonJavaProjectsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer_patternFilterId_.*&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.SyntheticMembersFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ContainedLibraryFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.HideInnerClassFilesFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ImportDeclarationFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonJavaElementFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.LibraryFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.CuAndClassFileFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.EmptyPackageFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonPublicFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;/xmlDefinedFilters&gt;&#x0D;&#x0A;&lt;/customFilters&gt;&#x0D;&#x0A;&lt;/packageExplorer&gt;" key="memento"/>
<item value="1" key="rootMode"/>
<item value="false" key="linkWithEditor"/>
</section>
</section>

@ -0,0 +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>

@ -0,0 +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

@ -0,0 +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

@ -0,0 +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

@ -0,0 +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>

@ -0,0 +1 @@
org.eclipse.core.runtime=1

@ -1,41 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>data_manager_backend</name> <name>data_manager_backend</name>
<comment></comment> <comment></comment>
<projects> <projects>
</projects> </projects>
<buildSpec> <buildSpec>
<buildCommand> <buildCommand>
<name>org.eclipse.wst.jsdt.core.javascriptValidator</name> <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name> <name>org.eclipse.jdt.core.javabuilder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name> <name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name> <name>org.eclipse.wst.validation.validationbuilder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>
<name>com.genuitec.eclipse.ast.deploy.core.DeploymentBuilder</name> <name>com.genuitec.eclipse.ast.deploy.core.DeploymentBuilder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
</buildSpec> </buildSpec>
<natures> <natures>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature> <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature> <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature> <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures> </natures>
</projectDescription> </projectDescription>

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="WebContent"/> <classpathentry kind="src" path="WebContent"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject"> <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
<attributes> <attributes>
<attribute name="hide" value="true"/> <attribute name="hide" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/> <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
<classpathentry kind="output" path=""/> <classpathentry kind="output" path=""/>
</classpath> </classpath>

@ -1,3 +1,3 @@
eclipse.preferences.version=1 eclipse.preferences.version=1
performed.operation.correct.unbound.jre=1.0 performed.operation.correct.unbound.jre=1.0
performed.operation.resolve.unknown.runtime=1.0 performed.operation.resolve.unknown.runtime=1.0

@ -1,5 +1,10 @@
eclipse.preferences.version=1 eclipse.preferences.version=1
encoding//WebContent/WEB-INF/config/config.properties=UTF-8 encoding//WebContent/WEB-INF/config/config.properties=UTF-8
encoding//src/com/platform/utils/GanymedSSH.java=UTF-8 <<<<<<< HEAD
encoding/<project>=UTF-8 encoding//src/com/platform/controller/DataModelController.java=UTF-8
separateDerivedEncodings=true encoding/<project>=UTF-8
=======
encoding//src/com/platform/utils/GanymedSSH.java=UTF-8
encoding/<project>=UTF-8
separateDerivedEncodings=true
>>>>>>> ef099fd1aed73bcc4ef4c8d62aaba6cc6ec2dabf

@ -1,101 +1,101 @@
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
org.eclipse.jdt.core.compiler.problem.deadCode=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning
org.eclipse.jdt.core.compiler.problem.deprecation=warning org.eclipse.jdt.core.compiler.problem.deprecation=warning
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
org.eclipse.jdt.core.compiler.problem.nullReference=warning org.eclipse.jdt.core.compiler.problem.nullReference=warning
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedImport=warning org.eclipse.jdt.core.compiler.problem.unusedImport=warning
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.7 org.eclipse.jdt.core.compiler.source=1.7

@ -1,3 +1,3 @@
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jpt.core.platform=generic2_1 org.eclipse.jpt.core.platform=generic2_1
org.eclipse.jpt.jpa.core.discoverAnnotatedClasses=false org.eclipse.jpt.jpa.core.discoverAnnotatedClasses=false

@ -1,4 +1,4 @@
activeProfiles= activeProfiles=
eclipse.preferences.version=1 eclipse.preferences.version=1
resolveWorkspaceProjects=true resolveWorkspaceProjects=true
version=1 version=1

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0"> <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="data_manager_backend"> <wb-module deploy-name="data_manager_backend">
<wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/> <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/test"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/test"/>
<property name="java-output-path" value="/data_manager_backend/build/classes"/> <property name="java-output-path" value="/data_manager_backend/build/classes"/>
<property name="context-root" value="/"/> <property name="context-root" value="/"/>
</wb-module> </wb-module>
</project-modules> </project-modules>

@ -1,7 +1,7 @@
<root> <root>
<facet id="jpt.jpa"> <facet id="jpt.jpa">
<node name="libprov"> <node name="libprov">
<attribute name="provider-id" value="jpa-no-op-library-provider"/> <attribute name="provider-id" value="jpa-no-op-library-provider"/>
</node> </node>
</facet> </facet>
</root> </root>

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<runtime name="MyEclipse Tomcat v7.0"/> <runtime name="MyEclipse Tomcat v7.0"/>
<fixed facet="java"/> <fixed facet="java"/>
<fixed facet="wst.jsdt.web"/> <fixed facet="wst.jsdt.web"/>
<fixed facet="jst.web"/> <fixed facet="jst.web"/>
<installed facet="java" version="1.7"/> <installed facet="java" version="1.7"/>
<installed facet="jst.web" version="3.0"/> <installed facet="jst.web" version="3.0"/>
<installed facet="wst.jsdt.web" version="1.0"/> <installed facet="wst.jsdt.web" version="1.0"/>
<installed facet="jpt.jpa" version="2.1"/> <installed facet="jpt.jpa" version="2.1"/>
</faceted-project> </faceted-project>

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>RemoteSystemsTempFiles</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
<nature>org.eclipse.rse.ui.remoteSystemsTempNature</nature>
</natures>
</projectDescription>

@ -1,3 +1,3 @@
Manifest-Version: 1.0 Manifest-Version: 1.0
Class-Path: Class-Path:

@ -1,50 +1,50 @@
#============================================================================================================= #=============================================================================================================
# MySQL # MySQL
#============================================================================================================= #=============================================================================================================
# 驱动程序 # 驱动程序
jdbc.mysql.driver=com.mysql.jdbc.Driver jdbc.mysql.driver=com.mysql.jdbc.Driver
# 连接url # 连接url
jdbc.mysql.url=jdbc:mysql://192.168.0.101:3306/test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true jdbc.mysql.url=jdbc:mysql://192.168.0.101:3306/test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
# 用户名 # 用户名
jdbc.mysql.username=root jdbc.mysql.username=root
# 密码 # 密码
jdbc.mysql.password=root jdbc.mysql.password=root
#============================================================================================================= #=============================================================================================================
# Oracle 连接配置 # Oracle 连接配置
#============================================================================================================= #=============================================================================================================
# hui用户名 # hui用户名
gather-user-name=system gather-user-name=system
# 密码 # 密码
gather-user-password=oracle gather-user-password=oracle
# #
gather-port=1521 gather-port=1521
# #
gather-service-name=orcl gather-service-name=orcl
#============================================================================================================= #=============================================================================================================
# 数据库公共配置 # 数据库公共配置
#============================================================================================================= #=============================================================================================================
jdbc.initialSize=5 jdbc.initialSize=5
jdbc.minIdle=5 jdbc.minIdle=5
jdbc.maxIdle=20 jdbc.maxIdle=20
jdbc.maxActive=100 jdbc.maxActive=100
jdbc.maxWait=100000 jdbc.maxWait=100000
jdbc.defaultAutoCommit=false jdbc.defaultAutoCommit=false
jdbc.removeAbandoned=true jdbc.removeAbandoned=true
jdbc.removeAbandonedTimeout=600 jdbc.removeAbandonedTimeout=600
jdbc.testWhileIdle=true jdbc.testWhileIdle=true
jdbc.timeBetweenEvictionRunsMillis=60000 jdbc.timeBetweenEvictionRunsMillis=60000
jdbc.numTestsPerEvictionRun=20 jdbc.numTestsPerEvictionRun=20
jdbc.minEvictableIdleTimeMillis=300000 jdbc.minEvictableIdleTimeMillis=300000
#============================================================================================================== #==============================================================================================================
# #
#============================================================================================================== #==============================================================================================================
table-suffix=_20152016 table-suffix=_20152016
extract-log-localtion=/home/log/ extract-log-localtion=/home/log/
gather-tablespace-name=TS_TTSSS gather-tablespace-name=TS_TTSSS
gather-tablespace-path= gather-tablespace-path=
gather-table-user-password= gather-table-user-password=
kubeMasterUrl=http://192.168.0.110:8080/ kubeMasterUrl=http://192.168.0.110:8080/
collect-user-name=system collect-user-name=system
collect-password=oracle collect-password=oracle
collect-service-name=orcl collect-service-name=orcl

@ -1,17 +1,17 @@
#!/bin/bash #!/bin/bash
function ergodic(){ function ergodic(){
for file in `ls $1` for file in `ls $1`
do do
if [ "$file" != "app" -a -d $1"/"$file ] if [ "$file" != "app" -a -d $1"/"$file ]
then then
ergodic $1"/"$file ergodic $1"/"$file
else else
local path=$1"/"$file local path=$1"/"$file
echo $path echo $path
fi fi
done done
} }
IFS=$'\n' #这个必须要,否则会在文件名中有空格时出错 IFS=$'\n' #这个必须要,否则会在文件名中有空格时出错
INIT_PATH="."; INIT_PATH=".";
ergodic $1 ergodic $1

@ -1,68 +1,68 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE log4j:configuration PUBLIC "-//APACHE//DTD LOG4J 1.2//EN" "log4j.dtd"> <!DOCTYPE log4j:configuration PUBLIC "-//APACHE//DTD LOG4J 1.2//EN" "log4j.dtd">
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"> <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
<!-- 根据需要进行添加 --> <!-- 根据需要进行添加 -->
<!-- 输出到控制台 --> <!-- 输出到控制台 -->
<appender name="console" class="org.apache.log4j.ConsoleAppender"> <appender name="console" class="org.apache.log4j.ConsoleAppender">
<param name="Threshold" value="info"></param> <param name="Threshold" value="info"></param>
<layout class="org.apache.log4j.TTCCLayout"> <layout class="org.apache.log4j.TTCCLayout">
<param name="ConversionPattern" value="TTCCLayout"></param> <param name="ConversionPattern" value="TTCCLayout"></param>
</layout> </layout>
</appender> </appender>
<!-- 输出日志到文件 每天一个文件 --> <!-- 输出日志到文件 每天一个文件 -->
<appender name="dailyRollingFile" class="org.apache.log4j.DailyRollingFileAppender"> <appender name="dailyRollingFile" class="org.apache.log4j.DailyRollingFileAppender">
<param name="Threshold" value="info"></param> <param name="Threshold" value="info"></param>
<param name="ImmediateFlush" value="true"></param> <param name="ImmediateFlush" value="true"></param>
<param name="File" value="logs/dailyRollingFile.log"></param> <param name="File" value="logs/dailyRollingFile.log"></param>
<param name="DatePattern" value="'.'yyyy-MM-dd'.log'"></param> <param name="DatePattern" value="'.'yyyy-MM-dd'.log'"></param>
<layout class="org.apache.log4j.PatternLayout"> <layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="[%d{yyyy-MM-dd HH:mm:ss\} %-5p] [%t] {%c:%L}-%m%n"></param> <param name="ConversionPattern" value="[%d{yyyy-MM-dd HH:mm:ss\} %-5p] [%t] {%c:%L}-%m%n"></param>
</layout> </layout>
</appender> </appender>
<!-- 输出日志到文件 文件大小到达指定尺寸的时候产生一个新的文件 --> <!-- 输出日志到文件 文件大小到达指定尺寸的时候产生一个新的文件 -->
<appender name="railyFile" class="org.apache.log4j.RollingFileAppender"> <appender name="railyFile" class="org.apache.log4j.RollingFileAppender">
<param name="File" value="logs/railyFile.log"></param> <param name="File" value="logs/railyFile.log"></param>
<param name="ImmediateFlush" value="true" /> <param name="ImmediateFlush" value="true" />
<param name="Threshold" value="info"></param> <param name="Threshold" value="info"></param>
<param name="Append" value="true"></param> <param name="Append" value="true"></param>
<param name="MaxFileSize" value="30KB"></param> <param name="MaxFileSize" value="30KB"></param>
<param name="MaxBackupIndex" value="100"></param> <param name="MaxBackupIndex" value="100"></param>
<layout class="org.apache.log4j.PatternLayout"> <layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="[%d{yyyy-MM-dd HH:mm:ss\} %-5p] [%t] {%c:%L}-%m%n"></param> <param name="ConversionPattern" value="[%d{yyyy-MM-dd HH:mm:ss\} %-5p] [%t] {%c:%L}-%m%n"></param>
</layout> </layout>
</appender> </appender>
<logger name="com.ibatis" additivity="true"> <logger name="com.ibatis" additivity="true">
<level value="DEBUG" /> <level value="DEBUG" />
</logger> </logger>
<logger name="java.sql.Connection" additivity="true"> <logger name="java.sql.Connection" additivity="true">
<level value="DEBUG" /> <level value="DEBUG" />
</logger> </logger>
<logger name="java.sql.Statement" additivity="true"> <logger name="java.sql.Statement" additivity="true">
<level value="DEBUG" /> <level value="DEBUG" />
</logger> </logger>
<logger name="java.sql.PreparedStatement" additivity="true"> <logger name="java.sql.PreparedStatement" additivity="true">
<level value="DEBUG" /> <level value="DEBUG" />
<appender-ref ref="IBatis" /> <appender-ref ref="IBatis" />
</logger> </logger>
<logger name="java.sql.ResultSet" additivity="true"> <logger name="java.sql.ResultSet" additivity="true">
<level value="DEBUG" /> <level value="DEBUG" />
<appender-ref ref="IBatis" /> <appender-ref ref="IBatis" />
</logger> </logger>
<!-- 定义全局的日志输出级别,但是在输出目的地的配置中配置的具体输出级别优先级高于全局定义的优先级。 如果在railyFile中定义<param <!-- 定义全局的日志输出级别,但是在输出目的地的配置中配置的具体输出级别优先级高于全局定义的优先级。 如果在railyFile中定义<param
name="Threshold" value="info"></param>那么将会把info以上级别的信息输出 --> name="Threshold" value="info"></param>那么将会把info以上级别的信息输出 -->
<root> <root>
<priority value="debug" /> <priority value="debug" />
<appender-ref ref="console" /> <appender-ref ref="console" />
<appender-ref ref="dailyRollingFile" /> <appender-ref ref="dailyRollingFile" />
<appender-ref ref="railyFile" /> <appender-ref ref="railyFile" />
<appender-ref ref="file" /> <appender-ref ref="file" />
</root> </root>
</log4j:configuration> </log4j:configuration>

@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE configuration PUBLIC <!DOCTYPE configuration PUBLIC
"-//mybatis.org//DTD Config 3.0//EN" "-//mybatis.org//DTD Config 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-config.dtd"> "http://mybatis.org/dtd/mybatis-3-config.dtd">
<configuration> <configuration>
<typeAliases> <typeAliases>
<typeAlias alias="EncodedInfoEntity" type="com.platform.entities.EncodedInfoEntity" /> <typeAlias alias="EncodedInfoEntity" type="com.platform.entities.EncodedInfoEntity" />
<typeAlias alias="DataInfoEntity" type="com.platform.entities.DataInfoEntity" /> <typeAlias alias="DataInfoEntity" type="com.platform.entities.DataInfoEntity" />
<typeAlias alias="PagerOptions" type="com.platform.entities.PagerOptions"/> <typeAlias alias="PagerOptions" type="com.platform.entities.PagerOptions"/>
<typeAlias alias="GatherOracleInfo" type="com.platform.entities.GatherOracleInfo"/> <typeAlias alias="GatherOracleInfo" type="com.platform.entities.GatherOracleInfo"/>
<typeAlias alias="DataInfoEntityMoveTmp" type="com.platform.entities.DataInfoEntityMoveTmp"/> <typeAlias alias="DataInfoEntityMoveTmp" type="com.platform.entities.DataInfoEntityMoveTmp"/>
<typeAlias alias="SystemEntity" type="com.platform.entities.SystemEntity"/> <typeAlias alias="SystemEntity" type="com.platform.entities.SystemEntity"/>
<typeAlias alias="RegionalismEntity" type="com.platform.entities.RegionalismEntity"/> <typeAlias alias="RegionalismEntity" type="com.platform.entities.RegionalismEntity"/>
</typeAliases> </typeAliases>
<mappers> <mappers>
<mapper resource="com/dao/mapper/data-details-mapper.xml" /> <mapper resource="com/dao/mapper/data-details-mapper.xml" />
<mapper resource="com/dao/mapper/config-details-mapper.xml"/> <mapper resource="com/dao/mapper/config-details-mapper.xml"/>
<mapper resource="com/dao/mapper/dataInfoMoveTmpmapper.xml"/> <mapper resource="com/dao/mapper/dataInfoMoveTmpmapper.xml"/>
<mapper resource="com/dao/mapper/RegionalismMapper.xml"/> <mapper resource="com/dao/mapper/RegionalismMapper.xml"/>
<mapper resource="com/dao/mapper/SystemCodeMapper.xml"/> <mapper resource="com/dao/mapper/SystemCodeMapper.xml"/>
</mappers> </mappers>
</configuration> </configuration>

@ -1,81 +1,93 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" <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:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tx="http://www.springframework.org/schema/tx" xmlns:aop="http://www.springframework.org/schema/aop" xmlns:p="http://www.springframework.org/schema/p"
xmlns:context="http://www.springframework.org/schema/context" xmlns:tx="http://www.springframework.org/schema/tx"
xmlns:task="http://www.springframework.org/schema/task" xmlns:aop="http://www.springframework.org/schema/aop"
xsi:schemaLocation="http://www.springframework.org/schema/beans xmlns:context="http://www.springframework.org/schema/context"
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd xmlns:task="http://www.springframework.org/schema/task"
http://www.springframework.org/schema/tx xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/tx/spring-tx-3.0.xsd http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/aop http://www.springframework.org/schema/tx
http://www.springframework.org/schema/aop/spring-aop-3.0.xsd http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/aop
http://www.springframework.org/schema/context/spring-context-3.0.xsd http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context
http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd"> http://www.springframework.org/schema/context/spring-context-3.0.xsd
<!-- 读取db.properties中的属性值 --> http://www.springframework.org/schema/websocket
<bean http://www.springframework.org/schema/websocket/spring-websocket.xsd
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> http://www.springframework.org/schema/beans
<property name="location" value="WEB-INF/config/config.properties"></property> http://www.springframework.org/schema/beans/spring-beans.xsd
</bean> http://www.springframework.org/schema/task
http://www.springframework.org/schema/task/spring-task-3.0.xsd">
<!-- 连接MySQL数据库 -->
<bean id="mySQLDataSource" <!-- 读取db.properties中的属性值 -->
class="org.springframework.jdbc.datasource.DriverManagerDataSource"> <bean
<property name="driverClassName" value="${jdbc.mysql.driver}" /> class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="url" value="${jdbc.mysql.url}" /> <property name="location" value="WEB-INF/config/config.properties"></property>
<property name="username" value="${jdbc.mysql.username}" /> </bean>
<property name="password" value="${jdbc.mysql.password}" />
</bean> <bean id="messageCodeResolver"
<bean id="mySQLSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean"> class="org.springframework.validation.DefaultMessageCodesResolver">
<property name="configLocation" value="WEB-INF/config/mybatis-applicationConfig.xml" /> <property name="prefix" value="validation."></property>
<property name="dataSource" ref="mySQLDataSource" /> </bean>
</bean>
<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer"> <!-- 连接MySQL数据库 -->
<property name="basePackage" value="com.platform.dao,com.dao.mapper" /> <bean id="mySQLDataSource"
</bean> class="org.springframework.jdbc.datasource.DriverManagerDataSource">
<!-- 配置声明式事物 事物管理器 --> <property name="driverClassName" value="${jdbc.mysql.driver}" />
<!-- 配置声明式事物 --> <property name="url" value="${jdbc.mysql.url}" />
<bean id="mySQLTxManager" <property name="username" value="${jdbc.mysql.username}" />
class="org.springframework.jdbc.datasource.DataSourceTransactionManager"> <property name="password" value="${jdbc.mysql.password}" />
<property name="dataSource" ref="mySQLDataSource" /> </bean>
</bean> <bean id="mySQLSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
<tx:advice id="txAdvice" transaction-manager="mySQLTxManager"> <property name="configLocation" value="WEB-INF/config/mybatis-applicationConfig.xml" />
<tx:attributes> <property name="dataSource" ref="mySQLDataSource" />
<tx:method name="delete*" propagation="REQUIRED" /> </bean>
<tx:method name="insert*" propagation="REQUIRED" /> <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
<tx:method name="update*" propagation="REQUIRED" /> <property name="basePackage" value="com.platform.dao,com.dao.mapper" />
<tx:method name="select*" read-only="true" /> </bean>
</tx:attributes> <!-- 配置声明式事物 事物管理器 -->
</tx:advice> <!-- 配置声明式事物 -->
<aop:config> <bean id="mySQLTxManager"
<aop:pointcut expression="execution(* com.platform.service.*.*(..))" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
id="pointcut" /> <property name="dataSource" ref="mySQLDataSource" />
<aop:advisor advice-ref="txAdvice" pointcut-ref="pointcut" /> </bean>
</aop:config> <tx:advice id="txAdvice" transaction-manager="mySQLTxManager">
<tx:attributes>
<!-- 连接oracle数据库 --> <tx:method name="delete*" propagation="REQUIRED" />
<!-- <bean id="oracleDataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource" <tx:method name="insert*" propagation="REQUIRED" />
destroy-method="close"> <property name="driverClassName" value="${jdbc.oracle.driver}" <tx:method name="update*" propagation="REQUIRED" />
/> <property name="url" value="${jdbc.oracle.url}" /> <property name="username" <tx:method name="select*" read-only="true" />
value="${jdbc.oracle.username}" /> <property name="password" value="${jdbc.oracle.password}" </tx:attributes>
/> <property name="initialSize" value="${jdbc.initialSize}" /> <property </tx:advice>
name="minIdle" value="${jdbc.minIdle}" /> <property name="maxIdle" value="${jdbc.maxIdle}" <aop:config>
/> <property name="maxActive" value="${jdbc.maxActive}" /> <property name="maxWait" <aop:pointcut expression="execution(* com.platform.service.*.*(..))"
value="${jdbc.maxWait}" /> <property name="defaultAutoCommit" value="${jdbc.defaultAutoCommit}" id="pointcut" />
/> <property name="removeAbandoned" value="${jdbc.removeAbandoned}" /> <property <aop:advisor advice-ref="txAdvice" pointcut-ref="pointcut" />
name="removeAbandonedTimeout" value="${jdbc.removeAbandonedTimeout}" /> <property </aop:config>
name="testWhileIdle" value="${jdbc.testWhileIdle}" /> <property name="timeBetweenEvictionRunsMillis"
value="${jdbc.timeBetweenEvictionRunsMillis}" /> <property name="numTestsPerEvictionRun" <!-- 连接oracle数据库 -->
value="${jdbc.numTestsPerEvictionRun}" /> <property name="minEvictableIdleTimeMillis" <!-- <bean id="oracleDataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource"
value="${jdbc.minEvictableIdleTimeMillis}" /> </bean> --> destroy-method="close"> <property name="driverClassName" value="${jdbc.oracle.driver}"
<context:component-scan base-package="com.platform.*"> /> <property name="url" value="${jdbc.oracle.url}" /> <property name="username"
<context:exclude-filter type="annotation" value="${jdbc.oracle.username}" /> <property name="password" value="${jdbc.oracle.password}"
expression="org.springframework.stereotype.Controller" /> /> <property name="initialSize" value="${jdbc.initialSize}" /> <property
</context:component-scan> name="minIdle" value="${jdbc.minIdle}" /> <property name="maxIdle" value="${jdbc.maxIdle}"
<!-- Enables the Spring Task @Scheduled programming model --> /> <property name="maxActive" value="${jdbc.maxActive}" /> <property name="maxWait"
<task:executor id="executor" pool-size="5" /> value="${jdbc.maxWait}" /> <property name="defaultAutoCommit" value="${jdbc.defaultAutoCommit}"
<task:scheduler id="scheduler" pool-size="10" /> /> <property name="removeAbandoned" value="${jdbc.removeAbandoned}" /> <property
<task:annotation-driven executor="executor" scheduler="scheduler" /> 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> </beans>

@ -1,36 +1,57 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" <beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop"
xsi:schemaLocation="http://www.springframework.org/schema/beans xmlns:mvc="http://www.springframework.org/schema/mvc"
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd xmlns:tx="http://www.springframework.org/schema/tx"
http://www.springframework.org/schema/context xmlns:jdbc="http://www.springframework.org/schema/jdbc"
http://www.springframework.org/schema/context/spring-context-3.0.xsd"> xmlns:context="http://www.springframework.org/schema/context"
xmlns:websocket="http://www.springframework.org/schema/websocket"
<context:component-scan base-package="com.platform.controller,com.platform.test;" > xsi:schemaLocation="
<context:include-filter type="annotation" expression="org.springframework.stereotype.Controller"/> http://www.springframework.org/schema/context
<context:exclude-filter type="annotation" expression="org.springframework.stereotype.Service"/> http://www.springframework.org/schema/context/spring-context-4.0.xsd
</context:component-scan> http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
<!-- 用于将对象转换为JSON --> http://www.springframework.org/schema/jdbc
<bean id="stringConverter" http://www.springframework.org/schema/jdbc/spring-jdbc-4.0.xsd
class="org.springframework.http.converter.StringHttpMessageConverter"> http://www.springframework.org/schema/tx
<property name="supportedMediaTypes"> http://www.springframework.org/schema/tx/spring-tx-4.0.xsd
<list> http://www.springframework.org/schema/aop
<value>application/json;charset=UTF-8</value> http://www.springframework.org/schema/aop/spring-aop-4.0.xsd
<value>text/html;charset=UTF-8</value> http://www.springframework.org/schema/mvc
</list> http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd
</property> http://www.springframework.org/schema/websocket
</bean> http://www.springframework.org/schema/websocket/spring-websocket-4.0.xsd"
<bean id="jsonConverter" default-autowire="byName">
class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter"/>
<bean class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter"> <context:component-scan base-package="com.platform.controller,com.platform.test,com.platform.websocket;" >
<property name="messageConverters"> <context:include-filter type="annotation" expression="org.springframework.stereotype.Controller"/>
<list> <context:exclude-filter type="annotation" expression="org.springframework.stereotype.Service"/>
<ref bean="stringConverter" /> </context:component-scan>
<ref bean="jsonConverter" />
</list> <context:annotation-config />
</property>
</bean> <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> </beans>

@ -1,65 +1,66 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://java.sun.com/xml/ns/javaee" 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" 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"> id="WebApp_ID" version="3.0">
<display-name>javaBackend</display-name> <display-name>javaBackend</display-name>
<welcome-file-list> <welcome-file-list>
<welcome-file>/index.html</welcome-file> <welcome-file>/index.html</welcome-file>
</welcome-file-list> </welcome-file-list>
<!-- 设置post请求字符编码:utf-8,get编码设置tomcat --> <!-- 设置post请求字符编码:utf-8,get编码设置tomcat -->
<filter> <filter>
<filter-name>CharacterEncodingFilter</filter-name> <filter-name>CharacterEncodingFilter</filter-name>
<filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class> <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
<init-param> <init-param>
<param-name>encoding</param-name> <param-name>encoding</param-name>
<param-value>UTF-8</param-value> <param-value>UTF-8</param-value>
</init-param> </init-param>
</filter> </filter>
<filter-mapping> <filter-mapping>
<filter-name>CharacterEncodingFilter</filter-name> <filter-name>CharacterEncodingFilter</filter-name>
<url-pattern>/</url-pattern> <url-pattern>/</url-pattern>
</filter-mapping> </filter-mapping>
<!-- spring配置文件 --> <!-- spring配置文件 -->
<context-param>
<param-name>contextConfigLocation</param-name> <context-param>
<param-value>WEB-INF/config/spring-applicationContext.xml</param-value> <param-name>contextConfigLocation</param-name>
</context-param> <param-value>WEB-INF/config/spring-applicationContext.xml</param-value>
<listener> </context-param>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> <listener>
</listener> <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
<listener>
<listener-class>com.platform.utils.ConfigsLoader</listener-class> <listener>
</listener> <listener-class>com.platform.utils.ConfigsLoader</listener-class>
</listener>
<!-- springmv的配置文件 -->
<servlet> <!-- springmv的配置文件 -->
<servlet-name>springmvc</servlet-name> <servlet>
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class> <servlet-name>springmvc</servlet-name>
<init-param> <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
<param-name>contextConfigLocation</param-name> <init-param>
<param-value>/WEB-INF/config/springmvc-applicationContext.xml</param-value> <param-name>contextConfigLocation</param-name>
</init-param> <param-value>/WEB-INF/config/springmvc-applicationContext.xml</param-value>
<load-on-startup>1</load-on-startup> </init-param>
<async-supported>true</async-supported> <load-on-startup>1</load-on-startup>
</servlet> <async-supported>true</async-supported>
<servlet-mapping> </servlet>
<servlet-name>springmvc</servlet-name> <servlet-mapping>
<url-pattern>/*</url-pattern> <servlet-name>springmvc</servlet-name>
</servlet-mapping> <url-pattern>/</url-pattern>
</servlet-mapping>
<!-- log4j配置文件 -->
<context-param> <!-- log4j配置文件 -->
<param-name>log4jConfigLocation</param-name> <context-param>
<param-value>/WEB-INF/config/log4j-config.xml</param-value> <param-name>log4jConfigLocation</param-name>
</context-param> <param-value>/WEB-INF/config/log4j-config.xml</param-value>
<listener> </context-param>
<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class> <listener>
</listener> <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
</listener>
<!-- 防止Spring内存溢出监听器 -->
<!-- <listener> <!-- 防止Spring内存溢出监听器 -->
<listener-class>org.springframework.web.util.IntrospectorCleanupListener</listener-class> <!-- <listener>
</listener> --> <listener-class>org.springframework.web.util.IntrospectorCleanupListener</listener-class>
</listener> -->
</web-app> </web-app>

@ -1,326 +1,326 @@
package com.platform.controller; package com.platform.controller;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import net.sf.json.JSONArray; import net.sf.json.JSONArray;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.base.BaseController; import com.base.BaseController;
import com.platform.entities.DataInfoEntity; import com.platform.entities.DataInfoEntity;
import com.platform.entities.DataInfoEntityMoveTmp; import com.platform.entities.DataInfoEntityMoveTmp;
import com.platform.entities.FolderNode; import com.platform.entities.FolderNode;
import com.platform.entities.GatherOracleInfo; import com.platform.entities.GatherOracleInfo;
import com.platform.entities.OracleConnectorParams; import com.platform.entities.OracleConnectorParams;
import com.platform.entities.PagerOptions; import com.platform.entities.PagerOptions;
import com.platform.entities.VolumeEntity; import com.platform.entities.VolumeEntity;
import com.platform.glusterfs.CheckoutMD5; import com.platform.glusterfs.CheckoutMD5;
import com.platform.service.DataInfoService; import com.platform.service.DataInfoService;
import com.platform.service.ICodeService; import com.platform.service.ICodeService;
import com.platform.service.IGfsService; import com.platform.service.IGfsService;
import com.platform.service.IMoveDataService; import com.platform.service.IMoveDataService;
import com.platform.service.IMySqlService; import com.platform.service.IMySqlService;
import com.platform.service.IOracleExtractService; import com.platform.service.IOracleExtractService;
import com.platform.service.OracleExtractHelper; import com.platform.service.OracleExtractHelper;
import com.platform.service.OracleStatusService; import com.platform.service.OracleStatusService;
import com.platform.service.impl.MySqlServiceImpl; import com.platform.service.impl.MySqlServiceImpl;
import com.platform.test.Brick; import com.platform.test.Brick;
import com.platform.test.FolderReader; import com.platform.test.FolderReader;
import com.platform.test.Volume; import com.platform.test.Volume;
import com.platform.utils.Bean2MapUtils; import com.platform.utils.Bean2MapUtils;
import com.platform.utils.Configs; import com.platform.utils.Configs;
import com.platform.utils.UtilsHelper; import com.platform.utils.UtilsHelper;
@Controller @Controller
public class DataModelController extends BaseController{ public class DataModelController extends BaseController{
public static Logger log = Logger.getLogger(DataModelController.class); public static Logger log = Logger.getLogger(DataModelController.class);
@Resource(name = "dataInfoService") @Resource(name = "dataInfoService")
private DataInfoService dfs; private DataInfoService dfs;
@Resource(name = "gfsService") @Resource(name = "gfsService")
private IGfsService gfsService; private IGfsService gfsService;
@Resource(name = "mySqlService") @Resource(name = "mySqlService")
private IMySqlService mySqlService; private IMySqlService mySqlService;
@Resource(name = "OracleExtract") @Resource(name = "OracleExtract")
private IOracleExtractService OracleExtract; private IOracleExtractService OracleExtract;
@Resource(name = "moveDataService") @Resource(name = "moveDataService")
private IMoveDataService moveDataService; private IMoveDataService moveDataService;
@Resource(name = "codeService") @Resource(name = "codeService")
private ICodeService codeService; private ICodeService codeService;
public void setDfsImp(DataInfoService dfs) { public void setDfsImp(DataInfoService dfs) {
this.dfs = dfs; this.dfs = dfs;
} }
@RequestMapping("/data.json") @RequestMapping("/data.json")
@ResponseBody @ResponseBody
public ModelMap getAllDataToJson(HttpServletRequest res, public ModelMap getAllDataToJson(HttpServletRequest res,
HttpServletResponse req) throws UnsupportedEncodingException { HttpServletResponse req) throws UnsupportedEncodingException {
res.setCharacterEncoding("UTF-8"); res.setCharacterEncoding("UTF-8");
Map<String, String[]> paramMap = res.getParameterMap(); Map<String, String[]> paramMap = res.getParameterMap();
Set<String> keySet = paramMap.keySet(); Set<String> keySet = paramMap.keySet();
Map<String, String> params = new HashMap<String, String>(); Map<String, String> params = new HashMap<String, String>();
StringBuffer sb = new StringBuffer().append("当前的请求参数:{"); StringBuffer sb = new StringBuffer().append("当前的请求参数:{");
for (String str : keySet) { for (String str : keySet) {
String value = paramMap.get(str)[0]; String value = paramMap.get(str)[0];
if (StringUtils.isNotEmpty(value)) { if (StringUtils.isNotEmpty(value)) {
params.put(str, value); params.put(str, value);
sb.append(str).append(":").append(value).append(","); sb.append(str).append(":").append(value).append(",");
} else { } else {
sb.append(str).append(":").append("null").append(","); sb.append(str).append(":").append("null").append(",");
} }
} }
Configs.CONSOLE_LOGGER.info(sb.deleteCharAt(sb.length() - 1) Configs.CONSOLE_LOGGER.info(sb.deleteCharAt(sb.length() - 1)
.append("}").toString()); .append("}").toString());
PagerOptions pagerOptions = (PagerOptions) UtilsHelper PagerOptions pagerOptions = (PagerOptions) UtilsHelper
.newObjAndSetAttrsByClass(PagerOptions.class, params); .newObjAndSetAttrsByClass(PagerOptions.class, params);
return dfs.getPagerTableData(pagerOptions); return dfs.getPagerTableData(pagerOptions);
} }
@RequestMapping(value="/delete/data", method= RequestMethod.POST) @RequestMapping(value="/delete/data", method= RequestMethod.POST)
public void deleteData(HttpServletRequest res, HttpServletResponse req) throws Exception { public void deleteData(HttpServletRequest res, HttpServletResponse req) throws Exception {
res.setCharacterEncoding("UTF-8"); res.setCharacterEncoding("UTF-8");
Map<String, String[]> paramMap = res.getParameterMap(); Map<String, String[]> paramMap = res.getParameterMap();
String[] data = paramMap.get("data"); String[] data = paramMap.get("data");
dfs.deleteData(data); dfs.deleteData(data);
} }
@RequestMapping("/connectOracle") @RequestMapping("/connectOracle")
public void connectOracle(HttpServletRequest res, HttpServletResponse req) throws UnsupportedEncodingException { public void connectOracle(HttpServletRequest res, HttpServletResponse req) throws UnsupportedEncodingException {
res.setCharacterEncoding("UTF-8"); res.setCharacterEncoding("UTF-8");
Map<String, String[]> paramMap = res.getParameterMap(); Map<String, String[]> paramMap = res.getParameterMap();
String[] oraclesName = paramMap.get("oracleName"); String[] oraclesName = paramMap.get("oracleName");
if (oraclesName != null) if (oraclesName != null)
for (String rcName : oraclesName) { for (String rcName : oraclesName) {
Configs.CONSOLE_LOGGER.info("连接成功\t" + rcName); Configs.CONSOLE_LOGGER.info("连接成功\t" + rcName);
new OracleStatusService().connectToOracle(rcName); new OracleStatusService().connectToOracle(rcName);
} }
} }
@RequestMapping("/cancelOracleConection") @RequestMapping("/cancelOracleConection")
public void cancelOracleConnection(HttpServletRequest res, public void cancelOracleConnection(HttpServletRequest res,
HttpServletResponse req) throws UnsupportedEncodingException { HttpServletResponse req) throws UnsupportedEncodingException {
res.setCharacterEncoding("UTF-8"); res.setCharacterEncoding("UTF-8");
Map<String, String[]> paramMap = res.getParameterMap(); Map<String, String[]> paramMap = res.getParameterMap();
String[] oraclesName = paramMap.get("oracleName"); String[] oraclesName = paramMap.get("oracleName");
String operate = paramMap.get("operation")[0]; String operate = paramMap.get("operation")[0];
if (null != oraclesName) { if (null != oraclesName) {
for (String rcName : oraclesName) { for (String rcName : oraclesName) {
Configs.CONSOLE_LOGGER.info("取消连接:\t" + rcName); Configs.CONSOLE_LOGGER.info("取消连接:\t" + rcName);
new OracleStatusService().cancelToOracle(rcName, operate); new OracleStatusService().cancelToOracle(rcName, operate);
} }
} }
} }
@RequestMapping(value="/oracle/{name}/extract", method= RequestMethod.POST) @RequestMapping(value="/oracle/{name}/extract", method= RequestMethod.POST)
public void oracleExtract(HttpServletRequest res, public void oracleExtract(HttpServletRequest res,
HttpServletResponse req,@PathVariable String name) throws Exception { HttpServletResponse req,@PathVariable String name) throws Exception {
res.setCharacterEncoding("UTF-8"); res.setCharacterEncoding("UTF-8");
System.out.println("------extract-------"); System.out.println("------extract-------");
System.out.println(name); System.out.println(name);
Map<String, String[]> paramMap = res.getParameterMap(); Map<String, String[]> paramMap = res.getParameterMap();
//汇总库 对象信息--带有tableName- //汇总库 对象信息--带有tableName-
String[] nodes = paramMap.get("target"); String[] nodes = paramMap.get("target");
Map map = null; Map map = null;
for (String string : nodes) { for (String string : nodes) {
JSONObject jsonobject = JSONObject.fromObject(string); JSONObject jsonobject = JSONObject.fromObject(string);
map = jsonobject; map = jsonobject;
System.out.println(map); System.out.println(map);
} }
// 采集库对象--(多个采集库抽取到1个汇总库的1个tableName下) // 采集库对象--(多个采集库抽取到1个汇总库的1个tableName下)
String[] inneed = paramMap.get("inneed"); String[] inneed = paramMap.get("inneed");
List<Map<String, String>> colleclist = new ArrayList<Map<String,String>>(); List<Map<String, String>> colleclist = new ArrayList<Map<String,String>>();
for (String string : nodes) { for (String string : nodes) {
JSONObject jsonobject = JSONObject.fromObject(string); JSONObject jsonobject = JSONObject.fromObject(string);
Map inneedMap = jsonobject; Map inneedMap = jsonobject;
colleclist.add(inneedMap); colleclist.add(inneedMap);
} }
OracleExtract.extractOracle(name, colleclist, map); OracleExtract.extractOracle(name, colleclist, map);
} }
// public void oracleExtract(HttpServletRequest res, // public void oracleExtract(HttpServletRequest res,
// HttpServletResponse req, String name, @RequestBody GatherOracleInfo gather, @RequestBody List<OracleConnectorParams> collectOracles) // HttpServletResponse req, String name, @RequestBody GatherOracleInfo gather, @RequestBody List<OracleConnectorParams> collectOracles)
// throws Exception { // throws Exception {
//// res.setCharacterEncoding("UTF-8"); //// res.setCharacterEncoding("UTF-8");
// log.debug("------extract-------"); // log.debug("------extract-------");
//// Map<String, String[]> paramMap = res.getParameterMap(); //// Map<String, String[]> paramMap = res.getParameterMap();
//// log.debug(paramMap); //// log.debug(paramMap);
//// //汇总库 对象信息--带有tableName- //// //汇总库 对象信息--带有tableName-
//// String[] nodes = paramMap.get("target"); //// String[] nodes = paramMap.get("target");
//// Map map = null; //// Map map = null;
//// for (String string : nodes) { //// for (String string : nodes) {
//// JSONObject jsonobject = JSONObject.fromObject(string); //// JSONObject jsonobject = JSONObject.fromObject(string);
//// map = jsonobject; //// map = jsonobject;
//// System.out.println(map); //// System.out.println(map);
//// } //// }
//// ////
//// // 采集库对象--(多个采集库抽取到1个汇总库的1个tableName下) //// // 采集库对象--(多个采集库抽取到1个汇总库的1个tableName下)
//// String[] inneed = paramMap.get("inneed"); //// String[] inneed = paramMap.get("inneed");
//// List<Map<String, String>> colleclist = new ArrayList<Map<String,String>>(); //// List<Map<String, String>> colleclist = new ArrayList<Map<String,String>>();
//// for (String string : nodes) { //// for (String string : nodes) {
//// JSONObject jsonobject = JSONObject.fromObject(string); //// JSONObject jsonobject = JSONObject.fromObject(string);
//// Map inneedMap = jsonobject; //// Map inneedMap = jsonobject;
//// colleclist.add(inneedMap); //// colleclist.add(inneedMap);
//// } //// }
// OracleExtract.extractOracle(name, collectOracles, gather); // OracleExtract.extractOracle(name, collectOracles, gather);
// } // }
@RequestMapping(value="/volume/list", method= RequestMethod.POST) @RequestMapping(value="/volume/list", method= RequestMethod.POST)
@ResponseBody @ResponseBody
public List<VolumeEntity> volumeList() throws Exception { public List<VolumeEntity> volumeList() throws Exception {
log.debug("-----/volume/list------"); log.debug("-----/volume/list------");
List<VolumeEntity> result = gfsService.getAllVolumes(); List<VolumeEntity> result = gfsService.getAllVolumes();
return result; return result;
} }
@RequestMapping(value = "/volume/{name}/move", method= RequestMethod.POST) @RequestMapping(value = "/volume/{name}/move", method= RequestMethod.POST)
public void volumeMove(HttpServletRequest res, HttpServletResponse req,@PathVariable String name, public void volumeMove(HttpServletRequest res, HttpServletResponse req,@PathVariable String name,
FolderNode selectNode, DataInfoEntity selectItems) throws Exception { FolderNode selectNode, DataInfoEntity selectItems) throws Exception {
res.setCharacterEncoding("UTF-8"); res.setCharacterEncoding("UTF-8");
System.out.println("get Request"); System.out.println("get Request");
Map<String, String[]> paramMap = res.getParameterMap(); Map<String, String[]> paramMap = res.getParameterMap();
// System.out.println(paramMap); // System.out.println(paramMap);
String[] nodes = paramMap.get("selectNode"); String[] nodes = paramMap.get("selectNode");
Map map = null; Map map = null;
for (String string : nodes) { for (String string : nodes) {
System.out.println(string); System.out.println(string);
JSONObject jsonobject = JSONObject.fromObject(string); JSONObject jsonobject = JSONObject.fromObject(string);
map = jsonobject; map = jsonobject;
} }
String dstVolume = (String) map.get("volume"); String dstVolume = (String) map.get("volume");
List<String> listItemPath = new ArrayList<String>(); List<String> listItemPath = new ArrayList<String>();
String[] items = paramMap.get("selectItems"); String[] items = paramMap.get("selectItems");
System.out.println("selectItems"); System.out.println("selectItems");
List<DataInfoEntity> datas = new ArrayList<DataInfoEntity>(); List<DataInfoEntity> datas = new ArrayList<DataInfoEntity>();
List<String> srcVolumes = new ArrayList<String>(); List<String> srcVolumes = new ArrayList<String>();
for (String string : items) { for (String string : items) {
System.out.println(string); System.out.println(string);
JSONObject jsobj = JSONObject.fromObject(string); JSONObject jsobj = JSONObject.fromObject(string);
Map itemmap = jsobj; Map itemmap = jsobj;
DataInfoEntity data = (DataInfoEntity) Bean2MapUtils.convertMap(DataInfoEntity.class, itemmap); DataInfoEntity data = (DataInfoEntity) Bean2MapUtils.convertMap(DataInfoEntity.class, itemmap);
datas.add(data); datas.add(data);
} }
System.out.println("------/volume/{name}/move--------"); System.out.println("------/volume/{name}/move--------");
if (datas.size() >0) { if (datas.size() >0) {
moveDataService.moveData(datas, (String)map.get("path")); moveDataService.moveData(datas, (String)map.get("path"));
} }
} }
// public Object volumeMove(HttpServletRequest res, HttpServletResponse req, String name, // public Object volumeMove(HttpServletRequest res, HttpServletResponse req, String name,
// @RequestBody FolderNode selectNode, @RequestBody List<DataInfoEntity> selectItems) throws Exception { // @RequestBody FolderNode selectNode, @RequestBody List<DataInfoEntity> selectItems) throws Exception {
// log.debug("-----/volume/{name}/move------"); // log.debug("-----/volume/{name}/move------");
//// Map<String, String[]> paramMap = res.getParameterMap(); //// Map<String, String[]> paramMap = res.getParameterMap();
//// System.out.println(paramMap); //// System.out.println(paramMap);
// Map<String, String[]> paramMap = res.getParameterMap(); // Map<String, String[]> paramMap = res.getParameterMap();
// log.debug(paramMap); // log.debug(paramMap);
// //汇总库 对象信息--带有tableName- // //汇总库 对象信息--带有tableName-
// String[] nodes = (String[]) paramMap.get("selectNode"); // String[] nodes = (String[]) paramMap.get("selectNode");
// Map map = null; // Map map = null;
// JSONObject jsonobject = JSONObject.fromObject(string); // JSONObject jsonobject = JSONObject.fromObject(string);
// map = jsonobject; // map = jsonobject;
// //
// //
// log.debug(selectItems); // log.debug(selectItems);
// log.debug(selectNode); // log.debug(selectNode);
// boolean result = false ; // boolean result = false ;
// if (selectItems.size() >0) { // if (selectItems.size() >0) {
// result = moveDataService.moveData(selectItems, selectNode.getPath()); // result = moveDataService.moveData(selectItems, selectNode.getPath());
// } // }
// return result; // return result;
// } // }
@RequestMapping(value="/oracle/list", method= RequestMethod.POST) @RequestMapping(value="/oracle/list", method= RequestMethod.POST)
@ResponseBody @ResponseBody
public List<GatherOracleInfo> oracleList() throws Exception { public List<GatherOracleInfo> oracleList() throws Exception {
log.debug("----------getOracleInfo-----------------------"); log.debug("----------getOracleInfo-----------------------");
List<GatherOracleInfo> result = mySqlService.findAllMySql(); List<GatherOracleInfo> result = mySqlService.findAllMySql();
return result; return result;
} }
@RequestMapping(value="/oracle/{id}/delete", method= RequestMethod.POST) @RequestMapping(value="/oracle/{id}/delete", method= RequestMethod.POST)
public void oracleDelete(@PathVariable String id) throws Exception { public void oracleDelete(@PathVariable String id) throws Exception {
log.debug("----------deleteOracleInfo----------------"); log.debug("----------deleteOracleInfo----------------");
Integer num = Integer.valueOf(id); Integer num = Integer.valueOf(id);
mySqlService.deleteMySql(num); mySqlService.deleteMySql(num);
} }
@RequestMapping(value="/oracle/{id}/insert", method= RequestMethod.POST) @RequestMapping(value="/oracle/{id}/insert", method= RequestMethod.POST)
@ResponseBody @ResponseBody
public void oracleInsert(@PathVariable String id, @RequestBody GatherOracleInfo oracle) throws Exception { public void oracleInsert(@PathVariable String id, @RequestBody GatherOracleInfo oracle) throws Exception {
log.debug("----------insertOracleInfo----------------"); log.debug("----------insertOracleInfo----------------");
oracle.setId(Integer.valueOf(id)); oracle.setId(Integer.valueOf(id));
mySqlService.insertOracle(oracle); mySqlService.insertOracle(oracle);
} }
@RequestMapping(value="/oracle/{id}/update", method= RequestMethod.POST) @RequestMapping(value="/oracle/{id}/update", method= RequestMethod.POST)
@ResponseBody @ResponseBody
public void oracleUpdate(@PathVariable("id") String id, @RequestBody GatherOracleInfo oracle) throws Exception { public void oracleUpdate(@PathVariable("id") String id, @RequestBody GatherOracleInfo oracle) throws Exception {
log.debug("----------updateOracleInfo-----------------------"); log.debug("----------updateOracleInfo-----------------------");
log.debug(oracle); log.debug(oracle);
mySqlService.updateOracle(oracle); mySqlService.updateOracle(oracle);
} }
@RequestMapping(value="/task/transfer/list", method= RequestMethod.POST) @RequestMapping(value="/task/transfer/list", method= RequestMethod.POST)
@ResponseBody @ResponseBody
public Object taskTransferList() throws Exception { public Object taskTransferList() throws Exception {
log.debug("----------/task/transfer/list-----------------------"); log.debug("----------/task/transfer/list-----------------------");
List<DataInfoEntityMoveTmp> result = moveDataService.findAll(); List<DataInfoEntityMoveTmp> result = moveDataService.findAll();
return result; return result;
} }
@RequestMapping(value="/task/transfer/{id}/delete", method= RequestMethod.POST) @RequestMapping(value="/task/transfer/{id}/delete", method= RequestMethod.POST)
@ResponseBody @ResponseBody
public Object taskTransferDelete(@PathVariable String id) throws Exception { public Object taskTransferDelete(@PathVariable String id) throws Exception {
log.debug("----------/task/transfer/{id}/delete-----------------------"); log.debug("----------/task/transfer/{id}/delete-----------------------");
DataInfoEntityMoveTmp move = new DataInfoEntityMoveTmp(); DataInfoEntityMoveTmp move = new DataInfoEntityMoveTmp();
move.setId(Integer.valueOf(id)); move.setId(Integer.valueOf(id));
int result = moveDataService.delete(move ); int result = moveDataService.delete(move );
return result; return result;
} }
@RequestMapping(value="/task/transfer/save", method= RequestMethod.POST) @RequestMapping(value="/task/transfer/save", method= RequestMethod.POST)
@ResponseBody @ResponseBody
public Object taskTransferSave(@RequestBody DataInfoEntity move) throws Exception { public Object taskTransferSave(@RequestBody DataInfoEntity move) throws Exception {
log.debug("---------/task/transfer/save-----------------------"); log.debug("---------/task/transfer/save-----------------------");
int result = dfs.save(move); int result = dfs.save(move);
return result; return result;
} }
@RequestMapping(value="/code/list", method= RequestMethod.POST) @RequestMapping(value="/code/list", method= RequestMethod.POST)
@ResponseBody @ResponseBody
public Object findCodeList() throws Exception { public Object findCodeList() throws Exception {
log.debug("---------/findSystemCode-----------------------"); log.debug("---------/findSystemCode-----------------------");
Map<String, Object> result = codeService.findAll(); Map<String, Object> result = codeService.findAll();
return result; return result;
} }
} }

@ -0,0 +1,28 @@
package com.platform.controller;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.base.BaseController;
@Controller
public class TaskModelController extends BaseController{
@RequestMapping("/task/transfer/list")
@ResponseBody
public List<Integer> getTransferTask(HttpServletRequest res, HttpServletResponse req) {
List<Integer> list = new ArrayList<Integer>();
list.add(1);
list.add(2);
list.add(3);
list.add(4);
return list;
}
}

@ -15,6 +15,7 @@ public class OracleConnectorParams {
public OracleConnectorParams() { public OracleConnectorParams() {
// TODO Auto-generated constructor stub // TODO Auto-generated constructor stub
maybeInit();
} }
public OracleConnectorParams(String port, String ip, String name) { public OracleConnectorParams(String port, String ip, String name) {
@ -37,9 +38,9 @@ public class OracleConnectorParams {
private void maybeInit() { private void maybeInit() {
Properties properties = ConfigPropertyReader.Builder( Properties properties = ConfigPropertyReader.Builder(
Configs.CONFIG_LOCALTION).getProperties(); Configs.CONFIG_LOCALTION).getProperties();
this.user = properties.getProperty("collect-user"); this.user = properties.getProperty("collect-user-name");
this.password = properties.getProperty("collect-password"); this.password = properties.getProperty("collect-password");
this.databaseName = properties.getProperty("collect-database"); this.databaseName = properties.getProperty("collect-service-name");
} }
public String getPort() { public String getPort() {
@ -89,5 +90,4 @@ public class OracleConnectorParams {
public void setDatabaseName(String databaseName) { public void setDatabaseName(String databaseName) {
this.databaseName = databaseName; this.databaseName = databaseName;
} }
} }

@ -6,11 +6,9 @@ import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import javax.validation.constraints.Pattern.Flag;
import com.platform.utils.Configs; import com.platform.utils.Configs;
public class OracleConnector { public class OracleConnector {
static { static {
try { try {
Class.forName("oracle.jdbc.driver.OracleDriver"); Class.forName("oracle.jdbc.driver.OracleDriver");
@ -19,18 +17,17 @@ public class OracleConnector {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
} }
} }
public static Connection ConnectionBuilder(String url, String user, public static Connection ConnectionBuilder(String url, String user,
String password) { String password) {
Connection conn = null; Connection conn=null;
try { try {
conn = DriverManager.getConnection(url, user, password); conn = DriverManager.getConnection(url, user, password);
} catch (SQLException e) { } catch (SQLException e) {
return conn; Configs.CONSOLE_LOGGER.info("创建oracle连接失败: [" + e.getMessage() + "]");
} }
return conn; return conn;
} }
@ -75,5 +72,5 @@ public class OracleConnector {
e.printStackTrace(); e.printStackTrace();
} }
return flag; return flag;
} }
} }

@ -17,31 +17,20 @@ import com.platform.utils.Configs;
public class OracleStatusService { public class OracleStatusService {
private static Map<String, Timer> alliveTask = new Hashtable<String, Timer>(); private static Map<String, Timer> alliveTask = new Hashtable<String, Timer>();
public final static int EXEC_TIME = 10;// 连接多少次后不成功,取消链接 public final static int EXEC_TIME = 9;// 连接多少次后不成功,取消链接
public final static long INTERVAL_TIME = 60 * 1000;// 每隔多少毫秒执行一次连接任务 public final static long INTERVAL_TIME = 60 * 1000;// 每隔多少毫秒执行一次连接任务
public final static long DELAY_TIME = 0; // 延迟多少秒后执行 public final static long DELAY_TIME = 30 * 1000; // 延迟多少秒后执行
public void connectToOracle(String replicasName) { public void connectToOracle(String replicasName) {
SimpleKubeClient sKubeClient = new SimpleKubeClient(); SimpleKubeClient sKubeClient = new SimpleKubeClient();
ReplicationController replicationController = sKubeClient
.getReplicationController(replicasName);
if (alliveTask.containsKey(replicasName)) { if (alliveTask.containsKey(replicasName)) {
killAlliveTask(replicasName); killAlliveTask(replicasName);
} }
if (null != replicationController) { OracleConnectorParams orp = new OracleConnectorParams();
List<Pod> filterPods = sKubeClient Timer timer = new Timer();
.getPodsForApplicaList(replicationController); alliveTask.put(replicasName, timer);
if (filterPods != null && filterPods.size() > 0) { timer.schedule(new connectTask(replicasName, orp, sKubeClient), DELAY_TIME,
Pod pod = filterPods.get(0); INTERVAL_TIME);
OracleConnectorParams orp = new OracleConnectorParams(
String.valueOf(sKubeClient.getPodContainerport(pod)),
sKubeClient.getPodHostIp(pod), replicasName);
Timer timer = new Timer();
alliveTask.put(replicasName, timer);
timer.schedule(new connectTask(orp, sKubeClient), DELAY_TIME,
INTERVAL_TIME);
}
}
} }
@ -96,6 +85,13 @@ public class OracleStatusService {
private int count; private int count;
private OracleConnectorParams ocp; private OracleConnectorParams ocp;
private SimpleKubeClient client; private SimpleKubeClient client;
public connectTask(String taskName, OracleConnectorParams ocp, SimpleKubeClient client){
this.taskName = taskName;
this.ocp = ocp;
this.count = 0;
this.client = client;
}
public connectTask(OracleConnectorParams ocp, SimpleKubeClient client) { public connectTask(OracleConnectorParams ocp, SimpleKubeClient client) {
this.taskName = ocp.getName(); this.taskName = ocp.getName();
@ -106,32 +102,58 @@ public class OracleStatusService {
@Override @Override
public void run() { public void run() {
if (count == EXEC_TIME && alliveTask.containsKey(taskName)) { if (count == EXEC_TIME && alliveTask.containsKey(taskName)) { //如果任务已经执行10次则任务oracle启动失败并取消oracle连接
killAlliveTask(taskName); killAlliveTask(taskName);
client.updateOrAddReplicasLabelById(taskName, "status", "1"); client.updateOrAddReplicasLabelById(taskName, "status", "1"); //更新ReplicationController标签将oracle状态标示未1(0:启动中1失败2成功)
} else { Configs.CONSOLE_LOGGER.info("更新replicationController标签 "
String url = "jdbc:oracle:thin:@" + ocp.getIp() + ":" + taskName + "\t[标签更新为: 失败]");
+ ocp.getPort() + "/" + ocp.getDatabaseName(); } else { //否则执行连接oracle任务判断oracle是否启动成功
boolean flag = OracleConnector.canConnect(url, ocp.getUser(), Pod pod = filterPod();
ocp.getPassword()); if (pod != null) {
String message = "失败"; String ip = client.getPodHostIp(pod);
if (flag && alliveTask.containsKey(taskName)) { int port = client.getPodContainerport(pod);
client.updateOrAddReplicasLabelById(taskName, "status", "2"); if (ip != null && port != 0) {
message = "成功"; String url = "jdbc:oracle:thin:@" + ip + ":" + port
killAlliveTask(taskName); // 连接成功,取消连接 + ":" + ocp.getDatabaseName();
boolean flag = OracleConnector.canConnect(url, //连接结果返回参数true标示连接成功false标示连接失败
ocp.getUser(), ocp.getPassword());
Configs.CONSOLE_LOGGER.info("url:" + url + ",user:"
+ ocp.getUser() + ",password:"
+ ocp.getPassword());
String message = "失败";
if (flag && alliveTask.containsKey(taskName)) {
client.updateOrAddReplicasLabelById(taskName,
"status", "2");
message = "成功";
killAlliveTask(taskName); // 连接成功,取消连接
Configs.CONSOLE_LOGGER
.info("更新replicationController标签 "
+ taskName + "\t[标签更新为: 成功]");
}
Configs.CONSOLE_LOGGER.info("连接到数据库服务: " + taskName
+ "\t[连接结果: " + message + "]");
}
} }
Configs.CONSOLE_LOGGER.info("连接到数据库服务: " + taskName
+ "\t[连接结果: " + message + "]");
} }
count++; count++;
} }
@Override /**
public boolean cancel() { * oracleip
System.out.println("aaaaaaa"); * @return
if (client != null) */
this.client.close(); private Pod filterPod() {
return super.cancel(); Pod pod = null;
ReplicationController replicationController = client
.getReplicationController(taskName);
if (null != replicationController) {
List<Pod> filterPods = client
.getPodsForApplicaList(replicationController);
if (filterPods != null && filterPods.size() > 0) {
pod = filterPods.get(0);
}
}
return pod;
} }
public String getTaskName() { public String getTaskName() {
@ -146,4 +168,4 @@ public class OracleStatusService {
return count; return count;
} }
} }
} }

@ -1,76 +1,74 @@
package com.platform.utils; package com.platform.utils;
import java.util.Properties; import java.util.Properties;
import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener; import javax.servlet.ServletContextListener;
import com.platform.service.thread.ThreadMoveData; public class ConfigsLoader implements ServletContextListener {
private static ConfigPropertyReader cReader = null;
public class ConfigsLoader implements ServletContextListener {
private static ConfigPropertyReader cReader = null; @Override
public void contextDestroyed(ServletContextEvent sEvent) {
@Override // TODO Auto-generated method stub
public void contextDestroyed(ServletContextEvent sEvent) { Configs.CONSOLE_LOGGER.info("系统停止..");
// TODO Auto-generated method stub }
Configs.CONSOLE_LOGGER.info("系统停止..");
} @SuppressWarnings("static-access")
@Override
@SuppressWarnings("static-access") public void contextInitialized(ServletContextEvent sEvent) {
@Override // TODO Auto-generated method stub
public void contextInitialized(ServletContextEvent sEvent) { Configs.CONSOLE_LOGGER.info("系统初始化..");
// TODO Auto-generated method stub String contextPath = sEvent.getServletContext().getRealPath("/")
Configs.CONSOLE_LOGGER.info("系统初始化.."); + "WEB-INF/config/config.properties";
String contextPath = sEvent.getServletContext().getRealPath("/") this.cReader = ConfigPropertyReader.Builder(contextPath);
+ "WEB-INF/config/config.properties"; init();
this.cReader = ConfigPropertyReader.Builder(contextPath); new ThreadVolume("").start();
init(); }
new ThreadVolume("").start();
} public static void init() {
Properties properties = cReader.getProperties();
public static void init() {
Properties properties = cReader.getProperties(); Configs.KUBE_MASTER_URL = properties.getProperty("kubeMasterUrl");
Configs.KUBE_MASTER_URL = properties.getProperty("kubeMasterUrl"); Configs.COLLECT_USER_NAME = properties.getProperty("collect-user-name");
Configs.COLLECT_USER_NAME = properties.getProperty("collect-user-name"); Configs.COLLECT_PASSWORD = properties.getProperty("collect-password");
Configs.COLLECT_PASSWORD = properties.getProperty("collect-password"); Configs.COLLECT_SERVICE_NAME = properties
.getProperty("collect-service-name");
Configs.COLLECT_SERVICE_NAME = properties
.getProperty("collect-service-name"); Configs.GATHER_USER_NAME = properties.getProperty("gather-user-name");
Configs.GATHER_USER_NAME = properties.getProperty("gather-user-name"); Configs.GATHER_USER_PASSWORD = properties
.getProperty("gather-user-password");
Configs.GATHER_USER_PASSWORD = properties
.getProperty("gather-user-password"); Configs.GATHER_PORT = properties.getProperty("gather-port");
Configs.GATHER_PORT = properties.getProperty("gather-port"); Configs.GATHER_SERVICE_NAME = properties
.getProperty("gather-service-name");
Configs.GATHER_SERVICE_NAME = properties
.getProperty("gather-service-name"); Configs.TABLE_SUFFIX = properties.getProperty("table-suffix");
Configs.TABLE_SUFFIX = properties.getProperty("table-suffix"); Configs.EXTRACT_LOG_LOCALTION = properties
.getProperty("extract-log-localtion");
Configs.EXTRACT_LOG_LOCALTION = properties
.getProperty("extract-log-localtion"); Configs.GATHER_TABLESPACE_NAME = properties
.getProperty("gather-tablespace-name");
Configs.GATHER_TABLESPACE_NAME = properties
.getProperty("gather-tablespace-name"); Configs.GATHER_TABLESPACE_PATH = properties
.getProperty("gather-tablespace-path");
Configs.GATHER_TABLESPACE_PATH = properties
.getProperty("gather-tablespace-path"); Configs.GATHER_TABLE_PASSWORD=properties.getProperty("gather-table-user-password");
}
Configs.GATHER_TABLE_PASSWORD=properties.getProperty("gather-table-user-password");
} public ConfigPropertyReader getcReader() {
return cReader;
public ConfigPropertyReader getcReader() { }
return cReader;
} @SuppressWarnings("static-access")
public void setcReader(ConfigPropertyReader cReader) {
@SuppressWarnings("static-access") this.cReader = cReader;
public void setcReader(ConfigPropertyReader cReader) { }
this.cReader = cReader;
} }
}

@ -1,4 +1,3 @@
package com.platform.utils; package com.platform.utils;
import java.util.List; import java.util.List;

@ -0,0 +1,51 @@
package com.platform.websocket;
import org.springframework.web.socket.CloseStatus;
import org.springframework.web.socket.TextMessage;
import org.springframework.web.socket.WebSocketHandler;
import org.springframework.web.socket.WebSocketMessage;
import org.springframework.web.socket.WebSocketSession;
public class SystemWebSocketHandler implements WebSocketHandler {
@Override
public void afterConnectionClosed(WebSocketSession arg0, CloseStatus arg1)
throws Exception {
// TODO Auto-generated method stub
}
@Override
public void afterConnectionEstablished(WebSocketSession arg0)
throws Exception {
// TODO Auto-generated method stub
}
@Override
public void handleMessage(WebSocketSession arg0, WebSocketMessage<?> arg1)
throws Exception {
// TODO Auto-generated method stub
TextMessage returnMessage = new TextMessage("received at server");
sendMessageToUsers(returnMessage);
System.out.println("接到请求");
}
@Override
public void handleTransportError(WebSocketSession arg0, Throwable arg1)
throws Exception {
// TODO Auto-generated method stub
}
@Override
public boolean supportsPartialMessages() {
// TODO Auto-generated method stub
return false;
}
public void sendMessageToUsers(TextMessage message) {
}
}

@ -0,0 +1,28 @@
package com.platform.websocket;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import org.springframework.web.socket.WebSocketHandler;
import org.springframework.web.socket.config.annotation.EnableWebSocket;
import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
@Configuration
@EnableWebMvc
@EnableWebSocket
public class WebSocketConfig extends WebMvcConfigurerAdapter implements WebSocketConfigurer {
@Override
public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
// TODO Auto-generated method stub
registry.addHandler(myHandler(), "/webSocketServer");
}
@Bean
public WebSocketHandler myHandler() {
return new SystemWebSocketHandler();
}
}

@ -1,26 +1,26 @@
package com.platform.test; package com.platform.test;
public class Brick { public class Brick {
private String ip; private String ip;
private String path; private String path;
public Brick(String ip, String path) { public Brick(String ip, String path) {
super(); super();
this.ip = ip; this.ip = ip;
this.path = path; this.path = path;
} }
public String getIp() { public String getIp() {
return ip; return ip;
} }
public void setIp(String ip) { public void setIp(String ip) {
this.ip = ip; this.ip = ip;
} }
public String getPath() { public String getPath() {
return path; return path;
} }
public void setPath(String path) { public void setPath(String path) {
this.path = path; this.path = path;
} }
} }

@ -1,37 +1,35 @@
package com.platform.test; package com.platform.test;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.platform.entities.FolderNode; import com.platform.entities.FolderNode;
public class FolderReader { public class FolderReader {
public static FolderNode reader(String path) { public static FolderNode reader(String path) {
FolderNode folderNode = null; FolderNode folderNode = null;
File file = new File(path); File file = new File(path);
if (file.exists()) { if (file.exists()) {
List<FolderNode> childrens = new ArrayList<FolderNode>(); List<FolderNode> childrens = new ArrayList<FolderNode>();
if (file.isDirectory()) { if (file.isDirectory()) {
File[] files = file.listFiles(); File[] files = file.listFiles();
for (int i = 0; i < files.length; i++) { for (int i = 0; i < files.length; i++) {
FolderNode children = reader(files[i].getAbsolutePath()); FolderNode children = reader(files[i].getAbsolutePath());
if (children != null) if (children != null)
childrens.add(children); childrens.add(children);
} }
} }
// folderNode = new FolderNode(file.getName(), file.getAbsolutePath(), }
// childrens); return folderNode;
} }
return folderNode;
} public static void main(String[] args) {
// TODO Auto-generated method stub
public static void main(String[] args) { FolderReader folderReader = new FolderReader();
// TODO Auto-generated method stub FolderNode folderNode = folderReader.reader("D:/bootstrap");
FolderReader folderReader = new FolderReader(); //folderReader.print(folderNode);
FolderNode folderNode = folderReader.reader("D:/bootstrap"); }
//folderReader.print(folderNode);
} }
}

@ -1,15 +1,15 @@
package com.platform.test; package com.platform.test;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.support.FileSystemXmlApplicationContext; import org.springframework.context.support.FileSystemXmlApplicationContext;
public class SMBasedTest { public class SMBasedTest {
public ApplicationContext applicationContext; public ApplicationContext applicationContext;
public SMBasedTest() { public SMBasedTest() {
applicationContext = new FileSystemXmlApplicationContext( applicationContext = new FileSystemXmlApplicationContext(
"test/spring-applicationContext-test.xml"); "test/spring-applicationContext-test.xml");
} }
} }

@ -0,0 +1,29 @@
package com.platform.test;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import com.platform.utils.Configs;
public class TestConnectOralce {
public static void main(String[] args) {
// TODO Auto-generated method stub
try{
Class.forName("oracle.jdbc.driver.OracleDriver");
Configs.CONSOLE_LOGGER.info("Oracle驱动加载成功");
}catch(Exception e){
System.out.println(e);
}
String url = "jdbc:oracle:thin:@192.168.0.110:60758:orcl";
try {
Connection conn = DriverManager.getConnection(url, "system", "oracle");
System.out.println("连接成功");
} catch (SQLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
}

@ -1,53 +1,53 @@
package com.platform.test; package com.platform.test;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.platform.entities.EncodedInfoEntity; import com.platform.entities.EncodedInfoEntity;
import com.platform.service.EncodeInfoService; import com.platform.service.EncodeInfoService;
@Controller @Controller
public class TestController { public class TestController {
// private static Logger logger = Logger.getLogger(TestController.class); // private static Logger logger = Logger.getLogger(TestController.class);
@Resource(name = "encodeInfoService") @Resource(name = "encodeInfoService")
private EncodeInfoService eis; private EncodeInfoService eis;
public void setEis(EncodeInfoService eis) { public void setEis(EncodeInfoService eis) {
this.eis = eis; this.eis = eis;
} }
@RequestMapping("/hello") @RequestMapping("/hello")
@ResponseBody @ResponseBody
public List<EncodedInfoEntity> hello(String name, HttpServletResponse res) { public List<EncodedInfoEntity> hello(String name, HttpServletResponse res) {
System.out.println(name); System.out.println(name);
return eis.getAllEncodeInfo("system_info"); return eis.getAllEncodeInfo("system_info");
} }
@RequestMapping("/json") @RequestMapping("/json")
@ResponseBody @ResponseBody
public List<User> getJson(HttpServletRequest res, HttpServletResponse req) { public List<User> getJson(HttpServletRequest res, HttpServletResponse req) {
List<User> list = new ArrayList<User>(); List<User> list = new ArrayList<User>();
list.add(new User("lisi", 1, "男")); list.add(new User("lisi", 1, "男"));
list.add(new User("zhansan", 2, "男")); list.add(new User("zhansan", 2, "男"));
return list; return list;
} }
@RequestMapping("log") @RequestMapping("log")
public void testLog(HttpServletResponse res) { public void testLog(HttpServletResponse res) {
System.out.println(eis.getEncodeNameByCode("1", "system_info")); System.out.println(eis.getEncodeNameByCode("1", "system_info"));
} }
@RequestMapping("/data111.json") @RequestMapping("/data111.json")
public void test(String name, HttpServletResponse res){ public void test(String name, HttpServletResponse res){
} }
} }

@ -1,64 +1,64 @@
package com.platform.test; package com.platform.test;
import java.util.List; import java.util.List;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import com.platform.dao.EncodeInfoDao; import com.platform.dao.EncodeInfoDao;
import com.platform.entities.EncodedInfoEntity; import com.platform.entities.EncodedInfoEntity;
public class TestEncodeInfoDao extends SMBasedTest { public class TestEncodeInfoDao extends SMBasedTest {
private EncodeInfoDao eiDao; private EncodeInfoDao eiDao;
private String testTableName; private String testTableName;
@Before @Before
public void initBeforeFunction() { public void initBeforeFunction() {
eiDao = (EncodeInfoDao) this.applicationContext eiDao = (EncodeInfoDao) this.applicationContext
.getBean("encodeInfoDao"); .getBean("encodeInfoDao");
testTableName = "system_info"; testTableName = "system_info";
} }
@Test @Test
public void testGetAllEntityInfo() { public void testGetAllEntityInfo() {
List<EncodedInfoEntity> allEntities = eiDao List<EncodedInfoEntity> allEntities = eiDao
.getAllEntityInfo(testTableName); .getAllEntityInfo(testTableName);
System.out.println(allEntities); System.out.println(allEntities);
Assert.assertTrue(allEntities.size() > 0); Assert.assertTrue(allEntities.size() > 0);
} }
@Test @Test
public void testGetEncodeNameByCode() { public void testGetEncodeNameByCode() {
String result = eiDao.getEncodeNameByCode("1", testTableName); String result = eiDao.getEncodeNameByCode("1", testTableName);
Assert.assertTrue(result.equals("预算执行系统")); Assert.assertTrue(result.equals("预算执行系统"));
} }
@Test @Test
public void testGetEncodeCodeByName() { public void testGetEncodeCodeByName() {
List<String> result = eiDao List<String> result = eiDao
.getEncodeCodeByName("预算执行系统", testTableName); .getEncodeCodeByName("预算执行系统", testTableName);
Assert.assertTrue(result.size() > 0); Assert.assertTrue(result.size() > 0);
} }
@Test @Test
public void testUpdateEncodeNameByCode() { public void testUpdateEncodeNameByCode() {
int result = eiDao int result = eiDao
.updateEncodeNameByCode("3", "财政一体化平台", testTableName); .updateEncodeNameByCode("3", "财政一体化平台", testTableName);
Assert.assertTrue(result > 0); Assert.assertTrue(result > 0);
} }
@Test @Test
public void testInsertEncodeEntity() { public void testInsertEncodeEntity() {
int result = eiDao.insertEncodeEntity(new EncodedInfoEntity("非税收入系统", int result = eiDao.insertEncodeEntity(new EncodedInfoEntity("非税收入系统",
"4"), testTableName); "4"), testTableName);
Assert.assertTrue(result == 1); Assert.assertTrue(result == 1);
} }
@Test @Test
public void testDeleteEncodeByCode() { public void testDeleteEncodeByCode() {
int result = eiDao.deleteEncodeByCode("5", testTableName); int result = eiDao.deleteEncodeByCode("5", testTableName);
Assert.assertTrue(result >= 1); Assert.assertTrue(result >= 1);
} }
} }

@ -1,45 +1,45 @@
package com.platform.test; package com.platform.test;
import java.util.List; import java.util.List;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import com.platform.entities.EncodedInfoEntity; import com.platform.entities.EncodedInfoEntity;
import com.platform.service.EncodeInfoService; import com.platform.service.EncodeInfoService;
public class TestEncodeService extends SMBasedTest { public class TestEncodeService extends SMBasedTest {
private EncodeInfoService eis; private EncodeInfoService eis;
private String testTableName; private String testTableName;
@Before @Before
public void initBeforeFunction() { public void initBeforeFunction() {
eis = (EncodeInfoService) this.applicationContext eis = (EncodeInfoService) this.applicationContext
.getBean("encodeInfoService"); .getBean("encodeInfoService");
testTableName = "system_info"; testTableName = "system_info";
} }
@Test @Test
public void testGetEncodeNameByCode() { public void testGetEncodeNameByCode() {
String result = eis.getEncodeNameByCode("2", testTableName); String result = eis.getEncodeNameByCode("2", testTableName);
Assert.assertTrue(result.equals("部门预算")); Assert.assertTrue(result.equals("部门预算"));
} }
/** /**
* *
*/ */
@Test @Test
public void testDeleteEncodeByCode() { public void testDeleteEncodeByCode() {
eis.deleteEncodeByCode("4", testTableName); eis.deleteEncodeByCode("4", testTableName);
} }
@Test @Test
public void testGetAllEncodeInfo() { public void testGetAllEncodeInfo() {
List<EncodedInfoEntity> allEntities = eis List<EncodedInfoEntity> allEntities = eis
.getAllEncodeInfo(testTableName); .getAllEncodeInfo(testTableName);
System.out.println(allEntities); System.out.println(allEntities);
Assert.assertTrue(allEntities.size() >= 1); Assert.assertTrue(allEntities.size() >= 1);
} }
} }

@ -1,42 +1,42 @@
package com.platform.test; package com.platform.test;
public class User { public class User {
private String name; private String name;
private int id; private int id;
private String sex; private String sex;
public String getName() { public String getName() {
return name; return name;
} }
public void setName(String name) { public void setName(String name) {
this.name = name; this.name = name;
} }
public int getId() { public int getId() {
return id; return id;
} }
public void setId(int id) { public void setId(int id) {
this.id = id; this.id = id;
} }
public String getSex() { public String getSex() {
return sex; return sex;
} }
public void setSex(String sex) { public void setSex(String sex) {
this.sex = sex; this.sex = sex;
} }
public User(String name, int id, String sex) { public User(String name, int id, String sex) {
super(); super();
this.name = name; this.name = name;
this.id = id; this.id = id;
this.sex = sex; this.sex = sex;
} }
public User(){ public User(){
} }
} }

@ -1,64 +1,64 @@
package com.platform.test; package com.platform.test;
import java.util.List; import java.util.List;
import com.platform.entities.FolderNode; import com.platform.entities.FolderNode;
public class Volume { public class Volume {
private String name; private String name;
private long totalSize; private long totalSize;
private long usedSize; private long usedSize;
private List<Brick> bricks; private List<Brick> bricks;
private List<FolderNode> folderNode; private List<FolderNode> folderNode;
public Volume(String volume, long totalSize, long usedSize, public Volume(String volume, long totalSize, long usedSize,
List<Brick> bricks, List<FolderNode> folderNode) { List<Brick> bricks, List<FolderNode> folderNode) {
super(); super();
this.name = volume; this.name = volume;
this.totalSize = totalSize; this.totalSize = totalSize;
this.usedSize = usedSize; this.usedSize = usedSize;
this.bricks = bricks; this.bricks = bricks;
this.folderNode = folderNode; this.folderNode = folderNode;
} }
public String getVolume() { public String getVolume() {
return name; return name;
} }
public void setVolume(String name) { public void setVolume(String name) {
this.name = name; this.name = name;
} }
public long getTotalSize() { public long getTotalSize() {
return totalSize; return totalSize;
} }
public void setTotalSize(long totalSize) { public void setTotalSize(long totalSize) {
this.totalSize = totalSize; this.totalSize = totalSize;
} }
public long getUsedSize() { public long getUsedSize() {
return usedSize; return usedSize;
} }
public void setUsedSize(long usedSize) { public void setUsedSize(long usedSize) {
this.usedSize = usedSize; this.usedSize = usedSize;
} }
public List<Brick> getBricks() { public List<Brick> getBricks() {
return bricks; return bricks;
} }
public void setBricks(List<Brick> bricks) { public void setBricks(List<Brick> bricks) {
this.bricks = bricks; this.bricks = bricks;
} }
public List<FolderNode> getFolderNode() { public List<FolderNode> getFolderNode() {
return folderNode; return folderNode;
} }
public void setFolderNode(List<FolderNode> folderNode) { public void setFolderNode(List<FolderNode> folderNode) {
this.folderNode = folderNode; this.folderNode = folderNode;
} }
} }

@ -1,19 +1,19 @@
package com.platform.test; package com.platform.test;
import org.junit.Before; import org.junit.Before;
import com.platform.dao.DataInfoDao; import com.platform.dao.DataInfoDao;
public class testSystemInfoDao extends SMBasedTest { public class testSystemInfoDao extends SMBasedTest {
private DataInfoDao dfDao; private DataInfoDao dfDao;
@Before @Before
public void initBeforeFunction() { public void initBeforeFunction() {
dfDao = (DataInfoDao) this.applicationContext.getBean("dataInfoDao"); dfDao = (DataInfoDao) this.applicationContext.getBean("dataInfoDao");
} }
// @Test @Test // @Test @Test
public void test() { public void test() {
//System.out.println(dfDao.getCount()); //System.out.println(dfDao.getCount());
} }
} }

@ -1,64 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" <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: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:tx="http://www.springframework.org/schema/tx" xmlns:aop="http://www.springframework.org/schema/aop"
xmlns:context="http://www.springframework.org/schema/context" xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx
http://www.springframework.org/schema/tx/spring-tx-3.0.xsd http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop
http://www.springframework.org/schema/aop/spring-aop-3.0.xsd http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-3.0.xsd"> http://www.springframework.org/schema/context/spring-context-3.0.xsd">
<!-- 读取db.properties中的属性值 --> <!-- 读取db.properties中的属性值 -->
<bean <bean
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="location" value="/WebContent/WEB-INF/config/config.properties"></property> <property name="location" value="/WebContent/WEB-INF/config/config.properties"></property>
</bean> </bean>
<!-- 连接MySQL数据库 --> <!-- 连接MySQL数据库 -->
<bean id="mySQLDataSource" <bean id="mySQLDataSource"
class="org.springframework.jdbc.datasource.DriverManagerDataSource"> class="org.springframework.jdbc.datasource.DriverManagerDataSource">
<property name="driverClassName" value="${jdbc.mysql.driver}" /> <property name="driverClassName" value="${jdbc.mysql.driver}" />
<property name="url" value="${jdbc.mysql.url}" /> <property name="url" value="${jdbc.mysql.url}" />
<property name="username" value="${jdbc.mysql.username}" /> <property name="username" value="${jdbc.mysql.username}" />
<property name="password" value="${jdbc.mysql.password}" /> <property name="password" value="${jdbc.mysql.password}" />
</bean> </bean>
<bean id="mySQLSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean"> <bean id="mySQLSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
<property name="configLocation" value="/WebContent/WEB-INF/config/mybatis-applicationConfig.xml" /> <property name="configLocation" value="/WebContent/WEB-INF/config/mybatis-applicationConfig.xml" />
<property name="dataSource" ref="mySQLDataSource" /> <property name="dataSource" ref="mySQLDataSource" />
</bean> </bean>
<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer"> <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
<property name="basePackage" value="com.platform.dao" /> <property name="basePackage" value="com.platform.dao" />
</bean> </bean>
<!-- 配置声明式事物 --> <!-- 配置声明式事物 -->
<bean id="mySQLTxManager" <bean id="mySQLTxManager"
class="org.springframework.jdbc.datasource.DataSourceTransactionManager"> class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
<property name="dataSource" ref="mySQLDataSource" /> <property name="dataSource" ref="mySQLDataSource" />
</bean> </bean>
<tx:advice id="txAdvice" transaction-manager="mySQLTxManager"> <tx:advice id="txAdvice" transaction-manager="mySQLTxManager">
<tx:attributes> <tx:attributes>
<tx:method name="delete*" propagation="REQUIRED" /> <tx:method name="delete*" propagation="REQUIRED" />
<tx:method name="insert*" propagation="REQUIRED" /> <tx:method name="insert*" propagation="REQUIRED" />
<tx:method name="update*" propagation="REQUIRED" /> <tx:method name="update*" propagation="REQUIRED" />
<tx:method name="get*" read-only="true" /> <tx:method name="get*" read-only="true" />
<tx:method name="select*" read-only="true" /> <tx:method name="select*" read-only="true" />
</tx:attributes> </tx:attributes>
</tx:advice> </tx:advice>
<aop:config> <aop:config>
<aop:pointcut expression="execution(* com.platform.service.*.*(..))" <aop:pointcut expression="execution(* com.platform.service.*.*(..))"
id="pointcut" /> id="pointcut" />
<aop:advisor advice-ref="txAdvice" pointcut-ref="pointcut" /> <aop:advisor advice-ref="txAdvice" pointcut-ref="pointcut" />
</aop:config> </aop:config>
<bean id="user" class="com.platform.test.User"> <bean id="user" class="com.platform.test.User">
<property name="name" value="伍名" /> <property name="name" value="伍名" />
<property name="id" value="1" /> <property name="id" value="1" />
<property name="sex" value="男" /> <property name="sex" value="男" />
</bean> </bean>
<context:component-scan base-package="com.platform.*"> <context:component-scan base-package="com.platform.*">
<context:exclude-filter type="annotation" <context:exclude-filter type="annotation"
expression="org.springframework.stereotype.Controller" /> expression="org.springframework.stereotype.Controller" />
</context:component-scan> </context:component-scan>
</beans> </beans>
Loading…
Cancel
Save