Compare commits
No commits in common. "web_backend_develope" and "master" have entirely different histories.
web_backen
...
master
15
.classpath
15
.classpath
|
|
@ -2,9 +2,18 @@
|
||||||
<classpath>
|
<classpath>
|
||||||
<classpathentry kind="src" path="src"/>
|
<classpathentry kind="src" path="src"/>
|
||||||
<classpathentry kind="src" path="test"/>
|
<classpathentry kind="src" path="test"/>
|
||||||
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
|
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/Java">
|
||||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
|
<attributes>
|
||||||
|
<attribute name="owner.project.facets" value="java"/>
|
||||||
|
</attributes>
|
||||||
|
</classpathentry>
|
||||||
|
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0">
|
||||||
|
<attributes>
|
||||||
|
<attribute name="owner.project.facets" value="jst.web"/>
|
||||||
|
</attributes>
|
||||||
|
</classpathentry>
|
||||||
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
|
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
|
||||||
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0"/>
|
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
|
||||||
|
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/junit-4.12.jar"/>
|
||||||
<classpathentry kind="output" path="build/classes"/>
|
<classpathentry kind="output" path="build/classes"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
/target
|
|
||||||
/build
|
|
||||||
/RemoteSystemsTempFiles
|
|
||||||
/bin/
|
|
||||||
.settings
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
!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.
|
|
||||||
Binary file not shown.
Binary file not shown.
|
|
@ -1,3 +0,0 @@
|
||||||
#GitProjectData
|
|
||||||
#Tue Sep 13 08:40:10 CST 2016
|
|
||||||
.gitdir=../.git
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
|
|
||||||
Binary file not shown.
|
|
@ -1 +0,0 @@
|
||||||
|
|
||||||
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,2 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
||||||
<typeInfoHistroy/>
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
||||||
<qualifiedTypeNameHistroy/>
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<section name="Workbench">
|
|
||||||
<section name="org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart">
|
|
||||||
<item value="2" key="layout"/>
|
|
||||||
<item value="true" key="group_libraries"/>
|
|
||||||
<item value="<?xml version="1.0" encoding="UTF-8"?>
<packageExplorer group_libraries="1" layout="2" linkWithEditor="0" rootMode="1" workingSetName="">
<customFilters userDefinedPatternsEnabled="false">
<xmlDefinedFilters>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.StaticsFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer_patternFilterId_RemoteSystemsConnections" isEnabled="true"/>
<child filterId="org.eclipse.mylyn.java.ui.MembersFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.NonSharedProjectsFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.internal.ui.PackageExplorer.EmptyInnerPackageFilter" isEnabled="true"/>
<child filterId="org.eclipse.m2e.MavenModuleFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.ClosedProjectsFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.EmptyLibraryContainerFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.PackageDeclarationFilter" isEnabled="true"/>
<child filterId="org.eclipse.pde.ui.BinaryProjectFilter1" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.LocalTypesFilter" isEnabled="false"/>
<child filterId="org.eclipse.pde.ui.ExternalPluginLibrariesFilter1" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.FieldsFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer_patternFilterId_RemoteSystemsTempFiles" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.NonJavaProjectsFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer_patternFilterId_.*" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.SyntheticMembersFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.ContainedLibraryFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.internal.ui.PackageExplorer.HideInnerClassFilesFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.ImportDeclarationFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.NonJavaElementFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.LibraryFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.CuAndClassFileFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.internal.ui.PackageExplorer.EmptyPackageFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.NonPublicFilter" isEnabled="false"/>
</xmlDefinedFilters>
</customFilters>
</packageExplorer>" key="memento"/>
|
|
||||||
<item value="1" key="rootMode"/>
|
|
||||||
<item value="false" key="linkWithEditor"/>
|
|
||||||
</section>
|
|
||||||
</section>
|
|
||||||
|
|
@ -1,41 +0,0 @@
|
||||||
<configuration scan="true">
|
|
||||||
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
|
|
||||||
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
|
|
||||||
<pattern>%date [%thread] %-5level %logger{35} - %msg%n</pattern>
|
|
||||||
</encoder>
|
|
||||||
<filter class="org.eclipse.m2e.logback.appender.ConsoleAppenderFilter"/>
|
|
||||||
</appender>
|
|
||||||
|
|
||||||
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
|
||||||
<File>${org.eclipse.m2e.log.dir}/0.log</File>
|
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
|
|
||||||
<FileNamePattern>${org.eclipse.m2e.log.dir}/%i.log</FileNamePattern>
|
|
||||||
<MinIndex>1</MinIndex>
|
|
||||||
<MaxIndex>10</MaxIndex>
|
|
||||||
</rollingPolicy>
|
|
||||||
<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
|
|
||||||
<MaxFileSize>100MB</MaxFileSize>
|
|
||||||
</triggeringPolicy>
|
|
||||||
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
|
|
||||||
<pattern>%date [%thread] %-5level %logger{35} - %msg%n</pattern>
|
|
||||||
</encoder>
|
|
||||||
</appender>
|
|
||||||
|
|
||||||
<appender name="EclipseLog" class="org.eclipse.m2e.logback.appender.EclipseLogAppender">
|
|
||||||
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
|
|
||||||
<level>WARN</level>
|
|
||||||
</filter>
|
|
||||||
</appender>
|
|
||||||
|
|
||||||
<appender name="MavenConsoleLog" class="org.eclipse.m2e.logback.appender.MavenConsoleAppender">
|
|
||||||
</appender>
|
|
||||||
|
|
||||||
<root level="INFO">
|
|
||||||
<appender-ref ref="FILE" />
|
|
||||||
<appender-ref ref="STDOUT" />
|
|
||||||
<appender-ref ref="EclipseLog" />
|
|
||||||
<appender-ref ref="MavenConsoleLog" />
|
|
||||||
</root>
|
|
||||||
|
|
||||||
<logger name="com.ning.http.client" level="INFO" />
|
|
||||||
</configuration>
|
|
||||||
|
|
@ -1,57 +0,0 @@
|
||||||
# RSE DOM Node
|
|
||||||
00-name=DESKTOP-65KJ4BV\:local.files
|
|
||||||
01-type=FilterPool
|
|
||||||
03-attr.default=true
|
|
||||||
03-attr.deletable=true
|
|
||||||
03-attr.id=local.files
|
|
||||||
03-attr.nonRenamable=false
|
|
||||||
03-attr.owningParentName=null
|
|
||||||
03-attr.release=200
|
|
||||||
03-attr.singleFilterStringOnly=false
|
|
||||||
03-attr.singleFilterStringOnlyESet=false
|
|
||||||
03-attr.stringsCaseSensitive=true
|
|
||||||
03-attr.supportsDuplicateFilterStrings=false
|
|
||||||
03-attr.supportsNestedFilters=true
|
|
||||||
03-attr.type=default
|
|
||||||
06-child.00000.00-name=My Home
|
|
||||||
06-child.00000.01-type=Filter
|
|
||||||
06-child.00000.03-attr.default=false
|
|
||||||
06-child.00000.03-attr.filterType=default
|
|
||||||
06-child.00000.03-attr.id=My Home
|
|
||||||
06-child.00000.03-attr.nonChangable=false
|
|
||||||
06-child.00000.03-attr.nonDeletable=false
|
|
||||||
06-child.00000.03-attr.nonRenamable=false
|
|
||||||
06-child.00000.03-attr.promptable=false
|
|
||||||
06-child.00000.03-attr.relativeOrder=0
|
|
||||||
06-child.00000.03-attr.release=200
|
|
||||||
06-child.00000.03-attr.singleFilterStringOnly=false
|
|
||||||
06-child.00000.03-attr.stringsCaseSensitive=false
|
|
||||||
06-child.00000.03-attr.stringsNonChangable=false
|
|
||||||
06-child.00000.03-attr.supportsDuplicateFilterStrings=false
|
|
||||||
06-child.00000.03-attr.supportsNestedFilters=true
|
|
||||||
06-child.00000.06-child.00000.00-name=C\:\\Users\\wuming\\*
|
|
||||||
06-child.00000.06-child.00000.01-type=FilterString
|
|
||||||
06-child.00000.06-child.00000.03-attr.default=false
|
|
||||||
06-child.00000.06-child.00000.03-attr.string=C\:\\Users\\wuming\\*
|
|
||||||
06-child.00000.06-child.00000.03-attr.type=default
|
|
||||||
06-child.00001.00-name=Drives
|
|
||||||
06-child.00001.01-type=Filter
|
|
||||||
06-child.00001.03-attr.default=false
|
|
||||||
06-child.00001.03-attr.filterType=default
|
|
||||||
06-child.00001.03-attr.id=Drives
|
|
||||||
06-child.00001.03-attr.nonChangable=false
|
|
||||||
06-child.00001.03-attr.nonDeletable=false
|
|
||||||
06-child.00001.03-attr.nonRenamable=false
|
|
||||||
06-child.00001.03-attr.promptable=false
|
|
||||||
06-child.00001.03-attr.relativeOrder=0
|
|
||||||
06-child.00001.03-attr.release=200
|
|
||||||
06-child.00001.03-attr.singleFilterStringOnly=false
|
|
||||||
06-child.00001.03-attr.stringsCaseSensitive=false
|
|
||||||
06-child.00001.03-attr.stringsNonChangable=false
|
|
||||||
06-child.00001.03-attr.supportsDuplicateFilterStrings=false
|
|
||||||
06-child.00001.03-attr.supportsNestedFilters=true
|
|
||||||
06-child.00001.06-child.00000.00-name=*
|
|
||||||
06-child.00001.06-child.00000.01-type=FilterString
|
|
||||||
06-child.00001.06-child.00000.03-attr.default=false
|
|
||||||
06-child.00001.06-child.00000.03-attr.string=*
|
|
||||||
06-child.00001.06-child.00000.03-attr.type=default
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
||||||
# RSE DOM Node
|
|
||||||
00-name=Local
|
|
||||||
01-type=Host
|
|
||||||
03-attr.description=
|
|
||||||
03-attr.hostname=LOCALHOST
|
|
||||||
03-attr.offline=false
|
|
||||||
03-attr.promptable=false
|
|
||||||
03-attr.systemType=org.eclipse.rse.systemtype.local
|
|
||||||
03-attr.type=Local
|
|
||||||
06-child.00000.00-name=Local Connector Service
|
|
||||||
06-child.00000.01-type=ConnectorService
|
|
||||||
06-child.00000.03-attr.group=Local Connector Service
|
|
||||||
06-child.00000.03-attr.port=0
|
|
||||||
06-child.00000.03-attr.useSSL=false
|
|
||||||
06-child.00000.06-child.00000.00-name=Local Files
|
|
||||||
06-child.00000.06-child.00000.01-type=SubSystem
|
|
||||||
06-child.00000.06-child.00000.03-attr.hidden=false
|
|
||||||
06-child.00000.06-child.00000.03-attr.type=local.files
|
|
||||||
06-child.00000.06-child.00000.06-child.00000.00-name=DESKTOP-65KJ4BV___DESKTOP-65KJ4BV\:local.files
|
|
||||||
06-child.00000.06-child.00000.06-child.00000.01-type=FilterPoolReference
|
|
||||||
06-child.00000.06-child.00000.06-child.00000.03-attr.refID=local.files
|
|
||||||
06-child.00000.06-child.00001.00-name=Local Shells
|
|
||||||
06-child.00000.06-child.00001.01-type=SubSystem
|
|
||||||
06-child.00000.06-child.00001.03-attr.hidden=false
|
|
||||||
06-child.00000.06-child.00001.03-attr.type=local.shells
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
# RSE DOM Node
|
|
||||||
00-name=DESKTOP-65KJ4BV
|
|
||||||
01-type=Profile
|
|
||||||
03-attr.defaultPrivate=true
|
|
||||||
03-attr.isActive=true
|
|
||||||
05-ref.00000=FP.local.files_0
|
|
||||||
05-ref.00001=H.local_16
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<section name="Workbench">
|
|
||||||
<section name="org.eclipse.ui.internal.QuickAccess">
|
|
||||||
<item value="759" key="dialogHeight"/>
|
|
||||||
<item value="1440" key="dialogWidth"/>
|
|
||||||
<list key="textEntries">
|
|
||||||
</list>
|
|
||||||
<list key="orderedElements">
|
|
||||||
</list>
|
|
||||||
<list key="orderedProviders">
|
|
||||||
</list>
|
|
||||||
<list key="textArray">
|
|
||||||
</list>
|
|
||||||
</section>
|
|
||||||
<section name="ShowViewDialog">
|
|
||||||
<item value="345" key="DIALOG_WIDTH"/>
|
|
||||||
<item value="1|Microsoft YaHei UI|9.0|0|WINDOWS|1|-12|0|0|0|400|0|0|0|1|0|0|0|0|Microsoft YaHei UI" key="DIALOG_FONT_NAME"/>
|
|
||||||
<item value="org.eclipse.jdt.ui.PackageExplorer" key="ShowViewDialog.STORE_SELECTED_VIEW_ID"/>
|
|
||||||
<item value="452" key="DIALOG_HEIGHT"/>
|
|
||||||
<item value="796" key="DIALOG_X_ORIGIN"/>
|
|
||||||
<item value="227" key="DIALOG_Y_ORIGIN"/>
|
|
||||||
<list key="ShowViewDialog.STORE_EXPANDED_CATEGORIES_ID">
|
|
||||||
<item value="org.eclipse.jdt.ui.java"/>
|
|
||||||
</list>
|
|
||||||
</section>
|
|
||||||
<section name="ImportExportAction">
|
|
||||||
</section>
|
|
||||||
</section>
|
|
||||||
Binary file not shown.
Binary file not shown.
|
|
@ -1 +0,0 @@
|
||||||
org.eclipse.core.runtime=1
|
|
||||||
7
.project
7
.project
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<projectDescription>
|
<projectDescription>
|
||||||
<name>data_manager_backend</name>
|
<name>data-aggregation-platform</name>
|
||||||
<comment></comment>
|
<comment></comment>
|
||||||
<projects>
|
<projects>
|
||||||
</projects>
|
</projects>
|
||||||
|
|
@ -25,11 +25,6 @@
|
||||||
<arguments>
|
<arguments>
|
||||||
</arguments>
|
</arguments>
|
||||||
</buildCommand>
|
</buildCommand>
|
||||||
<buildCommand>
|
|
||||||
<name>com.genuitec.eclipse.ast.deploy.core.DeploymentBuilder</name>
|
|
||||||
<arguments>
|
|
||||||
</arguments>
|
|
||||||
</buildCommand>
|
|
||||||
</buildSpec>
|
</buildSpec>
|
||||||
<natures>
|
<natures>
|
||||||
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
|
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,12 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<classpath>
|
||||||
|
<classpathentry kind="src" path="WebContent"/>
|
||||||
|
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
|
||||||
|
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
|
||||||
|
<attributes>
|
||||||
|
<attribute name="hide" value="true"/>
|
||||||
|
</attributes>
|
||||||
|
</classpathentry>
|
||||||
|
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
|
||||||
|
<classpathentry kind="output" path=""/>
|
||||||
|
</classpath>
|
||||||
|
|
@ -0,0 +1,2 @@
|
||||||
|
eclipse.preferences.version=1
|
||||||
|
encoding//WebContent/WEB-INF/config/config.properties=UTF-8
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
eclipse.preferences.version=1
|
||||||
|
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
||||||
|
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
|
||||||
|
org.eclipse.jdt.core.compiler.compliance=1.7
|
||||||
|
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
||||||
|
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
||||||
|
org.eclipse.jdt.core.compiler.source=1.7
|
||||||
|
|
@ -0,0 +1,9 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
|
||||||
|
<wb-module deploy-name="data-aggregation-platform">
|
||||||
|
<wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
|
||||||
|
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
|
||||||
|
<wb-resource deploy-path="/WEB-INF/classes" source-path="/test"/>
|
||||||
|
<property name="java-output-path" value="/data-aggregation-platform/build/classes"/>
|
||||||
|
<property name="context-root" value="/"/>
|
||||||
|
</wb-module>
|
||||||
|
</project-modules>
|
||||||
|
|
@ -0,0 +1,10 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<faceted-project>
|
||||||
|
<runtime name="Apache Tomcat v7.0"/>
|
||||||
|
<fixed facet="java"/>
|
||||||
|
<fixed facet="wst.jsdt.web"/>
|
||||||
|
<fixed facet="jst.web"/>
|
||||||
|
<installed facet="java" version="1.7"/>
|
||||||
|
<installed facet="jst.web" version="3.0"/>
|
||||||
|
<installed facet="wst.jsdt.web" version="1.0"/>
|
||||||
|
</faceted-project>
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
org.eclipse.wst.jsdt.launching.baseBrowserLibrary
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
Window
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
#=============================================================================================================
|
#=============================================================================================================
|
||||||
# MySQL
|
# MySQL连接配置
|
||||||
#=============================================================================================================
|
#=============================================================================================================
|
||||||
# 驱动程序
|
# 驱动程序
|
||||||
jdbc.mysql.driver=com.mysql.jdbc.Driver
|
jdbc.mysql.driver=com.mysql.jdbc.Driver
|
||||||
# 连接url
|
# 连接url
|
||||||
jdbc.mysql.url=jdbc:mysql://192.168.0.101:3306/test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
|
jdbc.mysql.url=jdbc:mysql://127.0.0.1:3306/test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
|
||||||
# 用户名
|
# 用户名
|
||||||
jdbc.mysql.username=root
|
jdbc.mysql.username=root
|
||||||
# 密码
|
# 密码
|
||||||
|
|
@ -13,14 +13,15 @@ jdbc.mysql.password=root
|
||||||
#=============================================================================================================
|
#=============================================================================================================
|
||||||
# Oracle 连接配置
|
# Oracle 连接配置
|
||||||
#=============================================================================================================
|
#=============================================================================================================
|
||||||
# hui用户名
|
# 驱动程序
|
||||||
gather-user-name=system
|
jdbc.oracle.driver=oracle.jdbc.driver.OracleDriver
|
||||||
|
# 连接url
|
||||||
|
jdbc.oracle.url=jdbc:oracle:thin:@localhost:1521:orcl;
|
||||||
|
# 用户名
|
||||||
|
jdbc.oracle.username=system
|
||||||
# 密码
|
# 密码
|
||||||
gather-user-password=oracle
|
jdbc.oracle.password=oracle
|
||||||
#
|
|
||||||
gather-port=1521
|
|
||||||
#
|
|
||||||
gather-service-name=orcl
|
|
||||||
#=============================================================================================================
|
#=============================================================================================================
|
||||||
# 数据库公共配置
|
# 数据库公共配置
|
||||||
#=============================================================================================================
|
#=============================================================================================================
|
||||||
|
|
@ -36,15 +37,3 @@ jdbc.testWhileIdle=true
|
||||||
jdbc.timeBetweenEvictionRunsMillis=60000
|
jdbc.timeBetweenEvictionRunsMillis=60000
|
||||||
jdbc.numTestsPerEvictionRun=20
|
jdbc.numTestsPerEvictionRun=20
|
||||||
jdbc.minEvictableIdleTimeMillis=300000
|
jdbc.minEvictableIdleTimeMillis=300000
|
||||||
#==============================================================================================================
|
|
||||||
#
|
|
||||||
#==============================================================================================================
|
|
||||||
table-suffix=_20152016
|
|
||||||
extract-log-localtion=/home/log/
|
|
||||||
gather-tablespace-name=TS_TTSSS
|
|
||||||
gather-tablespace-path=
|
|
||||||
gather-table-user-password=
|
|
||||||
kubeMasterUrl=http://192.168.0.110:8080/
|
|
||||||
collect-user-name=system
|
|
||||||
collect-password=oracle
|
|
||||||
collect-service-name=orcl
|
|
||||||
|
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
#!/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
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
<appender name="dailyRollingFile" class="org.apache.log4j.DailyRollingFileAppender">
|
<appender name="dailyRollingFile" class="org.apache.log4j.DailyRollingFileAppender">
|
||||||
<param name="Threshold" value="info"></param>
|
<param name="Threshold" value="info"></param>
|
||||||
<param name="ImmediateFlush" value="true"></param>
|
<param name="ImmediateFlush" value="true"></param>
|
||||||
<param name="File" value="logs/dailyRollingFile.log"></param>
|
<param name="File" value="d:/logs/dailyRollingFile.log"></param>
|
||||||
<param name="DatePattern" value="'.'yyyy-MM-dd'.log'"></param>
|
<param name="DatePattern" value="'.'yyyy-MM-dd'.log'"></param>
|
||||||
<layout class="org.apache.log4j.PatternLayout">
|
<layout class="org.apache.log4j.PatternLayout">
|
||||||
<param name="ConversionPattern" value="[%d{yyyy-MM-dd HH:mm:ss\} %-5p] [%t] {%c:%L}-%m%n"></param>
|
<param name="ConversionPattern" value="[%d{yyyy-MM-dd HH:mm:ss\} %-5p] [%t] {%c:%L}-%m%n"></param>
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
|
|
||||||
<!-- 输出日志到文件 文件大小到达指定尺寸的时候产生一个新的文件 -->
|
<!-- 输出日志到文件 文件大小到达指定尺寸的时候产生一个新的文件 -->
|
||||||
<appender name="railyFile" class="org.apache.log4j.RollingFileAppender">
|
<appender name="railyFile" class="org.apache.log4j.RollingFileAppender">
|
||||||
<param name="File" value="logs/railyFile.log"></param>
|
<param name="File" value="d:/logs/railyFile.log"></param>
|
||||||
<param name="ImmediateFlush" value="true" />
|
<param name="ImmediateFlush" value="true" />
|
||||||
<param name="Threshold" value="info"></param>
|
<param name="Threshold" value="info"></param>
|
||||||
<param name="Append" value="true"></param>
|
<param name="Append" value="true"></param>
|
||||||
|
|
|
||||||
|
|
@ -7,16 +7,8 @@
|
||||||
<typeAlias alias="EncodedInfoEntity" type="com.platform.entities.EncodedInfoEntity" />
|
<typeAlias alias="EncodedInfoEntity" type="com.platform.entities.EncodedInfoEntity" />
|
||||||
<typeAlias alias="DataInfoEntity" type="com.platform.entities.DataInfoEntity" />
|
<typeAlias alias="DataInfoEntity" type="com.platform.entities.DataInfoEntity" />
|
||||||
<typeAlias alias="PagerOptions" type="com.platform.entities.PagerOptions"/>
|
<typeAlias alias="PagerOptions" type="com.platform.entities.PagerOptions"/>
|
||||||
<typeAlias alias="GatherOracleInfo" type="com.platform.entities.GatherOracleInfo"/>
|
|
||||||
<typeAlias alias="DataInfoEntityMoveTmp" type="com.platform.entities.DataInfoEntityMoveTmp"/>
|
|
||||||
<typeAlias alias="SystemEntity" type="com.platform.entities.SystemEntity"/>
|
|
||||||
<typeAlias alias="RegionalismEntity" type="com.platform.entities.RegionalismEntity"/>
|
|
||||||
</typeAliases>
|
</typeAliases>
|
||||||
<mappers>
|
<mappers>
|
||||||
<mapper resource="com/dao/mapper/data-details-mapper.xml" />
|
<mapper resource="com/dao/mapper/data-detaisl-mapper.xml" />
|
||||||
<mapper resource="com/dao/mapper/config-details-mapper.xml"/>
|
|
||||||
<mapper resource="com/dao/mapper/dataInfoMoveTmpmapper.xml"/>
|
|
||||||
<mapper resource="com/dao/mapper/RegionalismMapper.xml"/>
|
|
||||||
<mapper resource="com/dao/mapper/SystemCodeMapper.xml"/>
|
|
||||||
</mappers>
|
</mappers>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|
@ -1,11 +1,8 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<beans xmlns="http://www.springframework.org/schema/beans"
|
<beans xmlns="http://www.springframework.org/schema/beans"
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
|
||||||
xmlns:p="http://www.springframework.org/schema/p"
|
xmlns:tx="http://www.springframework.org/schema/tx" xmlns:aop="http://www.springframework.org/schema/aop"
|
||||||
xmlns:tx="http://www.springframework.org/schema/tx"
|
|
||||||
xmlns:aop="http://www.springframework.org/schema/aop"
|
|
||||||
xmlns:context="http://www.springframework.org/schema/context"
|
xmlns:context="http://www.springframework.org/schema/context"
|
||||||
xmlns:task="http://www.springframework.org/schema/task"
|
|
||||||
xsi:schemaLocation="http://www.springframework.org/schema/beans
|
xsi:schemaLocation="http://www.springframework.org/schema/beans
|
||||||
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
|
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
|
||||||
http://www.springframework.org/schema/tx
|
http://www.springframework.org/schema/tx
|
||||||
|
|
@ -13,25 +10,13 @@
|
||||||
http://www.springframework.org/schema/aop
|
http://www.springframework.org/schema/aop
|
||||||
http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
|
http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
|
||||||
http://www.springframework.org/schema/context
|
http://www.springframework.org/schema/context
|
||||||
http://www.springframework.org/schema/context/spring-context-3.0.xsd
|
http://www.springframework.org/schema/context/spring-context-3.0.xsd">
|
||||||
http://www.springframework.org/schema/websocket
|
|
||||||
http://www.springframework.org/schema/websocket/spring-websocket.xsd
|
|
||||||
http://www.springframework.org/schema/beans
|
|
||||||
http://www.springframework.org/schema/beans/spring-beans.xsd
|
|
||||||
http://www.springframework.org/schema/task
|
|
||||||
http://www.springframework.org/schema/task/spring-task-3.0.xsd">
|
|
||||||
|
|
||||||
<!-- 读取db.properties中的属性值 -->
|
<!-- 读取db.properties中的属性值 -->
|
||||||
<bean
|
<bean
|
||||||
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
|
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
|
||||||
<property name="location" value="WEB-INF/config/config.properties"></property>
|
<property name="location" value="WEB-INF/config/config.properties"></property>
|
||||||
</bean>
|
</bean>
|
||||||
|
|
||||||
<bean id="messageCodeResolver"
|
|
||||||
class="org.springframework.validation.DefaultMessageCodesResolver">
|
|
||||||
<property name="prefix" value="validation."></property>
|
|
||||||
</bean>
|
|
||||||
|
|
||||||
<!-- 连接MySQL数据库 -->
|
<!-- 连接MySQL数据库 -->
|
||||||
<bean id="mySQLDataSource"
|
<bean id="mySQLDataSource"
|
||||||
class="org.springframework.jdbc.datasource.DriverManagerDataSource">
|
class="org.springframework.jdbc.datasource.DriverManagerDataSource">
|
||||||
|
|
@ -41,7 +26,7 @@
|
||||||
<property name="password" value="${jdbc.mysql.password}" />
|
<property name="password" value="${jdbc.mysql.password}" />
|
||||||
</bean>
|
</bean>
|
||||||
<bean id="mySQLSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
|
<bean id="mySQLSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
|
||||||
<property name="configLocation" value="WEB-INF/config/mybatis-applicationConfig.xml" />
|
<property name="configLocation" value="WEB-INF/config/mybatis-applicationConfig.xml" />
|
||||||
<property name="dataSource" ref="mySQLDataSource" />
|
<property name="dataSource" ref="mySQLDataSource" />
|
||||||
</bean>
|
</bean>
|
||||||
<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
|
<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
|
||||||
|
|
@ -86,8 +71,4 @@
|
||||||
<context:exclude-filter type="annotation"
|
<context:exclude-filter type="annotation"
|
||||||
expression="org.springframework.stereotype.Controller" />
|
expression="org.springframework.stereotype.Controller" />
|
||||||
</context:component-scan>
|
</context:component-scan>
|
||||||
<!-- Enables the Spring Task @Scheduled programming model -->
|
|
||||||
<task:executor id="executor" pool-size="5" />
|
|
||||||
<task:scheduler id="scheduler" pool-size="10" />
|
|
||||||
<task:annotation-driven executor="executor" scheduler="scheduler" />
|
|
||||||
</beans>
|
</beans>
|
||||||
|
|
@ -1,38 +1,17 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<beans xmlns="http://www.springframework.org/schema/beans"
|
<beans xmlns="http://www.springframework.org/schema/beans"
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xmlns:aop="http://www.springframework.org/schema/aop"
|
xmlns:context="http://www.springframework.org/schema/context"
|
||||||
xmlns:mvc="http://www.springframework.org/schema/mvc"
|
xsi:schemaLocation="http://www.springframework.org/schema/beans
|
||||||
xmlns:tx="http://www.springframework.org/schema/tx"
|
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
|
||||||
xmlns:jdbc="http://www.springframework.org/schema/jdbc"
|
|
||||||
xmlns:context="http://www.springframework.org/schema/context"
|
|
||||||
xmlns:websocket="http://www.springframework.org/schema/websocket"
|
|
||||||
xsi:schemaLocation="
|
|
||||||
http://www.springframework.org/schema/context
|
http://www.springframework.org/schema/context
|
||||||
http://www.springframework.org/schema/context/spring-context-4.0.xsd
|
http://www.springframework.org/schema/context/spring-context-3.0.xsd">
|
||||||
http://www.springframework.org/schema/beans
|
|
||||||
http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
|
|
||||||
http://www.springframework.org/schema/jdbc
|
|
||||||
http://www.springframework.org/schema/jdbc/spring-jdbc-4.0.xsd
|
|
||||||
http://www.springframework.org/schema/tx
|
|
||||||
http://www.springframework.org/schema/tx/spring-tx-4.0.xsd
|
|
||||||
http://www.springframework.org/schema/aop
|
|
||||||
http://www.springframework.org/schema/aop/spring-aop-4.0.xsd
|
|
||||||
http://www.springframework.org/schema/mvc
|
|
||||||
http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd
|
|
||||||
http://www.springframework.org/schema/websocket
|
|
||||||
http://www.springframework.org/schema/websocket/spring-websocket-4.0.xsd"
|
|
||||||
default-autowire="byName">
|
|
||||||
|
|
||||||
<context:component-scan base-package="com.platform.controller,com.platform.test,com.platform.websocket;" >
|
<context:component-scan base-package="com.platform.controller,com.platform.test;" >
|
||||||
<context:include-filter type="annotation" expression="org.springframework.stereotype.Controller"/>
|
<context:include-filter type="annotation" expression="org.springframework.stereotype.Controller"/>
|
||||||
<context:exclude-filter type="annotation" expression="org.springframework.stereotype.Service"/>
|
<context:exclude-filter type="annotation" expression="org.springframework.stereotype.Service"/>
|
||||||
</context:component-scan>
|
</context:component-scan>
|
||||||
|
|
||||||
<context:annotation-config />
|
|
||||||
|
|
||||||
<mvc:annotation-driven/>
|
|
||||||
|
|
||||||
<!-- 用于将对象转换为JSON -->
|
<!-- 用于将对象转换为JSON -->
|
||||||
<bean id="stringConverter"
|
<bean id="stringConverter"
|
||||||
class="org.springframework.http.converter.StringHttpMessageConverter">
|
class="org.springframework.http.converter.StringHttpMessageConverter">
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -3,7 +3,7 @@
|
||||||
xmlns="http://java.sun.com/xml/ns/javaee"
|
xmlns="http://java.sun.com/xml/ns/javaee"
|
||||||
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
|
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
|
||||||
id="WebApp_ID" version="3.0">
|
id="WebApp_ID" version="3.0">
|
||||||
<display-name>javaBackend</display-name>
|
<display-name>MyFirstTest</display-name>
|
||||||
<welcome-file-list>
|
<welcome-file-list>
|
||||||
<welcome-file>/index.html</welcome-file>
|
<welcome-file>/index.html</welcome-file>
|
||||||
</welcome-file-list>
|
</welcome-file-list>
|
||||||
|
|
@ -18,10 +18,9 @@
|
||||||
</filter>
|
</filter>
|
||||||
<filter-mapping>
|
<filter-mapping>
|
||||||
<filter-name>CharacterEncodingFilter</filter-name>
|
<filter-name>CharacterEncodingFilter</filter-name>
|
||||||
<url-pattern>/</url-pattern>
|
<url-pattern>/*</url-pattern>
|
||||||
</filter-mapping>
|
</filter-mapping>
|
||||||
<!-- spring配置文件 -->
|
<!-- spring配置文件 -->
|
||||||
|
|
||||||
<context-param>
|
<context-param>
|
||||||
<param-name>contextConfigLocation</param-name>
|
<param-name>contextConfigLocation</param-name>
|
||||||
<param-value>WEB-INF/config/spring-applicationContext.xml</param-value>
|
<param-value>WEB-INF/config/spring-applicationContext.xml</param-value>
|
||||||
|
|
@ -30,10 +29,6 @@
|
||||||
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
|
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
|
||||||
</listener>
|
</listener>
|
||||||
|
|
||||||
<listener>
|
|
||||||
<listener-class>com.platform.utils.ConfigsLoader</listener-class>
|
|
||||||
</listener>
|
|
||||||
|
|
||||||
<!-- springmv的配置文件 -->
|
<!-- springmv的配置文件 -->
|
||||||
<servlet>
|
<servlet>
|
||||||
<servlet-name>springmvc</servlet-name>
|
<servlet-name>springmvc</servlet-name>
|
||||||
|
|
@ -47,20 +42,20 @@
|
||||||
</servlet>
|
</servlet>
|
||||||
<servlet-mapping>
|
<servlet-mapping>
|
||||||
<servlet-name>springmvc</servlet-name>
|
<servlet-name>springmvc</servlet-name>
|
||||||
<url-pattern>/</url-pattern>
|
<url-pattern>/*</url-pattern>
|
||||||
</servlet-mapping>
|
</servlet-mapping>
|
||||||
|
|
||||||
<!-- log4j配置文件 -->
|
<!-- log4j配置文件 -->
|
||||||
<context-param>
|
<context-param>
|
||||||
<param-name>log4jConfigLocation</param-name>
|
<param-name>log4jConfigLocation</param-name>
|
||||||
<param-value>/WEB-INF/config/log4j-config.xml</param-value>
|
<param-value>/WEB-INF/config/log4j-config.xml</param-value>
|
||||||
</context-param>
|
</context-param>
|
||||||
<listener>
|
<listener>
|
||||||
<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
|
<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
|
||||||
</listener>
|
</listener>
|
||||||
|
|
||||||
<!-- 防止Spring内存溢出监听器 -->
|
<!-- 防止Spring内存溢出监听器 -->
|
||||||
<!-- <listener>
|
<listener>
|
||||||
<listener-class>org.springframework.web.util.IntrospectorCleanupListener</listener-class>
|
<listener-class>org.springframework.web.util.IntrospectorCleanupListener</listener-class>
|
||||||
</listener> -->
|
</listener>
|
||||||
</web-app>
|
</web-app>
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<title>Insert title here</title>
|
||||||
|
<script type="text/javascript" src="jquery-1.7.2.min.js"></script>
|
||||||
|
<script type="text/javascript">
|
||||||
|
$(function(){
|
||||||
|
$("#btn").{"name":"伍名"}click(function(){
|
||||||
|
$.post("json",function(data){
|
||||||
|
alert(data);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<form action="hello" method="post">
|
||||||
|
name:<input type="text" name="name">
|
||||||
|
<input type="submit" value="submit">
|
||||||
|
</form>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
@ -0,0 +1,93 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
|
<!DOCTYPE mapper
|
||||||
|
PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
|
||||||
|
"http://ibatis.apache.org/dtd/ibatis-3-mapper.dtd">
|
||||||
|
|
||||||
|
<mapper namespace="com.platform.dao.DataInfoDao">
|
||||||
|
<resultMap id="getEntityByText" type="DataInfoEntity">
|
||||||
|
<id property="id" column="id" javaType="int" jdbcType="INTEGER" />
|
||||||
|
<result property="regionalismCode" column="regionalism_code"
|
||||||
|
javaType="string" jdbcType="VARCHAR" />
|
||||||
|
<result property="cityName" column="city_name" javaType="string"
|
||||||
|
jdbcType="VARCHAR" />
|
||||||
|
<result property="districtName" column="district_name"
|
||||||
|
javaType="string" jdbcType="VARCHAR" />
|
||||||
|
<result property="systemCode" column="system_code" javaType="int"
|
||||||
|
jdbcType="INTEGER" />
|
||||||
|
<result property="systemName" column="system_name" javaType="string"
|
||||||
|
jdbcType="VARCHAR" />
|
||||||
|
<result property="dataType" column="data_type" javaType="string"
|
||||||
|
jdbcType="VARCHAR" />
|
||||||
|
<result property="dataVersion" column="data_version" javaType="int"
|
||||||
|
jdbcType="INTEGER" />
|
||||||
|
<result property="submittedBatch" column="submitted_batch"
|
||||||
|
javaType="string" jdbcType="VARCHAR" />
|
||||||
|
<result property="dataPath" column="data_path" javaType="string"
|
||||||
|
jdbcType="VARCHAR" />
|
||||||
|
<result property="charset" column="data_charset" javaType="string"
|
||||||
|
jdbcType="VARCHAR" />
|
||||||
|
<result property="collectingTime" column="collection_time"
|
||||||
|
javaType="string" jdbcType="DATE" />
|
||||||
|
<result property="collectorContacts" column="collector_contacts"
|
||||||
|
javaType="string" jdbcType="VARCHAR" />
|
||||||
|
<result property="collectorName" column="collector_name"
|
||||||
|
javaType="string" jdbcType="VARCHAR" />
|
||||||
|
<result property="year" column="data_year" javaType="string"
|
||||||
|
jdbcType="VARCHAR" />
|
||||||
|
</resultMap>
|
||||||
|
<sql id="conditionsFilters">
|
||||||
|
<if test="PagerOptions!=null">
|
||||||
|
<where>
|
||||||
|
<if test="PagerOptions.dataType!=null">
|
||||||
|
and data_details.data_type=#{PagerOptions.dataType}
|
||||||
|
</if>
|
||||||
|
<if test="PagerOptions.submittedBatch!=null">
|
||||||
|
and
|
||||||
|
data_details.submitted_batch=#{PagerOptions.submittedBatch}
|
||||||
|
</if>
|
||||||
|
<if test="PagerOptions.cityName!=null">
|
||||||
|
and data_details.city_name=#{PagerOptions.cityName}
|
||||||
|
</if>
|
||||||
|
<if test="PagerOptions.districtName!=null">
|
||||||
|
and
|
||||||
|
data_details.district_name=#{PagerOptions.districtName}
|
||||||
|
</if>
|
||||||
|
<if test="PagerOptions.dataVersion">
|
||||||
|
and
|
||||||
|
data_details.data_version=#{PagerOptions.dataVersion}
|
||||||
|
</if>
|
||||||
|
<if test="PagerOptions.systemName">
|
||||||
|
and data_details=#{PagerOptions.systemName}
|
||||||
|
</if>
|
||||||
|
<if test="PagerOptions.dataYear">
|
||||||
|
and data_details.data_year=#{PagerOptions.dataYear}
|
||||||
|
</if>
|
||||||
|
<choose>
|
||||||
|
<when test="PagerOptions.idIndex>0">
|
||||||
|
and data_details.id>=#{idIndex}
|
||||||
|
</when>
|
||||||
|
<otherwise>
|
||||||
|
and data_details.id>=0
|
||||||
|
</otherwise>
|
||||||
|
</choose>
|
||||||
|
</where>
|
||||||
|
ORDER BY data_details.id
|
||||||
|
<if test="PagerOptions.limit">LIMIT #{PagerOptions.limit}</if>
|
||||||
|
</if>
|
||||||
|
</sql>
|
||||||
|
|
||||||
|
<select id="getLimitedDataInfoEntities" parameterType="PagerOptions"
|
||||||
|
resultMap="getEntityByText">
|
||||||
|
SELECT
|
||||||
|
id,regionalism_code,city_name,district_name,system_code,system_name,data_type,data_version,submitted_batch,data_path,data_charset,collection_time,collector_name,collector_contacts,data_year
|
||||||
|
FROM data_details
|
||||||
|
<include refid="conditionsFilters" />
|
||||||
|
</select>
|
||||||
|
|
||||||
|
<select id="getLimitedDataCount" resultType="java.lang.Integer"
|
||||||
|
parameterType="PagerOptions">
|
||||||
|
SELECT COUNT(id) FROM data_details
|
||||||
|
<include refid="conditionsFilters" />
|
||||||
|
</select>
|
||||||
|
|
||||||
|
</mapper>
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -0,0 +1,64 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<beans xmlns="http://www.springframework.org/schema/beans"
|
||||||
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
|
||||||
|
xmlns:tx="http://www.springframework.org/schema/tx" xmlns:aop="http://www.springframework.org/schema/aop"
|
||||||
|
xmlns:context="http://www.springframework.org/schema/context"
|
||||||
|
xsi:schemaLocation="http://www.springframework.org/schema/beans
|
||||||
|
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
|
||||||
|
http://www.springframework.org/schema/tx
|
||||||
|
http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
|
||||||
|
http://www.springframework.org/schema/aop
|
||||||
|
http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
|
||||||
|
http://www.springframework.org/schema/context
|
||||||
|
http://www.springframework.org/schema/context/spring-context-3.0.xsd">
|
||||||
|
<!-- 读取db.properties中的属性值 -->
|
||||||
|
<bean
|
||||||
|
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
|
||||||
|
<property name="location" value="/WebContent/WEB-INF/config/config.properties"></property>
|
||||||
|
</bean>
|
||||||
|
|
||||||
|
<!-- 连接MySQL数据库 -->
|
||||||
|
<bean id="mySQLDataSource"
|
||||||
|
class="org.springframework.jdbc.datasource.DriverManagerDataSource">
|
||||||
|
<property name="driverClassName" value="${jdbc.mysql.driver}" />
|
||||||
|
<property name="url" value="${jdbc.mysql.url}" />
|
||||||
|
<property name="username" value="${jdbc.mysql.username}" />
|
||||||
|
<property name="password" value="${jdbc.mysql.password}" />
|
||||||
|
</bean>
|
||||||
|
<bean id="mySQLSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
|
||||||
|
<property name="configLocation" value="/WebContent/WEB-INF/config/mybatis-applicationConfig.xml" />
|
||||||
|
<property name="dataSource" ref="mySQLDataSource" />
|
||||||
|
</bean>
|
||||||
|
<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
|
||||||
|
<property name="basePackage" value="com.platform.dao" />
|
||||||
|
</bean>
|
||||||
|
|
||||||
|
<!-- 配置声明式事物 -->
|
||||||
|
<bean id="mySQLTxManager"
|
||||||
|
class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
|
||||||
|
<property name="dataSource" ref="mySQLDataSource" />
|
||||||
|
</bean>
|
||||||
|
<tx:advice id="txAdvice" transaction-manager="mySQLTxManager">
|
||||||
|
<tx:attributes>
|
||||||
|
<tx:method name="delete*" propagation="REQUIRED" />
|
||||||
|
<tx:method name="insert*" propagation="REQUIRED" />
|
||||||
|
<tx:method name="update*" propagation="REQUIRED" />
|
||||||
|
<tx:method name="get*" read-only="true" />
|
||||||
|
<tx:method name="select*" read-only="true" />
|
||||||
|
</tx:attributes>
|
||||||
|
</tx:advice>
|
||||||
|
<aop:config>
|
||||||
|
<aop:pointcut expression="execution(* com.platform.service.*.*(..))"
|
||||||
|
id="pointcut" />
|
||||||
|
<aop:advisor advice-ref="txAdvice" pointcut-ref="pointcut" />
|
||||||
|
</aop:config>
|
||||||
|
<bean id="user" class="com.platform.test.User">
|
||||||
|
<property name="name" value="伍名" />
|
||||||
|
<property name="id" value="1" />
|
||||||
|
<property name="sex" value="男" />
|
||||||
|
</bean>
|
||||||
|
<context:component-scan base-package="com.platform.*">
|
||||||
|
<context:exclude-filter type="annotation"
|
||||||
|
expression="org.springframework.stereotype.Controller" />
|
||||||
|
</context:component-scan>
|
||||||
|
</beans>
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
|
|
||||||
<persistence-unit name="aggregation-platform">
|
|
||||||
</persistence-unit>
|
|
||||||
</persistence>
|
|
||||||
|
|
@ -1,65 +0,0 @@
|
||||||
|
|
||||||
/**
|
|
||||||
* 文件名 : BaseController.java
|
|
||||||
* 版权 : XX科技有限公司。
|
|
||||||
* 描述 : <描述>
|
|
||||||
* 修改时间:2016年9月7日
|
|
||||||
* 修改内容:<修改内容>
|
|
||||||
*/
|
|
||||||
package com.base;
|
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
|
||||||
import javax.servlet.http.HttpServletResponse;
|
|
||||||
|
|
||||||
import org.apache.log4j.Logger;
|
|
||||||
import org.springframework.web.bind.annotation.ExceptionHandler;
|
|
||||||
|
|
||||||
import com.platform.utils.Configs;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* <一句话功能简述>
|
|
||||||
* <功能详细描述>
|
|
||||||
* @author chen
|
|
||||||
* @version [版本号,2016年9月7日]
|
|
||||||
* @see [相关类/方法]
|
|
||||||
* @since [产品/模块版本]
|
|
||||||
*/
|
|
||||||
public class BaseController {
|
|
||||||
|
|
||||||
/** log4j */
|
|
||||||
public static Logger log = Logger.getRootLogger();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* <一句话功能简述> 基于@ExceptionHandler异常处理----全局异常处理
|
|
||||||
* <功能详细描述>
|
|
||||||
* @param request
|
|
||||||
* @param ex 异常
|
|
||||||
* @return
|
|
||||||
* @see [类、类#方法、类#成员]
|
|
||||||
*/
|
|
||||||
@ExceptionHandler
|
|
||||||
public Object exp(HttpServletRequest request, HttpServletResponse response,Exception ex) {
|
|
||||||
System.out.println("URI"+request.getRequestURI());
|
|
||||||
request.setAttribute("ex", ex);
|
|
||||||
System.err.println("BaseController --exp " + ex);
|
|
||||||
// 根据不同错误转向不同页面
|
|
||||||
if(ex instanceof CustomException) {
|
|
||||||
CustomException cuse = (CustomException) ex;
|
|
||||||
Map<String, String> errmsg = new HashMap<>();
|
|
||||||
errmsg.put("code", cuse.getCode());
|
|
||||||
errmsg.put("msg", cuse.getMsg());
|
|
||||||
log.error(cuse.getCode());
|
|
||||||
response.setStatus(500);
|
|
||||||
return response;
|
|
||||||
} else {
|
|
||||||
//其他错误则 调到指定页面
|
|
||||||
log.error(Configs.GLOBAL_EXP_NOT_CUSTOM, ex);
|
|
||||||
response.setStatus(500);
|
|
||||||
return response;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
package com.base;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* <一句话功能简述>
|
|
||||||
* <功能详细描述>
|
|
||||||
* @author chen
|
|
||||||
* @version [版本号,2016年9月8日]
|
|
||||||
* @see [相关类/方法]
|
|
||||||
* @since [产品/模块版本]
|
|
||||||
*/
|
|
||||||
public class Constant {
|
|
||||||
|
|
||||||
/** 国际话配置文件文件-i18n.properties */
|
|
||||||
public static String I18N_PROPERTIES_FIEL_PATH = "/com/base/i18n.properties";
|
|
||||||
|
|
||||||
/** WritefileThread-线程睡眠时间--3000 */
|
|
||||||
public final static long THREAD_SLEEP_WRITEFILETHREAD = 3000;
|
|
||||||
|
|
||||||
/** CustomException记录报异常的对象的对象个数--10 */
|
|
||||||
public final static int CustomException_log_object_size = 10;
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -1,34 +0,0 @@
|
||||||
package com.base;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* <一句话功能简述> 异常常量编码
|
|
||||||
* <功能详细描述>
|
|
||||||
* @author chen
|
|
||||||
* @version [版本号,2016年9月8日]
|
|
||||||
* @see [相关类/方法]
|
|
||||||
* @since [产品/模块版本]
|
|
||||||
*/
|
|
||||||
public class Custom4exception {
|
|
||||||
//3003001001 : 第一位:标识异常, 第二到第四位:标识模块,第五道第七位:标识类别,第八道第十位标识具体异常
|
|
||||||
/**eg
|
|
||||||
* 3:异常
|
|
||||||
* 003:虚拟机模块
|
|
||||||
* 001:软件依赖虚拟机资源类别
|
|
||||||
* 001:启动异常
|
|
||||||
*/
|
|
||||||
/**
|
|
||||||
* ThreadVolume类查询 volume异常
|
|
||||||
*/
|
|
||||||
public final static String threadVolume_class_Except = "3001001001";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* ThreadVolume类线程休眠异常
|
|
||||||
*/
|
|
||||||
public final static String threadVolume_Thread_Except = "3001001002";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 抽取汇总
|
|
||||||
*/
|
|
||||||
public final static String threadVolume_Oracle_Except = "3002001002";
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -1,127 +0,0 @@
|
||||||
|
|
||||||
|
|
||||||
package com.base;
|
|
||||||
|
|
||||||
import org.apache.log4j.Logger;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* <一句话功能简述>
|
|
||||||
* <功能详细描述>
|
|
||||||
* @author chen
|
|
||||||
* @version [版本号,2016年9月8日]
|
|
||||||
* @see [相关类/方法]
|
|
||||||
* @since [产品/模块版本]
|
|
||||||
*/
|
|
||||||
@SuppressWarnings("serial")
|
|
||||||
public class CustomException extends Exception {
|
|
||||||
|
|
||||||
/** log4j */
|
|
||||||
public static Logger log = Logger.getRootLogger();
|
|
||||||
|
|
||||||
/** 自定义异常信息-错误信息 */
|
|
||||||
private String msg;
|
|
||||||
|
|
||||||
/** 自定义异常信息-错误代码 */
|
|
||||||
private String code;
|
|
||||||
|
|
||||||
/** 操作对象 */
|
|
||||||
private Object[] objArray;
|
|
||||||
|
|
||||||
/** 异常 */
|
|
||||||
private Throwable cause;
|
|
||||||
|
|
||||||
public CustomException() {
|
|
||||||
super();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @功能 将异常记录进文件
|
|
||||||
* @param code 异常编码
|
|
||||||
* @param msg 自定义异常信息
|
|
||||||
* @param e
|
|
||||||
* @param obj
|
|
||||||
*/
|
|
||||||
public CustomException(String code,Exception e,Object... obj) {
|
|
||||||
super(code);
|
|
||||||
StringBuffer sbuf= new StringBuffer();
|
|
||||||
sbuf.append(msg);
|
|
||||||
this.code = code;
|
|
||||||
sbuf.append(code);
|
|
||||||
sbuf.append("\r\n");
|
|
||||||
msg = Resource.getProperties().get(code);
|
|
||||||
// 记录自定义的 异常
|
|
||||||
if (null != msg) {
|
|
||||||
sbuf.append(msg);
|
|
||||||
sbuf.append("\r\n");
|
|
||||||
}
|
|
||||||
// 记录原始的异常
|
|
||||||
if (null != e) {
|
|
||||||
StackTraceElement[] array = e.getStackTrace();
|
|
||||||
cause = e.getCause();
|
|
||||||
for (StackTraceElement stackTraceElement : array) {
|
|
||||||
sbuf.append(stackTraceElement.toString());
|
|
||||||
sbuf.append("\r\n");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
//记录 出现异常时 当前的对象
|
|
||||||
if (null != obj) {
|
|
||||||
Object[] array = obj;
|
|
||||||
sbuf.append("Object[] size : ");
|
|
||||||
sbuf.append(array.length);
|
|
||||||
int forSize = 0;
|
|
||||||
if (Constant.CustomException_log_object_size < array.length) {
|
|
||||||
forSize = Constant.CustomException_log_object_size;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
forSize = array.length;
|
|
||||||
}
|
|
||||||
for (int i = 0; i < forSize; i++) {
|
|
||||||
sbuf.append(array[i]);
|
|
||||||
sbuf.append("\r\n");
|
|
||||||
}
|
|
||||||
sbuf.append("......");
|
|
||||||
sbuf.append("\r\n");
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
sbuf.append("null");
|
|
||||||
sbuf.append("\r\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
sbuf.append("\r\n");
|
|
||||||
// 是否 写入 文件
|
|
||||||
log.error(sbuf.toString());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @功能 获得msg
|
|
||||||
* @return msg
|
|
||||||
*/
|
|
||||||
public String getMsg() {
|
|
||||||
return msg;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return the code
|
|
||||||
*/
|
|
||||||
public String getCode() {
|
|
||||||
return code;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @功能 获得objArray
|
|
||||||
* @return objArray
|
|
||||||
*/
|
|
||||||
public Object[] getObjArray() {
|
|
||||||
return objArray;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @功能 获得cause
|
|
||||||
* @return cause
|
|
||||||
*/
|
|
||||||
public Throwable getCause() {
|
|
||||||
return cause;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -1,79 +0,0 @@
|
||||||
package com.base;
|
|
||||||
|
|
||||||
import java.io.BufferedInputStream;
|
|
||||||
import java.io.BufferedReader;
|
|
||||||
import java.io.FileInputStream;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.InputStreamReader;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Iterator;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Properties;
|
|
||||||
|
|
||||||
import com.base.Constant;
|
|
||||||
|
|
||||||
public class Resource {
|
|
||||||
|
|
||||||
private static Map<String, String> properties = new HashMap<>();
|
|
||||||
|
|
||||||
static{
|
|
||||||
// 读取 properties文件
|
|
||||||
// readPropertiesFile(Constant.SYSTEM_PROPERTIES_FIEL_PATH);
|
|
||||||
readPropertiesFile4Chinese(Constant.I18N_PROPERTIES_FIEL_PATH);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @功能 读取配置(解决中文乱码)
|
|
||||||
* @param filename "/com/utils/exception/i18n.properties" 的格式
|
|
||||||
*/
|
|
||||||
public static void readPropertiesFile4Chinese(String filename) {
|
|
||||||
Properties pro = new Properties();
|
|
||||||
try {
|
|
||||||
// 读取属性文件 XXXX.properties(Reader。writer解决中文乱码)
|
|
||||||
// InputStreamReader in= new InputStreamReader(Resource.class.getClassLoader().getResourceAsStream(filename), "UTF-8");
|
|
||||||
InputStreamReader in= new InputStreamReader(Resource.class.getResourceAsStream(filename), "UTF-8");
|
|
||||||
BufferedReader bf = new BufferedReader(in);
|
|
||||||
// InputStreamReader in = new BufferedInputStream(new FileInputStream(filename));
|
|
||||||
pro.load(bf); // /加载属性列表
|
|
||||||
Iterator<String> it = pro.stringPropertyNames().iterator();
|
|
||||||
while (it.hasNext()) {
|
|
||||||
String key = it.next();
|
|
||||||
properties.put(key, pro.getProperty(key));
|
|
||||||
}
|
|
||||||
in.close();
|
|
||||||
} catch (IOException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @功能 获得properties
|
|
||||||
* @return properties
|
|
||||||
*/
|
|
||||||
public static Map<String, String> getProperties() {
|
|
||||||
return properties;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @功能 读取配置
|
|
||||||
* @param filename 文件绝对路径
|
|
||||||
*/
|
|
||||||
public static void readPropertiesFile(String filename) {
|
|
||||||
Properties pro = new Properties();
|
|
||||||
try {
|
|
||||||
// 读取属性文件 XXXX.properties( 中文会 乱码)
|
|
||||||
BufferedInputStream bf = new BufferedInputStream(new FileInputStream(filename));
|
|
||||||
pro.load(bf); // /加载属性列表
|
|
||||||
Iterator<String> it = pro.stringPropertyNames().iterator();
|
|
||||||
while (it.hasNext()) {
|
|
||||||
String key = it.next();
|
|
||||||
properties.put(key, pro.getProperty(key));
|
|
||||||
}
|
|
||||||
bf.close();
|
|
||||||
} catch (IOException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue