diff --git a/.classpath b/.classpath new file mode 100644 index 00000000..47b4f45e --- /dev/null +++ b/.classpath @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/.gitignore b/.gitignore index 30c0ce06..01479dbd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -/target -/build -.classpath - -/bin/ +/target +/build +.classpath + +/bin/ diff --git a/.metadata/.lock b/.metadata/.lock new file mode 100644 index 00000000..e69de29b diff --git a/.metadata/.log b/.metadata/.log new file mode 100644 index 00000000..73325e19 --- /dev/null +++ b/.metadata/.log @@ -0,0 +1,14 @@ +!SESSION 2016-09-13 08:39:40.662 ----------------------------------------------- +eclipse.buildId=4.3.0.I20130605-2000 +java.version=1.8.0_91 +java.vendor=Oracle Corporation +BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=zh_CN +Framework arguments: -product org.eclipse.epp.package.jee.product +Command-line arguments: -os win32 -ws win32 -arch x86_64 -product org.eclipse.epp.package.jee.product + +!ENTRY org.eclipse.egit.ui 2 0 2016-09-13 08:40:07.850 +!MESSAGE Warning: The environment variable HOME is not set. The following directory will be used to store the Git +user global configuration and to define the default location to store repositories: 'C:\Users\wuming'. If this is +not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and +EGit might behave differently since they see different configuration options. +This warning can be switched off on the Team > Git > Confirmations and Warnings preference page. diff --git a/.metadata/.mylyn/repositories.xml.zip b/.metadata/.mylyn/repositories.xml.zip new file mode 100644 index 00000000..a72104b5 Binary files /dev/null and b/.metadata/.mylyn/repositories.xml.zip differ diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.indexes/properties.index b/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.indexes/properties.index new file mode 100644 index 00000000..1e099f3b Binary files /dev/null and b/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.indexes/properties.index differ 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 new file mode 100644 index 00000000..9a7827fd --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/org.eclipse.egit.core/GitProjectData.properties @@ -0,0 +1,3 @@ +#GitProjectData +#Tue Sep 13 08:40:10 CST 2016 +.gitdir=../.git diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version b/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version new file mode 100644 index 00000000..25cb955b --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index b/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index new file mode 100644 index 00000000..bfa6b4c2 Binary files /dev/null and b/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index differ diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version b/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version new file mode 100644 index 00000000..6b2aaa76 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/1.tree b/.metadata/.plugins/org.eclipse.core.resources/.root/1.tree new file mode 100644 index 00000000..a3003ede Binary files /dev/null and b/.metadata/.plugins/org.eclipse.core.resources/.root/1.tree differ diff --git a/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources new file mode 100644 index 00000000..75faf83a Binary files /dev/null and b/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources differ diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..77fe5831 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +version=1 diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.egit.core.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.egit.core.prefs new file mode 100644 index 00000000..e1cf592f --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.egit.core.prefs @@ -0,0 +1,2 @@ +GitRepositoriesView.GitDirectories=C\:\\Users\\wuming\\workspace\\data_manager_backend\\.git; +eclipse.preferences.version=1 diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 00000000..2842910e --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,14 @@ +content_assist_proposals_background=255,255,255 +content_assist_proposals_foreground=0,0,0 +eclipse.preferences.version=1 +fontPropagated=true +org.eclipse.jdt.internal.ui.navigator.layout=2 +org.eclipse.jdt.ui.editor.tab.width= +org.eclipse.jdt.ui.formatterprofiles.version=12 +org.eclipse.jdt.ui.javadoclocations.migrated=true +org.eclipse.jface.textfont=1|Courier New|10.0|0|WINDOWS|1|0|0|0|0|0|0|0|0|1|0|0|0|0|Courier New; +proposalOrderMigrated=true +spelling_locale_initialized=true +tabWidthPropagated=true +useAnnotationsPrefPage=true +useQuickDiffPrefPage=true diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jst.j2ee.webservice.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jst.j2ee.webservice.ui.prefs new file mode 100644 index 00000000..b79e47a4 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jst.j2ee.webservice.ui.prefs @@ -0,0 +1,2 @@ +areThereWebServices=false +eclipse.preferences.version=1 diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs new file mode 100644 index 00000000..c05c14ca --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +org.eclipse.m2e.discovery.pref.projects= diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs new file mode 100644 index 00000000..e5a71f29 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +mylyn.attention.migrated=true diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs new file mode 100644 index 00000000..e0b8c16e --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +org.eclipse.mylyn.monitor.activity.tracking.enabled.checked=true diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs new file mode 100644 index 00000000..07d6ad69 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +org.eclipse.mylyn.tasks.ui.filters.nonmatching=true +org.eclipse.mylyn.tasks.ui.filters.nonmatching.encouraged=true diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.core.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.core.prefs new file mode 100644 index 00000000..824dc6da --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.core.prefs @@ -0,0 +1,3 @@ +activeuserprofiles=DESKTOP-65KJ4BV;Team +eclipse.preferences.version=1 +org.eclipse.rse.systemtype.local.systemType.defaultUserId=wuming diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.ui.prefs new file mode 100644 index 00000000..a8e9ed48 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.ui.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +org.eclipse.rse.preferences.order.connections=DESKTOP-65KJ4BV.Local diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.cvs.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.cvs.ui.prefs new file mode 100644 index 00000000..56114a2b --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.cvs.ui.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +pref_first_startup=false diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.ui.prefs new file mode 100644 index 00000000..848e2638 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.ui.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +org.eclipse.team.ui.first_time=false diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.browser.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.browser.prefs new file mode 100644 index 00000000..5fe466c2 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.browser.prefs @@ -0,0 +1,2 @@ +browsers=\r\n\r\n\r\n\r\n +eclipse.preferences.version=1 diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs new file mode 100644 index 00000000..0d882fe3 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs @@ -0,0 +1,5 @@ +PROBLEMS_FILTERS_MIGRATE=true +eclipse.preferences.version=1 +platformState=1470357608478 +quickStart=false +tipsAndTricks=true diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs new file mode 100644 index 00000000..bd7d2109 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +showIntro=false diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs new file mode 100644 index 00000000..88952f99 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs @@ -0,0 +1,4 @@ +//org.eclipse.ui.commands/state/org.eclipse.wst.xml.views.XPathView.processor.xpathprocessor/org.eclipse.ui.commands.radioState=xpath10 +ENABLED_DECORATORS=org.eclipse.jst.ws.jaxws.dom.integration.navigator.WebServiceDecorator\:true,org.eclipse.m2e.core.mavenVersionDecorator\:false,org.eclipse.wst.server.ui.decorator\:false,org.eclipse.datatools.connectivity.sqm.core.internal.ui.explorer.DependencyDecoration\:true,org.eclipse.datatools.connectivity.sqm.core.internal.ui.explorer.ColumnDecoration\:true,org.eclipse.datatools.connectivity.sqm.core.internal.ui.explorer.ForeignKeyDecoration\:true,org.eclipse.datatools.connectivity.sqm.core.internal.ui.explorer.IndexTriggerDecoration\:true,org.eclipse.datatools.connectivity.internal.core.ui.bookmarkDecoration\:true,org.eclipse.datatools.connectivity.internal.core.ui.FilterNodeDecoration\:true,org.eclipse.datatools.connectivity.ui.decorator.contentextension\:false,org.eclipse.datatools.enablement.ingres.ui.providers.decorators.SynonymDecorationService\:true,org.eclipse.datatools.enablement.ingres.internal.ui.providers.decorators.ParameterDecorationService\:true,org.eclipse.datatools.enablement.sybase.asa.proxytabledecorator\:true,org.eclipse.datatools.enablement.sybase.ase.webservicetabledecorator\:true,org.eclipse.datatools.enablement.sybase.systemtabledecorator\:true,org.eclipse.egit.ui.internal.decorators.GitLightweightDecorator\:true,org.eclipse.jdt.ui.override.decorator\:true,org.eclipse.jdt.ui.interface.decorator\:false,org.eclipse.jdt.ui.buildpath.decorator\:true,org.eclipse.jst.j2ee.internal.ui.util.AnnotationIconDecorator_ejb\:true,org.eclipse.jst.j2ee.navigator.internal.J2EEProjectDecorator\:true,org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanDecorator\:true,org.eclipse.jst.jee.navigator.internal.JEEProjectDecorator\:true,org.eclipse.jst.j2ee.internal.ui.util.AnnotationIconDecorator_servlet\:true,org.eclipse.m2e.core.maven2decorator\:true,org.eclipse.mylyn.context.ui.decorator.interest\:true,org.eclipse.mylyn.tasks.ui.decorators.task\:true,org.eclipse.mylyn.team.ui.changeset.decorator\:true,org.eclipse.pde.ui.binaryProjectDecorator\:false,org.eclipse.rse.core.virtualobject.decorator\:true,org.eclipse.rse.core.binary.executable.decorator\:true,org.eclipse.rse.core.script.executable.decorator\:true,org.eclipse.rse.core.java.executable.decorator\:true,org.eclipse.rse.core.library.decorator\:true,org.eclipse.rse.core.link.decorator\:true,org.eclipse.rse.subsystems.error.decorator\:true,org.eclipse.team.cvs.ui.decorator\:true,org.eclipse.ui.LinkedResourceDecorator\:true,org.eclipse.ui.SymlinkDecorator\:true,org.eclipse.ui.VirtualResourceDecorator\:true,org.eclipse.ui.ContentTypeDecorator\:true,org.eclipse.ui.ResourceFilterDecorator\:false,org.eclipse.wst.jsdt.ui.override.decorator\:true,org.eclipse.wst.server.ui.navigatorDecorator\:true, +PLUGINS_NOT_ACTIVATED_ON_STARTUP=org.eclipse.m2e.discovery; +eclipse.preferences.version=1 diff --git a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi new file mode 100644 index 00000000..4521125c --- /dev/null +++ b/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi @@ -0,0 +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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.metadata/.plugins/org.eclipse.jdt.core/invalidArchivesCache b/.metadata/.plugins/org.eclipse.jdt.core/invalidArchivesCache new file mode 100644 index 00000000..593f4708 Binary files /dev/null and b/.metadata/.plugins/org.eclipse.jdt.core/invalidArchivesCache differ diff --git a/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache b/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache new file mode 100644 index 00000000..593f4708 Binary files /dev/null and b/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache differ diff --git a/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat b/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat new file mode 100644 index 00000000..3de398e8 Binary files /dev/null and b/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat differ diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml b/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml new file mode 100644 index 00000000..6cd95629 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml @@ -0,0 +1,2 @@ + + diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml b/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml new file mode 100644 index 00000000..8c365b72 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml @@ -0,0 +1,2 @@ + + diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml b/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml new file mode 100644 index 00000000..528dc13a --- /dev/null +++ b/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml @@ -0,0 +1,10 @@ + +
+
+ + + + + +
+
diff --git a/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log b/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log new file mode 100644 index 00000000..e69de29b 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 new file mode 100644 index 00000000..d21ad94e --- /dev/null +++ b/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.4.0.20130601-0317.xml @@ -0,0 +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 + + + + + + + + + + + + + + + diff --git a/.metadata/.plugins/org.eclipse.rse.core/.log b/.metadata/.plugins/org.eclipse.rse.core/.log new file mode 100644 index 00000000..e69de29b diff --git a/.metadata/.plugins/org.eclipse.rse.core/initializerMarks/org.eclipse.rse.internal.core.RSELocalConnectionInitializer.mark b/.metadata/.plugins/org.eclipse.rse.core/initializerMarks/org.eclipse.rse.internal.core.RSELocalConnectionInitializer.mark new file mode 100644 index 00000000..e69de29b 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 new file mode 100644 index 00000000..661ad5cb --- /dev/null +++ b/.metadata/.plugins/org.eclipse.rse.core/profiles/PRF.desktop-65kj4bv_32539/FP.local.files_0/node.properties @@ -0,0 +1,57 @@ +# RSE DOM Node +00-name=DESKTOP-65KJ4BV\:local.files +01-type=FilterPool +03-attr.default=true +03-attr.deletable=true +03-attr.id=local.files +03-attr.nonRenamable=false +03-attr.owningParentName=null +03-attr.release=200 +03-attr.singleFilterStringOnly=false +03-attr.singleFilterStringOnlyESet=false +03-attr.stringsCaseSensitive=true +03-attr.supportsDuplicateFilterStrings=false +03-attr.supportsNestedFilters=true +03-attr.type=default +06-child.00000.00-name=My Home +06-child.00000.01-type=Filter +06-child.00000.03-attr.default=false +06-child.00000.03-attr.filterType=default +06-child.00000.03-attr.id=My Home +06-child.00000.03-attr.nonChangable=false +06-child.00000.03-attr.nonDeletable=false +06-child.00000.03-attr.nonRenamable=false +06-child.00000.03-attr.promptable=false +06-child.00000.03-attr.relativeOrder=0 +06-child.00000.03-attr.release=200 +06-child.00000.03-attr.singleFilterStringOnly=false +06-child.00000.03-attr.stringsCaseSensitive=false +06-child.00000.03-attr.stringsNonChangable=false +06-child.00000.03-attr.supportsDuplicateFilterStrings=false +06-child.00000.03-attr.supportsNestedFilters=true +06-child.00000.06-child.00000.00-name=C\:\\Users\\wuming\\* +06-child.00000.06-child.00000.01-type=FilterString +06-child.00000.06-child.00000.03-attr.default=false +06-child.00000.06-child.00000.03-attr.string=C\:\\Users\\wuming\\* +06-child.00000.06-child.00000.03-attr.type=default +06-child.00001.00-name=Drives +06-child.00001.01-type=Filter +06-child.00001.03-attr.default=false +06-child.00001.03-attr.filterType=default +06-child.00001.03-attr.id=Drives +06-child.00001.03-attr.nonChangable=false +06-child.00001.03-attr.nonDeletable=false +06-child.00001.03-attr.nonRenamable=false +06-child.00001.03-attr.promptable=false +06-child.00001.03-attr.relativeOrder=0 +06-child.00001.03-attr.release=200 +06-child.00001.03-attr.singleFilterStringOnly=false +06-child.00001.03-attr.stringsCaseSensitive=false +06-child.00001.03-attr.stringsNonChangable=false +06-child.00001.03-attr.supportsDuplicateFilterStrings=false +06-child.00001.03-attr.supportsNestedFilters=true +06-child.00001.06-child.00000.00-name=* +06-child.00001.06-child.00000.01-type=FilterString +06-child.00001.06-child.00000.03-attr.default=false +06-child.00001.06-child.00000.03-attr.string=* +06-child.00001.06-child.00000.03-attr.type=default 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 new file mode 100644 index 00000000..2f742f51 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.rse.core/profiles/PRF.desktop-65kj4bv_32539/H.local_16/node.properties @@ -0,0 +1,25 @@ +# RSE DOM Node +00-name=Local +01-type=Host +03-attr.description= +03-attr.hostname=LOCALHOST +03-attr.offline=false +03-attr.promptable=false +03-attr.systemType=org.eclipse.rse.systemtype.local +03-attr.type=Local +06-child.00000.00-name=Local Connector Service +06-child.00000.01-type=ConnectorService +06-child.00000.03-attr.group=Local Connector Service +06-child.00000.03-attr.port=0 +06-child.00000.03-attr.useSSL=false +06-child.00000.06-child.00000.00-name=Local Files +06-child.00000.06-child.00000.01-type=SubSystem +06-child.00000.06-child.00000.03-attr.hidden=false +06-child.00000.06-child.00000.03-attr.type=local.files +06-child.00000.06-child.00000.06-child.00000.00-name=DESKTOP-65KJ4BV___DESKTOP-65KJ4BV\:local.files +06-child.00000.06-child.00000.06-child.00000.01-type=FilterPoolReference +06-child.00000.06-child.00000.06-child.00000.03-attr.refID=local.files +06-child.00000.06-child.00001.00-name=Local Shells +06-child.00000.06-child.00001.01-type=SubSystem +06-child.00000.06-child.00001.03-attr.hidden=false +06-child.00000.06-child.00001.03-attr.type=local.shells 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 new file mode 100644 index 00000000..53c9f43d --- /dev/null +++ b/.metadata/.plugins/org.eclipse.rse.core/profiles/PRF.desktop-65kj4bv_32539/node.properties @@ -0,0 +1,7 @@ +# RSE DOM Node +00-name=DESKTOP-65KJ4BV +01-type=Profile +03-attr.defaultPrivate=true +03-attr.isActive=true +05-ref.00000=FP.local.files_0 +05-ref.00001=H.local_16 diff --git a/.metadata/.plugins/org.eclipse.rse.ui/.log b/.metadata/.plugins/org.eclipse.rse.ui/.log new file mode 100644 index 00000000..e69de29b diff --git a/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml b/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml new file mode 100644 index 00000000..d4cd801d --- /dev/null +++ b/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml @@ -0,0 +1,28 @@ + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + +
+
+
+
diff --git a/.metadata/.plugins/org.eclipse.wst.common.snippets/hidden.xml b/.metadata/.plugins/org.eclipse.wst.common.snippets/hidden.xml new file mode 100644 index 00000000..ab946b83 Binary files /dev/null and b/.metadata/.plugins/org.eclipse.wst.common.snippets/hidden.xml differ diff --git a/.metadata/.plugins/org.eclipse.wst.common.snippets/user.xml b/.metadata/.plugins/org.eclipse.wst.common.snippets/user.xml new file mode 100644 index 00000000..77a5127f Binary files /dev/null and b/.metadata/.plugins/org.eclipse.wst.common.snippets/user.xml differ diff --git a/.metadata/version.ini b/.metadata/version.ini new file mode 100644 index 00000000..c51ff745 --- /dev/null +++ b/.metadata/version.ini @@ -0,0 +1 @@ +org.eclipse.core.runtime=1 \ No newline at end of file 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/.settings/.jsdtscope b/.settings/.jsdtscope index 3a28de0c..887f573a 100644 --- a/.settings/.jsdtscope +++ b/.settings/.jsdtscope @@ -1,12 +1,12 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/.settings/com.genuitec.eclipse.migration.prefs b/.settings/com.genuitec.eclipse.migration.prefs index bf0067e7..3fcb66e5 100644 --- a/.settings/com.genuitec.eclipse.migration.prefs +++ b/.settings/com.genuitec.eclipse.migration.prefs @@ -1,3 +1,3 @@ -eclipse.preferences.version=1 -performed.operation.correct.unbound.jre=1.0 -performed.operation.resolve.unknown.runtime=1.0 +eclipse.preferences.version=1 +performed.operation.correct.unbound.jre=1.0 +performed.operation.resolve.unknown.runtime=1.0 diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index 544ad1e4..fad78458 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -1,5 +1,10 @@ -eclipse.preferences.version=1 -encoding//WebContent/WEB-INF/config/config.properties=UTF-8 -encoding//src/com/platform/utils/GanymedSSH.java=UTF-8 -encoding/=UTF-8 -separateDerivedEncodings=true +eclipse.preferences.version=1 +encoding//WebContent/WEB-INF/config/config.properties=UTF-8 +<<<<<<< HEAD +encoding//src/com/platform/controller/DataModelController.java=UTF-8 +encoding/=UTF-8 +======= +encoding//src/com/platform/utils/GanymedSSH.java=UTF-8 +encoding/=UTF-8 +separateDerivedEncodings=true +>>>>>>> ef099fd1aed73bcc4ef4c8d62aaba6cc6ec2dabf diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 68c704e1..8ae60c4b 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,101 +1,101 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.7 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error +org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/.settings/org.eclipse.jpt.core.prefs b/.settings/org.eclipse.jpt.core.prefs index 4fd5f244..47e8f864 100644 --- a/.settings/org.eclipse.jpt.core.prefs +++ b/.settings/org.eclipse.jpt.core.prefs @@ -1,3 +1,3 @@ -eclipse.preferences.version=1 -org.eclipse.jpt.core.platform=generic2_1 -org.eclipse.jpt.jpa.core.discoverAnnotatedClasses=false +eclipse.preferences.version=1 +org.eclipse.jpt.core.platform=generic2_1 +org.eclipse.jpt.jpa.core.discoverAnnotatedClasses=false diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs index f897a7f1..14b697b7 100644 --- a/.settings/org.eclipse.m2e.core.prefs +++ b/.settings/org.eclipse.m2e.core.prefs @@ -1,4 +1,4 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index d5dd44d5..5f5eeeca 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,9 +1,9 @@ - - - - - - - - - + + + + + + + + + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml index 7961132f..c8ec2a65 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index ba1bfbde..011d2b86 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,11 +1,11 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/RemoteSystemsTempFiles/.project b/RemoteSystemsTempFiles/.project new file mode 100644 index 00000000..76756293 --- /dev/null +++ b/RemoteSystemsTempFiles/.project @@ -0,0 +1,12 @@ + + + RemoteSystemsTempFiles + + + + + + + org.eclipse.rse.ui.remoteSystemsTempNature + + 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 6f2a35ac..024e203f 100644 --- a/WebContent/WEB-INF/config/spring-applicationContext.xml +++ b/WebContent/WEB-INF/config/spring-applicationContext.xml @@ -1,81 +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 2d119a71..2290481e 100644 --- a/WebContent/WEB-INF/config/springmvc-applicationContext.xml +++ b/WebContent/WEB-INF/config/springmvc-applicationContext.xml @@ -1,36 +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/lib/spring-websocket-4.3.1.RELEASE.jar b/WebContent/WEB-INF/lib/spring-websocket-4.3.1.RELEASE.jar new file mode 100644 index 00000000..4fb19b09 Binary files /dev/null and b/WebContent/WEB-INF/lib/spring-websocket-4.3.1.RELEASE.jar differ diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index cfdc2ad5..2d425519 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -1,65 +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/platform/controller/DataModelController.java b/src/com/platform/controller/DataModelController.java index d70689da..77126406 100644 --- a/src/com/platform/controller/DataModelController.java +++ b/src/com/platform/controller/DataModelController.java @@ -1,326 +1,326 @@ -package com.platform.controller; - -import java.io.UnsupportedEncodingException; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - -import org.apache.commons.lang.StringUtils; -import org.apache.ibatis.annotations.Param; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Controller; -import org.springframework.stereotype.Service; -import org.springframework.ui.ModelMap; -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; -import com.platform.entities.DataInfoEntity; -import com.platform.entities.DataInfoEntityMoveTmp; -import com.platform.entities.FolderNode; -import com.platform.entities.GatherOracleInfo; -import com.platform.entities.OracleConnectorParams; -import com.platform.entities.PagerOptions; -import com.platform.entities.VolumeEntity; -import com.platform.glusterfs.CheckoutMD5; -import com.platform.service.DataInfoService; -import com.platform.service.ICodeService; -import com.platform.service.IGfsService; -import com.platform.service.IMoveDataService; -import com.platform.service.IMySqlService; -import com.platform.service.IOracleExtractService; -import com.platform.service.OracleExtractHelper; -import com.platform.service.OracleStatusService; -import com.platform.service.impl.MySqlServiceImpl; -import com.platform.test.Brick; -import com.platform.test.FolderReader; -import com.platform.test.Volume; -import com.platform.utils.Bean2MapUtils; -import com.platform.utils.Configs; -import com.platform.utils.UtilsHelper; - -@Controller -public class DataModelController extends BaseController{ - - public static Logger log = Logger.getLogger(DataModelController.class); - - @Resource(name = "dataInfoService") - private DataInfoService dfs; - - @Resource(name = "gfsService") - private IGfsService gfsService; - - @Resource(name = "mySqlService") - private IMySqlService mySqlService; - - @Resource(name = "OracleExtract") - private IOracleExtractService OracleExtract; - - @Resource(name = "moveDataService") - private IMoveDataService moveDataService; - - @Resource(name = "codeService") - private ICodeService codeService; - - public void setDfsImp(DataInfoService dfs) { - this.dfs = dfs; - } - - @RequestMapping("/data.json") - @ResponseBody - public ModelMap getAllDataToJson(HttpServletRequest res, - HttpServletResponse req) throws UnsupportedEncodingException { - res.setCharacterEncoding("UTF-8"); - Map paramMap = res.getParameterMap(); - Set keySet = paramMap.keySet(); - Map params = new HashMap(); - StringBuffer sb = new StringBuffer().append("当前的请求参数:{"); - for (String str : keySet) { - String value = paramMap.get(str)[0]; - if (StringUtils.isNotEmpty(value)) { - params.put(str, value); - sb.append(str).append(":").append(value).append(","); - } else { - sb.append(str).append(":").append("null").append(","); - } - } - Configs.CONSOLE_LOGGER.info(sb.deleteCharAt(sb.length() - 1) - .append("}").toString()); - PagerOptions pagerOptions = (PagerOptions) UtilsHelper - .newObjAndSetAttrsByClass(PagerOptions.class, params); - - return dfs.getPagerTableData(pagerOptions); - } - - @RequestMapping(value="/delete/data", method= RequestMethod.POST) - public void deleteData(HttpServletRequest res, HttpServletResponse req) throws Exception { - res.setCharacterEncoding("UTF-8"); - Map paramMap = res.getParameterMap(); - String[] data = paramMap.get("data"); - dfs.deleteData(data); - } - - @RequestMapping("/connectOracle") - public void connectOracle(HttpServletRequest res, HttpServletResponse req) throws UnsupportedEncodingException { - res.setCharacterEncoding("UTF-8"); - Map paramMap = res.getParameterMap(); - String[] oraclesName = paramMap.get("oracleName"); - if (oraclesName != null) - for (String rcName : oraclesName) { - Configs.CONSOLE_LOGGER.info("连接成功\t" + rcName); - new OracleStatusService().connectToOracle(rcName); - } - } - - @RequestMapping("/cancelOracleConection") - public void cancelOracleConnection(HttpServletRequest res, - HttpServletResponse req) throws UnsupportedEncodingException { - res.setCharacterEncoding("UTF-8"); - Map paramMap = res.getParameterMap(); - String[] oraclesName = paramMap.get("oracleName"); - String operate = paramMap.get("operation")[0]; - if (null != oraclesName) { - for (String rcName : oraclesName) { - Configs.CONSOLE_LOGGER.info("取消连接:\t" + rcName); - new OracleStatusService().cancelToOracle(rcName, operate); - } - } - } - - @RequestMapping(value="/oracle/{name}/extract", method= RequestMethod.POST) - public void oracleExtract(HttpServletRequest res, - HttpServletResponse req,@PathVariable String name) throws Exception { - res.setCharacterEncoding("UTF-8"); - System.out.println("------extract-------"); - System.out.println(name); - Map paramMap = res.getParameterMap(); - //汇总库 对象信息--带有tableName- - String[] nodes = paramMap.get("target"); - Map map = null; - for (String string : nodes) { - JSONObject jsonobject = JSONObject.fromObject(string); - map = jsonobject; - System.out.println(map); - } - - // 采集库对象--(多个采集库抽取到1个汇总库的1个tableName下) - String[] inneed = paramMap.get("inneed"); - List> colleclist = new ArrayList>(); - for (String string : nodes) { - JSONObject jsonobject = JSONObject.fromObject(string); - Map inneedMap = jsonobject; - colleclist.add(inneedMap); - } - OracleExtract.extractOracle(name, colleclist, map); - - } -// public void oracleExtract(HttpServletRequest res, -// HttpServletResponse req, String name, @RequestBody GatherOracleInfo gather, @RequestBody List collectOracles) -// throws Exception { -//// res.setCharacterEncoding("UTF-8"); -// log.debug("------extract-------"); -//// Map paramMap = res.getParameterMap(); -//// log.debug(paramMap); -//// //汇总库 对象信息--带有tableName- -//// String[] nodes = paramMap.get("target"); -//// Map map = null; -//// for (String string : nodes) { -//// JSONObject jsonobject = JSONObject.fromObject(string); -//// map = jsonobject; -//// System.out.println(map); -//// } -//// -//// // 采集库对象--(多个采集库抽取到1个汇总库的1个tableName下) -//// String[] inneed = paramMap.get("inneed"); -//// List> colleclist = new ArrayList>(); -//// for (String string : nodes) { -//// JSONObject jsonobject = JSONObject.fromObject(string); -//// Map inneedMap = jsonobject; -//// colleclist.add(inneedMap); -//// } -// OracleExtract.extractOracle(name, collectOracles, gather); -// } - - @RequestMapping(value="/volume/list", method= RequestMethod.POST) - @ResponseBody - public List volumeList() throws Exception { - log.debug("-----/volume/list------"); - List result = gfsService.getAllVolumes(); - return result; - } - - @RequestMapping(value = "/volume/{name}/move", method= RequestMethod.POST) - public void volumeMove(HttpServletRequest res, HttpServletResponse req,@PathVariable String name, - FolderNode selectNode, DataInfoEntity selectItems) throws Exception { - res.setCharacterEncoding("UTF-8"); - System.out.println("get Request"); - Map paramMap = res.getParameterMap(); -// System.out.println(paramMap); - String[] nodes = paramMap.get("selectNode"); - Map map = null; - for (String string : nodes) { - System.out.println(string); - JSONObject jsonobject = JSONObject.fromObject(string); - map = jsonobject; - } - String dstVolume = (String) map.get("volume"); - - List listItemPath = new ArrayList(); - String[] items = paramMap.get("selectItems"); - System.out.println("selectItems"); - List datas = new ArrayList(); - List srcVolumes = new ArrayList(); - for (String string : items) { - System.out.println(string); - JSONObject jsobj = JSONObject.fromObject(string); - Map itemmap = jsobj; - DataInfoEntity data = (DataInfoEntity) Bean2MapUtils.convertMap(DataInfoEntity.class, itemmap); - datas.add(data); - } - System.out.println("------/volume/{name}/move--------"); - if (datas.size() >0) { - moveDataService.moveData(datas, (String)map.get("path")); - } - } -// public Object volumeMove(HttpServletRequest res, HttpServletResponse req, String name, -// @RequestBody FolderNode selectNode, @RequestBody List selectItems) throws Exception { -// log.debug("-----/volume/{name}/move------"); -//// Map paramMap = res.getParameterMap(); -//// System.out.println(paramMap); -// Map paramMap = res.getParameterMap(); -// log.debug(paramMap); -// //汇总库 对象信息--带有tableName- -// String[] nodes = (String[]) paramMap.get("selectNode"); -// Map map = null; -// JSONObject jsonobject = JSONObject.fromObject(string); -// map = jsonobject; -// -// -// log.debug(selectItems); -// log.debug(selectNode); -// boolean result = false ; -// if (selectItems.size() >0) { -// result = moveDataService.moveData(selectItems, selectNode.getPath()); -// } -// return result; -// } - - @RequestMapping(value="/oracle/list", method= RequestMethod.POST) - @ResponseBody - public List oracleList() throws Exception { - log.debug("----------getOracleInfo-----------------------"); - List result = mySqlService.findAllMySql(); - return result; - } - - @RequestMapping(value="/oracle/{id}/delete", method= RequestMethod.POST) - public void oracleDelete(@PathVariable String id) throws Exception { - log.debug("----------deleteOracleInfo----------------"); - Integer num = Integer.valueOf(id); - mySqlService.deleteMySql(num); - } - - @RequestMapping(value="/oracle/{id}/insert", method= RequestMethod.POST) - @ResponseBody - public void oracleInsert(@PathVariable String id, @RequestBody GatherOracleInfo oracle) throws Exception { - log.debug("----------insertOracleInfo----------------"); - oracle.setId(Integer.valueOf(id)); - mySqlService.insertOracle(oracle); - } - - @RequestMapping(value="/oracle/{id}/update", method= RequestMethod.POST) - @ResponseBody - public void oracleUpdate(@PathVariable("id") String id, @RequestBody GatherOracleInfo oracle) throws Exception { - log.debug("----------updateOracleInfo-----------------------"); - log.debug(oracle); - mySqlService.updateOracle(oracle); - } - - @RequestMapping(value="/task/transfer/list", method= RequestMethod.POST) - @ResponseBody - public Object taskTransferList() throws Exception { - log.debug("----------/task/transfer/list-----------------------"); - List result = moveDataService.findAll(); - return result; - } - - @RequestMapping(value="/task/transfer/{id}/delete", method= RequestMethod.POST) - @ResponseBody - public Object taskTransferDelete(@PathVariable String id) throws Exception { - log.debug("----------/task/transfer/{id}/delete-----------------------"); - DataInfoEntityMoveTmp move = new DataInfoEntityMoveTmp(); - move.setId(Integer.valueOf(id)); - int result = moveDataService.delete(move ); - return result; - } - - @RequestMapping(value="/task/transfer/save", method= RequestMethod.POST) - @ResponseBody - public Object taskTransferSave(@RequestBody DataInfoEntity move) throws Exception { - log.debug("---------/task/transfer/save-----------------------"); - int result = dfs.save(move); - return result; - } - - @RequestMapping(value="/code/list", method= RequestMethod.POST) - @ResponseBody - public Object findCodeList() throws Exception { - log.debug("---------/findSystemCode-----------------------"); - Map result = codeService.findAll(); - return result; - } -} +package com.platform.controller; + +import java.io.UnsupportedEncodingException; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; + +import org.apache.commons.lang.StringUtils; +import org.apache.ibatis.annotations.Param; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Controller; +import org.springframework.stereotype.Service; +import org.springframework.ui.ModelMap; +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; +import com.platform.entities.DataInfoEntity; +import com.platform.entities.DataInfoEntityMoveTmp; +import com.platform.entities.FolderNode; +import com.platform.entities.GatherOracleInfo; +import com.platform.entities.OracleConnectorParams; +import com.platform.entities.PagerOptions; +import com.platform.entities.VolumeEntity; +import com.platform.glusterfs.CheckoutMD5; +import com.platform.service.DataInfoService; +import com.platform.service.ICodeService; +import com.platform.service.IGfsService; +import com.platform.service.IMoveDataService; +import com.platform.service.IMySqlService; +import com.platform.service.IOracleExtractService; +import com.platform.service.OracleExtractHelper; +import com.platform.service.OracleStatusService; +import com.platform.service.impl.MySqlServiceImpl; +import com.platform.test.Brick; +import com.platform.test.FolderReader; +import com.platform.test.Volume; +import com.platform.utils.Bean2MapUtils; +import com.platform.utils.Configs; +import com.platform.utils.UtilsHelper; + +@Controller +public class DataModelController extends BaseController{ + + public static Logger log = Logger.getLogger(DataModelController.class); + + @Resource(name = "dataInfoService") + private DataInfoService dfs; + + @Resource(name = "gfsService") + private IGfsService gfsService; + + @Resource(name = "mySqlService") + private IMySqlService mySqlService; + + @Resource(name = "OracleExtract") + private IOracleExtractService OracleExtract; + + @Resource(name = "moveDataService") + private IMoveDataService moveDataService; + + @Resource(name = "codeService") + private ICodeService codeService; + + public void setDfsImp(DataInfoService dfs) { + this.dfs = dfs; + } + + @RequestMapping("/data.json") + @ResponseBody + public ModelMap getAllDataToJson(HttpServletRequest res, + HttpServletResponse req) throws UnsupportedEncodingException { + res.setCharacterEncoding("UTF-8"); + Map paramMap = res.getParameterMap(); + Set keySet = paramMap.keySet(); + Map params = new HashMap(); + StringBuffer sb = new StringBuffer().append("当前的请求参数:{"); + for (String str : keySet) { + String value = paramMap.get(str)[0]; + if (StringUtils.isNotEmpty(value)) { + params.put(str, value); + sb.append(str).append(":").append(value).append(","); + } else { + sb.append(str).append(":").append("null").append(","); + } + } + Configs.CONSOLE_LOGGER.info(sb.deleteCharAt(sb.length() - 1) + .append("}").toString()); + PagerOptions pagerOptions = (PagerOptions) UtilsHelper + .newObjAndSetAttrsByClass(PagerOptions.class, params); + + return dfs.getPagerTableData(pagerOptions); + } + + @RequestMapping(value="/delete/data", method= RequestMethod.POST) + public void deleteData(HttpServletRequest res, HttpServletResponse req) throws Exception { + res.setCharacterEncoding("UTF-8"); + Map paramMap = res.getParameterMap(); + String[] data = paramMap.get("data"); + dfs.deleteData(data); + } + + @RequestMapping("/connectOracle") + public void connectOracle(HttpServletRequest res, HttpServletResponse req) throws UnsupportedEncodingException { + res.setCharacterEncoding("UTF-8"); + Map paramMap = res.getParameterMap(); + String[] oraclesName = paramMap.get("oracleName"); + if (oraclesName != null) + for (String rcName : oraclesName) { + Configs.CONSOLE_LOGGER.info("连接成功\t" + rcName); + new OracleStatusService().connectToOracle(rcName); + } + } + + @RequestMapping("/cancelOracleConection") + public void cancelOracleConnection(HttpServletRequest res, + HttpServletResponse req) throws UnsupportedEncodingException { + res.setCharacterEncoding("UTF-8"); + Map paramMap = res.getParameterMap(); + String[] oraclesName = paramMap.get("oracleName"); + String operate = paramMap.get("operation")[0]; + if (null != oraclesName) { + for (String rcName : oraclesName) { + Configs.CONSOLE_LOGGER.info("取消连接:\t" + rcName); + new OracleStatusService().cancelToOracle(rcName, operate); + } + } + } + + @RequestMapping(value="/oracle/{name}/extract", method= RequestMethod.POST) + public void oracleExtract(HttpServletRequest res, + HttpServletResponse req,@PathVariable String name) throws Exception { + res.setCharacterEncoding("UTF-8"); + System.out.println("------extract-------"); + System.out.println(name); + Map paramMap = res.getParameterMap(); + //汇总库 对象信息--带有tableName- + String[] nodes = paramMap.get("target"); + Map map = null; + for (String string : nodes) { + JSONObject jsonobject = JSONObject.fromObject(string); + map = jsonobject; + System.out.println(map); + } + + // 采集库对象--(多个采集库抽取到1个汇总库的1个tableName下) + String[] inneed = paramMap.get("inneed"); + List> colleclist = new ArrayList>(); + for (String string : nodes) { + JSONObject jsonobject = JSONObject.fromObject(string); + Map inneedMap = jsonobject; + colleclist.add(inneedMap); + } + OracleExtract.extractOracle(name, colleclist, map); + + } +// public void oracleExtract(HttpServletRequest res, +// HttpServletResponse req, String name, @RequestBody GatherOracleInfo gather, @RequestBody List collectOracles) +// throws Exception { +//// res.setCharacterEncoding("UTF-8"); +// log.debug("------extract-------"); +//// Map paramMap = res.getParameterMap(); +//// log.debug(paramMap); +//// //汇总库 对象信息--带有tableName- +//// String[] nodes = paramMap.get("target"); +//// Map map = null; +//// for (String string : nodes) { +//// JSONObject jsonobject = JSONObject.fromObject(string); +//// map = jsonobject; +//// System.out.println(map); +//// } +//// +//// // 采集库对象--(多个采集库抽取到1个汇总库的1个tableName下) +//// String[] inneed = paramMap.get("inneed"); +//// List> colleclist = new ArrayList>(); +//// for (String string : nodes) { +//// JSONObject jsonobject = JSONObject.fromObject(string); +//// Map inneedMap = jsonobject; +//// colleclist.add(inneedMap); +//// } +// OracleExtract.extractOracle(name, collectOracles, gather); +// } + + @RequestMapping(value="/volume/list", method= RequestMethod.POST) + @ResponseBody + public List volumeList() throws Exception { + log.debug("-----/volume/list------"); + List result = gfsService.getAllVolumes(); + return result; + } + + @RequestMapping(value = "/volume/{name}/move", method= RequestMethod.POST) + public void volumeMove(HttpServletRequest res, HttpServletResponse req,@PathVariable String name, + FolderNode selectNode, DataInfoEntity selectItems) throws Exception { + res.setCharacterEncoding("UTF-8"); + System.out.println("get Request"); + Map paramMap = res.getParameterMap(); +// System.out.println(paramMap); + String[] nodes = paramMap.get("selectNode"); + Map map = null; + for (String string : nodes) { + System.out.println(string); + JSONObject jsonobject = JSONObject.fromObject(string); + map = jsonobject; + } + String dstVolume = (String) map.get("volume"); + + List listItemPath = new ArrayList(); + String[] items = paramMap.get("selectItems"); + System.out.println("selectItems"); + List datas = new ArrayList(); + List srcVolumes = new ArrayList(); + for (String string : items) { + System.out.println(string); + JSONObject jsobj = JSONObject.fromObject(string); + Map itemmap = jsobj; + DataInfoEntity data = (DataInfoEntity) Bean2MapUtils.convertMap(DataInfoEntity.class, itemmap); + datas.add(data); + } + System.out.println("------/volume/{name}/move--------"); + if (datas.size() >0) { + moveDataService.moveData(datas, (String)map.get("path")); + } + } +// public Object volumeMove(HttpServletRequest res, HttpServletResponse req, String name, +// @RequestBody FolderNode selectNode, @RequestBody List selectItems) throws Exception { +// log.debug("-----/volume/{name}/move------"); +//// Map paramMap = res.getParameterMap(); +//// System.out.println(paramMap); +// Map paramMap = res.getParameterMap(); +// log.debug(paramMap); +// //汇总库 对象信息--带有tableName- +// String[] nodes = (String[]) paramMap.get("selectNode"); +// Map map = null; +// JSONObject jsonobject = JSONObject.fromObject(string); +// map = jsonobject; +// +// +// log.debug(selectItems); +// log.debug(selectNode); +// boolean result = false ; +// if (selectItems.size() >0) { +// result = moveDataService.moveData(selectItems, selectNode.getPath()); +// } +// return result; +// } + + @RequestMapping(value="/oracle/list", method= RequestMethod.POST) + @ResponseBody + public List oracleList() throws Exception { + log.debug("----------getOracleInfo-----------------------"); + List result = mySqlService.findAllMySql(); + return result; + } + + @RequestMapping(value="/oracle/{id}/delete", method= RequestMethod.POST) + public void oracleDelete(@PathVariable String id) throws Exception { + log.debug("----------deleteOracleInfo----------------"); + Integer num = Integer.valueOf(id); + mySqlService.deleteMySql(num); + } + + @RequestMapping(value="/oracle/{id}/insert", method= RequestMethod.POST) + @ResponseBody + public void oracleInsert(@PathVariable String id, @RequestBody GatherOracleInfo oracle) throws Exception { + log.debug("----------insertOracleInfo----------------"); + oracle.setId(Integer.valueOf(id)); + mySqlService.insertOracle(oracle); + } + + @RequestMapping(value="/oracle/{id}/update", method= RequestMethod.POST) + @ResponseBody + public void oracleUpdate(@PathVariable("id") String id, @RequestBody GatherOracleInfo oracle) throws Exception { + log.debug("----------updateOracleInfo-----------------------"); + log.debug(oracle); + mySqlService.updateOracle(oracle); + } + + @RequestMapping(value="/task/transfer/list", method= RequestMethod.POST) + @ResponseBody + public Object taskTransferList() throws Exception { + log.debug("----------/task/transfer/list-----------------------"); + List result = moveDataService.findAll(); + return result; + } + + @RequestMapping(value="/task/transfer/{id}/delete", method= RequestMethod.POST) + @ResponseBody + public Object taskTransferDelete(@PathVariable String id) throws Exception { + log.debug("----------/task/transfer/{id}/delete-----------------------"); + DataInfoEntityMoveTmp move = new DataInfoEntityMoveTmp(); + move.setId(Integer.valueOf(id)); + int result = moveDataService.delete(move ); + return result; + } + + @RequestMapping(value="/task/transfer/save", method= RequestMethod.POST) + @ResponseBody + public Object taskTransferSave(@RequestBody DataInfoEntity move) throws Exception { + log.debug("---------/task/transfer/save-----------------------"); + int result = dfs.save(move); + return result; + } + + @RequestMapping(value="/code/list", method= RequestMethod.POST) + @ResponseBody + public Object findCodeList() throws Exception { + log.debug("---------/findSystemCode-----------------------"); + Map result = codeService.findAll(); + return result; + } +} diff --git a/src/com/platform/controller/TaskModelController.java b/src/com/platform/controller/TaskModelController.java new file mode 100644 index 00000000..7a861661 --- /dev/null +++ b/src/com/platform/controller/TaskModelController.java @@ -0,0 +1,28 @@ +package com.platform.controller; + +import java.util.ArrayList; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import com.base.BaseController; + +@Controller +public class TaskModelController extends BaseController{ + + @RequestMapping("/task/transfer/list") + @ResponseBody + public List getTransferTask(HttpServletRequest res, HttpServletResponse req) { + List list = new ArrayList(); + list.add(1); + list.add(2); + list.add(3); + list.add(4); + return list; + } +} diff --git a/src/com/platform/entities/OracleConnectorParams.java b/src/com/platform/entities/OracleConnectorParams.java index 75c90a5e..8391a84a 100644 --- a/src/com/platform/entities/OracleConnectorParams.java +++ b/src/com/platform/entities/OracleConnectorParams.java @@ -15,6 +15,7 @@ public class OracleConnectorParams { public OracleConnectorParams() { // TODO Auto-generated constructor stub + maybeInit(); } public OracleConnectorParams(String port, String ip, String name) { @@ -37,9 +38,9 @@ public class OracleConnectorParams { private void maybeInit() { Properties properties = ConfigPropertyReader.Builder( Configs.CONFIG_LOCALTION).getProperties(); - this.user = properties.getProperty("collect-user"); + this.user = properties.getProperty("collect-user-name"); this.password = properties.getProperty("collect-password"); - this.databaseName = properties.getProperty("collect-database"); + this.databaseName = properties.getProperty("collect-service-name"); } public String getPort() { @@ -89,5 +90,4 @@ public class OracleConnectorParams { public void setDatabaseName(String databaseName) { this.databaseName = databaseName; } - } diff --git a/src/com/platform/oracle/OracleConnector.java b/src/com/platform/oracle/OracleConnector.java index ddbb0f3b..c7749648 100644 --- a/src/com/platform/oracle/OracleConnector.java +++ b/src/com/platform/oracle/OracleConnector.java @@ -6,11 +6,9 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import javax.validation.constraints.Pattern.Flag; - import com.platform.utils.Configs; -public class OracleConnector { +public class OracleConnector { static { try { Class.forName("oracle.jdbc.driver.OracleDriver"); @@ -19,18 +17,17 @@ public class OracleConnector { // TODO Auto-generated catch block e.printStackTrace(); } - } + } + public static Connection ConnectionBuilder(String url, String user, - String password) { - Connection conn = null; + String password) { + Connection conn=null; try { - conn = DriverManager.getConnection(url, user, password); - } catch (SQLException e) { - return conn; + } catch (SQLException e) { + Configs.CONSOLE_LOGGER.info("创建oracle连接失败: [" + e.getMessage() + "]"); } - return conn; } @@ -75,5 +72,5 @@ public class OracleConnector { e.printStackTrace(); } return flag; - } -} + } +} \ No newline at end of file diff --git a/src/com/platform/service/OracleStatusService.java b/src/com/platform/service/OracleStatusService.java index 86e54628..d9b006e7 100644 --- a/src/com/platform/service/OracleStatusService.java +++ b/src/com/platform/service/OracleStatusService.java @@ -17,31 +17,20 @@ import com.platform.utils.Configs; public class OracleStatusService { private static Map alliveTask = new Hashtable(); - public final static int EXEC_TIME = 10;// 连接多少次后不成功，取消链接 + public final static int EXEC_TIME = 9;// 连接多少次后不成功，取消链接 public final static long INTERVAL_TIME = 60 * 1000;// 每隔多少毫秒执行一次连接任务 - public final static long DELAY_TIME = 0; // 延迟多少秒后执行 + public final static long DELAY_TIME = 30 * 1000; // 延迟多少秒后执行 public void connectToOracle(String replicasName) { SimpleKubeClient sKubeClient = new SimpleKubeClient(); - ReplicationController replicationController = sKubeClient - .getReplicationController(replicasName); if (alliveTask.containsKey(replicasName)) { killAlliveTask(replicasName); } - if (null != replicationController) { - List filterPods = sKubeClient - .getPodsForApplicaList(replicationController); - if (filterPods != null && filterPods.size() > 0) { - Pod pod = filterPods.get(0); - OracleConnectorParams orp = new OracleConnectorParams( - String.valueOf(sKubeClient.getPodContainerport(pod)), - sKubeClient.getPodHostIp(pod), replicasName); - Timer timer = new Timer(); - alliveTask.put(replicasName, timer); - timer.schedule(new connectTask(orp, sKubeClient), DELAY_TIME, - INTERVAL_TIME); - } - } + OracleConnectorParams orp = new OracleConnectorParams(); + Timer timer = new Timer(); + alliveTask.put(replicasName, timer); + timer.schedule(new connectTask(replicasName, orp, sKubeClient), DELAY_TIME, + INTERVAL_TIME); } @@ -96,6 +85,13 @@ public class OracleStatusService { private int count; private OracleConnectorParams ocp; private SimpleKubeClient client; + + public connectTask(String taskName, OracleConnectorParams ocp, SimpleKubeClient client){ + this.taskName = taskName; + this.ocp = ocp; + this.count = 0; + this.client = client; + } public connectTask(OracleConnectorParams ocp, SimpleKubeClient client) { this.taskName = ocp.getName(); @@ -106,32 +102,58 @@ public class OracleStatusService { @Override public void run() { - if (count == EXEC_TIME && alliveTask.containsKey(taskName)) { + if (count == EXEC_TIME && alliveTask.containsKey(taskName)) { //如果任务已经执行10次，则任务oracle启动失败，并取消oracle连接 killAlliveTask(taskName); - client.updateOrAddReplicasLabelById(taskName, "status", "1"); - } else { - String url = "jdbc:oracle:thin:@" + ocp.getIp() + ":" - + ocp.getPort() + "/" + ocp.getDatabaseName(); - boolean flag = OracleConnector.canConnect(url, ocp.getUser(), - ocp.getPassword()); - String message = "失败"; - if (flag && alliveTask.containsKey(taskName)) { - client.updateOrAddReplicasLabelById(taskName, "status", "2"); - message = "成功"; - killAlliveTask(taskName); // 连接成功，取消连接 + client.updateOrAddReplicasLabelById(taskName, "status", "1"); //更新ReplicationController标签，将oracle状态标示未1(0:启动中，1：失败，2：成功) + Configs.CONSOLE_LOGGER.info("更新replicationController标签： " + + taskName + "\t[标签更新为： 失败]"); + } else { //否则，执行连接oracle任务，判断oracle是否启动成功 + Pod pod = filterPod(); + if (pod != null) { + String ip = client.getPodHostIp(pod); + int port = client.getPodContainerport(pod); + if (ip != null && port != 0) { + String url = "jdbc:oracle:thin:@" + ip + ":" + port + + ":" + ocp.getDatabaseName(); + boolean flag = OracleConnector.canConnect(url, //连接结果返回参数，true标示连接成功，false标示连接失败 + ocp.getUser(), ocp.getPassword()); + Configs.CONSOLE_LOGGER.info("url:" + url + ",user:" + + ocp.getUser() + ",password:" + + ocp.getPassword()); + String message = "失败"; + if (flag && alliveTask.containsKey(taskName)) { + client.updateOrAddReplicasLabelById(taskName, + "status", "2"); + message = "成功"; + killAlliveTask(taskName); // 连接成功，取消连接 + Configs.CONSOLE_LOGGER + .info("更新replicationController标签： " + + taskName + "\t[标签更新为： 成功]"); + } + Configs.CONSOLE_LOGGER.info("连接到数据库服务： " + taskName + + "\t[连接结果： " + message + "]"); + } } - Configs.CONSOLE_LOGGER.info("连接到数据库服务： " + taskName - + "\t[连接结果： " + message + "]"); } count++; } - @Override - public boolean cancel() { - System.out.println("aaaaaaa"); - if (client != null) - this.client.close(); - return super.cancel(); + /** + * 获取oracle的连接ip地址和端口号 + * @return + */ + private Pod filterPod() { + Pod pod = null; + ReplicationController replicationController = client + .getReplicationController(taskName); + if (null != replicationController) { + List filterPods = client + .getPodsForApplicaList(replicationController); + if (filterPods != null && filterPods.size() > 0) { + pod = filterPods.get(0); + } + } + return pod; } public String getTaskName() { @@ -146,4 +168,4 @@ public class OracleStatusService { return count; } } -} +} \ No newline at end of file diff --git a/src/com/platform/utils/ConfigsLoader.java b/src/com/platform/utils/ConfigsLoader.java index 9f3880df..56745ce0 100644 --- a/src/com/platform/utils/ConfigsLoader.java +++ b/src/com/platform/utils/ConfigsLoader.java @@ -1,76 +1,74 @@ -package com.platform.utils; - -import java.util.Properties; - -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; - -import com.platform.service.thread.ThreadMoveData; - -public class ConfigsLoader implements ServletContextListener { - private static ConfigPropertyReader cReader = null; - - @Override - public void contextDestroyed(ServletContextEvent sEvent) { - // TODO Auto-generated method stub - Configs.CONSOLE_LOGGER.info("系统停止.."); - } - - @SuppressWarnings("static-access") - @Override - public void contextInitialized(ServletContextEvent sEvent) { - // TODO Auto-generated method stub - Configs.CONSOLE_LOGGER.info("系统初始化.."); - String contextPath = sEvent.getServletContext().getRealPath("/") - + "WEB-INF/config/config.properties"; - this.cReader = ConfigPropertyReader.Builder(contextPath); - init(); - new ThreadVolume("").start(); - } - - public static void init() { - Properties properties = cReader.getProperties(); - - Configs.KUBE_MASTER_URL = properties.getProperty("kubeMasterUrl"); - - Configs.COLLECT_USER_NAME = properties.getProperty("collect-user-name"); - - Configs.COLLECT_PASSWORD = properties.getProperty("collect-password"); - - Configs.COLLECT_SERVICE_NAME = properties - .getProperty("collect-service-name"); - - Configs.GATHER_USER_NAME = properties.getProperty("gather-user-name"); - - Configs.GATHER_USER_PASSWORD = properties - .getProperty("gather-user-password"); - - Configs.GATHER_PORT = properties.getProperty("gather-port"); - - Configs.GATHER_SERVICE_NAME = properties - .getProperty("gather-service-name"); - - Configs.TABLE_SUFFIX = properties.getProperty("table-suffix"); - - Configs.EXTRACT_LOG_LOCALTION = properties - .getProperty("extract-log-localtion"); - - Configs.GATHER_TABLESPACE_NAME = properties - .getProperty("gather-tablespace-name"); - - Configs.GATHER_TABLESPACE_PATH = properties - .getProperty("gather-tablespace-path"); - - Configs.GATHER_TABLE_PASSWORD=properties.getProperty("gather-table-user-password"); - } - - public ConfigPropertyReader getcReader() { - return cReader; - } - - @SuppressWarnings("static-access") - public void setcReader(ConfigPropertyReader cReader) { - this.cReader = cReader; - } - -} +package com.platform.utils; + +import java.util.Properties; + +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; + +public class ConfigsLoader implements ServletContextListener { + private static ConfigPropertyReader cReader = null; + + @Override + public void contextDestroyed(ServletContextEvent sEvent) { + // TODO Auto-generated method stub + Configs.CONSOLE_LOGGER.info("系统停止.."); + } + + @SuppressWarnings("static-access") + @Override + public void contextInitialized(ServletContextEvent sEvent) { + // TODO Auto-generated method stub + Configs.CONSOLE_LOGGER.info("系统初始化.."); + String contextPath = sEvent.getServletContext().getRealPath("/") + + "WEB-INF/config/config.properties"; + this.cReader = ConfigPropertyReader.Builder(contextPath); + init(); + new ThreadVolume("").start(); + } + + public static void init() { + Properties properties = cReader.getProperties(); + + Configs.KUBE_MASTER_URL = properties.getProperty("kubeMasterUrl"); + + Configs.COLLECT_USER_NAME = properties.getProperty("collect-user-name"); + + Configs.COLLECT_PASSWORD = properties.getProperty("collect-password"); + + Configs.COLLECT_SERVICE_NAME = properties + .getProperty("collect-service-name"); + + Configs.GATHER_USER_NAME = properties.getProperty("gather-user-name"); + + Configs.GATHER_USER_PASSWORD = properties + .getProperty("gather-user-password"); + + Configs.GATHER_PORT = properties.getProperty("gather-port"); + + Configs.GATHER_SERVICE_NAME = properties + .getProperty("gather-service-name"); + + Configs.TABLE_SUFFIX = properties.getProperty("table-suffix"); + + Configs.EXTRACT_LOG_LOCALTION = properties + .getProperty("extract-log-localtion"); + + Configs.GATHER_TABLESPACE_NAME = properties + .getProperty("gather-tablespace-name"); + + Configs.GATHER_TABLESPACE_PATH = properties + .getProperty("gather-tablespace-path"); + + Configs.GATHER_TABLE_PASSWORD=properties.getProperty("gather-table-user-password"); + } + + public ConfigPropertyReader getcReader() { + return cReader; + } + + @SuppressWarnings("static-access") + public void setcReader(ConfigPropertyReader cReader) { + this.cReader = cReader; + } + +} diff --git a/src/com/platform/utils/getTreeDataByPath.java b/src/com/platform/utils/getTreeDataByPath.java index 376de4de..5dbfb9be 100644 --- a/src/com/platform/utils/getTreeDataByPath.java +++ b/src/com/platform/utils/getTreeDataByPath.java @@ -1,4 +1,3 @@ - package com.platform.utils; import java.util.List; diff --git a/src/com/platform/websocket/SystemWebSocketHandler.java b/src/com/platform/websocket/SystemWebSocketHandler.java new file mode 100644 index 00000000..fb278803 --- /dev/null +++ b/src/com/platform/websocket/SystemWebSocketHandler.java @@ -0,0 +1,51 @@ +package com.platform.websocket; + +import org.springframework.web.socket.CloseStatus; +import org.springframework.web.socket.TextMessage; +import org.springframework.web.socket.WebSocketHandler; +import org.springframework.web.socket.WebSocketMessage; +import org.springframework.web.socket.WebSocketSession; + +public class SystemWebSocketHandler implements WebSocketHandler { + + @Override + public void afterConnectionClosed(WebSocketSession arg0, CloseStatus arg1) + throws Exception { + // TODO Auto-generated method stub + + } + + @Override + public void afterConnectionEstablished(WebSocketSession arg0) + throws Exception { + // TODO Auto-generated method stub + + } + + @Override + public void handleMessage(WebSocketSession arg0, WebSocketMessage arg1) + throws Exception { + // TODO Auto-generated method stub + TextMessage returnMessage = new TextMessage("received at server"); + sendMessageToUsers(returnMessage); + System.out.println("接到请求"); + } + + @Override + public void handleTransportError(WebSocketSession arg0, Throwable arg1) + throws Exception { + // TODO Auto-generated method stub + + } + + @Override + public boolean supportsPartialMessages() { + // TODO Auto-generated method stub + return false; + } + + public void sendMessageToUsers(TextMessage message) { + + } + +} diff --git a/src/com/platform/websocket/WebSocketConfig.java b/src/com/platform/websocket/WebSocketConfig.java new file mode 100644 index 00000000..5faef12b --- /dev/null +++ b/src/com/platform/websocket/WebSocketConfig.java @@ -0,0 +1,28 @@ +package com.platform.websocket; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.EnableWebMvc; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; +import org.springframework.web.socket.WebSocketHandler; +import org.springframework.web.socket.config.annotation.EnableWebSocket; +import org.springframework.web.socket.config.annotation.WebSocketConfigurer; +import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry; + + +@Configuration +@EnableWebMvc +@EnableWebSocket +public class WebSocketConfig extends WebMvcConfigurerAdapter implements WebSocketConfigurer { + + @Override + public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { + // TODO Auto-generated method stub + registry.addHandler(myHandler(), "/webSocketServer"); + } + + @Bean + public WebSocketHandler myHandler() { + return new SystemWebSocketHandler(); + } +} 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 9b00b15c..39ce1962 100644 --- a/test/com/platform/test/FolderReader.java +++ b/test/com/platform/test/FolderReader.java @@ -1,37 +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); - } - } -// folderNode = new FolderNode(file.getName(), file.getAbsolutePath(), -// childrens); - } - 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 new file mode 100644 index 00000000..7fb359de --- /dev/null +++ b/test/com/platform/test/TestConnectOralce.java @@ -0,0 +1,29 @@ +package com.platform.test; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; + +import com.platform.utils.Configs; + +public class TestConnectOralce { + + public static void main(String[] args) { + // TODO Auto-generated method stub + try{ + Class.forName("oracle.jdbc.driver.OracleDriver"); + Configs.CONSOLE_LOGGER.info("Oracle驱动加载成功"); + }catch(Exception e){ + System.out.println(e); + } + String url = "jdbc:oracle:thin:@192.168.0.110:60758:orcl"; + try { + Connection conn = DriverManager.getConnection(url, "system", "oracle"); + System.out.println("连接成功"); + } catch (SQLException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + +} 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