diff --git a/.classpath b/.classpath index 2b646a7f..bb13dba0 100644 --- a/.classpath +++ b/.classpath @@ -1,14 +1,10 @@ - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/.gitignore b/.gitignore index 0008c727..04e4ee9a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -/target -/build -/RemoteSystemsTempFiles -/bin/ -.settings +/target +/build +/RemoteSystemsTempFiles +/bin/ +.settings diff --git a/.metadata/.log b/.metadata/.log index f2fea4ba..73325e19 100644 --- a/.metadata/.log +++ b/.metadata/.log @@ -1,14 +1,14 @@ -!SESSION 2016-09-13 08:39:40.662 ----------------------------------------------- -eclipse.buildId=4.3.0.I20130605-2000 -java.version=1.8.0_91 -java.vendor=Oracle Corporation -BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=zh_CN -Framework arguments: -product org.eclipse.epp.package.jee.product -Command-line arguments: -os win32 -ws win32 -arch x86_64 -product org.eclipse.epp.package.jee.product - -!ENTRY org.eclipse.egit.ui 2 0 2016-09-13 08:40:07.850 -!MESSAGE Warning: The environment variable HOME is not set. The following directory will be used to store the Git -user global configuration and to define the default location to store repositories: 'C:\Users\wuming'. If this is -not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and -EGit might behave differently since they see different configuration options. -This warning can be switched off on the Team > Git > Confirmations and Warnings preference page. +!SESSION 2016-09-13 08:39:40.662 ----------------------------------------------- +eclipse.buildId=4.3.0.I20130605-2000 +java.version=1.8.0_91 +java.vendor=Oracle Corporation +BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=zh_CN +Framework arguments: -product org.eclipse.epp.package.jee.product +Command-line arguments: -os win32 -ws win32 -arch x86_64 -product org.eclipse.epp.package.jee.product + +!ENTRY org.eclipse.egit.ui 2 0 2016-09-13 08:40:07.850 +!MESSAGE Warning: The environment variable HOME is not set. The following directory will be used to store the Git +user global configuration and to define the default location to store repositories: 'C:\Users\wuming'. If this is +not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and +EGit might behave differently since they see different configuration options. +This warning can be switched off on the Team > Git > Confirmations and Warnings preference page. diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/org.eclipse.egit.core/GitProjectData.properties b/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/org.eclipse.egit.core/GitProjectData.properties index ad45730a..9a7827fd 100644 --- a/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/org.eclipse.egit.core/GitProjectData.properties +++ b/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/org.eclipse.egit.core/GitProjectData.properties @@ -1,3 +1,3 @@ -#GitProjectData -#Tue Sep 13 08:40:10 CST 2016 -.gitdir=../.git +#GitProjectData +#Tue Sep 13 08:40:10 CST 2016 +.gitdir=../.git diff --git a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi index 82ba807c..4521125c 100644 --- a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi +++ b/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi @@ -1,2492 +1,2492 @@ - - - - activeSchemeId:org.eclipse.ui.defaultAcceleratorConfiguration - - - - - - topLevel - shellMaximized - - - - - persp.actionSet:org.eclipse.mylyn.context.ui.actionSet - persp.actionSet:org.eclipse.mylyn.doc.actionSet - persp.actionSet:org.eclipse.mylyn.tasks.ui.navigation - persp.actionSet:org.eclipse.ui.cheatsheets.actionSet - persp.actionSet:org.eclipse.rse.core.search.searchActionSet - persp.actionSet:org.eclipse.search.searchActionSet - persp.actionSet:org.eclipse.ui.edit.text.actionSet.annotationNavigation - persp.actionSet:org.eclipse.ui.edit.text.actionSet.navigation - persp.actionSet:org.eclipse.ui.edit.text.actionSet.convertLineDelimitersTo - persp.actionSet:org.eclipse.ui.externaltools.ExternalToolsSet - persp.actionSet:org.eclipse.ui.actionSet.keyBindings - persp.actionSet:org.eclipse.ui.actionSet.openFiles - persp.actionSet:org.eclipse.jst.j2ee.J2eeMainActionSet - persp.actionSet:org.eclipse.jdt.ui.JavaActionSet - persp.actionSet:org.eclipse.debug.ui.launchActionSet - persp.actionSet:org.eclipse.debug.ui.debugActionSet - persp.actionSet:org.eclipse.ui.NavigateActionSet - persp.viewSC:org.eclipse.ui.navigator.ProjectExplorer - persp.viewSC:org.eclipse.wst.server.ui.ServersView - persp.viewSC:org.eclipse.datatools.connectivity.DataSourceExplorerNavigator - persp.viewSC:org.eclipse.ui.views.BookmarkView - persp.viewSC:org.eclipse.ui.views.ContentOutline - persp.viewSC:org.eclipse.ui.views.PropertySheet - persp.viewSC:org.eclipse.ui.views.ResourceNavigator - persp.viewSC:org.eclipse.wst.common.snippets.internal.ui.SnippetsView - persp.viewSC:org.eclipse.ui.views.AllMarkersView - persp.viewSC:org.eclipse.mylyn.tasks.ui.views.tasks - persp.viewSC:org.eclipse.search.ui.views.SearchView - persp.viewSC:org.eclipse.ui.console.ConsoleView - persp.showIn:org.eclipse.ui.navigator.ProjectExplorer - persp.newWizSC:org.eclipse.jpt.jpa.ui.wizard.newJpaProject - persp.perspSC:org.eclipse.jpt.ui.jpaPerspective - persp.perspSC:org.eclipse.debug.ui.DebugPerspective - persp.perspSC:org.eclipse.jdt.ui.JavaPerspective - persp.perspSC:org.eclipse.ui.resourcePerspective - persp.perspSC:org.eclipse.wst.web.ui.webDevPerspective - persp.newWizSC:org.eclipse.jst.j2ee.ui.project.facet.EarProjectWizard - persp.newWizSC:org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard - persp.newWizSC:org.eclipse.jst.ejb.ui.project.facet.EjbProjectWizard - persp.newWizSC:org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorProjectWizard - persp.newWizSC:org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientProjectWizard - persp.newWizSC:org.eclipse.wst.web.ui.internal.wizards.SimpleWebProjectWizard - persp.newWizSC:org.eclipse.jpt.ui.wizard.newJpaProject - persp.newWizSC:org.eclipse.jst.servlet.ui.internal.wizard.AddServletWizard - persp.newWizSC:org.eclipse.jst.ejb.ui.internal.wizard.AddSessionBeanWizard - persp.newWizSC:org.eclipse.jst.ejb.ui.internal.wizard.AddMessageDrivenBeanWizard - persp.newWizSC:org.eclipse.jpt.ui.wizard.newEntity - persp.newWizSC:org.eclipse.jst.ws.creation.ui.wizard.serverwizard - persp.newWizSC:org.eclipse.ui.wizards.new.folder - persp.newWizSC:org.eclipse.ui.wizards.new.file - persp.actionSet:org.eclipse.wst.server.ui.internal.webbrowser.actionSet - persp.actionSet:org.eclipse.debug.ui.breakpointActionSet - persp.newWizSC:org.eclipse.m2e.core.wizards.Maven2ProjectWizard - persp.actionSet:org.eclipse.wst.ws.explorer.explorer - - - newtablook - - - - - - - - - - - newtablook - - - - - - newtablook - org.eclipse.e4.secondaryDataStack - - - - - - - - - - - - - - - - - - - - - - - - View - categoryTag:Help - - - View - categoryTag:General - - ViewMenu - menuContribution:menu - - - - - View - categoryTag:Help - - - - newtablook - org.eclipse.e4.primaryDataStack - EditorStack - - - - - View - categoryTag:General - - ViewMenu - menuContribution:menu - - - - - View - categoryTag:General - - - View - categoryTag:Java - - - View - categoryTag:Java Browsing - - - - View - categoryTag:General - - ViewMenu - menuContribution:menu - - - - - View - categoryTag:General - - - View - categoryTag:Server - - - View - categoryTag:Data Management - - - - View - categoryTag:General - - ViewMenu - menuContribution:menu - - - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:General - - - - View - categoryTag:General - - ViewMenu - menuContribution:menu - - - - - View - categoryTag:Mylyn - - - - View - categoryTag:Java - activeOnClose - - ViewMenu - menuContribution:menu - - - - - - toolbarSeparator - - - - Draggable - - - - - - - - - - - - - - - toolbarSeparator - - - - Draggable - - - - - - - Draggable - - - - - - Draggable - - - - - - - Draggable - - - - - Draggable - - - - - toolbarSeparator - - - - Draggable - - - - - - - - - - - - toolbarSeparator - - - - toolbarSeparator - - - - Draggable - - - - - stretch - - - glue - - - - glue - - - Draggable - - - - - stretch - - - - Draggable - - - - - TrimStack - - - - - - - - - - - - - - - - - - - - - - locale:zh - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - locale:zh - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - locale:zh - - - - - locale:zh - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - platform:win32 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Editor - - - View - categoryTag:Ant - - - View - categoryTag:Data Management - - - View - categoryTag:Data Management - - - View - categoryTag:Data Management - - - View - categoryTag:Debug - - - View - categoryTag:Debug - - - View - categoryTag:Debug - - - View - categoryTag:Debug - - - View - categoryTag:Debug - - - View - categoryTag:Debug - - - View - categoryTag:Debug - - - View - categoryTag:Git - - - View - categoryTag:Git - - - View - categoryTag:Git - - - View - categoryTag:Git - - - View - categoryTag:General - - - View - categoryTag:Help - - - View - categoryTag:Debug - - - View - categoryTag:Java - - - View - categoryTag:Java - - - View - categoryTag:Java - - - View - categoryTag:Java Browsing - - - View - categoryTag:Java Browsing - - - View - categoryTag:Java Browsing - - - View - categoryTag:Java Browsing - - - View - categoryTag:Java - - - View - categoryTag:General - - - View - categoryTag:Java - - - View - categoryTag:Java - - - View - categoryTag:JPA - - - View - categoryTag:JPA - - - View - categoryTag:JavaServer Faces - - - View - categoryTag:JavaServer Faces - - - View - categoryTag:Web Services - - - View - categoryTag:Maven - - - View - categoryTag:Maven - - - View - categoryTag:Mylyn - - - View - categoryTag:Mylyn - - - View - categoryTag:Mylyn - - - View - categoryTag:API Tools - - - View - categoryTag:Plug-in Development - - - View - categoryTag:Plug-in Development - - - View - categoryTag:Plug-in Development - - - View - categoryTag:Plug-in Development - - - View - categoryTag:Plug-in Development - - - View - categoryTag:Remote Systems - - - View - categoryTag:Remote Systems - - - View - categoryTag:Remote Systems - - - View - categoryTag:Remote Systems - - - View - categoryTag:Remote Systems - - - View - categoryTag:Remote Systems - - - View - categoryTag:Remote Systems - - - View - categoryTag:Remote Systems - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:CVS - - - View - categoryTag:CVS - - - View - categoryTag:Team - - - View - categoryTag:Team - - - View - categoryTag:Terminal - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:Help - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:Debug - - - View - categoryTag:JavaScript - - - View - categoryTag:JavaScript - - - View - categoryTag:JavaScript - - - View - categoryTag:JavaScript - - - View - categoryTag:JavaScript - - - View - categoryTag:Server - - - View - categoryTag:XML - - - View - categoryTag:XML - - - View - categoryTag:XML - - - View - categoryTag:XML - - - View - categoryTag:XML - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + activeSchemeId:org.eclipse.ui.defaultAcceleratorConfiguration + + + + + + topLevel + shellMaximized + + + + + persp.actionSet:org.eclipse.mylyn.context.ui.actionSet + persp.actionSet:org.eclipse.mylyn.doc.actionSet + persp.actionSet:org.eclipse.mylyn.tasks.ui.navigation + persp.actionSet:org.eclipse.ui.cheatsheets.actionSet + persp.actionSet:org.eclipse.rse.core.search.searchActionSet + persp.actionSet:org.eclipse.search.searchActionSet + persp.actionSet:org.eclipse.ui.edit.text.actionSet.annotationNavigation + persp.actionSet:org.eclipse.ui.edit.text.actionSet.navigation + persp.actionSet:org.eclipse.ui.edit.text.actionSet.convertLineDelimitersTo + persp.actionSet:org.eclipse.ui.externaltools.ExternalToolsSet + persp.actionSet:org.eclipse.ui.actionSet.keyBindings + persp.actionSet:org.eclipse.ui.actionSet.openFiles + persp.actionSet:org.eclipse.jst.j2ee.J2eeMainActionSet + persp.actionSet:org.eclipse.jdt.ui.JavaActionSet + persp.actionSet:org.eclipse.debug.ui.launchActionSet + persp.actionSet:org.eclipse.debug.ui.debugActionSet + persp.actionSet:org.eclipse.ui.NavigateActionSet + persp.viewSC:org.eclipse.ui.navigator.ProjectExplorer + persp.viewSC:org.eclipse.wst.server.ui.ServersView + persp.viewSC:org.eclipse.datatools.connectivity.DataSourceExplorerNavigator + persp.viewSC:org.eclipse.ui.views.BookmarkView + persp.viewSC:org.eclipse.ui.views.ContentOutline + persp.viewSC:org.eclipse.ui.views.PropertySheet + persp.viewSC:org.eclipse.ui.views.ResourceNavigator + persp.viewSC:org.eclipse.wst.common.snippets.internal.ui.SnippetsView + persp.viewSC:org.eclipse.ui.views.AllMarkersView + persp.viewSC:org.eclipse.mylyn.tasks.ui.views.tasks + persp.viewSC:org.eclipse.search.ui.views.SearchView + persp.viewSC:org.eclipse.ui.console.ConsoleView + persp.showIn:org.eclipse.ui.navigator.ProjectExplorer + persp.newWizSC:org.eclipse.jpt.jpa.ui.wizard.newJpaProject + persp.perspSC:org.eclipse.jpt.ui.jpaPerspective + persp.perspSC:org.eclipse.debug.ui.DebugPerspective + persp.perspSC:org.eclipse.jdt.ui.JavaPerspective + persp.perspSC:org.eclipse.ui.resourcePerspective + persp.perspSC:org.eclipse.wst.web.ui.webDevPerspective + persp.newWizSC:org.eclipse.jst.j2ee.ui.project.facet.EarProjectWizard + persp.newWizSC:org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard + persp.newWizSC:org.eclipse.jst.ejb.ui.project.facet.EjbProjectWizard + persp.newWizSC:org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorProjectWizard + persp.newWizSC:org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientProjectWizard + persp.newWizSC:org.eclipse.wst.web.ui.internal.wizards.SimpleWebProjectWizard + persp.newWizSC:org.eclipse.jpt.ui.wizard.newJpaProject + persp.newWizSC:org.eclipse.jst.servlet.ui.internal.wizard.AddServletWizard + persp.newWizSC:org.eclipse.jst.ejb.ui.internal.wizard.AddSessionBeanWizard + persp.newWizSC:org.eclipse.jst.ejb.ui.internal.wizard.AddMessageDrivenBeanWizard + persp.newWizSC:org.eclipse.jpt.ui.wizard.newEntity + persp.newWizSC:org.eclipse.jst.ws.creation.ui.wizard.serverwizard + persp.newWizSC:org.eclipse.ui.wizards.new.folder + persp.newWizSC:org.eclipse.ui.wizards.new.file + persp.actionSet:org.eclipse.wst.server.ui.internal.webbrowser.actionSet + persp.actionSet:org.eclipse.debug.ui.breakpointActionSet + persp.newWizSC:org.eclipse.m2e.core.wizards.Maven2ProjectWizard + persp.actionSet:org.eclipse.wst.ws.explorer.explorer + + + newtablook + + + + + + + + + + + newtablook + + + + + + newtablook + org.eclipse.e4.secondaryDataStack + + + + + + + + + + + + + + + + + + + + + + + + View + categoryTag:Help + + + View + categoryTag:General + + ViewMenu + menuContribution:menu + + + + + View + categoryTag:Help + + + + newtablook + org.eclipse.e4.primaryDataStack + EditorStack + + + + + View + categoryTag:General + + ViewMenu + menuContribution:menu + + + + + View + categoryTag:General + + + View + categoryTag:Java + + + View + categoryTag:Java Browsing + + + + View + categoryTag:General + + ViewMenu + menuContribution:menu + + + + + View + categoryTag:General + + + View + categoryTag:Server + + + View + categoryTag:Data Management + + + + View + categoryTag:General + + ViewMenu + menuContribution:menu + + + + + View + categoryTag:General + + + View + categoryTag:General + + + View + categoryTag:General + + + View + categoryTag:General + + + View + categoryTag:General + + + View + categoryTag:General + + + + View + categoryTag:General + + ViewMenu + menuContribution:menu + + + + + View + categoryTag:Mylyn + + + + View + categoryTag:Java + activeOnClose + + ViewMenu + menuContribution:menu + + + + + + toolbarSeparator + + + + Draggable + + + + + + + + + + + + + + + toolbarSeparator + + + + Draggable + + + + + + + Draggable + + + + + + Draggable + + + + + + + Draggable + + + + + Draggable + + + + + toolbarSeparator + + + + Draggable + + + + + + + + + + + + toolbarSeparator + + + + toolbarSeparator + + + + Draggable + + + + + stretch + + + glue + + + + glue + + + Draggable + + + + + stretch + + + + Draggable + + + + + TrimStack + + + + + + + + + + + + + + + + + + + + + + locale:zh + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + locale:zh + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + locale:zh + + + + + locale:zh + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + platform:win32 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Editor + + + View + categoryTag:Ant + + + View + categoryTag:Data Management + + + View + categoryTag:Data Management + + + View + categoryTag:Data Management + + + View + categoryTag:Debug + + + View + categoryTag:Debug + + + View + categoryTag:Debug + + + View + categoryTag:Debug + + + View + categoryTag:Debug + + + View + categoryTag:Debug + + + View + categoryTag:Debug + + + View + categoryTag:Git + + + View + categoryTag:Git + + + View + categoryTag:Git + + + View + categoryTag:Git + + + View + categoryTag:General + + + View + categoryTag:Help + + + View + categoryTag:Debug + + + View + categoryTag:Java + + + View + categoryTag:Java + + + View + categoryTag:Java + + + View + categoryTag:Java Browsing + + + View + categoryTag:Java Browsing + + + View + categoryTag:Java Browsing + + + View + categoryTag:Java Browsing + + + View + categoryTag:Java + + + View + categoryTag:General + + + View + categoryTag:Java + + + View + categoryTag:Java + + + View + categoryTag:JPA + + + View + categoryTag:JPA + + + View + categoryTag:JavaServer Faces + + + View + categoryTag:JavaServer Faces + + + View + categoryTag:Web Services + + + View + categoryTag:Maven + + + View + categoryTag:Maven + + + View + categoryTag:Mylyn + + + View + categoryTag:Mylyn + + + View + categoryTag:Mylyn + + + View + categoryTag:API Tools + + + View + categoryTag:Plug-in Development + + + View + categoryTag:Plug-in Development + + + View + categoryTag:Plug-in Development + + + View + categoryTag:Plug-in Development + + + View + categoryTag:Plug-in Development + + + View + categoryTag:Remote Systems + + + View + categoryTag:Remote Systems + + + View + categoryTag:Remote Systems + + + View + categoryTag:Remote Systems + + + View + categoryTag:Remote Systems + + + View + categoryTag:Remote Systems + + + View + categoryTag:Remote Systems + + + View + categoryTag:Remote Systems + + + View + categoryTag:General + + + View + categoryTag:General + + + View + categoryTag:CVS + + + View + categoryTag:CVS + + + View + categoryTag:Team + + + View + categoryTag:Team + + + View + categoryTag:Terminal + + + View + categoryTag:General + + + View + categoryTag:General + + + View + categoryTag:Help + + + View + categoryTag:General + + + View + categoryTag:General + + + View + categoryTag:General + + + View + categoryTag:General + + + View + categoryTag:General + + + View + categoryTag:General + + + View + categoryTag:General + + + View + categoryTag:General + + + View + categoryTag:General + + + View + categoryTag:General + + + View + categoryTag:General + + + View + categoryTag:General + + + View + categoryTag:Debug + + + View + categoryTag:JavaScript + + + View + categoryTag:JavaScript + + + View + categoryTag:JavaScript + + + View + categoryTag:JavaScript + + + View + categoryTag:JavaScript + + + View + categoryTag:Server + + + View + categoryTag:XML + + + View + categoryTag:XML + + + View + categoryTag:XML + + + View + categoryTag:XML + + + View + categoryTag:XML + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml b/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml index a4ee3cbc..6cd95629 100644 --- a/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml +++ b/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml @@ -1,2 +1,2 @@ - - + + diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml b/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml index 9e390f50..8c365b72 100644 --- a/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml +++ b/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml @@ -1,2 +1,2 @@ - - + + diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml b/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml index 86bcee4f..528dc13a 100644 --- a/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml +++ b/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml @@ -1,10 +1,10 @@ - -
-
- - - - - -
-
+ +
+
+ + + + + +
+
diff --git a/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.4.0.20130601-0317.xml b/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.4.0.20130601-0317.xml index e0de5155..d21ad94e 100644 --- a/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.4.0.20130601-0317.xml +++ b/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.4.0.20130601-0317.xml @@ -1,41 +1,41 @@ - - - - %date [%thread] %-5level %logger{35} - %msg%n - - - - - - ${org.eclipse.m2e.log.dir}/0.log - - ${org.eclipse.m2e.log.dir}/%i.log - 1 - 10 - - - 100MB - - - %date [%thread] %-5level %logger{35} - %msg%n - - - - - - WARN - - - - - - - - - - - - - - - + + + + %date [%thread] %-5level %logger{35} - %msg%n + + + + + + ${org.eclipse.m2e.log.dir}/0.log + + ${org.eclipse.m2e.log.dir}/%i.log + 1 + 10 + + + 100MB + + + %date [%thread] %-5level %logger{35} - %msg%n + + + + + + WARN + + + + + + + + + + + + + + + diff --git a/.metadata/.plugins/org.eclipse.rse.core/profiles/PRF.desktop-65kj4bv_32539/FP.local.files_0/node.properties b/.metadata/.plugins/org.eclipse.rse.core/profiles/PRF.desktop-65kj4bv_32539/FP.local.files_0/node.properties index 4312c4a6..661ad5cb 100644 --- a/.metadata/.plugins/org.eclipse.rse.core/profiles/PRF.desktop-65kj4bv_32539/FP.local.files_0/node.properties +++ b/.metadata/.plugins/org.eclipse.rse.core/profiles/PRF.desktop-65kj4bv_32539/FP.local.files_0/node.properties @@ -1,57 +1,57 @@ -# RSE DOM Node -00-name=DESKTOP-65KJ4BV\:local.files -01-type=FilterPool -03-attr.default=true -03-attr.deletable=true -03-attr.id=local.files -03-attr.nonRenamable=false -03-attr.owningParentName=null -03-attr.release=200 -03-attr.singleFilterStringOnly=false -03-attr.singleFilterStringOnlyESet=false -03-attr.stringsCaseSensitive=true -03-attr.supportsDuplicateFilterStrings=false -03-attr.supportsNestedFilters=true -03-attr.type=default -06-child.00000.00-name=My Home -06-child.00000.01-type=Filter -06-child.00000.03-attr.default=false -06-child.00000.03-attr.filterType=default -06-child.00000.03-attr.id=My Home -06-child.00000.03-attr.nonChangable=false -06-child.00000.03-attr.nonDeletable=false -06-child.00000.03-attr.nonRenamable=false -06-child.00000.03-attr.promptable=false -06-child.00000.03-attr.relativeOrder=0 -06-child.00000.03-attr.release=200 -06-child.00000.03-attr.singleFilterStringOnly=false -06-child.00000.03-attr.stringsCaseSensitive=false -06-child.00000.03-attr.stringsNonChangable=false -06-child.00000.03-attr.supportsDuplicateFilterStrings=false -06-child.00000.03-attr.supportsNestedFilters=true -06-child.00000.06-child.00000.00-name=C\:\\Users\\wuming\\* -06-child.00000.06-child.00000.01-type=FilterString -06-child.00000.06-child.00000.03-attr.default=false -06-child.00000.06-child.00000.03-attr.string=C\:\\Users\\wuming\\* -06-child.00000.06-child.00000.03-attr.type=default -06-child.00001.00-name=Drives -06-child.00001.01-type=Filter -06-child.00001.03-attr.default=false -06-child.00001.03-attr.filterType=default -06-child.00001.03-attr.id=Drives -06-child.00001.03-attr.nonChangable=false -06-child.00001.03-attr.nonDeletable=false -06-child.00001.03-attr.nonRenamable=false -06-child.00001.03-attr.promptable=false -06-child.00001.03-attr.relativeOrder=0 -06-child.00001.03-attr.release=200 -06-child.00001.03-attr.singleFilterStringOnly=false -06-child.00001.03-attr.stringsCaseSensitive=false -06-child.00001.03-attr.stringsNonChangable=false -06-child.00001.03-attr.supportsDuplicateFilterStrings=false -06-child.00001.03-attr.supportsNestedFilters=true -06-child.00001.06-child.00000.00-name=* -06-child.00001.06-child.00000.01-type=FilterString -06-child.00001.06-child.00000.03-attr.default=false -06-child.00001.06-child.00000.03-attr.string=* -06-child.00001.06-child.00000.03-attr.type=default +# RSE DOM Node +00-name=DESKTOP-65KJ4BV\:local.files +01-type=FilterPool +03-attr.default=true +03-attr.deletable=true +03-attr.id=local.files +03-attr.nonRenamable=false +03-attr.owningParentName=null +03-attr.release=200 +03-attr.singleFilterStringOnly=false +03-attr.singleFilterStringOnlyESet=false +03-attr.stringsCaseSensitive=true +03-attr.supportsDuplicateFilterStrings=false +03-attr.supportsNestedFilters=true +03-attr.type=default +06-child.00000.00-name=My Home +06-child.00000.01-type=Filter +06-child.00000.03-attr.default=false +06-child.00000.03-attr.filterType=default +06-child.00000.03-attr.id=My Home +06-child.00000.03-attr.nonChangable=false +06-child.00000.03-attr.nonDeletable=false +06-child.00000.03-attr.nonRenamable=false +06-child.00000.03-attr.promptable=false +06-child.00000.03-attr.relativeOrder=0 +06-child.00000.03-attr.release=200 +06-child.00000.03-attr.singleFilterStringOnly=false +06-child.00000.03-attr.stringsCaseSensitive=false +06-child.00000.03-attr.stringsNonChangable=false +06-child.00000.03-attr.supportsDuplicateFilterStrings=false +06-child.00000.03-attr.supportsNestedFilters=true +06-child.00000.06-child.00000.00-name=C\:\\Users\\wuming\\* +06-child.00000.06-child.00000.01-type=FilterString +06-child.00000.06-child.00000.03-attr.default=false +06-child.00000.06-child.00000.03-attr.string=C\:\\Users\\wuming\\* +06-child.00000.06-child.00000.03-attr.type=default +06-child.00001.00-name=Drives +06-child.00001.01-type=Filter +06-child.00001.03-attr.default=false +06-child.00001.03-attr.filterType=default +06-child.00001.03-attr.id=Drives +06-child.00001.03-attr.nonChangable=false +06-child.00001.03-attr.nonDeletable=false +06-child.00001.03-attr.nonRenamable=false +06-child.00001.03-attr.promptable=false +06-child.00001.03-attr.relativeOrder=0 +06-child.00001.03-attr.release=200 +06-child.00001.03-attr.singleFilterStringOnly=false +06-child.00001.03-attr.stringsCaseSensitive=false +06-child.00001.03-attr.stringsNonChangable=false +06-child.00001.03-attr.supportsDuplicateFilterStrings=false +06-child.00001.03-attr.supportsNestedFilters=true +06-child.00001.06-child.00000.00-name=* +06-child.00001.06-child.00000.01-type=FilterString +06-child.00001.06-child.00000.03-attr.default=false +06-child.00001.06-child.00000.03-attr.string=* +06-child.00001.06-child.00000.03-attr.type=default diff --git a/.metadata/.plugins/org.eclipse.rse.core/profiles/PRF.desktop-65kj4bv_32539/H.local_16/node.properties b/.metadata/.plugins/org.eclipse.rse.core/profiles/PRF.desktop-65kj4bv_32539/H.local_16/node.properties index e469a944..2f742f51 100644 --- a/.metadata/.plugins/org.eclipse.rse.core/profiles/PRF.desktop-65kj4bv_32539/H.local_16/node.properties +++ b/.metadata/.plugins/org.eclipse.rse.core/profiles/PRF.desktop-65kj4bv_32539/H.local_16/node.properties @@ -1,25 +1,25 @@ -# RSE DOM Node -00-name=Local -01-type=Host -03-attr.description= -03-attr.hostname=LOCALHOST -03-attr.offline=false -03-attr.promptable=false -03-attr.systemType=org.eclipse.rse.systemtype.local -03-attr.type=Local -06-child.00000.00-name=Local Connector Service -06-child.00000.01-type=ConnectorService -06-child.00000.03-attr.group=Local Connector Service -06-child.00000.03-attr.port=0 -06-child.00000.03-attr.useSSL=false -06-child.00000.06-child.00000.00-name=Local Files -06-child.00000.06-child.00000.01-type=SubSystem -06-child.00000.06-child.00000.03-attr.hidden=false -06-child.00000.06-child.00000.03-attr.type=local.files -06-child.00000.06-child.00000.06-child.00000.00-name=DESKTOP-65KJ4BV___DESKTOP-65KJ4BV\:local.files -06-child.00000.06-child.00000.06-child.00000.01-type=FilterPoolReference -06-child.00000.06-child.00000.06-child.00000.03-attr.refID=local.files -06-child.00000.06-child.00001.00-name=Local Shells -06-child.00000.06-child.00001.01-type=SubSystem -06-child.00000.06-child.00001.03-attr.hidden=false -06-child.00000.06-child.00001.03-attr.type=local.shells +# RSE DOM Node +00-name=Local +01-type=Host +03-attr.description= +03-attr.hostname=LOCALHOST +03-attr.offline=false +03-attr.promptable=false +03-attr.systemType=org.eclipse.rse.systemtype.local +03-attr.type=Local +06-child.00000.00-name=Local Connector Service +06-child.00000.01-type=ConnectorService +06-child.00000.03-attr.group=Local Connector Service +06-child.00000.03-attr.port=0 +06-child.00000.03-attr.useSSL=false +06-child.00000.06-child.00000.00-name=Local Files +06-child.00000.06-child.00000.01-type=SubSystem +06-child.00000.06-child.00000.03-attr.hidden=false +06-child.00000.06-child.00000.03-attr.type=local.files +06-child.00000.06-child.00000.06-child.00000.00-name=DESKTOP-65KJ4BV___DESKTOP-65KJ4BV\:local.files +06-child.00000.06-child.00000.06-child.00000.01-type=FilterPoolReference +06-child.00000.06-child.00000.06-child.00000.03-attr.refID=local.files +06-child.00000.06-child.00001.00-name=Local Shells +06-child.00000.06-child.00001.01-type=SubSystem +06-child.00000.06-child.00001.03-attr.hidden=false +06-child.00000.06-child.00001.03-attr.type=local.shells diff --git a/.metadata/.plugins/org.eclipse.rse.core/profiles/PRF.desktop-65kj4bv_32539/node.properties b/.metadata/.plugins/org.eclipse.rse.core/profiles/PRF.desktop-65kj4bv_32539/node.properties index 9237cbe5..53c9f43d 100644 --- a/.metadata/.plugins/org.eclipse.rse.core/profiles/PRF.desktop-65kj4bv_32539/node.properties +++ b/.metadata/.plugins/org.eclipse.rse.core/profiles/PRF.desktop-65kj4bv_32539/node.properties @@ -1,7 +1,7 @@ -# RSE DOM Node -00-name=DESKTOP-65KJ4BV -01-type=Profile -03-attr.defaultPrivate=true -03-attr.isActive=true -05-ref.00000=FP.local.files_0 -05-ref.00001=H.local_16 +# RSE DOM Node +00-name=DESKTOP-65KJ4BV +01-type=Profile +03-attr.defaultPrivate=true +03-attr.isActive=true +05-ref.00000=FP.local.files_0 +05-ref.00001=H.local_16 diff --git a/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml b/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml index 8ce2f5ca..d4cd801d 100644 --- a/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml +++ b/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml @@ -1,28 +1,28 @@ - -
-
- - - - - - - - - - -
-
- - - - - - - - - -
-
-
-
+ +
+
+ + + + + + + + + + +
+
+ + + + + + + + + +
+
+
+
diff --git a/.project b/.project index ed1fe4a2..c9ff485b 100644 --- a/.project +++ b/.project @@ -1,41 +1,41 @@ - - - data_manager_backend - - - - - - org.eclipse.wst.jsdt.core.javascriptValidator - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - com.genuitec.eclipse.ast.deploy.core.DeploymentBuilder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.jsdt.core.jsNature - - + + + data_manager_backend + + + + + + org.eclipse.wst.jsdt.core.javascriptValidator + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.wst.validation.validationbuilder + + + + + com.genuitec.eclipse.ast.deploy.core.DeploymentBuilder + + + + + + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.jdt.core.javanature + org.eclipse.wst.jsdt.core.jsNature + + diff --git a/WebContent/META-INF/MANIFEST.MF b/WebContent/META-INF/MANIFEST.MF index 254272e1..5e949512 100644 --- a/WebContent/META-INF/MANIFEST.MF +++ b/WebContent/META-INF/MANIFEST.MF @@ -1,3 +1,3 @@ -Manifest-Version: 1.0 -Class-Path: - +Manifest-Version: 1.0 +Class-Path: + diff --git a/WebContent/WEB-INF/config/config.properties b/WebContent/WEB-INF/config/config.properties index 050f4bfa..04910986 100644 --- a/WebContent/WEB-INF/config/config.properties +++ b/WebContent/WEB-INF/config/config.properties @@ -1,50 +1,50 @@ -#============================================================================================================= -# MySQL -#============================================================================================================= -# 驱动程序 -jdbc.mysql.driver=com.mysql.jdbc.Driver -# 连接url -jdbc.mysql.url=jdbc:mysql://192.168.0.101:3306/test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true -# 用户名 -jdbc.mysql.username=root -# 密码 -jdbc.mysql.password=root - -#============================================================================================================= -# Oracle 连接配置 -#============================================================================================================= -# hui用户名 -gather-user-name=system -# 密码 -gather-user-password=oracle -# -gather-port=1521 -# -gather-service-name=orcl -#============================================================================================================= -# 数据库公共配置 -#============================================================================================================= -jdbc.initialSize=5 -jdbc.minIdle=5 -jdbc.maxIdle=20 -jdbc.maxActive=100 -jdbc.maxWait=100000 -jdbc.defaultAutoCommit=false -jdbc.removeAbandoned=true -jdbc.removeAbandonedTimeout=600 -jdbc.testWhileIdle=true -jdbc.timeBetweenEvictionRunsMillis=60000 -jdbc.numTestsPerEvictionRun=20 -jdbc.minEvictableIdleTimeMillis=300000 -#============================================================================================================== -# -#============================================================================================================== -table-suffix=_20152016 -extract-log-localtion=/home/log/ -gather-tablespace-name=TS_TTSSS -gather-tablespace-path= -gather-table-user-password= -kubeMasterUrl=http://192.168.0.110:8080/ -collect-user-name=system -collect-password=oracle -collect-service-name=orcl +#============================================================================================================= +# MySQL +#============================================================================================================= +# 驱动程序 +jdbc.mysql.driver=com.mysql.jdbc.Driver +# 连接url +jdbc.mysql.url=jdbc:mysql://192.168.0.101:3306/test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true +# 用户名 +jdbc.mysql.username=root +# 密码 +jdbc.mysql.password=root + +#============================================================================================================= +# Oracle 连接配置 +#============================================================================================================= +# hui用户名 +gather-user-name=system +# 密码 +gather-user-password=oracle +# +gather-port=1521 +# +gather-service-name=orcl +#============================================================================================================= +# 数据库公共配置 +#============================================================================================================= +jdbc.initialSize=5 +jdbc.minIdle=5 +jdbc.maxIdle=20 +jdbc.maxActive=100 +jdbc.maxWait=100000 +jdbc.defaultAutoCommit=false +jdbc.removeAbandoned=true +jdbc.removeAbandonedTimeout=600 +jdbc.testWhileIdle=true +jdbc.timeBetweenEvictionRunsMillis=60000 +jdbc.numTestsPerEvictionRun=20 +jdbc.minEvictableIdleTimeMillis=300000 +#============================================================================================================== +# +#============================================================================================================== +table-suffix=_20152016 +extract-log-localtion=/home/log/ +gather-tablespace-name=TS_TTSSS +gather-tablespace-path= +gather-table-user-password= +kubeMasterUrl=http://192.168.0.110:8080/ +collect-user-name=system +collect-password=oracle +collect-service-name=orcl diff --git a/WebContent/WEB-INF/config/getTreedata.sh b/WebContent/WEB-INF/config/getTreedata.sh index d486a449..0e24ad6c 100644 --- a/WebContent/WEB-INF/config/getTreedata.sh +++ b/WebContent/WEB-INF/config/getTreedata.sh @@ -1,17 +1,17 @@ -#!/bin/bash -function ergodic(){ - for file in `ls $1` - do - if [ "$file" != "app" -a -d $1"/"$file ] - then - ergodic $1"/"$file - else - local path=$1"/"$file - echo $path - fi - done -} - -IFS=$'\n' #这个必须要，否则会在文件名中有空格时出错 -INIT_PATH="."; +#!/bin/bash +function ergodic(){ + for file in `ls $1` + do + if [ "$file" != "app" -a -d $1"/"$file ] + then + ergodic $1"/"$file + else + local path=$1"/"$file + echo $path + fi + done +} + +IFS=$'\n' #这个必须要，否则会在文件名中有空格时出错 +INIT_PATH="."; ergodic $1 \ No newline at end of file diff --git a/WebContent/WEB-INF/config/log4j-config.xml b/WebContent/WEB-INF/config/log4j-config.xml index d02e5918..55b0cb0f 100644 --- a/WebContent/WEB-INF/config/log4j-config.xml +++ b/WebContent/WEB-INF/config/log4j-config.xml @@ -1,68 +1,68 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebContent/WEB-INF/config/mybatis-applicationConfig.xml b/WebContent/WEB-INF/config/mybatis-applicationConfig.xml index d7bc4f95..4bb8e731 100644 --- a/WebContent/WEB-INF/config/mybatis-applicationConfig.xml +++ b/WebContent/WEB-INF/config/mybatis-applicationConfig.xml @@ -1,22 +1,22 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebContent/WEB-INF/config/spring-applicationContext.xml b/WebContent/WEB-INF/config/spring-applicationContext.xml index fc462369..024e203f 100644 --- a/WebContent/WEB-INF/config/spring-applicationContext.xml +++ b/WebContent/WEB-INF/config/spring-applicationContext.xml @@ -1,93 +1,93 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebContent/WEB-INF/config/springmvc-applicationContext.xml b/WebContent/WEB-INF/config/springmvc-applicationContext.xml index 25517806..2290481e 100644 --- a/WebContent/WEB-INF/config/springmvc-applicationContext.xml +++ b/WebContent/WEB-INF/config/springmvc-applicationContext.xml @@ -1,57 +1,57 @@ - - - - - - - - - - - - - - - - - application/json;charset=UTF-8 - text/html;charset=UTF-8 - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + application/json;charset=UTF-8 + text/html;charset=UTF-8 + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index ce73380c..2d425519 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -1,66 +1,66 @@ - - - javaBackend - - /index.html - - - - CharacterEncodingFilter - org.springframework.web.filter.CharacterEncodingFilter - - encoding - UTF-8 - - - - CharacterEncodingFilter - / - - - - - contextConfigLocation - WEB-INF/config/spring-applicationContext.xml - - - org.springframework.web.context.ContextLoaderListener - - - - com.platform.utils.ConfigsLoader - - - - - springmvc - org.springframework.web.servlet.DispatcherServlet - - contextConfigLocation - /WEB-INF/config/springmvc-applicationContext.xml - - 1 - true - - - springmvc - / - - - - - log4jConfigLocation - /WEB-INF/config/log4j-config.xml - - - org.springframework.web.util.Log4jConfigListener - - - - + + + javaBackend + + /index.html + + + + CharacterEncodingFilter + org.springframework.web.filter.CharacterEncodingFilter + + encoding + UTF-8 + + + + CharacterEncodingFilter + / + + + + + contextConfigLocation + WEB-INF/config/spring-applicationContext.xml + + + org.springframework.web.context.ContextLoaderListener + + + + com.platform.utils.ConfigsLoader + + + + + springmvc + org.springframework.web.servlet.DispatcherServlet + + contextConfigLocation + /WEB-INF/config/springmvc-applicationContext.xml + + 1 + true + + + springmvc + / + + + + + log4jConfigLocation + /WEB-INF/config/log4j-config.xml + + + org.springframework.web.util.Log4jConfigListener + + + + \ No newline at end of file diff --git a/src/com/base/BaseController.java b/src/com/base/BaseController.java index 8a98dcfd..88ef5f48 100644 --- a/src/com/base/BaseController.java +++ b/src/com/base/BaseController.java @@ -1,65 +1,65 @@ - -/** - * 文件名 ： BaseController.java - * 版权 : XX科技有限公司。 - * 描述 : <描述> - * 修改时间：2016年9月7日 - * 修改内容：<修改内容> - */ -package com.base; - -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.log4j.Logger; -import org.springframework.web.bind.annotation.ExceptionHandler; - -import com.platform.utils.Configs; - -/** - * <一句话功能简述> - * <功能详细描述> - * @author chen - * @version [版本号，2016年9月7日] - * @see [相关类/方法] - * @since [产品/模块版本] - */ -public class BaseController { - - /** log4j */ - public static Logger log = Logger.getRootLogger(); - - /** - * <一句话功能简述> 基于@ExceptionHandler异常处理----全局异常处理 - * <功能详细描述> - * @param request - * @param ex 异常 - * @return - * @see [类、类#方法、类#成员] - */ - @ExceptionHandler - public Object exp(HttpServletRequest request, HttpServletResponse response,Exception ex) { - System.out.println("URI"+request.getRequestURI()); - request.setAttribute("ex", ex); - System.err.println("BaseController --exp "); - // 根据不同错误转向不同页面 - if(ex instanceof CustomException) { - CustomException cuse = (CustomException) ex; - Map errmsg = new HashMap<>(); - errmsg.put("code", cuse.getCode()); - errmsg.put("msg", cuse.getMsg()); - log.error(cuse.getCode()); - response.setStatus(500); - return response; - } else { - //其他错误则 调到指定页面 - log.error(Configs.GLOBAL_EXP_NOT_CUSTOM, ex); - response.setStatus(500); - return response; - } - } - + +/** + * 文件名 ： BaseController.java + * 版权 : XX科技有限公司。 + * 描述 : <描述> + * 修改时间：2016年9月7日 + * 修改内容：<修改内容> + */ +package com.base; + +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.log4j.Logger; +import org.springframework.web.bind.annotation.ExceptionHandler; + +import com.platform.utils.Configs; + +/** + * <一句话功能简述> + * <功能详细描述> + * @author chen + * @version [版本号，2016年9月7日] + * @see [相关类/方法] + * @since [产品/模块版本] + */ +public class BaseController { + + /** log4j */ + public static Logger log = Logger.getRootLogger(); + + /** + * <一句话功能简述> 基于@ExceptionHandler异常处理----全局异常处理 + * <功能详细描述> + * @param request + * @param ex 异常 + * @return + * @see [类、类#方法、类#成员] + */ + @ExceptionHandler + public Object exp(HttpServletRequest request, HttpServletResponse response,Exception ex) { + System.out.println("URI"+request.getRequestURI()); + request.setAttribute("ex", ex); + System.err.println("BaseController --exp " + ex); + // 根据不同错误转向不同页面 + if(ex instanceof CustomException) { + CustomException cuse = (CustomException) ex; + Map errmsg = new HashMap<>(); + errmsg.put("code", cuse.getCode()); + errmsg.put("msg", cuse.getMsg()); + log.error(cuse.getCode()); + response.setStatus(500); + return response; + } else { + //其他错误则 调到指定页面 + log.error(Configs.GLOBAL_EXP_NOT_CUSTOM, ex); + response.setStatus(500); + return response; + } + } + } \ No newline at end of file diff --git a/src/com/platform/controller/DataModelController.java b/src/com/platform/controller/DataModelController.java index ff0b7a93..418ed466 100644 --- a/src/com/platform/controller/DataModelController.java +++ b/src/com/platform/controller/DataModelController.java @@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import com.base.BaseController; @@ -329,4 +330,15 @@ public class DataModelController extends BaseController{ Map result = codeService.findAll(); return result; } + + @RequestMapping(value = "/oracle/extract/log", method= RequestMethod.POST ) + @ResponseBody + public Object getExtractLog(@RequestParam("rcName") String name, HttpServletRequest res, HttpServletResponse req){ + log.info("---------/oracle/extract/log-------------------"); + StringBuilder sb = new StringBuilder(); + sb.append("查看相应日志").append("\n").append("看到了"); + Map log = new HashMap<>(); + log.put(name, sb.toString()); + return log; + } } diff --git a/src/com/platform/service/impl/MoveDataServiceImpl.java b/src/com/platform/service/impl/MoveDataServiceImpl.java index 23e78c41..163d86b3 100644 --- a/src/com/platform/service/impl/MoveDataServiceImpl.java +++ b/src/com/platform/service/impl/MoveDataServiceImpl.java @@ -1,174 +1,174 @@ -package com.platform.service.impl; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import javax.annotation.Resource; - -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; -import org.springframework.stereotype.Service; - -import com.platform.dao.DataInfoDao; -import com.platform.dao.DataInfoMoveTmpDao; -import com.platform.entities.DataInfoEntity; -import com.platform.entities.DataInfoEntityMoveTmp; -import com.platform.entities.FolderNode; -import com.platform.glusterfs.CheckoutMD5; -import com.platform.glusterfs.CopyData; -import com.platform.glusterfs.RemoveData; -import com.platform.glusterfs.ShowData; -import com.platform.service.IMoveDataService; -import com.platform.utils.Bean2MapUtils; -import com.platform.utils.Constant; -import com.platform.utils.DateForm; - -@Component -@Service(value = "moveDataService") -public class MoveDataServiceImpl implements IMoveDataService { - - @Resource(name = "dataInfoDao") - private DataInfoDao dataInfoDao; - - private RemoveData removeservice = new RemoveData(); - - /** - * 迁移 - */ - CopyData copy = new CopyData(); - - /** - * MD5校验 - */ - CheckoutMD5 check = new CheckoutMD5(); - - @Resource(name = "dataInfoMoveTmpDao") - private DataInfoMoveTmpDao dataInfoMoveTmpDao; - - /** - * 查看数据 - */ - ShowData show = new ShowData(); - - @Override - public boolean moveData(List data, FolderNode node) - throws Exception { - boolean isSuccess = false; - String tailPath = ""; - if (null != data) { - // XXX/320198_16/1,or XXX/320122KFQ_15/1 ---> /320198_16/1, or - // /320122KFQ_15/1 - List exist = dataInfoMoveTmpDao.findAll(); - List existIds = new ArrayList(); - if (null != exist) { - for (DataInfoEntityMoveTmp dataInfoEntityMoveTmp : exist) { - if ("0".equals(dataInfoEntityMoveTmp.getCompleteStatus()) - || "1".equals(dataInfoEntityMoveTmp - .getCompleteStatus())) { - if (null != dataInfoEntityMoveTmp.getDataPath()) { - existIds.add(dataInfoEntityMoveTmp.getDataPath()); - } - } - } - } - Pattern pattern = Pattern - .compile("\\/\\d+[a-z]*[A-Z]*_\\d+\\/\\d*\\/*$"); - // 末尾 含有 / - Pattern pattern2 = Pattern.compile("\\/$"); - String dstPath = node.getPath(); - Matcher matcher2 = pattern2.matcher(dstPath); - // 去掉 最后 的 / 符合 - if (matcher2.find()) { - dstPath = dstPath.substring(0, dstPath.length() - 1); - } - List moveList = new ArrayList(); - for (DataInfoEntity dataInfoEntity : data) { - if (existIds.contains(dataInfoEntity.getDataPath())) { - continue; - } - // TODO 正则：取出 data 的后面 的 路径，eg: XXX/320198_16/1,or - // XXX/320122KFQ_15/1） - Matcher matcher = pattern.matcher(dataInfoEntity.getDataPath()); - // tailPath 第一个字符是 / 符号取尾："\\/\\d+[a-z]*[A-Z]*_\\d+\\/\\d*\\/*$" - if (matcher.find()) { - tailPath = matcher.group(); - } - String finalDestPath = dstPath + tailPath; - Matcher matchertmp2 = pattern2.matcher(finalDestPath); - // 去掉 最后 的 / 符合 - if (!matchertmp2.find()) { - finalDestPath = finalDestPath + "/"; - } - DataInfoEntityMoveTmp dataMove = new DataInfoEntityMoveTmp(); - dataMove.setSystemCode(dataInfoEntity.getSystemCode()); - dataMove.setRegionalismCode(dataInfoEntity.getRegionalismCode()); - dataMove.setDstPath(finalDestPath); - dataMove.setLastTime(DateForm.date2StringBysecond(new Date())); - dataMove.setFkid(dataInfoEntity.getId()); - dataMove.setVolumePath(node.getName()); - moveList.add(dataMove); - } - if (moveList.size() > 0) { - dataInfoMoveTmpDao.insertBatch(moveList); - isSuccess = true; - } - } - return isSuccess; - } - - @Override - public List findAll() throws Exception { - List result = new ArrayList(); - try { - result = dataInfoMoveTmpDao.findAll(); - - } catch (Exception e) { - System.err.println(e); - } - return result; - } - - @Override - public int delete(DataInfoEntityMoveTmp dataMove) throws Exception { - List list = dataInfoMoveTmpDao.findAll(); - if (null != list) { - for (DataInfoEntityMoveTmp dataInfoEntityMoveTmp : list) { - if (dataMove.getId() == dataInfoEntityMoveTmp.getId()) { - dataMove = dataInfoEntityMoveTmp; - break; - } - } - - } - if ("3".equals(dataMove.getCompleteStatus())) { - removeservice.deleteFolder(dataMove.getDstPath()); - } - int result = 0; - if (!"1".equals(dataMove.getCompleteStatus())) { - result = dataInfoMoveTmpDao.remove(dataMove.getId()); - } - return result; - } - - @Override - public int save(DataInfoEntityMoveTmp data) throws Exception { - dataInfoMoveTmpDao.save(data); - return 0; - } - - @Override - public int insertBatch(List list) throws Exception { - // TODO Auto-generated method stub - return 0; - } - - @Override - public int update(DataInfoEntityMoveTmp data) throws Exception { - int result = dataInfoMoveTmpDao.update(data); - return result; - } - -} +package com.platform.service.impl; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javax.annotation.Resource; + +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; +import org.springframework.stereotype.Service; + +import com.platform.dao.DataInfoDao; +import com.platform.dao.DataInfoMoveTmpDao; +import com.platform.entities.DataInfoEntity; +import com.platform.entities.DataInfoEntityMoveTmp; +import com.platform.entities.FolderNode; +import com.platform.glusterfs.CheckoutMD5; +import com.platform.glusterfs.CopyData; +import com.platform.glusterfs.RemoveData; +import com.platform.glusterfs.ShowData; +import com.platform.service.IMoveDataService; +import com.platform.utils.Bean2MapUtils; +import com.platform.utils.Constant; +import com.platform.utils.DateForm; + +@Component +@Service(value = "moveDataService") +public class MoveDataServiceImpl implements IMoveDataService { + + @Resource(name = "dataInfoDao") + private DataInfoDao dataInfoDao; + + private RemoveData removeservice = new RemoveData(); + + /** + * 迁移 + */ + CopyData copy = new CopyData(); + + /** + * MD5校验 + */ + CheckoutMD5 check = new CheckoutMD5(); + + @Resource(name = "dataInfoMoveTmpDao") + private DataInfoMoveTmpDao dataInfoMoveTmpDao; + + /** + * 查看数据 + */ + ShowData show = new ShowData(); + + @Override + public boolean moveData(List data, FolderNode node) + throws Exception { + boolean isSuccess = false; + String tailPath = ""; + if (null != data) { + // XXX/320198_16/1,or XXX/320122KFQ_15/1 ---> /320198_16/1, or + // /320122KFQ_15/1 + List exist = dataInfoMoveTmpDao.findAll(); + List existIds = new ArrayList(); + if (null != exist) { + for (DataInfoEntityMoveTmp dataInfoEntityMoveTmp : exist) { + if ("0".equals(dataInfoEntityMoveTmp.getCompleteStatus()) + || "1".equals(dataInfoEntityMoveTmp + .getCompleteStatus())) { + if (null != dataInfoEntityMoveTmp.getDataPath()) { + existIds.add(dataInfoEntityMoveTmp.getDataPath()); + } + } + } + } + Pattern pattern = Pattern + .compile("\\/\\d+[a-z]*[A-Z]*_\\d+\\/\\d*\\/*$"); + // 末尾 含有 / + Pattern pattern2 = Pattern.compile("\\/$"); + String dstPath = node.getPath(); + Matcher matcher2 = pattern2.matcher(dstPath); + // 去掉 最后 的 / 符合 + if (matcher2.find()) { + dstPath = dstPath.substring(0, dstPath.length() - 1); + } + List moveList = new ArrayList(); + for (DataInfoEntity dataInfoEntity : data) { + if (existIds.contains(dataInfoEntity.getDataPath())) { + continue; + } + // TODO 正则：取出 data 的后面 的 路径，eg: XXX/320198_16/1,or + // XXX/320122KFQ_15/1） + Matcher matcher = pattern.matcher(dataInfoEntity.getDataPath()); + // tailPath 第一个字符是 / 符号取尾："\\/\\d+[a-z]*[A-Z]*_\\d+\\/\\d*\\/*$" + if (matcher.find()) { + tailPath = matcher.group(); + } + String finalDestPath = dstPath + tailPath; + Matcher matchertmp2 = pattern2.matcher(finalDestPath); + // 去掉 最后 的 / 符合 + if (!matchertmp2.find()) { + finalDestPath = finalDestPath + "/"; + } + DataInfoEntityMoveTmp dataMove = new DataInfoEntityMoveTmp(); + dataMove.setSystemCode(dataInfoEntity.getSystemCode()); + dataMove.setRegionalismCode(dataInfoEntity.getRegionalismCode()); + dataMove.setDstPath(finalDestPath); + dataMove.setLastTime(DateForm.date2StringBysecond(new Date())); + dataMove.setFkid(dataInfoEntity.getId()); + dataMove.setVolumePath(node.getName()); + moveList.add(dataMove); + } + if (moveList.size() > 0) { + dataInfoMoveTmpDao.insertBatch(moveList); + isSuccess = true; + } + } + return isSuccess; + } + + @Override + public List findAll() throws Exception { + List result = new ArrayList(); + try { + result = dataInfoMoveTmpDao.findAll(); + + } catch (Exception e) { + System.err.println(e); + } + return result; + } + + @Override + public int delete(DataInfoEntityMoveTmp dataMove) throws Exception { + List list = dataInfoMoveTmpDao.findAll(); + if (null != list) { + for (DataInfoEntityMoveTmp dataInfoEntityMoveTmp : list) { + if (dataMove.getId() == dataInfoEntityMoveTmp.getId()) { + dataMove = dataInfoEntityMoveTmp; + break; + } + } + + } + if ("3".equals(dataMove.getCompleteStatus())) { + removeservice.deleteFolder(dataMove.getDstPath()); + } + int result = 0; + if (!"1".equals(dataMove.getCompleteStatus())) { + result = dataInfoMoveTmpDao.remove(dataMove.getId()); + } + return result; + } + + @Override + public int save(DataInfoEntityMoveTmp data) throws Exception { + dataInfoMoveTmpDao.save(data); + return 0; + } + + @Override + public int insertBatch(List list) throws Exception { + // TODO Auto-generated method stub + return 0; + } + + @Override + public int update(DataInfoEntityMoveTmp data) throws Exception { + int result = dataInfoMoveTmpDao.update(data); + return result; + } + +} diff --git a/src/com/platform/service/impl/OracleExtractServiceImpl.java b/src/com/platform/service/impl/OracleExtractServiceImpl.java index 26c5ba86..053001e9 100644 --- a/src/com/platform/service/impl/OracleExtractServiceImpl.java +++ b/src/com/platform/service/impl/OracleExtractServiceImpl.java @@ -1,94 +1,97 @@ -package com.platform.service.impl; - -import java.sql.Connection; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import org.springframework.stereotype.Service; - -import com.platform.entities.DataInfoEntity; -import com.platform.entities.GatherOracleInfo; -import com.platform.entities.OracleConnectorParams; -import com.platform.oracle.OracleConnector; -import com.platform.service.IOracleExtractService; -import com.platform.service.OracleExtractHelper; -import com.platform.utils.Bean2MapUtils; - -@Service(value = "OracleExtract") -public class OracleExtractServiceImpl implements IOracleExtractService { - - /** - * 抽取 - */ - private OracleExtractHelper oracleExtract = new OracleExtractHelper(); - - /** - * 数据库连接实现类 - */ - private OracleConnector connect = new OracleConnector(); - - @Override - public boolean extractOracle(String name, List> dataInfoMap, - Map oracleConnect) throws Exception { - boolean isSuccess = false; - try{ - //map转 bean(汇总库信息-带tableName的) - GatherOracleInfo oracleModel = (GatherOracleInfo) Bean2MapUtils.convertMap(GatherOracleInfo.class, oracleConnect); - - //采集库连接参数 - List datainfos = new ArrayList(); - for (Map map : dataInfoMap) { - OracleConnectorParams dataInfoEntity = (OracleConnectorParams) Bean2MapUtils.convertMap(OracleConnectorParams.class, oracleConnect); - datainfos.add(dataInfoEntity); - } - - Connection conn = OracleConnector.ConnectionBuilder("jdbc:oracle:thin:@" + oracleModel.getIp() + ":" + oracleModel.getPort() + "/" - + oracleModel.getDatabaseName(), oracleModel.getUser(), oracleModel.getPassword()); - - for (OracleConnectorParams collectOracle : datainfos) { - - oracleExtract.createDBLink(conn, collectOracle); - oracleExtract.createTableSpace(conn, oracleModel); - oracleExtract.createUser(conn, oracleModel); - oracleExtract.extractColleDB(conn, collectOracle); - } - isSuccess = true; - }catch(Exception e){ - - } - return false; - } - -// @Override -// public boolean extractOracle(String name, List dataInfos, GatherOracleInfo oracleConnect) throws Exception { -// boolean isSuccess = false; -// try{ -// //map转 bean(汇总库信息-带tableName的) -//// GatherOracleInfo oracleModel = (GatherOracleInfo) Bean2MapUtils.convertMap(GatherOracleInfo.class, oracleConnect); -// -// //采集库连接参数 -//// List datainfos = new ArrayList(); -//// for (Map map : dataInfoMap) { -//// OracleConnectorParams dataInfoEntity = (OracleConnectorParams) Bean2MapUtils.convertMap(OracleConnectorParams.class, oracleConnect); -//// datainfos.add(dataInfoEntity); -//// } -// -// Connection conn = OracleConnector.ConnectionBuilder("jdbc:oracle:thin:@" + oracleConnect.getIp() + ":" + oracleConnect.getPort() + "/" -// + oracleConnect.getDatabaseName(), oracleConnect.getUser(), oracleConnect.getPassword()); -// -// for (OracleConnectorParams collectOracle : dataInfos) { -// -// oracleExtract.createDBLink(conn, collectOracle); -// oracleExtract.createTableSpace(conn, oracleConnect); -// oracleExtract.createUser(conn, oracleConnect); -// oracleExtract.extractColleDB(conn, collectOracle); -// } -// isSuccess = true; -// }catch(Exception e){ -// -// } -// return false; -// } - -} +package com.platform.service.impl; + +import java.sql.Connection; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.springframework.stereotype.Service; + +import com.platform.entities.GatherOracleInfo; +import com.platform.entities.OracleConnectorParams; +import com.platform.kubernetes.SimpleKubeClient; +import com.platform.oracle.OracleConnector; +import com.platform.service.IOracleExtractService; +import com.platform.service.OracleExtractHelper; +import com.platform.utils.Bean2MapUtils; + +@Service(value = "OracleExtract") +public class OracleExtractServiceImpl implements IOracleExtractService { + /** + * kubernetes client + */ + private SimpleKubeClient client = new SimpleKubeClient(); + /** + * 抽取 + */ + private OracleExtractHelper oracleExtract = new OracleExtractHelper(); + + /** + * 数据库连接实现类 + */ + private OracleConnector connect = new OracleConnector(); + + @Override + public boolean extractOracle(String name, List> dataInfoMap, + Map oracleConnect) throws Exception { + boolean isSuccess = false; + try{ + //map转 bean(汇总库信息-带tableName的) + GatherOracleInfo oracleModel = (GatherOracleInfo) Bean2MapUtils.convertMap(GatherOracleInfo.class, oracleConnect); + + //采集库连接参数 + List datainfos = new ArrayList(); + for (Map map : dataInfoMap) { + OracleConnectorParams dataInfoEntity = (OracleConnectorParams) Bean2MapUtils.convertMap(OracleConnectorParams.class, oracleConnect); + datainfos.add(dataInfoEntity); + } + + Connection conn = OracleConnector.ConnectionBuilder("jdbc:oracle:thin:@" + oracleModel.getIp() + ":" + oracleModel.getPort() + "/" + + oracleModel.getDatabaseName(), oracleModel.getUser(), oracleModel.getPassword()); + for (OracleConnectorParams collectOracle : datainfos) { + client.updateOrAddReplicasLabelById(collectOracle.getName(), "isExtract", "1"); //更新oracle汇总状态，0标示为未汇总，1标示汇总中，2标示汇总完成 + oracleExtract.createDBLink(conn, collectOracle); //创建dblink + oracleExtract.createTableSpace(conn, oracleModel); //创建表空间 + oracleExtract.createUser(conn, oracleModel);//创建用户并授权 + oracleExtract.extractColleDB(conn, collectOracle);//执行抽取 + client.updateOrAddReplicasLabelById(collectOracle.getName(), "isExtract", "2"); //更新oracle汇总状态，0标示为未汇总，1标示汇总中，2标示汇总完成 + } + isSuccess = true; + }catch(Exception e){ + + } + return false; + } + +// @Override +// public boolean extractOracle(String name, List dataInfos, GatherOracleInfo oracleConnect) throws Exception { +// boolean isSuccess = false; +// try{ +// //map转 bean(汇总库信息-带tableName的) +//// GatherOracleInfo oracleModel = (GatherOracleInfo) Bean2MapUtils.convertMap(GatherOracleInfo.class, oracleConnect); +// +// //采集库连接参数 +//// List datainfos = new ArrayList(); +//// for (Map map : dataInfoMap) { +//// OracleConnectorParams dataInfoEntity = (OracleConnectorParams) Bean2MapUtils.convertMap(OracleConnectorParams.class, oracleConnect); +//// datainfos.add(dataInfoEntity); +//// } +// +// Connection conn = OracleConnector.ConnectionBuilder("jdbc:oracle:thin:@" + oracleConnect.getIp() + ":" + oracleConnect.getPort() + "/" +// + oracleConnect.getDatabaseName(), oracleConnect.getUser(), oracleConnect.getPassword()); +// +// for (OracleConnectorParams collectOracle : dataInfos) { +// +// oracleExtract.createDBLink(conn, collectOracle); +// oracleExtract.createTableSpace(conn, oracleConnect); +// oracleExtract.createUser(conn, oracleConnect); +// oracleExtract.extractColleDB(conn, collectOracle); +// } +// isSuccess = true; +// }catch(Exception e){ +// +// } +// return false; +// } + +} diff --git a/src/com/platform/utils/Constant.java b/src/com/platform/utils/Constant.java index e3005ea0..d0eb303b 100644 --- a/src/com/platform/utils/Constant.java +++ b/src/com/platform/utils/Constant.java @@ -1,49 +1,49 @@ - -package com.platform.utils; - - -public class Constant { - public static String rootUser = "root"; - public static String rootPasswd = "root"; - public static String hostIp = "192.168.0.110"; - // public static String hostIp = "192.168.1.105"; - public static int port = 22; - public static String glusterPeerStatus = "gluster peer status"; - public static String glusterVolumeInfo = "gluster volume info "; - public static String df = "df -k "; - public static String peerincluster_connected = "PeerinCluster(Connected)"; - public static String peerincluster_disconnected = "PeerinCluster(Disconnected)"; - public static String peerNotinCluster = "PeerNotinCluster"; - public static String distributed = "distributed"; - public static String replica = "replica"; - public static String stripe = "stripe"; - public static String noVolume = "No volumes present"; - public static String success = "success"; - public static String failed = "failed"; - public static String noSuchFile = "No such file or directory"; - public static GanymedSSH ganymedSSH = new GanymedSSH(hostIp, rootUser, rootPasswd, port); - public static String fileGetTreeData = "WebContent\\WEB-INF\\config\\getTreedata.sh"; - public static String AutoMountfile="/gfsAutoMount/AutoRun.sh"; - public static String MountRecord="/gfsAutoMount/mountPoint.record"; - public static String strGetTreeData = "function ergodic(){\n " - + "for file in \\`ls \\$1\\`\n do\n if [ \"\\$file\" != \"app\" -a -d \\$1\\\"/\\\"\\$file ]\n " - + "then\n ergodic \\$1\"/\"\\$file\n else\n local path=\\$1\"/\"\\$file\n " - + "echo \\$path \n fi\n done\n}\n\nIFS=\\$\\'\\n\\' " - + "#这个必须要，否则会在文件名中有空格时出错\nINIT_PATH=\".\";\nergodic \\$1\n"; - - /** - * volume 获取的线程休眠时间 - */ - public final static int moveFileMaxNum = 1; - - /** - * volume 获取的线程休眠时间 - */ - public final static int get_volume_sleep_time = 600000; - - /** - * volume 获取的线程休眠时间 - */ - public final static int update_dataInfo_sleep_time = 30000; - -} + +package com.platform.utils; + + +public class Constant { + public static String rootUser = "root"; + public static String rootPasswd = "root"; + public static String hostIp = "192.168.0.110"; + // public static String hostIp = "192.168.1.105"; + public static int port = 22; + public static String glusterPeerStatus = "gluster peer status"; + public static String glusterVolumeInfo = "gluster volume info "; + public static String df = "df -k "; + public static String peerincluster_connected = "PeerinCluster(Connected)"; + public static String peerincluster_disconnected = "PeerinCluster(Disconnected)"; + public static String peerNotinCluster = "PeerNotinCluster"; + public static String distributed = "distributed"; + public static String replica = "replica"; + public static String stripe = "stripe"; + public static String noVolume = "No volumes present"; + public static String success = "success"; + public static String failed = "failed"; + public static String noSuchFile = "No such file or directory"; + public static GanymedSSH ganymedSSH = new GanymedSSH(hostIp, rootUser, rootPasswd, port); + public static String fileGetTreeData = "WebContent\\WEB-INF\\config\\getTreedata.sh"; + public static String AutoMountfile="/gfsAutoMount/AutoRun.sh"; + public static String MountRecord="/gfsAutoMount/mountPoint.record"; + public static String strGetTreeData = "function ergodic(){\n " + + "for file in \\`ls \\$1\\`\n do\n if [ \"\\$file\" != \"app\" -a -d \\$1\\\"/\\\"\\$file ]\n " + + "then\n ergodic \\$1\"/\"\\$file\n else\n local path=\\$1\"/\"\\$file\n " + + "echo \\$path \n fi\n done\n}\n\nIFS=\\$\\'\\n\\' " + + "#这个必须要，否则会在文件名中有空格时出错\nINIT_PATH=\".\";\nergodic \\$1\n"; + + /** + * volume 获取的线程休眠时间 + */ + public final static int moveFileMaxNum = 1; + + /** + * volume 获取的线程休眠时间 + */ + public final static int get_volume_sleep_time = 600000; + + /** + * volume 获取的线程休眠时间 + */ + public final static int update_dataInfo_sleep_time = 30000; + +} diff --git a/test/com/platform/test/Brick.java b/test/com/platform/test/Brick.java index f83b37c1..93f93dc6 100644 --- a/test/com/platform/test/Brick.java +++ b/test/com/platform/test/Brick.java @@ -1,26 +1,26 @@ -package com.platform.test; - -public class Brick { - private String ip; - private String path; - - public Brick(String ip, String path) { - super(); - this.ip = ip; - this.path = path; - } - public String getIp() { - return ip; - } - public void setIp(String ip) { - this.ip = ip; - } - public String getPath() { - return path; - } - public void setPath(String path) { - this.path = path; - } - - -} +package com.platform.test; + +public class Brick { + private String ip; + private String path; + + public Brick(String ip, String path) { + super(); + this.ip = ip; + this.path = path; + } + public String getIp() { + return ip; + } + public void setIp(String ip) { + this.ip = ip; + } + public String getPath() { + return path; + } + public void setPath(String path) { + this.path = path; + } + + +} diff --git a/test/com/platform/test/FolderReader.java b/test/com/platform/test/FolderReader.java index 57456af1..39ce1962 100644 --- a/test/com/platform/test/FolderReader.java +++ b/test/com/platform/test/FolderReader.java @@ -1,35 +1,35 @@ -package com.platform.test; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import com.platform.entities.FolderNode; - -public class FolderReader { - - public static FolderNode reader(String path) { - FolderNode folderNode = null; - File file = new File(path); - if (file.exists()) { - List childrens = new ArrayList(); - if (file.isDirectory()) { - File[] files = file.listFiles(); - for (int i = 0; i < files.length; i++) { - FolderNode children = reader(files[i].getAbsolutePath()); - if (children != null) - childrens.add(children); - } - } - } - return folderNode; - } - - public static void main(String[] args) { - // TODO Auto-generated method stub - FolderReader folderReader = new FolderReader(); - FolderNode folderNode = folderReader.reader("D:/bootstrap"); - //folderReader.print(folderNode); - } - -} +package com.platform.test; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +import com.platform.entities.FolderNode; + +public class FolderReader { + + public static FolderNode reader(String path) { + FolderNode folderNode = null; + File file = new File(path); + if (file.exists()) { + List childrens = new ArrayList(); + if (file.isDirectory()) { + File[] files = file.listFiles(); + for (int i = 0; i < files.length; i++) { + FolderNode children = reader(files[i].getAbsolutePath()); + if (children != null) + childrens.add(children); + } + } + } + return folderNode; + } + + public static void main(String[] args) { + // TODO Auto-generated method stub + FolderReader folderReader = new FolderReader(); + FolderNode folderNode = folderReader.reader("D:/bootstrap"); + //folderReader.print(folderNode); + } + +} diff --git a/test/com/platform/test/SMBasedTest.java b/test/com/platform/test/SMBasedTest.java index b0a77f9f..aa429bd5 100644 --- a/test/com/platform/test/SMBasedTest.java +++ b/test/com/platform/test/SMBasedTest.java @@ -1,15 +1,15 @@ -package com.platform.test; - -import org.springframework.context.ApplicationContext; -import org.springframework.context.support.FileSystemXmlApplicationContext; - -public class SMBasedTest { - - public ApplicationContext applicationContext; - - public SMBasedTest() { - applicationContext = new FileSystemXmlApplicationContext( - "test/spring-applicationContext-test.xml"); - } - -} +package com.platform.test; + +import org.springframework.context.ApplicationContext; +import org.springframework.context.support.FileSystemXmlApplicationContext; + +public class SMBasedTest { + + public ApplicationContext applicationContext; + + public SMBasedTest() { + applicationContext = new FileSystemXmlApplicationContext( + "test/spring-applicationContext-test.xml"); + } + +} diff --git a/test/com/platform/test/TestConnectOralce.java b/test/com/platform/test/TestConnectOralce.java index ef3f7b0e..7fb359de 100644 --- a/test/com/platform/test/TestConnectOralce.java +++ b/test/com/platform/test/TestConnectOralce.java @@ -1,29 +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(); - } - } - -} +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(); + } + } + +} diff --git a/test/com/platform/test/TestController.java b/test/com/platform/test/TestController.java index 94e8aaf0..bf741926 100644 --- a/test/com/platform/test/TestController.java +++ b/test/com/platform/test/TestController.java @@ -1,53 +1,53 @@ -package com.platform.test; - -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Resource; -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.platform.entities.EncodedInfoEntity; -import com.platform.service.EncodeInfoService; - -@Controller -public class TestController { - // private static Logger logger = Logger.getLogger(TestController.class); - @Resource(name = "encodeInfoService") - private EncodeInfoService eis; - - public void setEis(EncodeInfoService eis) { - this.eis = eis; - } - - @RequestMapping("/hello") - @ResponseBody - public List hello(String name, HttpServletResponse res) { - System.out.println(name); - return eis.getAllEncodeInfo("system_info"); - } - - @RequestMapping("/json") - @ResponseBody - public List getJson(HttpServletRequest res, HttpServletResponse req) { - List list = new ArrayList(); - list.add(new User("lisi", 1, "男")); - list.add(new User("zhansan", 2, "男")); - return list; - } - - @RequestMapping("log") - public void testLog(HttpServletResponse res) { - System.out.println(eis.getEncodeNameByCode("1", "system_info")); - } - - @RequestMapping("/data111.json") - public void test(String name, HttpServletResponse res){ - - - } -} +package com.platform.test; + +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Resource; +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.platform.entities.EncodedInfoEntity; +import com.platform.service.EncodeInfoService; + +@Controller +public class TestController { + // private static Logger logger = Logger.getLogger(TestController.class); + @Resource(name = "encodeInfoService") + private EncodeInfoService eis; + + public void setEis(EncodeInfoService eis) { + this.eis = eis; + } + + @RequestMapping("/hello") + @ResponseBody + public List hello(String name, HttpServletResponse res) { + System.out.println(name); + return eis.getAllEncodeInfo("system_info"); + } + + @RequestMapping("/json") + @ResponseBody + public List getJson(HttpServletRequest res, HttpServletResponse req) { + List list = new ArrayList(); + list.add(new User("lisi", 1, "男")); + list.add(new User("zhansan", 2, "男")); + return list; + } + + @RequestMapping("log") + public void testLog(HttpServletResponse res) { + System.out.println(eis.getEncodeNameByCode("1", "system_info")); + } + + @RequestMapping("/data111.json") + public void test(String name, HttpServletResponse res){ + + + } +} diff --git a/test/com/platform/test/TestEncodeInfoDao.java b/test/com/platform/test/TestEncodeInfoDao.java index 3ad7d492..6a0b9a60 100644 --- a/test/com/platform/test/TestEncodeInfoDao.java +++ b/test/com/platform/test/TestEncodeInfoDao.java @@ -1,64 +1,64 @@ -package com.platform.test; - -import java.util.List; - -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import com.platform.dao.EncodeInfoDao; -import com.platform.entities.EncodedInfoEntity; - -public class TestEncodeInfoDao extends SMBasedTest { - - private EncodeInfoDao eiDao; - private String testTableName; - - @Before - public void initBeforeFunction() { - eiDao = (EncodeInfoDao) this.applicationContext - .getBean("encodeInfoDao"); - testTableName = "system_info"; - } - - @Test - public void testGetAllEntityInfo() { - List allEntities = eiDao - .getAllEntityInfo(testTableName); - System.out.println(allEntities); - Assert.assertTrue(allEntities.size() > 0); - } - - @Test - public void testGetEncodeNameByCode() { - String result = eiDao.getEncodeNameByCode("1", testTableName); - Assert.assertTrue(result.equals("预算执行系统")); - } - - @Test - public void testGetEncodeCodeByName() { - List result = eiDao - .getEncodeCodeByName("预算执行系统", testTableName); - Assert.assertTrue(result.size() > 0); - } - - @Test - public void testUpdateEncodeNameByCode() { - int result = eiDao - .updateEncodeNameByCode("3", "财政一体化平台", testTableName); - Assert.assertTrue(result > 0); - } - - @Test - public void testInsertEncodeEntity() { - int result = eiDao.insertEncodeEntity(new EncodedInfoEntity("非税收入系统", - "4"), testTableName); - Assert.assertTrue(result == 1); - } - - @Test - public void testDeleteEncodeByCode() { - int result = eiDao.deleteEncodeByCode("5", testTableName); - Assert.assertTrue(result >= 1); - } -} +package com.platform.test; + +import java.util.List; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import com.platform.dao.EncodeInfoDao; +import com.platform.entities.EncodedInfoEntity; + +public class TestEncodeInfoDao extends SMBasedTest { + + private EncodeInfoDao eiDao; + private String testTableName; + + @Before + public void initBeforeFunction() { + eiDao = (EncodeInfoDao) this.applicationContext + .getBean("encodeInfoDao"); + testTableName = "system_info"; + } + + @Test + public void testGetAllEntityInfo() { + List allEntities = eiDao + .getAllEntityInfo(testTableName); + System.out.println(allEntities); + Assert.assertTrue(allEntities.size() > 0); + } + + @Test + public void testGetEncodeNameByCode() { + String result = eiDao.getEncodeNameByCode("1", testTableName); + Assert.assertTrue(result.equals("预算执行系统")); + } + + @Test + public void testGetEncodeCodeByName() { + List result = eiDao + .getEncodeCodeByName("预算执行系统", testTableName); + Assert.assertTrue(result.size() > 0); + } + + @Test + public void testUpdateEncodeNameByCode() { + int result = eiDao + .updateEncodeNameByCode("3", "财政一体化平台", testTableName); + Assert.assertTrue(result > 0); + } + + @Test + public void testInsertEncodeEntity() { + int result = eiDao.insertEncodeEntity(new EncodedInfoEntity("非税收入系统", + "4"), testTableName); + Assert.assertTrue(result == 1); + } + + @Test + public void testDeleteEncodeByCode() { + int result = eiDao.deleteEncodeByCode("5", testTableName); + Assert.assertTrue(result >= 1); + } +} diff --git a/test/com/platform/test/TestEncodeService.java b/test/com/platform/test/TestEncodeService.java index a790ebe4..43a8f015 100644 --- a/test/com/platform/test/TestEncodeService.java +++ b/test/com/platform/test/TestEncodeService.java @@ -1,45 +1,45 @@ -package com.platform.test; - -import java.util.List; - -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import com.platform.entities.EncodedInfoEntity; -import com.platform.service.EncodeInfoService; - -public class TestEncodeService extends SMBasedTest { - - private EncodeInfoService eis; - private String testTableName; - - @Before - public void initBeforeFunction() { - eis = (EncodeInfoService) this.applicationContext - .getBean("encodeInfoService"); - testTableName = "system_info"; - } - - @Test - public void testGetEncodeNameByCode() { - String result = eis.getEncodeNameByCode("2", testTableName); - Assert.assertTrue(result.equals("部门预算")); - } - - /** - * 事务测试 - */ - @Test - public void testDeleteEncodeByCode() { - eis.deleteEncodeByCode("4", testTableName); - } - - @Test - public void testGetAllEncodeInfo() { - List allEntities = eis - .getAllEncodeInfo(testTableName); - System.out.println(allEntities); - Assert.assertTrue(allEntities.size() >= 1); - } -} +package com.platform.test; + +import java.util.List; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import com.platform.entities.EncodedInfoEntity; +import com.platform.service.EncodeInfoService; + +public class TestEncodeService extends SMBasedTest { + + private EncodeInfoService eis; + private String testTableName; + + @Before + public void initBeforeFunction() { + eis = (EncodeInfoService) this.applicationContext + .getBean("encodeInfoService"); + testTableName = "system_info"; + } + + @Test + public void testGetEncodeNameByCode() { + String result = eis.getEncodeNameByCode("2", testTableName); + Assert.assertTrue(result.equals("部门预算")); + } + + /** + * 事务测试 + */ + @Test + public void testDeleteEncodeByCode() { + eis.deleteEncodeByCode("4", testTableName); + } + + @Test + public void testGetAllEncodeInfo() { + List allEntities = eis + .getAllEncodeInfo(testTableName); + System.out.println(allEntities); + Assert.assertTrue(allEntities.size() >= 1); + } +} diff --git a/test/com/platform/test/User.java b/test/com/platform/test/User.java index e96fbc11..d3ec4417 100644 --- a/test/com/platform/test/User.java +++ b/test/com/platform/test/User.java @@ -1,42 +1,42 @@ -package com.platform.test; - -public class User { - private String name; - private int id; - private String sex; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public String getSex() { - return sex; - } - - public void setSex(String sex) { - this.sex = sex; - } - - public User(String name, int id, String sex) { - super(); - this.name = name; - this.id = id; - this.sex = sex; - } - - public User(){ - - } -} +package com.platform.test; + +public class User { + private String name; + private int id; + private String sex; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getSex() { + return sex; + } + + public void setSex(String sex) { + this.sex = sex; + } + + public User(String name, int id, String sex) { + super(); + this.name = name; + this.id = id; + this.sex = sex; + } + + public User(){ + + } +} diff --git a/test/com/platform/test/Volume.java b/test/com/platform/test/Volume.java index 5f6a4423..74c739e8 100644 --- a/test/com/platform/test/Volume.java +++ b/test/com/platform/test/Volume.java @@ -1,64 +1,64 @@ -package com.platform.test; - -import java.util.List; - -import com.platform.entities.FolderNode; - -public class Volume { - private String name; - private long totalSize; - private long usedSize; - private List bricks; - private List folderNode; - - public Volume(String volume, long totalSize, long usedSize, - List bricks, List folderNode) { - super(); - this.name = volume; - this.totalSize = totalSize; - this.usedSize = usedSize; - this.bricks = bricks; - this.folderNode = folderNode; - } - - public String getVolume() { - return name; - } - - public void setVolume(String name) { - this.name = name; - } - - public long getTotalSize() { - return totalSize; - } - - public void setTotalSize(long totalSize) { - this.totalSize = totalSize; - } - - public long getUsedSize() { - return usedSize; - } - - public void setUsedSize(long usedSize) { - this.usedSize = usedSize; - } - - public List getBricks() { - return bricks; - } - - public void setBricks(List bricks) { - this.bricks = bricks; - } - - public List getFolderNode() { - return folderNode; - } - - public void setFolderNode(List folderNode) { - this.folderNode = folderNode; - } - -} +package com.platform.test; + +import java.util.List; + +import com.platform.entities.FolderNode; + +public class Volume { + private String name; + private long totalSize; + private long usedSize; + private List bricks; + private List folderNode; + + public Volume(String volume, long totalSize, long usedSize, + List bricks, List folderNode) { + super(); + this.name = volume; + this.totalSize = totalSize; + this.usedSize = usedSize; + this.bricks = bricks; + this.folderNode = folderNode; + } + + public String getVolume() { + return name; + } + + public void setVolume(String name) { + this.name = name; + } + + public long getTotalSize() { + return totalSize; + } + + public void setTotalSize(long totalSize) { + this.totalSize = totalSize; + } + + public long getUsedSize() { + return usedSize; + } + + public void setUsedSize(long usedSize) { + this.usedSize = usedSize; + } + + public List getBricks() { + return bricks; + } + + public void setBricks(List bricks) { + this.bricks = bricks; + } + + public List getFolderNode() { + return folderNode; + } + + public void setFolderNode(List folderNode) { + this.folderNode = folderNode; + } + +} diff --git a/test/com/platform/test/testSystemInfoDao.java b/test/com/platform/test/testSystemInfoDao.java index 95be6ef6..41ea2d36 100644 --- a/test/com/platform/test/testSystemInfoDao.java +++ b/test/com/platform/test/testSystemInfoDao.java @@ -1,19 +1,19 @@ -package com.platform.test; - -import org.junit.Before; - -import com.platform.dao.DataInfoDao; - -public class testSystemInfoDao extends SMBasedTest { - private DataInfoDao dfDao; - - @Before - public void initBeforeFunction() { - dfDao = (DataInfoDao) this.applicationContext.getBean("dataInfoDao"); - } - - // @Test @Test - public void test() { - //System.out.println(dfDao.getCount()); - } -} +package com.platform.test; + +import org.junit.Before; + +import com.platform.dao.DataInfoDao; + +public class testSystemInfoDao extends SMBasedTest { + private DataInfoDao dfDao; + + @Before + public void initBeforeFunction() { + dfDao = (DataInfoDao) this.applicationContext.getBean("dataInfoDao"); + } + + // @Test @Test + public void test() { + //System.out.println(dfDao.getCount()); + } +} diff --git a/test/spring-applicationContext-test.xml b/test/spring-applicationContext-test.xml index 27b1248b..36258c88 100644 --- a/test/spring-applicationContext-test.xml +++ b/test/spring-applicationContext-test.xml @@ -1,64 +1,64 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file