BJ_ZTEITS-Developers / zteits-bcp-portal

Commit 6ed716f27a3b37b0d4ca85b3fdaaba5c7b362ac8

Authored by atao
2 parents 8b3c55b3 5ccf0421

Merge branch 'master' into branch_0808 

# Conflicts:
#	.gitignore
Inline Side-by-side
Showing 2 changed files with 194 additions and 1 deletions
@@ -160,4 +160,4 @@ @@ -160,4 +160,4 @@
160 </plugin> 160 </plugin>
161 </plugins> 161 </plugins>
162 </build> 162 </build>
163 -</project>  
164 \ No newline at end of file 163 \ No newline at end of file
  164 +</project>
zteits-park-portal.iml 0 → 100644
  View file @6ed716f
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
  3 + <component name="FacetManager">
  4 + <facet type="Spring" name="Spring">
  5 + <configuration />
  6 + </facet>
  7 + </component>
  8 + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
  9 + <output url="file://$MODULE_DIR$/target/classes" />
  10 + <output-test url="file://$MODULE_DIR$/target/test-classes" />
  11 + <content url="file://$MODULE_DIR$">
  12 + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
  13 + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
  14 + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
  15 + <excludeFolder url="file://$MODULE_DIR$/target" />
  16 + </content>
  17 + <orderEntry type="inheritedJdk" />
  18 + <orderEntry type="sourceFolder" forTests="false" />
  19 + <orderEntry type="library" name="Maven: com.zteits:zteits-framework:0.0.1-SNAPSHOT" level="project" />
  20 + <orderEntry type="library" name="Maven: com.zteits:zteits-api:0.0.1-SNAPSHOT" level="project" />
  21 + <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.7.0" level="project" />
  22 + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.24" level="project" />
  23 + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.5.2.RELEASE" level="project" />
  24 + <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
  25 + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-redis:1.4.6.RELEASE" level="project" />
  26 + <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.8.1.RELEASE" level="project" />
  27 + <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:1.2.1.RELEASE" level="project" />
  28 + <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.13.1.RELEASE" level="project" />
  29 + <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.7.RELEASE" level="project" />
  30 + <orderEntry type="library" name="Maven: org.springframework:spring-oxm:4.3.7.RELEASE" level="project" />
  31 + <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.7.RELEASE" level="project" />
  32 + <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.24" level="project" />
  33 + <orderEntry type="library" name="Maven: redis.clients:jedis:2.9.0" level="project" />
  34 + <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
  35 + <orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" />
  36 + <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.6" level="project" />
  37 + <orderEntry type="library" name="Maven: com.sign:sign:1.0" level="project" />
  38 + <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.9" level="project" />
  39 + <orderEntry type="library" name="Maven: org.apache.poi:poi:3.9" level="project" />
  40 + <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.9" level="project" />
  41 + <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" level="project" />
  42 + <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
  43 + <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
  44 + <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
  45 + <orderEntry type="library" name="Maven: com.xiaoleilu:hutool-all:3.0.5" level="project" />
  46 + <orderEntry type="library" name="Maven: org.apache.ant:ant:1.8.2" level="project" />
  47 + <orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.8.2" level="project" />
  48 + <orderEntry type="library" name="Maven: net.sourceforge.javacsv:javacsv:2.0" level="project" />
  49 + <orderEntry type="library" name="Maven: com.zteits:zteits-tool-swagger:0.0.1-SNAPSHOT" level="project" />
  50 + <orderEntry type="library" name="Maven: net.logstash.logback:logstash-logback-encoder:4.5.1" level="project" />
  51 + <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.11" level="project" />
  52 + <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.8.7" level="project" />
  53 + <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.7" level="project" />
  54 + <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-afterburner:2.8.7" level="project" />
  55 + <orderEntry type="library" name="Maven: org.springframework.restdocs:spring-restdocs-mockmvc:1.1.2.RELEASE" level="project" />
  56 + <orderEntry type="library" name="Maven: org.springframework.restdocs:spring-restdocs-core:1.1.2.RELEASE" level="project" />
  57 + <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.6.1" level="project" />
  58 + <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.10" level="project" />
  59 + <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.6.1" level="project" />
  60 + <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.6.1" level="project" />
  61 + <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.6.1" level="project" />
  62 + <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.6.1" level="project" />
  63 + <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.6.1" level="project" />
  64 + <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.3" level="project" />
  65 + <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
  66 + <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
  67 + <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.0.0.Final" level="project" />
  68 + <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.6.1" level="project" />
  69 + <orderEntry type="library" name="Maven: io.springfox:springfox-staticdocs:2.4.0" level="project" />
  70 + <orderEntry type="library" name="Maven: io.github.robwin:swagger2markup:0.9.2" level="project" />
  71 + <orderEntry type="library" name="Maven: io.github.robwin:markup-document-builder:0.1.5" level="project" />
  72 + <orderEntry type="library" name="Maven: io.swagger:swagger-compat-spec-parser:1.0.13" level="project" />
  73 + <orderEntry type="library" name="Maven: io.swagger:swagger-core:1.5.4" level="project" />
  74 + <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-joda:2.8.7" level="project" />
  75 + <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.7" level="project" />
  76 + <orderEntry type="library" name="Maven: io.swagger:swagger-parser:1.0.13" level="project" />
  77 + <orderEntry type="library" name="Maven: org.slf4j:slf4j-ext:1.6.3" level="project" />
  78 + <orderEntry type="library" name="Maven: ch.qos.cal10n:cal10n-api:0.7.4" level="project" />
  79 + <orderEntry type="library" name="Maven: com.github.fge:json-schema-validator:2.2.3" level="project" />
  80 + <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.7" level="project" />
  81 + <orderEntry type="library" name="Maven: com.github.fge:json-schema-core:1.2.1" level="project" />
  82 + <orderEntry type="library" name="Maven: com.github.fge:uri-template:0.9" level="project" />
  83 + <orderEntry type="library" name="Maven: org.mozilla:rhino:1.7R4" level="project" />
  84 + <orderEntry type="library" name="Maven: com.googlecode.libphonenumber:libphonenumber:6.0" level="project" />
  85 + <orderEntry type="library" name="Maven: javax.mail:mailapi:1.4.3" level="project" />
  86 + <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
  87 + <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:2.0.1" level="project" />
  88 + <orderEntry type="library" name="Maven: net.sf.jopt-simple:jopt-simple:4.6" level="project" />
  89 + <orderEntry type="library" name="Maven: com.github.fge:json-patch:1.6" level="project" />
  90 + <orderEntry type="library" name="Maven: com.github.fge:jackson-coreutils:1.6" level="project" />
  91 + <orderEntry type="library" name="Maven: com.github.fge:msg-simple:1.1" level="project" />
  92 + <orderEntry type="library" name="Maven: com.github.fge:btf:1.2" level="project" />
  93 + <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
  94 + <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
  95 + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.5.2.RELEASE" level="project" />
  96 + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.5.2.RELEASE" level="project" />
  97 + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.5.2.RELEASE" level="project" />
  98 + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.5.2.RELEASE" level="project" />
  99 + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:1.5.2.RELEASE" level="project" />
  100 + <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.11" level="project" />
  101 + <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.24" level="project" />
  102 + <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.24" level="project" />
  103 + <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
  104 + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.5.2.RELEASE" level="project" />
  105 + <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.11" level="project" />
  106 + <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.11" level="project" />
  107 + <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.11" level="project" />
  108 + <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.3.4.Final" level="project" />
  109 + <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
  110 + <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
  111 + <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.7" level="project" />
  112 + <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" level="project" />
  113 + <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.7.RELEASE" level="project" />
  114 + <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.7.RELEASE" level="project" />
  115 + <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.7.RELEASE" level="project" />
  116 + <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.7.RELEASE" level="project" />
  117 + <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.7.RELEASE" level="project" />
  118 + <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.5.2.RELEASE" level="project" />
  119 + <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:1.5.2.RELEASE" level="project" />
  120 + <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:1.5.2.RELEASE" level="project" />
  121 + <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.2.0" level="project" />
  122 + <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.2.1" level="project" />
  123 + <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.1" level="project" />
  124 + <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.3" level="project" />
  125 + <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
  126 + <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:2.6.0" level="project" />
  127 + <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
  128 + <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.1" level="project" />
  129 + <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
  130 + <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
  131 + <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.4.0" level="project" />
  132 + <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
  133 + <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.7.RELEASE" level="project" />
  134 + <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.7.RELEASE" level="project" />
  135 + <orderEntry type="library" name="Maven: com.alibaba:dubbo:2.5.3" level="project" />
  136 + <orderEntry type="library" name="Maven: org.javassist:javassist:3.15.0-GA" level="project" />
  137 + <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.5.Final" level="project" />
  138 + <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.6" level="project" />
  139 + <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.24" level="project" />
  140 + <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
  141 + <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" />
  142 + <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.31" level="project" />
  143 + <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:5.1.21" level="project" />
  144 + <orderEntry type="library" name="Maven: com.alibaba:druid:1.0.29" level="project" />
  145 + <orderEntry type="module-library">
  146 + <library name="Maven: com.alibaba:jconsole:1.8.0">
  147 + <CLASSES>
  148 + <root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_111.jdk/Contents/Home/lib/jconsole.jar!/" />
  149 + </CLASSES>
  150 + <JAVADOC />
  151 + <SOURCES />
  152 + </library>
  153 + </orderEntry>
  154 + <orderEntry type="module-library">
  155 + <library name="Maven: com.alibaba:tools:1.8.0">
  156 + <CLASSES>
  157 + <root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_111.jdk/Contents/Home/lib/tools.jar!/" />
  158 + </CLASSES>
  159 + <JAVADOC />
  160 + <SOURCES />
  161 + </library>
  162 + </orderEntry>
  163 + <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.4" level="project" />
  164 + <orderEntry type="library" name="Maven: com.github.sgroschupf:zkclient:0.1" level="project" />
  165 + <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
  166 + <orderEntry type="library" name="Maven: org.springframework.session:spring-session:1.3.1.RELEASE" level="project" />
  167 + <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
  168 + <orderEntry type="library" name="Maven: javax.servlet:servlet-api:3.0-alpha-1" level="project" />
  169 + <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.9" level="project" />
  170 + <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
  171 + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:1.5.2.RELEASE" level="project" />
  172 + <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.7.RELEASE" level="project" />
  173 + <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:4.2.2.RELEASE" level="project" />
  174 + <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:4.2.2.RELEASE" level="project" />
  175 + <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:4.2.2.RELEASE" level="project" />
  176 + <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
  177 + <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.6" level="project" />
  178 + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:1.5.2.RELEASE" level="project" />
  179 + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:1.5.2.RELEASE" level="project" />
  180 + <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
  181 + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.2.RELEASE" level="project" />
  182 + <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.7.RELEASE" level="project" />
  183 + <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.7.RELEASE" level="project" />
  184 + <orderEntry type="library" name="Maven: org.webjars:webjars-locator:0.32" level="project" />
  185 + <orderEntry type="library" name="Maven: org.webjars:webjars-locator-core:0.30" level="project" />
  186 + <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.1" level="project" />
  187 + <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.9" level="project" />
  188 + <orderEntry type="library" name="Maven: org.webjars:sockjs-client:1.0.2" level="project" />
  189 + <orderEntry type="library" name="Maven: org.webjars:stomp-websocket:2.3.3" level="project" />
  190 + <orderEntry type="library" name="Maven: org.webjars:bootstrap:3.3.7" level="project" />
  191 + <orderEntry type="library" name="Maven: org.webjars:jquery:3.1.0" level="project" />
  192 + </component>
  193 +</module>
0 \ No newline at end of file 194 \ No newline at end of file