提交更新到的东西

iamberry-common-config/iamberry-common-config.iml

@@ -1,39 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: com.google.zxing:core:3.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.google.zxing:javase:3.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.53" level="project" />
     <orderEntry type="library" name="Maven: jaxen:jaxen:1.1.6" level="project" />
-    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-mock:2.0.8" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.3.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.3.RELEASE" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:5.1.39" level="project" />
@@ -46,8 +39,8 @@
     <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.5" level="project" />
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.5" level="project" />
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
     <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
     <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.1" level="project" />
@@ -55,18 +48,20 @@
     <orderEntry type="library" name="Maven: com.google.guava:guava:16.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.9" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjtools:1.8.9" level="project" />
-    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.21" level="project" />
-    <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.4" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
     <orderEntry type="library" name="Maven: displaytag:displaytag:1.2" level="project" />
     <orderEntry type="library" name="Maven: com.lowagie:itext:1.3" level="project" />
     <orderEntry type="library" name="Maven: jsptags:pager-taglib:2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.2.1" level="project" />
-    <orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.1" level="project" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
     <orderEntry type="library" name="Maven: redis.clients:jedis:2.8.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.21" level="project" />
+    <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.4" level="project" />
     <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.7" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.6" level="project" />
@@ -112,8 +107,8 @@
     <orderEntry type="library" name="Maven: com.alibaba:dubbo:2.5.3" level="project" />
     <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.5.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
     <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.6" level="project" />

iamberry-common-core/iamberry-common-core.iml

@@ -1,24 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="iamberry-common-tool" />
-    <orderEntry type="module" module-name="iamberry-common-config" />
+    <orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch:2.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-backward-codecs:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-suggest:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-misc:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-join:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-grouping:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial3d:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: com.spatial4j:spatial4j:0.5" level="project" />
+    <orderEntry type="library" name="Maven: org.elasticsearch:securesm:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.carrotsearch:hppc:0.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.joda:joda-convert:1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
+    <orderEntry type="library" name="Maven: com.ning:compress-lzf:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.tdunning:t-digest:3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.twitter:jsr166e:1.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:2.2.1" level="project" />
     <orderEntry type="library" name="Maven: com.google.zxing:core:3.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.google.zxing:javase:3.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.53" level="project" />
     <orderEntry type="library" name="Maven: jaxen:jaxen:1.1.6" level="project" />
-    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.3.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.3.RELEASE" level="project" />
@@ -43,97 +70,51 @@
     <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.5" level="project" />
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
     <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.1" level="project" />
     <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.1" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:16.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.9" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjtools:1.8.9" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
+    <orderEntry type="library" name="Maven: displaytag:displaytag:1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.lowagie:itext:1.3" level="project" />
+    <orderEntry type="library" name="Maven: jsptags:pager-taglib:2.0" level="project" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
+    <orderEntry type="library" name="Maven: redis.clients:jedis:2.8.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
     <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.21" level="project" />
     <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.4" level="project" />
-    <orderEntry type="library" name="Maven: displaytag:displaytag:1.2" level="project" />
-    <orderEntry type="library" name="Maven: jsptags:pager-taglib:2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.2.1" level="project" />
-    <orderEntry type="library" name="Maven: redis.clients:jedis:2.8.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.7" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
     <orderEntry type="library" name="Maven: com.nimbusds:nimbus-jose-jwt:4.11.2" level="project" />
+    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:json-smart:1.3.1" level="project" />
     <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.3.4.O" level="project" />
     <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib-ext-spring:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.2.2" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.4" level="project" />
     <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi:3.14" level="project" />
     <orderEntry type="library" name="Maven: com.mortennobel:java-image-scaling:0.8.5" level="project" />
+    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235" level="project" />
     <orderEntry type="library" name="Maven: QRCode:QRCode:3.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.sogyf:goja-qrcode:0.1.2" level="project" />
     <orderEntry type="library" name="Maven: jdom:jdom:1.0" level="project" />
     <orderEntry type="library" name="Maven: jexcelapi:jxl:2.4.2" level="project" />
     <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
     <orderEntry type="library" name="Maven: org.owasp.antisamy:antisamy:1.4.3" level="project" />
-    <orderEntry type="library" name="Maven: org.owasp.esapi:esapi:2.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.8" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.101tec:zkclient:0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:dubbo:2.5.3" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.6" level="project" />
-    <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
-    <orderEntry type="library" name="Maven: cn.jpush.api:jpush-client:3.2.8" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch:2.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-backward-codecs:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-join:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-suggest:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-misc:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-grouping:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial3d:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: com.spatial4j:spatial4j:0.5" level="project" />
-    <orderEntry type="library" name="Maven: org.elasticsearch:securesm:1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.carrotsearch:hppc:0.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.joda:joda-convert:1.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.ning:compress-lzf:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: com.tdunning:t-digest:3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.twitter:jsr166e:1.1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.auth0:java-jwt:2.2.1" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: com.lowagie:itext:1.3" level="project" />
-    <orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
-    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
-    <orderEntry type="library" name="Maven: net.minidev:json-smart:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.3.4.O" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.2.2" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.4" level="project" />
-    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235" level="project" />
     <orderEntry type="library" name="Maven: xerces:xercesImpl:2.8.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.7" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.7" level="project" />
@@ -141,17 +122,31 @@
     <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" />
     <orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22" level="project" />
     <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.owasp.esapi:esapi:2.1.0" level="project" />
     <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.5" level="project" />
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils-core:1.7.0" level="project" />
     <orderEntry type="library" name="Maven: xom:xom:1.2.5" level="project" />
     <orderEntry type="library" name="Maven: xalan:xalan:2.7.0" level="project" />
     <orderEntry type="library" name="Maven: org.beanshell:bsh-core:2.0b4" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.8" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
+    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
     <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.101tec:zkclient:0.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:dubbo:2.5.3" level="project" />
     <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.5.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.6" level="project" />
+    <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
+    <orderEntry type="library" name="Maven: cn.jpush.api:jpush-client:3.2.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.1.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:0.9.5" level="project" />
   </component>
 </module>

iamberry-common-core/src/main/java/com/iamberry/wechat/core/entity/cart/CartDto.java

@@ -41,7 +41,7 @@ public class CartDto implements Serializable{
 	
 	private String productRemark; //商品备注
 	
-	private Integer productColor;			//产品颜色		1：红色	2：橙色	3：黄色	4：绿色 5：青色	6：蓝色	7：紫色	8：白色
+	private String productColor;			//产品颜色		不再用代码表示，直接使用汉字- 1：红色	2：橙色	3：黄色	4：绿色 5：青色	6：蓝色	7：紫色	8：白色
 
 	private Integer cartColorId;	//产品颜色id
 
@@ -61,11 +61,11 @@ public class CartDto implements Serializable{
 		this.productType = productType;
 	}
 
-	public Integer getProductColor() {
+	public String getProductColor() {
 		return productColor;
 	}
 
-	public void setProductColor(Integer productColor) {
+	public void setProductColor(String productColor) {
 		this.productColor = productColor;
 	}
 

iamberry-common-core/src/main/java/com/iamberry/wechat/core/entity/product/Product.java

@@ -48,7 +48,7 @@ public class Product implements java.io.Serializable{
 	
 	private String productRemark;			//产品备注
 	
-	private Integer productColor;			//产品颜色		1：红色	2：橙色	3：黄色	4：绿色
+	private String productColor;			//产品颜色		1：红色	2：橙色	3：黄色	4：绿色
 											//			5：青色	6：蓝色	7：紫色	8：白色
 	private ProductType productType;			//商品类型
 	
@@ -227,11 +227,11 @@ public class Product implements java.io.Serializable{
 		this.productRemark = productRemark;
 	}
 
-	public Integer getProductColor() {
+	public String getProductColor() {
 		return productColor;
 	}
 
-	public void setProductColor(Integer productColor) {
+	public void setProductColor(String productColor) {
 		this.productColor = productColor;
 	}
 

iamberry-common-interface/iamberry-common-interface.iml

@@ -1,24 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="iamberry-common-core" />
     <orderEntry type="module" module-name="iamberry-common-tool" />
+    <orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch:2.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-backward-codecs:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-suggest:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-misc:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-join:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-grouping:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial3d:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: com.spatial4j:spatial4j:0.5" level="project" />
+    <orderEntry type="library" name="Maven: org.elasticsearch:securesm:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.carrotsearch:hppc:0.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.joda:joda-convert:1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
+    <orderEntry type="library" name="Maven: com.ning:compress-lzf:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.tdunning:t-digest:3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.twitter:jsr166e:1.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:2.2.1" level="project" />
     <orderEntry type="library" name="Maven: com.google.zxing:core:3.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.google.zxing:javase:3.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.53" level="project" />
     <orderEntry type="library" name="Maven: jaxen:jaxen:1.1.6" level="project" />
-    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.3.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.3.RELEASE" level="project" />
@@ -43,98 +69,51 @@
     <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.5" level="project" />
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
     <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.1" level="project" />
     <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.1" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:16.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.9" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjtools:1.8.9" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
+    <orderEntry type="library" name="Maven: displaytag:displaytag:1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.lowagie:itext:1.3" level="project" />
+    <orderEntry type="library" name="Maven: jsptags:pager-taglib:2.0" level="project" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
+    <orderEntry type="library" name="Maven: redis.clients:jedis:2.8.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
     <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.21" level="project" />
     <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.4" level="project" />
-    <orderEntry type="library" name="Maven: displaytag:displaytag:1.2" level="project" />
-    <orderEntry type="library" name="Maven: jsptags:pager-taglib:2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.2.1" level="project" />
-    <orderEntry type="library" name="Maven: redis.clients:jedis:2.8.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.7" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
     <orderEntry type="library" name="Maven: com.nimbusds:nimbus-jose-jwt:4.11.2" level="project" />
+    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:json-smart:1.3.1" level="project" />
     <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.3.4.O" level="project" />
     <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib-ext-spring:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.2.2" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.4" level="project" />
     <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi:3.14" level="project" />
     <orderEntry type="library" name="Maven: com.mortennobel:java-image-scaling:0.8.5" level="project" />
+    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235" level="project" />
     <orderEntry type="library" name="Maven: QRCode:QRCode:3.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.sogyf:goja-qrcode:0.1.2" level="project" />
     <orderEntry type="library" name="Maven: jdom:jdom:1.0" level="project" />
     <orderEntry type="library" name="Maven: jexcelapi:jxl:2.4.2" level="project" />
     <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
     <orderEntry type="library" name="Maven: org.owasp.antisamy:antisamy:1.4.3" level="project" />
-    <orderEntry type="library" name="Maven: org.owasp.esapi:esapi:2.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.8" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.101tec:zkclient:0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:dubbo:2.5.3" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.6" level="project" />
-    <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
-    <orderEntry type="library" name="Maven: cn.jpush.api:jpush-client:3.2.8" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.0.1" level="project" />
-    <orderEntry type="module" module-name="iamberry-common-config" />
-    <orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch:2.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-backward-codecs:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-join:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-suggest:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-misc:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-grouping:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial3d:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: com.spatial4j:spatial4j:0.5" level="project" />
-    <orderEntry type="library" name="Maven: org.elasticsearch:securesm:1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.carrotsearch:hppc:0.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.joda:joda-convert:1.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.ning:compress-lzf:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: com.tdunning:t-digest:3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.twitter:jsr166e:1.1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.auth0:java-jwt:2.2.1" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: com.lowagie:itext:1.3" level="project" />
-    <orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
-    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
-    <orderEntry type="library" name="Maven: net.minidev:json-smart:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.3.4.O" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.2.2" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.4" level="project" />
-    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235" level="project" />
     <orderEntry type="library" name="Maven: xerces:xercesImpl:2.8.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.7" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.7" level="project" />
@@ -142,17 +121,31 @@
     <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" />
     <orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22" level="project" />
     <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.owasp.esapi:esapi:2.1.0" level="project" />
     <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.5" level="project" />
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils-core:1.7.0" level="project" />
     <orderEntry type="library" name="Maven: xom:xom:1.2.5" level="project" />
     <orderEntry type="library" name="Maven: xalan:xalan:2.7.0" level="project" />
     <orderEntry type="library" name="Maven: org.beanshell:bsh-core:2.0b4" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.8" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
+    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
     <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.101tec:zkclient:0.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:dubbo:2.5.3" level="project" />
     <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.5.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.6" level="project" />
+    <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
+    <orderEntry type="library" name="Maven: cn.jpush.api:jpush-client:3.2.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.1.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:0.9.5" level="project" />
   </component>
 </module>

iamberry-wechat-interface/iamberry-wechat-interface.iml

@@ -1,22 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="iamberry-common-core" />
     <orderEntry type="module" module-name="iamberry-common-tool" />
+    <orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch:2.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-backward-codecs:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-suggest:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-misc:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-join:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-grouping:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial3d:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: com.spatial4j:spatial4j:0.5" level="project" />
+    <orderEntry type="library" name="Maven: org.elasticsearch:securesm:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.carrotsearch:hppc:0.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.joda:joda-convert:1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
+    <orderEntry type="library" name="Maven: com.ning:compress-lzf:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.tdunning:t-digest:3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.twitter:jsr166e:1.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:2.2.1" level="project" />
     <orderEntry type="library" name="Maven: com.google.zxing:core:3.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.google.zxing:javase:3.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.53" level="project" />
     <orderEntry type="library" name="Maven: jaxen:jaxen:1.1.6" level="project" />
-    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.3.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.3.RELEASE" level="project" />
@@ -41,98 +70,51 @@
     <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.5" level="project" />
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
     <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.1" level="project" />
     <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.1" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:16.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.9" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjtools:1.8.9" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
+    <orderEntry type="library" name="Maven: displaytag:displaytag:1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.lowagie:itext:1.3" level="project" />
+    <orderEntry type="library" name="Maven: jsptags:pager-taglib:2.0" level="project" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
+    <orderEntry type="library" name="Maven: redis.clients:jedis:2.8.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
     <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.21" level="project" />
     <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.4" level="project" />
-    <orderEntry type="library" name="Maven: displaytag:displaytag:1.2" level="project" />
-    <orderEntry type="library" name="Maven: jsptags:pager-taglib:2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.2.1" level="project" />
-    <orderEntry type="library" name="Maven: redis.clients:jedis:2.8.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.7" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
     <orderEntry type="library" name="Maven: com.nimbusds:nimbus-jose-jwt:4.11.2" level="project" />
+    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:json-smart:1.3.1" level="project" />
     <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.3.4.O" level="project" />
     <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib-ext-spring:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.2.2" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.4" level="project" />
     <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi:3.14" level="project" />
     <orderEntry type="library" name="Maven: com.mortennobel:java-image-scaling:0.8.5" level="project" />
+    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235" level="project" />
     <orderEntry type="library" name="Maven: QRCode:QRCode:3.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.sogyf:goja-qrcode:0.1.2" level="project" />
     <orderEntry type="library" name="Maven: jdom:jdom:1.0" level="project" />
     <orderEntry type="library" name="Maven: jexcelapi:jxl:2.4.2" level="project" />
     <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
     <orderEntry type="library" name="Maven: org.owasp.antisamy:antisamy:1.4.3" level="project" />
-    <orderEntry type="library" name="Maven: org.owasp.esapi:esapi:2.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.8" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.101tec:zkclient:0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:dubbo:2.5.3" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.6" level="project" />
-    <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
-    <orderEntry type="library" name="Maven: cn.jpush.api:jpush-client:3.2.8" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.0.1" level="project" />
-    <orderEntry type="module" module-name="iamberry-common-config" />
-    <orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch:2.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-backward-codecs:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-join:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-suggest:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-misc:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-grouping:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial3d:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: com.spatial4j:spatial4j:0.5" level="project" />
-    <orderEntry type="library" name="Maven: org.elasticsearch:securesm:1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.carrotsearch:hppc:0.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.joda:joda-convert:1.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.ning:compress-lzf:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: com.tdunning:t-digest:3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.twitter:jsr166e:1.1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.auth0:java-jwt:2.2.1" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: com.lowagie:itext:1.3" level="project" />
-    <orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
-    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
-    <orderEntry type="library" name="Maven: net.minidev:json-smart:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.3.4.O" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.2.2" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.4" level="project" />
-    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235" level="project" />
     <orderEntry type="library" name="Maven: xerces:xercesImpl:2.8.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.7" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.7" level="project" />
@@ -140,17 +122,31 @@
     <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" />
     <orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22" level="project" />
     <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.owasp.esapi:esapi:2.1.0" level="project" />
     <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.5" level="project" />
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils-core:1.7.0" level="project" />
     <orderEntry type="library" name="Maven: xom:xom:1.2.5" level="project" />
     <orderEntry type="library" name="Maven: xalan:xalan:2.7.0" level="project" />
     <orderEntry type="library" name="Maven: org.beanshell:bsh-core:2.0b4" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.8" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
+    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
     <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.101tec:zkclient:0.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:dubbo:2.5.3" level="project" />
     <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.5.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.6" level="project" />
+    <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
+    <orderEntry type="library" name="Maven: cn.jpush.api:jpush-client:3.2.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.1.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:0.9.5" level="project" />
   </component>
 </module>

iamberry-wechat-service/iamberry-wechat-service.iml

@@ -1,25 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="iamberry-wechat-interface" />
     <orderEntry type="module" module-name="iamberry-common-core" />
     <orderEntry type="module" module-name="iamberry-common-tool" />
+    <orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch:2.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-backward-codecs:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-suggest:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-misc:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-join:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-grouping:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial3d:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: com.spatial4j:spatial4j:0.5" level="project" />
+    <orderEntry type="library" name="Maven: org.elasticsearch:securesm:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.carrotsearch:hppc:0.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.joda:joda-convert:1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
+    <orderEntry type="library" name="Maven: com.ning:compress-lzf:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.tdunning:t-digest:3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.twitter:jsr166e:1.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:2.2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.2.1" level="project" />
+    <orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.1" level="project" />
     <orderEntry type="library" name="Maven: com.google.zxing:core:3.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.google.zxing:javase:3.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.53" level="project" />
     <orderEntry type="library" name="Maven: jaxen:jaxen:1.1.6" level="project" />
-    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.3.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.3.RELEASE" level="project" />
@@ -44,101 +74,51 @@
     <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.5" level="project" />
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
     <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.1" level="project" />
     <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.1" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:16.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.9" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjtools:1.8.9" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
+    <orderEntry type="library" name="Maven: displaytag:displaytag:1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.lowagie:itext:1.3" level="project" />
+    <orderEntry type="library" name="Maven: jsptags:pager-taglib:2.0" level="project" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
+    <orderEntry type="library" name="Maven: redis.clients:jedis:2.8.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
     <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.21" level="project" />
     <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.4" level="project" />
-    <orderEntry type="library" name="Maven: displaytag:displaytag:1.2" level="project" />
-    <orderEntry type="library" name="Maven: jsptags:pager-taglib:2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.2.1" level="project" />
-    <orderEntry type="library" name="Maven: redis.clients:jedis:2.8.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.7" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
     <orderEntry type="library" name="Maven: com.nimbusds:nimbus-jose-jwt:4.11.2" level="project" />
+    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:json-smart:1.3.1" level="project" />
     <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.3.4.O" level="project" />
     <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib-ext-spring:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.2.2" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.4" level="project" />
     <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi:3.14" level="project" />
     <orderEntry type="library" name="Maven: com.mortennobel:java-image-scaling:0.8.5" level="project" />
+    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235" level="project" />
     <orderEntry type="library" name="Maven: QRCode:QRCode:3.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.sogyf:goja-qrcode:0.1.2" level="project" />
     <orderEntry type="library" name="Maven: jdom:jdom:1.0" level="project" />
     <orderEntry type="library" name="Maven: jexcelapi:jxl:2.4.2" level="project" />
     <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
     <orderEntry type="library" name="Maven: org.owasp.antisamy:antisamy:1.4.3" level="project" />
-    <orderEntry type="library" name="Maven: org.owasp.esapi:esapi:2.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.8" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.101tec:zkclient:0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:dubbo:2.5.3" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.6" level="project" />
-    <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
-    <orderEntry type="library" name="Maven: cn.jpush.api:jpush-client:3.2.8" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.0.1" level="project" />
-    <orderEntry type="module" module-name="iamberry-common-config" />
-    <orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch:2.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-backward-codecs:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-join:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-suggest:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-misc:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-grouping:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial3d:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: com.spatial4j:spatial4j:0.5" level="project" />
-    <orderEntry type="library" name="Maven: org.elasticsearch:securesm:1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.carrotsearch:hppc:0.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.joda:joda-convert:1.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.ning:compress-lzf:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: com.tdunning:t-digest:3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.twitter:jsr166e:1.1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.auth0:java-jwt:2.2.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.4.1.BUILD-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.4.1.BUILD-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.4.1.BUILD-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.1" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: com.lowagie:itext:1.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
-    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
-    <orderEntry type="library" name="Maven: net.minidev:json-smart:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.3.4.O" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.2.2" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.4" level="project" />
-    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235" level="project" />
     <orderEntry type="library" name="Maven: xerces:xercesImpl:2.8.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.7" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.7" level="project" />
@@ -146,17 +126,31 @@
     <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" />
     <orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22" level="project" />
     <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.owasp.esapi:esapi:2.1.0" level="project" />
     <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.5" level="project" />
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils-core:1.7.0" level="project" />
     <orderEntry type="library" name="Maven: xom:xom:1.2.5" level="project" />
     <orderEntry type="library" name="Maven: xalan:xalan:2.7.0" level="project" />
     <orderEntry type="library" name="Maven: org.beanshell:bsh-core:2.0b4" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.8" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
+    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
     <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.101tec:zkclient:0.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:dubbo:2.5.3" level="project" />
     <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.5.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.6" level="project" />
+    <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
+    <orderEntry type="library" name="Maven: cn.jpush.api:jpush-client:3.2.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.1.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:0.9.5" level="project" />
   </component>
 </module>

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/cartMapper.xml

@@ -10,11 +10,13 @@ PUBLIC
 	<!-- 查询用户购物车所有信息 -->
 	<select id="selectCartByOpenId" parameterType="String" resultType="CartDto">
 		SELECT 
-			C.CART_ID cartId, C.CART_PRODUCT_ID cartProductId, C.CART_NUM cartNum,P.PRODUCT_NAME productName, 
-			P.PRODUCT_DISCOUNT productPrice, P.PRODUCT_STATUS productStatus, P.PRODUCT_COLOR productColor, 
-			P.PRODUCT_INTRODUCE_IMG productIntroduceImg, PRODUCT_REMARK productRemark 
+			C.CART_ID cartId, C.CART_PRODUCT_ID cartProductId, C.CART_NUM cartNum,P.PRODUCT_NAME productName,
+			pc.color_discount productPrice, P.PRODUCT_STATUS productStatus, pc.color_name productColor,
+			pc.color_product_pic productIntroduceImg, PRODUCT_REMARK productRemark
 		FROM 
-			TB_IAMBERRY_SHOP_CART C LEFT JOIN TB_IAMBERRY_PRODUCT_INFO P ON C.CART_PRODUCT_ID = P.PRODUCT_ID
+			TB_IAMBERRY_SHOP_CART C
+			LEFT JOIN TB_IAMBERRY_PRODUCT_INFO P ON C.CART_PRODUCT_ID = P.PRODUCT_ID
+			LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR  pc on C.CART_PRODUCT_ID = pc.color_product_id
 		WHERE
 			C.CART_OPENID = #{openId} 
 		ORDER BY C.CART_ID DESC 

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/productInfoMapper.xml

@@ -11,11 +11,27 @@
 	
 	<!-- 分页查询商品信息 -->
 	<select id="selectPageProduct" parameterType="PaperBean" resultType="Product">
-		SELECT 
-			<include refid="product" />
+		SELECT
+		PRODUCT_ID productId,
+		PRODUCT_NAME productName,
+		PRODUCT_ABBREVIATION productAbbreviation,
+		color_discount productDiscount,
+		color_price productPrice,
+		PRODUCT_SALESNUM productSalesnum,
+		PRODUCT_ACCESSNUM productAccessnum,
+		PRODUCT_STATUS productStatus,
+		color_product_pic productIntroduceImg,
+		PRODUCT_PARAMETER_IMG productParameterImg,
+		PRODUCT_CREATE_DATE productCreateDate,
+		PRODUCT_SORT_NUM productSortNum,
+		PRODUCT_COLOR_DES productColorDes,
+		PRODUCT_REMARK productRemark,
+		color_name productColor
 		FROM 
-			TB_IAMBERRY_PRODUCT_INFO 
-		WHERE 
+			TB_IAMBERRY_PRODUCT_INFO
+		LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR
+		on TB_IAMBERRY_PRODUCT_INFO.product_id = TB_IAMBERRY_PRODUCT_COLOR.color_product_id
+		WHERE
 			PRODUCT_STATUS = 1 
 			<if test="str != null and str != ''">
 				AND PRODUCT_NAME like #{str} 
@@ -40,11 +56,17 @@
 	<!-- 查询首页产品 -->
 	<select id="selectIndexPageProduct" resultType="Product">
 		SELECT 
-			PRODUCT_ID productId, PRODUCT_COLOR_DES productColorDes,
-			PRODUCT_DISCOUNT productDiscount, PRODUCT_INTRODUCE_IMG productIntroduceImg,
-			PRODUCT_NAME productName, PRODUCT_COLOR productColor, PRODUCT_PRICE productPrice
+			PRODUCT_ID productId,
+			PRODUCT_COLOR_DES productColorDes,
+			color_discount productDiscount,
+			color_product_pic productIntroduceImg,
+			PRODUCT_NAME productName,
+			color_name productColor,
+			color_price productPrice
 		FROM 
-			TB_IAMBERRY_PRODUCT_INFO 
+			TB_IAMBERRY_PRODUCT_INFO
+			LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR
+		on TB_IAMBERRY_PRODUCT_INFO.product_id = TB_IAMBERRY_PRODUCT_COLOR.color_product_id
 		WHERE 
 			PRODUCT_STATUS = 1
 		LIMIT 
@@ -54,19 +76,51 @@
 	<!-- 根据productId查询商品信息 -->
 	<select id="getProductByProductId" parameterType="java.lang.Integer" resultType="Product">
 		SELECT 
-			<include refid="product" />
+			PRODUCT_ID productId,
+			PRODUCT_NAME productName,
+			PRODUCT_ABBREVIATION productAbbreviation,
+			color_discount productDiscount,
+			color_price productPrice,
+			PRODUCT_SALESNUM productSalesnum,
+			PRODUCT_ACCESSNUM productAccessnum,
+			PRODUCT_STATUS productStatus,
+			color_product_pic productIntroduceImg,
+			PRODUCT_PARAMETER_IMG productParameterImg,
+			PRODUCT_CREATE_DATE productCreateDate,
+			PRODUCT_SORT_NUM productSortNum,
+			PRODUCT_COLOR_DES productColorDes,
+			PRODUCT_REMARK productRemark,
+			color_name productColor
 		FROM 
-			TB_IAMBERRY_PRODUCT_INFO 
+			TB_IAMBERRY_PRODUCT_INFO
+		LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR
+		on TB_IAMBERRY_PRODUCT_INFO.product_id = TB_IAMBERRY_PRODUCT_COLOR.color_product_id
 		WHERE 
 			PRODUCT_ID = #{productId}
 	</select>
 	
 	<!-- 根据商品名称查询商品信息 -->
 	<select id="getProductByProductName" parameterType="java.lang.String" resultType="Product">
-		SELECT 
-			<include refid="product"/>
+		SELECT
+			PRODUCT_ID productId,
+			PRODUCT_NAME productName,
+			PRODUCT_ABBREVIATION productAbbreviation,
+			color_discount productDiscount,
+			color_price productPrice,
+			PRODUCT_SALESNUM productSalesnum,
+			PRODUCT_ACCESSNUM productAccessnum,
+			PRODUCT_STATUS productStatus,
+			color_product_pic productIntroduceImg,
+			PRODUCT_PARAMETER_IMG productParameterImg,
+			PRODUCT_CREATE_DATE productCreateDate,
+			PRODUCT_SORT_NUM productSortNum,
+			PRODUCT_COLOR_DES productColorDes,
+			PRODUCT_REMARK productRemark,
+			color_name productColor
 		FROM 
-			TB_IAMBERRY_PRODUCT_INFO 
+			TB_IAMBERRY_PRODUCT_INFO
+			LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR
+			on TB_IAMBERRY_PRODUCT_INFO.product_id = TB_IAMBERRY_PRODUCT_COLOR.color_product_id
 		<where>
 			<if test="_parameter != null">
 				PRODUCT_NAME like #{productName} 

iamberry-wechat-web/iamberry-wechat-web.iml

@@ -9,31 +9,85 @@
         <webroots>
           <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
         </webroots>
-        <sourceRoots>
-          <root url="file://$MODULE_DIR$/src/main/java" />
-          <root url="file://$MODULE_DIR$/src/main/resources" />
-        </sourceRoots>
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="iamberry-common-web" />
+    <orderEntry type="module" module-name="iamberry-wechat-service" />
+    <orderEntry type="module" module-name="iamberry-wechat-interface" />
+    <orderEntry type="module" module-name="iamberry-common-core" />
+    <orderEntry type="module" module-name="iamberry-common-tool" />
+    <orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch:2.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-backward-codecs:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-suggest:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-misc:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-join:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-grouping:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial3d:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: com.spatial4j:spatial4j:0.5" level="project" />
+    <orderEntry type="library" name="Maven: org.elasticsearch:securesm:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.carrotsearch:hppc:0.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.joda:joda-convert:1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
+    <orderEntry type="library" name="Maven: com.ning:compress-lzf:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.tdunning:t-digest:3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.twitter:jsr166e:1.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:2.2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.2.1" level="project" />
+    <orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet.jsp:javax.servlet.jsp-api:2.3.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.7.3" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid:1.0.20" level="project" />
+    <orderEntry type="module-library">
+      <library name="Maven: com.alibaba:jconsole:1.8.0">
+        <CLASSES>
+          <root url="jar://D:/JDKAZML/lib/jconsole.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Maven: com.alibaba:tools:1.8.0">
+        <CLASSES>
+          <root url="jar://D:/JDKAZML/lib/tools.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntry type="library" name="Maven: com.google.zxing:core:3.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.google.zxing:javase:3.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.53" level="project" />
     <orderEntry type="library" name="Maven: jaxen:jaxen:1.1.6" level="project" />
-    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.3.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.3.RELEASE" level="project" />
@@ -58,103 +112,49 @@
     <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.5" level="project" />
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
     <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.1" level="project" />
     <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.1" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:16.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.9" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjtools:1.8.9" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
+    <orderEntry type="library" name="Maven: displaytag:displaytag:1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.lowagie:itext:1.3" level="project" />
+    <orderEntry type="library" name="Maven: jsptags:pager-taglib:2.0" level="project" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
+    <orderEntry type="library" name="Maven: redis.clients:jedis:2.8.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
     <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.21" level="project" />
     <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.4" level="project" />
-    <orderEntry type="library" name="Maven: displaytag:displaytag:1.2" level="project" />
-    <orderEntry type="library" name="Maven: jsptags:pager-taglib:2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.2.1" level="project" />
-    <orderEntry type="library" name="Maven: redis.clients:jedis:2.8.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.7" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
     <orderEntry type="library" name="Maven: com.nimbusds:nimbus-jose-jwt:4.11.2" level="project" />
+    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:json-smart:1.3.1" level="project" />
     <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.3.4.O" level="project" />
     <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib-ext-spring:1.0.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.2.2" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.4" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi:3.14" level="project" />
     <orderEntry type="library" name="Maven: com.mortennobel:java-image-scaling:0.8.5" level="project" />
+    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235" level="project" />
     <orderEntry type="library" name="Maven: QRCode:QRCode:3.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.sogyf:goja-qrcode:0.1.2" level="project" />
     <orderEntry type="library" name="Maven: jdom:jdom:1.0" level="project" />
     <orderEntry type="library" name="Maven: jexcelapi:jxl:2.4.2" level="project" />
-    <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
     <orderEntry type="library" name="Maven: org.owasp.antisamy:antisamy:1.4.3" level="project" />
-    <orderEntry type="library" name="Maven: org.owasp.esapi:esapi:2.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.8" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.101tec:zkclient:0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:dubbo:2.5.3" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.6" level="project" />
-    <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
-    <orderEntry type="library" name="Maven: cn.jpush.api:jpush-client:3.2.8" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.0.1" level="project" />
-    <orderEntry type="module" module-name="iamberry-wechat-interface" />
-    <orderEntry type="module" module-name="iamberry-common-core" />
-    <orderEntry type="module" module-name="iamberry-common-tool" />
-    <orderEntry type="module" module-name="iamberry-common-config" />
-    <orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch:2.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-backward-codecs:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-join:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-suggest:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-misc:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-grouping:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial3d:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: com.spatial4j:spatial4j:0.5" level="project" />
-    <orderEntry type="library" name="Maven: org.elasticsearch:securesm:1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.carrotsearch:hppc:0.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.joda:joda-convert:1.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.ning:compress-lzf:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: com.tdunning:t-digest:3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.twitter:jsr166e:1.1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.auth0:java-jwt:2.2.1" level="project" />
-    <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet.jsp:javax.servlet.jsp-api:2.3.1" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: com.lowagie:itext:1.3" level="project" />
-    <orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
-    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
-    <orderEntry type="library" name="Maven: net.minidev:json-smart:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.3.4.O" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.2.2" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.4" level="project" />
-    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235" level="project" />
     <orderEntry type="library" name="Maven: xerces:xercesImpl:2.8.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.7" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.7" level="project" />
@@ -162,17 +162,31 @@
     <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" />
     <orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22" level="project" />
     <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.owasp.esapi:esapi:2.1.0" level="project" />
     <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.5" level="project" />
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils-core:1.7.0" level="project" />
     <orderEntry type="library" name="Maven: xom:xom:1.2.5" level="project" />
     <orderEntry type="library" name="Maven: xalan:xalan:2.7.0" level="project" />
     <orderEntry type="library" name="Maven: org.beanshell:bsh-core:2.0b4" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.8" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
+    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
     <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.101tec:zkclient:0.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:dubbo:2.5.3" level="project" />
     <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.5.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.6" level="project" />
+    <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
+    <orderEntry type="library" name="Maven: cn.jpush.api:jpush-client:3.2.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.1.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:0.9.5" level="project" />
   </component>
 </module>

iamberry-wechat-web/src/main/webapp/WEB-INF/views/wechat/chanpin_list.html

@@ -61,8 +61,9 @@
 		<script src="http://static.iamberry.com/js/mui.min.js?v=2016101701"></script>
 		<script src="http://static.iamberry.com/js/jquery-2.1.1.min.js"></script>
 		<script src="http://static.iamberry.com/js/shop/main.js?v=2016101701"></script>
-		<script src="http://static.iamberry.com/js/shop/wechat-utils-1.0.js"></script>
+		<!--<script src="http://static.iamberry.com/js/shop/wechat-utils-1.0.js"></script>-->
 		<script src="http://static.iamberry.com/js/shop/validate.js?v=2016101701"></script>
-		<script src="http://static.iamberry.com/js/shop/chanpin_list.js?v=2016101701"></script>
+		<!--<script src="http://static.iamberry.com/js/shop/chanpin_list.js?v=2016101701"></script>-->
+		<script src="/iamberry/common/shop/js/page/chanpin_list.js?v=2016101701"></script>
 	</body>
 </html>

iamberry-wechat-web/src/main/webapp/WEB-INF/views/wechat/index.html

@@ -83,6 +83,7 @@
 		<script src="http://static.iamberry.com/js/jquery-2.1.1.min.js"></script>
 		<script src="http://static.iamberry.com/js/shop/main.js?v=2016101701"></script>
 		<script src="http://static.iamberry.com/js/shop/wechat-utils-1.0.js"></script>
-		<script src="http://static.iamberry.com/js/shop/index.js?v=2016101701"></script>
+		<!--<script src="http://static.iamberry.com/js/shop/index.js?v=2016101701"></script>-->
+		<script src="/iamberry/common/shop/js/page/index.js?v=2016101701"></script>
 	</body>
 </html>

iamberry-wechat-web/src/main/webapp/WEB-INF/views/wechat/shopping_cart.html

@@ -95,7 +95,8 @@
 		<script src="http://static.iamberry.com/js/jquery-2.1.1.min.js"></script>
 		<script src="http://static.iamberry.com/js/shop/main.js?v=2016101701"></script>
 		<script src="http://static.iamberry.com/js/shop/wechat-utils-1.0.js"></script>
-		<script src="http://static.iamberry.com/js/shop/shopping_cart.js?v=2016101701"></script>
+<!--		<script src="http://static.iamberry.com/js/shop/shopping_cart.js?v=2016101701"></script>-->
+		<script src="/iamberry/common/shop/js/page/shopping_cart.js?v=2016101701"></script>
 	</body>
 
 </html>

iamberry-wechat-web/src/main/webapp/common/shop/js/page/index.js

@@ -28,7 +28,8 @@ console.log(dian);
 				var pro_data = dt.data.products;
 				mui(pro_data).each(function(index) {
 					var img_str = "";
-					var pro_color = switchcolor(this.productColor)
+					/*var pro_color = switchcolor(this.productColor)*/
+					var pro_color = this.productColor;
 
 					if(index == 0) {
 						img_str = '<img val="' + this.productIntroduceImg + '"  src="' + this.productIntroduceImg + '">';

iamberry-wechat-web/src/main/webapp/common/shop/js/page/shopping_cart.js

@@ -121,7 +121,8 @@ function selectCart() {
 					var sumCount = 0;
 					var pro_color="";
 					for (var i = 0; i < dt.data.cartList.length; i++) {
-					    pro_color=switchcolor(dt.data.cartList[i].productColor)
+					    /*pro_color=switchcolor(dt.data.cartList[i].productColor)*/
+                        pro_color= dt.data.cartList[i].productColor;
 						if (dt.data.cartList[i].productStatus != 1) {
 							noteLi += "<li class='mui-table-view-cell mui-media bg-f'>" + 
 										"<div class='mui-slider-right mui-disabled'><a class='mui-btn mui-btn-red btn-del' onclick='deleteCartItem(this, 1)' lang='" + dt.data.cartList[i].cartProductId + "'>删除</a></div><div class='mui-slider-handle'><img class='mui-media-object mui-pull-left wh-100' src='" + dt.data.cartList[i].productIntroduceImg + "'>" + 

watero-common-tool/src/main/java/com/iamberry/wechat/tools/SignUtil.java

@@ -28,7 +28,7 @@ public class SignUtil{
 		for (int i = 0; i < arr.length; i++) {
 			content.append(arr[i]);
 		}
-		
+
 		String tmpStr = Sha1Util.getSha1(content.toString());
 
 		content = null;

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/ComplaintQuestionInfo.java

@@ -26,6 +26,8 @@ public class ComplaintQuestionInfo implements Serializable {
     private Integer complaintId; //问题分类id
     private Integer complaintType;//咨询类型 1.售前 2.售后 3.其它
 
+    private Integer questionNum; //数量
+
     public Integer getQuestionId() {
         return questionId;
     }
@@ -121,4 +123,12 @@ public class ComplaintQuestionInfo implements Serializable {
     public void setComplaintType(Integer complaintType) {
         this.complaintType = complaintType;
     }
+
+    public Integer getQuestionNum() {
+        return questionNum;
+    }
+
+    public void setQuestionNum(Integer questionNum) {
+        this.questionNum = questionNum;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/ComplaintSmallClassInfo.java

@@ -1,7 +1,9 @@
 package com.iamberry.rst.core.cm;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 客诉小类表
@@ -21,6 +23,10 @@ public class ComplaintSmallClassInfo implements Serializable {
     private Date smallClassCreateTime;           //创建时间
     private Date smallClassUpdateTime;           //修改时间
 
+    private Integer smallClassNum; //数量
+
+    private List<ComplaintQuestionInfo> questionInfoList = new ArrayList<ComplaintQuestionInfo>();
+
     public Integer getSmallClassId() {
         return smallClassId;
     }
@@ -84,4 +90,20 @@ public class ComplaintSmallClassInfo implements Serializable {
     public void setSmallClassUpdateTime(Date smallClassUpdateTime) {
         this.smallClassUpdateTime = smallClassUpdateTime;
     }
+
+    public List<ComplaintQuestionInfo> getQuestionInfoList() {
+        return questionInfoList;
+    }
+
+    public void setQuestionInfoList(List<ComplaintQuestionInfo> questionInfoList) {
+        this.questionInfoList = questionInfoList;
+    }
+
+    public Integer getSmallClassNum() {
+        return smallClassNum;
+    }
+
+    public void setSmallClassNum(Integer smallClassNum) {
+        this.smallClassNum = smallClassNum;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/ComplaintTypeInfo.java

@@ -1,7 +1,9 @@
 package com.iamberry.rst.core.cm;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 客诉类型表
@@ -19,6 +21,10 @@ public class ComplaintTypeInfo implements Serializable {
     private Date complaintCreateTime;      //创建时间
     private Date complaintUpdateTime;      //修改时间
 
+    private Integer complaintNum;       //查询数量
+
+    private List<ComplaintSmallClassInfo> smallClassInfoList = new ArrayList<ComplaintSmallClassInfo>();
+
     public Integer getComplaintId() {
         return complaintId;
     }
@@ -74,4 +80,20 @@ public class ComplaintTypeInfo implements Serializable {
     public void setComplaintUpdateTime(Date complaintUpdateTime) {
         this.complaintUpdateTime = complaintUpdateTime;
     }
+
+    public List<ComplaintSmallClassInfo> getSmallClassInfoList() {
+        return smallClassInfoList;
+    }
+
+    public void setSmallClassInfoList(List<ComplaintSmallClassInfo> smallClassInfoList) {
+        this.smallClassInfoList = smallClassInfoList;
+    }
+
+    public Integer getComplaintNum() {
+        return complaintNum;
+    }
+
+    public void setComplaintNum(Integer complaintNum) {
+        this.complaintNum = complaintNum;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/CustomerInfo.java

@@ -108,6 +108,13 @@ public class CustomerInfo  implements Serializable {
         return complaintDetectList;
     }
 
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
+    private Date startTime;  //开始时间
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
+    private Date endTime;   //结束时间
+
     public void setComplaintDetectList(List<ComplaintDetectInfo> complaintDetectList) {
         this.complaintDetectList = complaintDetectList;
     }
@@ -511,4 +518,28 @@ public class CustomerInfo  implements Serializable {
     public void setVisitDesignatedAdminId(Integer visitDesignatedAdminId) {
         this.visitDesignatedAdminId = visitDesignatedAdminId;
     }
+
+    public String getVisitDesignatedAdminName() {
+        return visitDesignatedAdminName;
+    }
+
+    public void setVisitDesignatedAdminName(String visitDesignatedAdminName) {
+        this.visitDesignatedAdminName = visitDesignatedAdminName;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/QuestionDescribe.java

@@ -10,12 +10,12 @@ public class QuestionDescribe implements Serializable {
     private static final long serialVersionUID = -3855353499616091790L;
     //   问题描述id
     private Integer describeId;
-    //   描述  
+    //   描述 --> 问题回复
     private String describeContent;
     //   客诉主键  ,
     private Integer customerId;
 
-    //处理描述：用于新建客诉的时候的处理描述
+    //处理描述：用于新建客诉的时候的处理描述----> 客服备注 --> 问题描述
     private String describeHandleDesc;
 
     private String describeTitle;   //客诉标题

watero-rst-core/src/main/java/com.iamberry.rst.core/tools/WeixinUtil.java

@@ -220,15 +220,18 @@ public class WeixinUtil {
 	 *            凭证
 	 * @param appsecret
 	 *            密钥
+	 * @param isUpdate
+	 *            是否更新 1,不需要更新，直接取缓存
 	 * @return
 	 */
-	public static AccessToken getAccessToken(String appid, String appsecret,String pubNo) {
-
-		// 根据public No查询access_token
-		Token token = cache.get(pubNo);
-
+	public static AccessToken getAccessToken(String appid, String appsecret,String pubNo,Integer isUpdate) {
+		Token token = null;
+		if(isUpdate == 1){
+			// 根据public No查询access_token
+			token = cache.get(pubNo);
+		}
 		AccessToken accessToken = null;
-		//判断数据库中是否存在token
+		//判断缓存中是否存在token
 		if (token != null) {
 			//判断token是否失效
 			Date date = new Date();
@@ -330,11 +333,17 @@ public class WeixinUtil {
 	public static QRCJson createQrcodeByWechatMp(String json,String appId,String appSecret,String pubNo) {
 		QRCJson qrcJson = new QRCJson();
 		try {
-			AccessToken at = getAccessToken(appId,appSecret,pubNo);
+			AccessToken at = getAccessToken(appId,appSecret,pubNo,1);
 			if (at != null) {
 				String token = at.getToken();
 				JSONObject jsonObject = httpRequest(NameUtils.get_token_url.replaceAll("TOKEN", token), "POST", json);
 				if (jsonObject != null) {
+					if(!jsonObject.containsKey("ticket")){
+						logger.info("重新获取AccessToken"+jsonObject);
+						at = getAccessToken(appId,appSecret,pubNo,2);
+						token = at.getToken();
+						jsonObject = httpRequest(NameUtils.get_token_url.replaceAll("TOKEN", token), "POST", json);
+					}
 					String ticket = URLEncoder.encode(jsonObject.getString("ticket"), "UTF-8");
 					qrcJson.setTicket(ticket);
 					qrcJson.setUrl(NameUtils.show_qrcode_url + ticket);

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/ComplaintTypeInfoService.java

@@ -1,5 +1,6 @@
 package com.iamberry.rst.faces.cm;
 
+import com.iamberry.rst.core.cm.ComplaintQuestionInfo;
 import com.iamberry.rst.core.cm.ComplaintTypeInfo;
 
 import java.util.List;
@@ -27,4 +28,10 @@ public interface ComplaintTypeInfoService {
     /*查询问题分类*/
     List<ComplaintTypeInfo> listComplaintTypeInfo(ComplaintTypeInfo complaintTypeInfo);
 
+    /**
+     * 查询客诉结构
+     * @return
+     */
+    List<ComplaintTypeInfo> listComplaintQuestionToReport(ComplaintTypeInfo complaintTypeInfo);
+
 }

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/CustomerService.java

@@ -131,6 +131,8 @@ public interface CustomerService {
      * 向Efast推送订单  仅换新，维修 ,补发
      * @return
      */
-    @Transactional
     Map<String,Object> sendEfastOrder(CustomerCommon customerCommon,SalesOrder salesOrder);
+
+    /*查询问题个数*/
+    Integer getQuestionNumber(CustomerInfo customerInfo);
 }

watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/MachineService.java

@@ -50,6 +50,9 @@ public interface MachineService {
     //机器集合
     List<PtsMachine> ListPtsMachine(PtsMachine ptsMachine);
 
+    //机器集合--> 仓储查询机器
+    List<PtsMachine> ListPtsMachineToSignclosed(PtsMachine ptsMachine);
+
     //获取单个机器生产流程日志
     List<PtsMachineLogs> listMachineLogs(Integer machineId);
 

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/ComplaintTypeInfoServiceImpl.java

@@ -37,4 +37,9 @@ public class ComplaintTypeInfoServiceImpl implements ComplaintTypeInfoService {
     public List<ComplaintTypeInfo> listComplaintTypeInfo(ComplaintTypeInfo complaintTypeInfo) {
         return complaintTypeInfoMapper.listComplaintTypeInfo(complaintTypeInfo);
     }
+
+    @Override
+    public List<ComplaintTypeInfo> listComplaintQuestionToReport(ComplaintTypeInfo complaintTypeInfo) {
+        return complaintTypeInfoMapper.listComplaintQuestionToReport(complaintTypeInfo);
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/CustomerServiceImpl.java

@@ -498,6 +498,11 @@ public class CustomerServiceImpl implements CustomerService {
         return map;
     }
 
+    @Override
+    public Integer getQuestionNumber(CustomerInfo customerInfo) {
+        return customerInfoMapper.getQuestionNumber(customerInfo);
+    }
+
     /**
      * 向Efast推送订单--添加订单
      * @return

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/ComplaintTypeInfoMapper.java

@@ -10,23 +10,36 @@ import java.util.List;
 public interface ComplaintTypeInfoMapper {
     /**
      * 添加单个客诉类型
+     *
      * @return
      */
     int insert(ComplaintTypeInfo record);
+
     /**
      * 查询单个客诉类型
+     *
      * @return
      */
     ComplaintTypeInfo getTypeById(Integer complaintId);
+
     /**
      * 修改单个客诉类型
+     *
      * @return
      */
     int updateTypeById(ComplaintTypeInfo record);
 
     /**
      * 查询所有客诉类型
+     *
      * @return
      */
     List<ComplaintTypeInfo> listComplaintTypeInfo(ComplaintTypeInfo complaintTypeInfo);
+
+    /**
+     * 查询客诉结构
+     *
+     * @return
+     */
+    List<ComplaintTypeInfo> listComplaintQuestionToReport(ComplaintTypeInfo complaintTypeInfo);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/CustomerInfoMapper.java

@@ -38,4 +38,7 @@ public interface CustomerInfoMapper {
      * @return
      */
     ProductType getcompanyAffiliation(Integer customerId);
+
+    /*查询问题个数*/
+    Integer getQuestionNumber(CustomerInfo customerInfo);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/complaintTypeInfoMapper.xml

@@ -68,4 +68,83 @@
     </set>
     where complaint_id = #{complaintId,jdbcType=INTEGER}
   </update>
+
+  <resultMap id="questionMap" type="ComplaintTypeInfo" >
+    <id column="complaintId" property="complaintId"  />
+    <result column="complaint_consulting_type" property="complaintConsultingType"  />
+    <result column="complaint_class_name" property="complaintClassName" />
+    <result column="complaint_class_profile" property="complaintClassProfile"  />
+    <result column="complaint_class_state" property="complaintClassState" />
+    <result column="complaint_create_time" property="complaintCreateTime"  />
+    <result column="complaint_update_time" property="complaintUpdateTime" />
+    <collection property="smallClassInfoList" column="complaintId" javaType="ArrayList"
+                ofType="com.iamberry.rst.core.cm.ComplaintSmallClassInfo" select="getListComplaintSmallClassInfo"/>
+  </resultMap>
+  <resultMap id="complaintSmallClassInfoMap" type="ComplaintSmallClassInfo" >
+    <id column="smallClassId" property="smallClassId"  />
+    <result column="complaint_id" property="complaintId"  />
+    <result column="small_class_name" property="smallClassName" />
+    <result column="small_class_profile" property="smallClassProfile"  />
+    <result column="small_class_state" property="smallClassState"  />
+    <result column="small_question_num" property="smallQuestionNum"  />
+    <result column="small_class_create_time" property="smallClassCreateTime"  />
+    <result column="small_class_update_time" property="smallClassUpdateTime"  />
+    <collection property="questionInfoList" column="smallClassId" javaType="ArrayList"
+                ofType="com.iamberry.rst.core.cm.ComplaintQuestionInfo" select="getListComplaintQuestionInfo"/>
+  </resultMap>
+  <resultMap id="complaintQuestionInfoMap" type="ComplaintQuestionInfo" >
+    <id column="question_id" property="questionId"  />
+    <result column="small_class_id" property="smallClassId"  />
+    <result column="question_name" property="questionName"  />
+    <result column="question_state" property="questionState"  />
+    <result column="question_is_qc_detect" property="questionIsQcDetect"  />
+    <result column="question_create_time" property="questionCreateTime"  />
+    <result column="question_update_time" property="questionUpdateTime" />
+    <result column="question_resolved_num" property="questionResolvedNum"  />
+    <result column="question_not_solved_num" property="questionNotSolvedNum"  />
+  </resultMap>
+  <select id="listComplaintQuestionToReport" resultMap="questionMap" parameterType="ComplaintTypeInfo" >
+    select
+      complaint_id AS complaintId,
+      complaint_consulting_type,
+      complaint_class_name,
+      complaint_class_profile,
+      complaint_class_state,
+      complaint_create_time,
+      complaint_update_time
+    from tb_rst_complaint_type
+  </select>
+  <select id="getListComplaintSmallClassInfo" resultMap="complaintSmallClassInfoMap" parameterType="java.lang.Integer" >
+    select
+      small_class_id AS smallClassId,
+      complaint_id,
+      small_class_name,
+      small_class_profile,
+      small_class_state,
+      small_question_num,
+      small_class_create_time,
+      small_class_update_time
+    from tb_rst_complaint_small_class
+    where
+      complaint_id = #{complaintId}
+  </select>
+  <select id="getListComplaintQuestionInfo" resultMap="complaintQuestionInfoMap" parameterType="java.lang.Integer" >
+    select
+      cq.question_id,
+      cq.small_class_id,
+      cq.question_name,
+      cq.question_state,
+      cq.question_is_qc_detect,
+      cq.question_resolved_num,
+      cq.question_not_solved_num,
+      cq.question_create_time,
+      cq.question_update_time,
+      COUNT(ci.customer_id) AS questionNum
+    from tb_rst_complaint_question cq
+    LEFT JOIN tb_rst_customer_info ci ON cq.question_id = ci.question_id
+    where
+      cq.small_class_id = #{smallClassId}
+    GROUP BY cq.question_id
+  </select>
+
 </mapper>

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/customerInfoMapper.xml

@@ -68,8 +68,10 @@
       v.visit_time_select,
       v.visit_complete_name,
       v.visit_complete_tel,
+      sa.admin_name AS  visitDesignatedAdminName,
       q.question_profile,
-      d.describe_handle_desc
+      d.describe_handle_desc,
+      d.describe_content
     from
       tb_rst_customer_info c
     LEFT JOIN tb_rst_question_describe d ON c.customer_id = d.customer_id
@@ -79,8 +81,9 @@
     LEFT JOIN tb_rst_complaint_type ct ON s.complaint_id = ct.complaint_id
     LEFT JOIN tb_rst_sales_company sc ON c.company_id = sc.company_id
     LEFT JOIN tb_rst_store_info si ON c.store_id = si.store_id
+    LEFT JOIN tb_rst_sys_admin a ON c.admin_id = a.admin_id
     LEFT JOIN tb_rst_visit v ON v.customer_id = c.customer_id
-    LEFT JOIN tb_rst_sys_admin a ON v.designated_admin_id = a.admin_id
+    LEFT JOIN tb_rst_sys_admin sa ON v.designated_admin_id = sa.admin_id
     <where>
       <if test="customerName != null and customerName != ''">
         c.customer_name like CONCAT('%',#{customerName},'%')
@@ -149,6 +152,7 @@
     <result column="visit_complete_tel" property="visitCompleteTel"/>
     <result column="question_profile" property="questionProfile"/>
     <result column="describe_handle_desc" property="describeHandleDesc"/>
+    <result column="describe_content" property="describeContent"/>
     <collection property="complaintDetectList" column="customer_id" ofType="ComplaintDetectInfo" select="listComplaintDetect"/>
   </resultMap>
 
@@ -242,4 +246,23 @@
     where
     ci.customer_id = #{customerId}
   </select>
+
+  <select id="getQuestionNumber" parameterType="CustomerInfo" resultType="Integer">
+      SELECT
+        COUNT(customer_id)
+      FROM
+        tb_rst_customer_info
+      <where>
+        <if test="questionId != null" >
+           question_id = #{questionId}
+        </if>
+        <if test="startTime!=null and startTime!='' ">
+           and customer_create_time &gt;= #{startTime}
+        </if>
+        <if test="endTime!=null and endTime!=''">
+           and customer_create_time &lt;= #{endTime}
+        </if>
+      </where>
+  </select>
+
 </mapper>

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/MachineServiceImpl.java

@@ -75,6 +75,11 @@ public class MachineServiceImpl implements MachineService {
     }
 
     @Override
+    public List<PtsMachine> ListPtsMachineToSignclosed(PtsMachine ptsMachine) {
+        return machineMapper.ListPtsMachineToSignclosed(ptsMachine);
+    }
+
+    @Override
     public List<PtsMachine> listMachineWebApp(PtsMachine ptsMachine) {
         return machineMapper.listMachineWebApp(ptsMachine);
     }

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/MachineMapper.java

@@ -25,6 +25,9 @@ public interface MachineMapper {
     //查询机器列表
     List<PtsMachine> listMachine(PtsMachine ptsMachine);
 
+    //机器集合--> 仓储查询机器
+    List<PtsMachine> ListPtsMachineToSignclosed(PtsMachine ptsMachine);
+
     //查询机器列表--webapp
     List<PtsMachine> listMachineWebApp(PtsMachine ptsMachine);
 

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/machineMapper.xml

@@ -120,6 +120,21 @@
         order by machine_create_time desc
     </select>
 
+    <select id="ListPtsMachineToSignclosed" parameterType="PtsMachine" resultType="PtsMachine">
+        SELECT
+        t.machine_id machineId,
+        t.machine_qrcode machineQrcode,
+        t.machine_barcode machineBarcode
+        FROM  tb_rst_pts_machine t
+        <where>
+            <if test="machineBarcode != null and machineBarcode != ''">
+                t.machine_barcode like CONCAT('%',#{machineBarcode},'%')
+            </if>
+        </where>
+        order by machine_create_time desc
+        LIMIT 0,10;
+    </select>
+
 
     <select id="listMachineWebApp" parameterType="PtsMachine" resultType="PtsMachine">
         SELECT

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerReportController.java

@@ -0,0 +1,182 @@
+package com.iamberry.rst.controllers.cm;
+
+import com.iamberry.rst.core.cm.*;
+import com.iamberry.rst.faces.cm.ComplaintSmallClassInfoService;
+import com.iamberry.rst.faces.cm.ComplaintTypeInfoService;
+import com.iamberry.rst.faces.cm.CustomerService;
+import com.iamberry.wechat.tools.ResponseJson;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.crypto.Data;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * 客诉统计
+ * @auto wxm
+ */
+@Controller
+@RequestMapping("/admin/customer_report")
+public class AdminCustomerReportController {
+
+    private Logger logger = LoggerFactory.getLogger(AdminCustomerController.class);
+
+    @Autowired
+    private ComplaintTypeInfoService complaintTypeInfoService;
+    @Autowired
+    private CustomerService customerService;
+    @Autowired
+    private ComplaintSmallClassInfoService complaintSmallClassInfoService;
+
+    /**
+     * 客诉问题统计
+     *
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions("customer:question:report")
+    @RequestMapping(value = "/question_statistics")
+    public ResponseJson listStoreInfo(HttpServletRequest request,CustomerInfo customerInfo) {
+        ComplaintTypeInfo complaintTypeInfo = new ComplaintTypeInfo();
+        List<ComplaintTypeInfo> complaintTypeInfoList = complaintTypeInfoService.listComplaintQuestionToReport(complaintTypeInfo);
+        Integer num = 0;
+        for(int i=0;i<complaintTypeInfoList.size();i++){
+            Integer complaintTypeNum = 0;
+            ComplaintTypeInfo type = complaintTypeInfoList.get(i);
+            for(int j=0;j<type.getSmallClassInfoList().size();j++){
+                Integer smallClassNum = 0;
+                ComplaintSmallClassInfo small = type.getSmallClassInfoList().get(j);
+                for(int k=0;k<small.getQuestionInfoList().size();k++){
+                    Integer questionNum = 0;
+                    ComplaintQuestionInfo questionInfo = small.getQuestionInfoList().get(k);
+                    customerInfo.setQuestionId(questionInfo.getQuestionId());
+                    questionNum = customerService.getQuestionNumber(customerInfo);
+                    smallClassNum += questionNum;
+                    small.getQuestionInfoList().get(k).setQuestionNum(questionNum);
+                }
+                complaintTypeNum += smallClassNum;
+                type.getSmallClassInfoList().get(j).setSmallClassNum(smallClassNum);
+            }
+            num += complaintTypeNum;
+            complaintTypeInfoList.get(i).setComplaintNum(complaintTypeNum);
+        }
+
+        ResponseJson rj = new ResponseJson(200, "查询成功", 200);
+        rj.addResponseKeyValue("complaintTypeInfoList",complaintTypeInfoList);
+        rj.addResponseKeyValue("num",num);
+        return rj;
+    }
+
+    /**
+     * 跳转到报表页面
+     * @param request
+     * @return
+     */
+    @RequiresPermissions("customer:question:report")
+    @RequestMapping(value = "/to_statistics")
+    public ModelAndView selectOrder(HttpServletRequest request) {
+        ModelAndView mv = new ModelAndView("/cm/report/customer_report");
+        return mv;
+    }
+
+    /**
+     * 跳转到客诉问题分布展示页面
+     * @param request
+     * @return
+     */
+    @RequiresPermissions("customer:question:report")
+    @RequestMapping(value = "/show_pie_chart")
+    public ModelAndView showPieChart(HttpServletRequest request,String id,String typeName,String startTime,String endTime) {
+        ModelAndView mv = new ModelAndView("/cm/report/customer_picChart");
+        mv.addObject("id",id);
+        mv.addObject("typeName",typeName);
+        mv.addObject("startTime",startTime);
+        mv.addObject("endTime",endTime);
+        return mv;
+    }
+
+    /**
+     * 客诉问题分布展示
+     *
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions("customer:question:report")
+    @RequestMapping(value = "/get_pic_chart_data")
+    public ResponseJson getPicChartData(HttpServletRequest request,String id,String typeName,String startTime,String endTime) throws Exception {
+        CustomerInfo customerInfo = new CustomerInfo();
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        Date startDate = dateFormat.parse(startTime);
+        Date endDate = dateFormat.parse(endTime);
+        customerInfo.setStartTime(startDate);
+        customerInfo.setEndTime(endDate);
+
+        List dataList = new ArrayList<>();
+        List nameList = new ArrayList<>();
+        String name = "";
+        ComplaintTypeInfo complaintTypeInfo = new ComplaintTypeInfo();
+        List<ComplaintTypeInfo> complaintTypeInfoList = complaintTypeInfoService.listComplaintQuestionToReport(complaintTypeInfo);
+        Integer num = 0;
+        for(int i=0;i<complaintTypeInfoList.size();i++){
+            Integer complaintTypeNum = 0;
+            ComplaintTypeInfo type = complaintTypeInfoList.get(i);
+            for(int j=0;j<type.getSmallClassInfoList().size();j++){
+                Integer smallClassNum = 0;
+                ComplaintSmallClassInfo small = type.getSmallClassInfoList().get(j);
+                for(int k=0;k<small.getQuestionInfoList().size();k++){
+                    Integer questionNum = 0;
+                    ComplaintQuestionInfo questionInfo = small.getQuestionInfoList().get(k);
+                    customerInfo.setQuestionId(questionInfo.getQuestionId());
+                    questionNum = customerService.getQuestionNumber(customerInfo);
+                    smallClassNum += questionNum;
+                    small.getQuestionInfoList().get(k).setQuestionNum(questionNum);
+                    if("small".equals(typeName) && questionInfo.getSmallClassId() == Integer.valueOf(id) && questionNum!=0){
+                        Map<String ,Object> map = new HashMap<>();
+                        map.put("name",questionInfo.getQuestionName());
+                        map.put("value",questionNum);
+                        dataList.add(map);
+                        name = small.getSmallClassName();
+                        nameList.add(questionInfo.getQuestionName());
+                    }
+                }
+                complaintTypeNum += smallClassNum;
+                type.getSmallClassInfoList().get(j).setSmallClassNum(smallClassNum);
+                if("type".equals(typeName) && small.getComplaintId() == Integer.valueOf(id) && smallClassNum!=0){
+                    Map<String ,Object> map = new HashMap<>();
+                    map.put("name",small.getSmallClassName());
+                    map.put("value",smallClassNum);
+                    dataList.add(map);
+                    name = type.getComplaintClassName();
+                    nameList.add(small.getSmallClassName());
+                }
+            }
+            num += complaintTypeNum;
+            complaintTypeInfoList.get(i).setComplaintNum(complaintTypeNum);
+        }
+
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy年MM月dd日");
+        String startValue = formatter.format(startDate);
+        String endValue = formatter.format(endDate);
+        String dateValue = startValue + "-" + endValue;
+
+        ResponseJson rj = new ResponseJson(200, "查询成功", 200);
+        rj.addResponseKeyValue("dataList",dataList);
+        rj.addResponseKeyValue("nameList",nameList);
+        rj.addResponseKeyValue("name",name);
+        rj.addResponseKeyValue("startTime",startTime);
+        rj.addResponseKeyValue("endTime",endTime);
+        rj.addResponseKeyValue("dateValue",dateValue);
+        return rj;
+    }
+}

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminSalesOrderController.java

@@ -292,8 +292,6 @@ public class AdminSalesOrderController {
     @RequiresPermissions("salesOrder:sync:order")
     @RequestMapping("/sync_efast_order")
     public ResponseJson syncEfastOrder(HttpServletRequest request) throws Exception {
-        int pageNo = 1;
-        int pageSize = 20;
         String salesDealCode = request.getParameter("salesDealCode");
         if (!StringUtils.isNotEmpty(salesDealCode)) {
             return new ResponseJson(500, "订单编号不能为空，请重新输入!", 500);

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminSignclosedController.java

@@ -4,11 +4,13 @@ import com.iamberry.rst.core.cm.*;
 import com.iamberry.rst.core.order.Product;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
+import com.iamberry.rst.core.pts.PtsMachine;
 import com.iamberry.rst.faces.cm.AwaitingSignclosedProductInfoService;
 import com.iamberry.rst.faces.cm.ComplaintDetectInfoService;
 import com.iamberry.rst.faces.cm.ComplaintSignclosedInfoService;
 import com.iamberry.rst.faces.cm.FittingsInfoService;
 import com.iamberry.rst.faces.product.ProductService;
+import com.iamberry.rst.faces.pts.MachineService;
 import com.iamberry.rst.service.cm.mapper.AwaitingSignclosedProductMapper;
 import com.iamberry.rst.service.cm.mapper.ComplaintSignclosedInfoMapper;
 import com.iamberry.rst.service.cm.mapper.ComplaintSignclosedProductInfoMapper;
@@ -45,6 +47,9 @@ public class AdminSignclosedController {
     private ComplaintSignclosedInfoService complaintSignclosedInfoService;
     @Autowired
     private AwaitingSignclosedProductInfoService awaitingSignclosedProductInfoService;
+    @Autowired
+    private MachineService machineService;
+
     /**
      * 跳转到添加签收记录页面
      *
@@ -98,6 +103,43 @@ public class AdminSignclosedController {
         return mv;
     }
 
+
+    /**
+     * 获取机器信息
+     * @param
+     * @return
+     * @throws Exception
+     */
+    @ResponseBody
+    @RequiresPermissions("signclosed:add:signclosed")
+    @RequestMapping("/get_machine_id")
+    public ResponseJson getMachineId(@RequestParam(value = "pageSize", defaultValue = "10", required = false) Integer pageSize,
+                                     @RequestParam(value = "pageNO", defaultValue = "1", required = false) Integer pageNO,
+                                     @RequestParam(value = "pageTotal", required = false) Integer pageTotal,
+                                     PtsMachine ptsMachine) throws Exception {
+        ResponseJson rj = new ResponseJson();
+        List<PtsMachine> ptsMachineList = machineService.ListPtsMachineToSignclosed(ptsMachine);
+
+        List results = new ArrayList();
+        for (PtsMachine machine : ptsMachineList){
+            Map<String,Object> m = new HashMap<String,Object>();
+            m.put("id",machine.getMachineId());
+            m.put("text",machine.getMachineBarcode());
+            results.add(m);
+        }
+
+//        Map<String,Object> paginationMap = new HashMap<String,Object>();
+//        paginationMap.put("more",true);
+//
+//        Map<String,Object> map = new HashMap<String,Object>();
+//        map.put("results",results);
+//        map.put("pagination",paginationMap);
+//
+//        rj.addResponseKeyValue("map",map);
+        rj.addResponseKeyValue("results",results);
+        return rj;
+    }
+
     /**
      * 添加签收信息
      * @param request

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/add_customer.ftl

@@ -677,7 +677,8 @@
         toolbars: [tool],
         autoHeightEnabled: true,
         autoFloatEnabled: true,
-        elementPathEnabled : false  /*去掉元素路径*/
+        elementPathEnabled : false,  /*去掉元素路径*/
+        zIndex : 5
     });
     /*邮寄地址*/
     var sendAddressSms = UE.getEditor('sendAddressSms', {

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/custome_detail.ftl

@@ -87,13 +87,19 @@
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1">回复内容：</label>
+            <label class="form-label col-1 col-sm-1">问题描述：</label>
             <div class="formControls col-5 col-sm-5">
                 <label id="questionProfile"></label>
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1">用户信息:</label>
+            <label class="form-label col-1 col-sm-1">问题回复：</label>
+            <div class="formControls col-5 col-sm-5">
+                <label id="describeContent"></label>
+            </div>
+        </div>
+        <div class="row cl">
+            <label class="form-label col-1 col-sm-1">用户信息：</label>
             <div class="formControls col-5 col-sm-5" style="margin-top: 2px;">
                 <label id="customerName"></label>
                 <label id="customerTel"></label>
@@ -125,7 +131,7 @@
                 </div>
             </div>
             <div class="row cl">
-                <label class="form-label col-1 col-sm-1">订单信息</label>
+                <label class="form-label col-1 col-sm-1">订单信息：</label>
                 <div class="formControls col-7 col-sm-7 text-c">
                     <table class="table table-border table-bg table-bordered">
                         <tr>
@@ -180,7 +186,7 @@
             </div>
         </div>
 
-        <div class="row cl">
+        <div class="row cl" style="display: none">
             <label class="form-label col-1 col-sm-1">客服备注：</label>
             <div class="formControls col-7 col-sm-7" id="describeHandleDesc" style="border: 1px solid #ddd;">
             </div>
@@ -291,6 +297,7 @@
                     $('#typeName').html(customer.typeName);
                     $('#describeTitle').html(customer.describeTitle);
                     $('#questionProfile').html(customer.describeHandleDesc);
+                    $('#describeContent').html(customer.describeContent);
                     $('#customerName').html(customer.customerName);
                     $('#customerTel').html(customer.customerTel);
                     var txtcustomerIsSolve = '';
@@ -371,18 +378,18 @@
                             case 3:visitTime = '14:00-18:00';break;
                         }
                         var visitText = "";
-                        if(customer.visitStatus == 1){
-                            visitText = '(<span class="txt-red">'+convertUndefinedToEmpty(customer.visitName)+'</span>)&nbsp;&nbsp;'+
+                        if(customer.visitStatus == 1 || customer.visitStatus == 2){
+                            visitText  += '(<span class="txt-red">'+convertUndefinedToEmpty(customer.visitDesignatedAdminName)+'</span>)&nbsp;&nbsp;'+
                                     '需要在&nbsp;&nbsp;<span class="txt-red">'+convertUndefinedToEmpty(customer.visitDate)+
                                     '&nbsp;&nbsp;'+convertUndefinedToEmpty(visitTime)+'</span>对&nbsp;&nbsp;<span class="txt-red">'+
                                     convertUndefinedToEmpty(customer.visitName)+'&nbsp;&nbsp;'+
-                                    convertUndefinedToEmpty(customer.visitTel)+'</span>&nbsp;&nbsp;进行回访';
+                                    convertUndefinedToEmpty(customer.visitTel)+'</span>&nbsp;&nbsp;进行回访<br>';
 
-                    }
+                        }
                         if(customer.visitStatus == 2){
-                            visitText = '(<span class="txt-red">'+convertUndefinedToEmpty(customer.adminName)+'</span>)&nbsp;&nbsp;'+
-                                    '在&nbsp;&nbsp;<span class="txt-red">'+convertUndefinedToEmpty(customer.visitDate)+
-                                    '&nbsp;&nbsp;'+convertUndefinedToEmpty(visitTime)+'</span>对&nbsp;&nbsp;<span class="txt-red">'+
+                            visitText += '(<span class="txt-red">'+convertUndefinedToEmpty(customer.visitDesignatedAdminName)+'</span>)&nbsp;&nbsp;'+
+                                    '在&nbsp;&nbsp;<span class="txt-red">'+convertUndefinedToEmpty(customer.visitCompleteDate)+
+                                    '&nbsp;&nbsp;</span>对&nbsp;&nbsp;<span class="txt-red">'+
                                     convertUndefinedToEmpty(customer.visitCompleteName)+'&nbsp;&nbsp;'+
                                     convertUndefinedToEmpty(customer.visitCompleteTel)+'</span>&nbsp;&nbsp;完成回访';
                         }

watero-rst-web/src/main/webapp/WEB-INF/views/cm/report/customer_picChart.ftl

@@ -0,0 +1,123 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+    <meta http-equiv="Cache-Control" content="no-siteapp" />
+    <link rel="Bookmark" href="/favicon.ico" >
+    <link rel="Shortcut Icon" href="/favicon.ico" />
+<#include "/base/list_base.ftl">
+    <title>客诉统计</title>
+    <style>
+        *{padding: 0;margin: 0;}
+        .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+        .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
+        .table-bg thead th{background-color: #e2f6ff;}
+        .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
+        .txt2{
+            width:60px;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+        }
+    </style>
+</head>
+<body>
+<div class="page-container">
+    <div class="mt-20" id="createTable">
+        <div id="main" style="width: 800px;height:400px;"></div>
+    </div>
+</div>
+<tfoot>
+</tfoot>
+<#--<script type="text/javascript" src="${path}/common/lib/echarts/3.8/echarts.js"></script>-->
+<script type="text/javascript" src="${path}/common/lib/echarts/3.8/macarons.js"></script>
+<script type="text/javascript" src="${path}/common/lib/echarts/3.8/echarts.common.min.js"></script>
+<script type="text/javascript">
+
+    $(function (){
+        /*查询统计*/
+        getPicChartData();
+    });
+
+    /**
+     * 查询统计
+     */
+    function getPicChartData() {
+        var id = '${id}';
+        var typeName = '${typeName}';
+        var startTime = '${startTime}';
+        var endTime = '${endTime}';
+        var index = layer.load(1, {
+            shade: [0.5,'#fff'] //0.1透明度的白色背景
+        });
+        $.ajax({
+            type: "POST",
+            data: {
+                id :id,
+                typeName : typeName,
+                startTime : startTime,
+                endTime : endTime
+            },
+            url: "${path}/admin/customer_report/get_pic_chart_data",
+            success: function(data){
+                //alert(JSON.stringify(data.returnMsg));
+                showChart(data.returnMsg);
+                layer.close(index);
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+                layer.close(index);
+            }
+        })
+    }
+
+    function showChart(data){
+        // 第二个参数可以指定前面引入的主题
+        var chart = echarts.init(document.getElementById('main'), 'macarons');
+        var option = {
+            title: {
+                text: data.name,
+                subtext: data.dateValue,
+                left: 'center'
+            },
+            tooltip : {
+                trigger: 'item',
+                formatter: "{a} <br/>{b} : {c} ({d}%)"
+            },
+            legend: {
+                //orient: 'vertical',
+                //top: 'middle',
+                //x: 'left',
+                //itemWidth: 20,             // 图例图形宽度
+                //itemHeight: 14,            // 图例图形高度
+                //padding: 50,
+                bottom: 40,
+                left: 'center',
+                data: data.nameList
+            },
+            series : [
+                {
+                    type: 'pie',
+                    radius : '40%',
+                    center: ['50%', '40%'],
+                    selectedMode: 'single',
+                    data:data.dataList,
+                    itemStyle: {
+                        emphasis: {
+                            shadowBlur: 10,
+                            shadowOffsetX: 0,
+                            shadowColor: 'rgba(0, 0, 0, 0.5)'
+                        }
+                    }
+                }
+            ]
+        };
+        // 使用刚指定的配置项和数据显示图表。
+        chart.setOption(option);
+    }
+</script>
+</body>
+</html>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/report/customer_report.ftl

@@ -0,0 +1,316 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+    <meta http-equiv="Cache-Control" content="no-siteapp" />
+    <link rel="Bookmark" href="/favicon.ico" >
+    <link rel="Shortcut Icon" href="/favicon.ico" />
+<#include "/base/list_base.ftl">
+    <title>客诉统计</title>
+    <style>
+        *{padding: 0;margin: 0;}
+        .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+        .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
+        .table-bg thead th{background-color: #e2f6ff;}
+        .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
+        .txt2{
+            width:60px;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+        }
+    </style>
+</head>
+<body>
+<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
+    <span class="c-gray en">&gt;</span> 客诉管理
+    <span class="c-gray en">&gt;</span> 客诉统计
+    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
+</nav>
+<div class="page-container">
+    <div class="text-c">
+        <form method="post">
+
+            <input type="text" placeholder="请选择开始日期" id="startTime"  name="startTime" class="my-input Wdate" onclick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})"  readonly="readonly">
+            <input type="text" placeholder="请选择结束日期" id="endTime"  name="endTime" class="my-input Wdate" onclick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d',minDate:'#F{$dp.$D(\'startTime\',{d:0})}'})"  readonly="readonly">
+
+            <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="" name="" onclick="getStatistics()"><i class="Hui-iconfont">&#xe665;</i> 查询</button>
+        </form>
+    </div>
+
+    <div class="cl bg-1 bk-gray " style="margin-top: 20px;">
+        <span class="l" style="margin-left: 10px; height: 30px;line-height: 30px;font-weight: bold;">
+           合计：<span id="allNumber">0</span>
+        </span>
+    </div>
+    <div class="mt-20" id="createTable" style="margin-top: 0px;">
+    </div>
+
+</div>
+<tfoot>
+</tfoot>
+<script type="text/javascript">
+
+    /*是否开启问题数量为0的展示   true 显示，false：不显示*/
+    var isEnabledZeroShow = false;
+
+    $(function (){
+        showTime();
+
+        /*查询统计*/
+        getStatistics();
+    });
+
+    function showTime(){
+        var myDate = new Date();//获取系统当前时间
+        var endTime = myDate.getFullYear() + "-" + (parseInt(myDate.getMonth())+1) + "-" + myDate.getDate();
+        $("#endTime").val(endTime);
+
+        var startTime = GetDateStr(-7);
+        $("#startTime").val(startTime);
+    }
+
+    function GetDateStr(AddDayCount) {
+        var dd = new Date();
+        dd.setDate(dd.getDate()+AddDayCount);//获取AddDayCount天后的日期
+        var y = dd.getFullYear();
+        var m = dd.getMonth()+1;//获取当前月份的日期
+        var d = dd.getDate();
+        return y+"-"+m+"-"+d;
+     }
+
+    /**
+     * 查询统计
+     */
+    function getStatistics() {
+        var startTime = $("#startTime").val();
+        var endTime = $("#endTime").val();
+        var index = layer.load(1, {
+            shade: [0.5,'#fff'] //0.1透明度的白色背景
+        });
+        $.ajax({
+            cache: true,
+            type: "POST",
+            data: {
+                startTime :startTime,
+                endTime : endTime
+            },
+            url: "${path}/admin/customer_report/question_statistics",
+            success: function(data){
+                var typeList = data.returnMsg.complaintTypeInfoList;
+                var num = data.returnMsg.num;
+
+                var arrayTile = new Array(); // 表格标题数组
+                arrayTile.push("日期");
+                arrayTile.push("类型");
+                arrayTile.push("数量");
+                arrayTile.push("类型");
+                arrayTile.push("数量");
+                arrayTile.push("客诉问题");
+                arrayTile.push("数量");
+                arrayTile.push("百分比");
+
+                var tbody_array = new Array();
+                table_fmt.creat_table(arrayTile,typeList,null,num);
+
+                $("#allNumber").html(data.returnMsg.num);
+
+                layer.close(index);
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+                layer.close(index);
+            }
+        })
+    }
+
+    /**
+     * 展示饼图
+     * @param id
+     * @param typeName
+     */
+    function showPieChart(id,typeName){
+        var startTime = $("#startTime").val();
+        var endTime = $("#endTime").val();
+        layer_show("客诉问题分布图","${path}/admin/customer_report/show_pie_chart?startTime="+startTime+"&endTime=" +endTime+"&id="+ id +"&typeName="+typeName ,"900","500");
+    }
+</script>
+
+<script>
+    var table_fmt = {
+        creat_table : function (titleTable,allTableArray,lelNum,allNum){
+            table_fmt.hebingFunction();
+            $('#createTable').html('');
+            var table = $('<table id="process" class="table table-border table-bg table-bordered" ></table>');
+            table.appendTo($('#createTable'));
+            var thead = $('<thead></thead>');
+            thead.appendTo(table);
+            var trHead = $('<tr class="text-c"></tr>');
+            trHead.appendTo(thead);
+            // 创建表头
+            var str = '';
+            $.each(titleTable, function(index, item) {
+                str += '<th width="100">' + item + '</th>';
+            })
+            //str += '<th  width="200">价格</th><th width="100">操作</th>';
+            trHead.append(str);
+            var tbody = $('<tbody></tbody>');
+            tbody.appendTo(table);
+
+            var table_array = table_fmt.creat_tbody(allTableArray,allNum);
+
+            var style_array = [
+                "width: 10%;",
+                "width: 12%;",
+                "display: none;",
+                "width: 8%;",
+                "width: 12%;",
+                "display: none;",
+                "width: 8%;",
+                "width: 32%;text-align: left !important;",
+                "display: none;",
+                "width: 8%;",
+                "width: 10%;"
+            ];
+
+            if (table_array.length > 0) {
+                //创建行
+                $.each(table_array, function(index, item) {
+                    var tr = $('<tr></tr>');
+                    tr.appendTo(tbody);
+                    var str = '';
+                    for(var i=0;i<table_array[index].length;i++){
+                        switch (i){
+                            case 1:
+                                str += '<td class="text-c" style="'+ style_array[i] +'"><a href="javascript:void(0);" style="color: #06c;"  onclick="showPieChart(' + table_array[index][i+1] + ',\'type\')">' + table_array[index][i] + '<a></td>';
+                                break;
+                            case 4:
+                                str += '<td class="text-c" style="'+ style_array[i] +'"><a href="javascript:void(0);" style="color: #06c;" onclick="showPieChart(' + table_array[index][i+1] + ',\'small\')">' + table_array[index][i] + '<a></td>';
+                                break;
+                            default:
+                                str += '<td class="text-c" style="'+ style_array[i] +'">' + table_array[index][i] + '</td>';
+                                break;
+                        }
+                    }
+                    tr.append(str);
+                });
+            }
+
+            //结束创建Table表
+            //arrayColumn.pop(); //删除数组中最后一项
+
+            var arrayColumn = new Array(); // 指定列，用来合并哪些列
+            arrayColumn.push(0);
+            arrayColumn.push(1);
+            arrayColumn.push(2);
+            arrayColumn.push(3);
+            arrayColumn.push(4);
+            arrayColumn.push(5);
+            arrayColumn.push(6);
+
+            //合并单元格
+            $(table).mergeCell({
+                // 目前只有cols这么一个配置项, 用数组表示列的索引,从0开始
+                cols: arrayColumn
+            });
+        },
+        creat_tbody : function (allTableArray,allNum){
+
+            var  table_array = new Array();
+            for(var i=0; i<allTableArray.length; i++){
+                if(!isEnabledZeroShow && allTableArray[i].complaintNum != 0){
+                    for(var j=0; j<allTableArray[i].smallClassInfoList.length; j++){
+                        var small = allTableArray[i].smallClassInfoList[j];
+                        if(!isEnabledZeroShow && small.smallClassNum != 0){
+                            for(var k=0; k<small.questionInfoList.length; k++){
+                                var question = small.questionInfoList[k];
+                                if(!isEnabledZeroShow &&  question.questionNum != 0){
+                                    var tb_array = new Array();
+                                    tb_array.push("2017-2018");
+                                    tb_array.push(allTableArray[i].complaintClassName);
+                                    tb_array.push(allTableArray[i].complaintId);
+                                    tb_array.push(allTableArray[i].complaintNum)
+                                    tb_array.push(small.smallClassName);
+                                    tb_array.push(small.smallClassId);
+                                    tb_array.push(small.smallClassNum);
+                                    tb_array.push(question.questionName);
+                                    tb_array.push(question.questionId);
+                                    tb_array.push(question.questionNum);
+                                    var n = (Math.round((question.questionNum/allNum) * 10000)/100).toFixed(2) + '%';
+                                    tb_array.push(n);
+                                    table_array.push(tb_array);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            return table_array;
+        },
+        hebingFunction: function() {
+            $.fn.mergeCell = function(options) {
+                return this.each(function() {
+                    var cols = options.cols;
+                    for (var i = cols.length - 1; cols[i] != undefined; i--) {
+                        mergeCell($(this), cols[i]);
+                    }
+                    dispose($(this));
+                })
+            };
+
+            function mergeCell($table, colIndex) {
+                $table.data('col-content', ''); // 存放单元格内容
+                $table.data('col-rowspan', 1); // 存放计算的rowspan值 默认为1
+                $table.data('col-td', $()); // 存放发现的第一个与前一行比较结果不同td(jQuery封装过的), 默认一个"空"的jquery对象
+                $table.data('trNum', $('tbody tr', $table).length); // 要处理表格的总行数, 用于最后一行做特殊处理时进行判断之用
+                // 进行"扫面"处理 关键是定位col-td, 和其对应的rowspan
+                $('tbody tr', $table).each(function(index) {
+                    // td:eq中的colIndex即列索引
+                    var $td = $('td:eq(' + colIndex + ')', this);
+                    // 获取单元格的当前内容
+                    var currentContent = $td.html();
+                    // 第一次时走次分支
+                    if ($table.data('col-content') == '') {
+                        $table.data('col-content', currentContent);
+                        $table.data('col-td', $td);
+                    } else {
+                        // 上一行与当前行内容相同
+                        if ($table.data('col-content') == currentContent) {
+                            // 上一行与当前行内容相同则col-rowspan累加, 保存新值
+                            var rowspan = $table.data('col-rowspan') + 1;
+                            $table.data('col-rowspan', rowspan);
+                            // 值得注意的是 如果用了$td.remove()就会对其他列的处理造成影响
+                            $td.hide();
+                            // 最后一行的情况比较特殊一点
+                            // 比如最后2行 td中的内容是一样的, 那么到最后一行就应该把此时的col-td里保存的td设置rowspan
+                            // 最后一行不会向下判断是否有不同的内容
+                            if (++index == $table.data('trNum'))
+                                $table.data('col-td').attr('rowspan', $table.data('col-rowspan'));
+                        }
+                        // 上一行与当前行内容不同
+                        else {
+                            // col-rowspan默认为1, 如果统计出的col-rowspan没有变化, 不处理
+                            if ($table.data('col-rowspan') != 1) {
+                                $table.data('col-td').attr('rowspan', $table.data('col-rowspan'));
+                            }
+                            // 保存第一次出现不同内容的td, 和其内容, 重置col-rowspan
+                            $table.data('col-td', $td);
+                            $table.data('col-content', $td.html());
+                            $table.data('col-rowspan', 1);
+                        }
+                    }
+                })
+            }
+            // 同样是个private函数 清理内存之用
+            function dispose($table) {
+                $table.removeData();
+            }
+        }
+    }
+</script>
+
+</body>
+</html>

watero-rst-web/src/main/webapp/WEB-INF/views/order/excel_to_order.ftl

@@ -99,6 +99,7 @@
                             <option value="26">北京悦祺</option>
                             <option value="27">上海淘宝</option>
                             <option value="28">蓝极风</option>
+                            <option value="29">小莉团购</option>
                         </select>
                     </label>
                 </td>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/addRenovationMachine.ftl

@@ -31,35 +31,45 @@
 <div class="pd-20">
     <form   class="form form-horizontal" id="form-admin-add">
         <div class="input-box">
+            <span class="input-dic spanhidth">产品:</span>
+            <select class="my-select" name="produceId" id="produceId">
+            <#if (produceList ?size > 0)>
+                <#list produceList as list>
+                    <option value ="${list.produceId}">${list.produceName}</option>
+                </#list>
+            <#else >
+                <option value ="">暂无产品，请先添加产品</option>
+            </#if>
+            </select>
+        </div>
+        <div class="input-box">
             <span class="input-dic spanhidth">批次:</span>
             <select class="my-select" name="batchId" id="batchId">
             <#if (listptsBatch ?size > 0)>
                 <#list listptsBatch as list>
-                    <option value ="${list.batchId}" softwareVersionNo="${list.softwareVersionNo!''}" bomName="${list.bomName!''}(${list.bomVersion!''})">${list.batchNo}</option>
+                    <option value ="${list.batchId}">${list.batchNo}</option>
                 </#list>
             <#else >
                 <option value ="">暂无批次，请先添加批次</option>
             </#if>
-            </select>
+            </select><br>
+            <span style="margin-left: 15.5%">请对照生产计划部给到的纸制生产计划信息。</span>
         </div>
         <div class="input-box">
             <span class="input-dic spanhidth">软件版本:</span>
-            <span class="input-dic spanhidth" id="softwareVersionNo" style="width: 76%;text-align: left;padding-left: 10px;    margin-bottom: 10px;height: 30px;"></span>
-        <#-- <input class="my-input" type="text" style="width: 76%;"  name="machineLine" id="machineLine" value="A1"/>-->
-        <#--<select class="my-select" name="versionId" id="versionId">
-        <#if (listVersion ?size > 0)>
-            <#list listVersion as list>
-                <option value ="${list.machineVersionId}">${list.machineVersionName}</option>
-            </#list>
-        <#else >
-            <option value ="">暂无软件版本，请先添加软件版本</option>
-        </#if>
-        </select>-->
+            <select class="my-select" name="versionId" id="versionId">
+            <#if (listVersion ?size > 0)>
+                <#list listVersion as list>
+                    <option value ="${list.machineVersionId}">${list.machineVersionName}</option>
+                </#list>
+            <#else >
+                <option value ="">暂无软件版本，请先添加软件版本</option>
+            </#if>
+            </select>
         </div>
         <div class="input-box">
             <span class="input-dic spanhidth">Bom单:</span>
-            <span class="input-dic spanhidth" id="bomName" style="width: 76%;text-align: left;padding-left: 10px;    margin-bottom: 15px;height: 30px;"></span>
-        <#--<select class="my-select" name="bomId" id="bomId">
+            <select class="my-select" name="bomId" id="bomId">
             <#if listBom??>
                 <#if (listBom ?size > 0)>
                     <#list listBom as list>
@@ -71,7 +81,7 @@
             <#else >
                 <option value ="">暂无Bom，请先添加Bom单</option>
             </#if>
-        </select>-->
+            </select>
         </div>
         <div class="input-box">
             <span class="input-dic" style="margin-top: 0">是否翻新机:</span>
@@ -83,9 +93,7 @@
             </label>
         </div>
 
-        <div class="input-box"><span class="input-dic spanhidth">拉线:</span>
-            <input class="my-input" type="text" style="width: 76%;"  name="machineLine" id="machineLine" value="A1"/>
-        </div>
+        <div class="input-box"><span class="input-dic spanhidth">拉线:</span><input class="my-input" type="text" style="width: 76%;"  name="machineLine" id="machineLine" value="A1"/> </div>
         <div class="input-box"><span class="input-dic spanhidth">机器数量:</span><input class="my-input" type="text" style="width: 76%;"  name="number" id="number" value="4" placeholder="每次最少生成一个机器"/> </div>
         <div class="input-box">如果遇到批次，软件版本，BOM不清晰时，请联系POA（刘经理）</div>
 
@@ -99,33 +107,26 @@
 <#--<script type="text/javascript" src="${path}/common/admin/js/tips.js"></script>-->
 <script type="text/javascript">
 
-    $(function(){
-        var version = $("#batchId").find("option:selected").attr("softwareVersionNo");
-        var bomName = $("#batchId").find("option:selected").attr("bomName");
-        $("#softwareVersionNo").html(version);
-        $("#bomName").html(bomName);
-    })
-
     /*监听批次修改Bom  bom单*/
     $("#batchId").change(function(){
         var batchId = $(this).val();
-        var version = $("#batchId").find("option:selected").attr("softwareVersionNo");
-        var bomName = $("#batchId").find("option:selected").attr("bomName");
-        $("#softwareVersionNo").html(version);
-        $("#bomName").html(bomName);
-        //getBom(batchId);
+        getBom(batchId);
+    });
+    /*监听产品修改批次  bom单*/
+    $("#produceId").change(function(){
+        var produceId = $(this).val();
+        getProduce(produceId);
     });
-
 
     /*获取bom信息，赋值在页面上*/
-    /* function getBom(batchId){
-         var bom = new Object();
-         $.ajax({
-             type: "POST",
-             data: {
-                 batchId : batchId
-             },
-             url: "${path}/admin/machine/select_bom",
+    function getBom(batchId){
+        var bom = new Object();
+        $.ajax({
+            type: "POST",
+            data: {
+                batchId : batchId
+            },
+            url: "${path}/admin/machine/select_bom",
             async: false,
             success: function(data){
                 if (data.returnCode == 200) {
@@ -144,8 +145,40 @@
             });
 
         }
-    }*/
+    }
 
+    /*获取批次信息，赋值在页面上*/
+    function getProduce(produceId){
+        var listptsBatch = new Object();
+        $.ajax({
+            type: "POST",
+            data: {
+                productId : produceId
+            },
+            url: "${path}/admin/machine/select_Batch",
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    listptsBatch = data.returnMsg.listptsBatch;
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+            }
+        });
+
+        if(listptsBatch != null){
+            $("#bomId").empty();
+            $("#batchId").empty();
+            $.each(listptsBatch,function(n,value) {
+                if(n == 0){
+                    getBom(value.batchId);
+                }
+                var appoption = "<option value='"+value.batchId+"'>"+value.batchNo+"</option>";
+                $("#batchId").append(appoption);
+            });
+
+        }
+    }
     function dataCharm() {
 
         var batchId = $("#batchId").val();
@@ -154,17 +187,17 @@
             return false;
         }
 
-//         var versionId = $("#versionId").val();
-//         if(versionId == null || versionId == "" || typeof(versionId)=="undefined"){
-//             layer.msg("必须选择一个软件版本，没有软件版本请到产品列表中添加软件版本",{icon: 5,time:3000});
-//             return false;
-//         }
-
-//        var bomId = $("#bomId").val();
-//         if(bomId == null || bomId == "" || typeof(bomId)=="undefined"){
-//             layer.msg("必须选择一个Bom单，没有Bom单请到Bom单列表添加Bom单",{icon: 5,time:3000});
-//             return false;
-//         }
+        var versionId = $("#versionId").val();
+        if(versionId == null || versionId == "" || typeof(versionId)=="undefined"){
+            layer.msg("必须选择一个软件版本，没有软件版本请到产品列表中添加软件版本",{icon: 5,time:3000});
+            return false;
+        }
+
+        var bomId = $("#bomId").val();
+        if(bomId == null || bomId == "" || typeof(bomId)=="undefined"){
+            layer.msg("必须选择一个Bom单，没有Bom单请到Bom单列表添加Bom单",{icon: 5,time:3000});
+            return false;
+        }
 
         var machineLine = $("#machineLine").val();
         if(machineLine == null || machineLine == "" || typeof(machineLine)=="undefined"){

watero-rst-web/src/main/webapp/common/lib/echarts/3.8/macarons.js

@@ -0,0 +1,198 @@
+(function (root, factory) {
+    if (typeof define === 'function' && define.amd) {
+        // AMD. Register as an anonymous module.
+        define(['exports', 'echarts'], factory);
+    } else if (typeof exports === 'object' && typeof exports.nodeName !== 'string') {
+        // CommonJS
+        factory(exports, require('echarts'));
+    } else {
+        // Browser globals
+        factory({}, root.echarts);
+    }
+}(this, function (exports, echarts) {
+    var log = function (msg) {
+        if (typeof console !== 'undefined') {
+            console && console.error && console.error(msg);
+        }
+    };
+    if (!echarts) {
+        log('ECharts is not Loaded');
+        return;
+    }
+
+    var colorPalette = [
+        '#2ec7c9','#b6a2de','#5ab1ef','#ffb980','#d87a80',
+        '#8d98b3','#e5cf0d','#97b552','#95706d','#dc69aa',
+        '#07a2a4','#9a7fd1','#588dd5','#f5994e','#c05050',
+        '#59678c','#c9ab00','#7eb00a','#6f5553','#c14089'
+    ];
+
+
+    var theme = {
+        color: colorPalette,
+
+        title: {
+            textStyle: {
+                fontWeight: 'normal',
+                color: '#008acd'
+            }
+        },
+
+        visualMap: {
+            itemWidth: 15,
+            color: ['#5ab1ef','#e0ffff']
+        },
+
+        toolbox: {
+            iconStyle: {
+                normal: {
+                    borderColor: colorPalette[0]
+                }
+            }
+        },
+
+        tooltip: {
+            backgroundColor: 'rgba(50,50,50,0.5)',
+            axisPointer : {
+                type : 'line',
+                lineStyle : {
+                    color: '#008acd'
+                },
+                crossStyle: {
+                    color: '#008acd'
+                },
+                shadowStyle : {
+                    color: 'rgba(200,200,200,0.2)'
+                }
+            }
+        },
+
+        dataZoom: {
+            dataBackgroundColor: '#efefff',
+            fillerColor: 'rgba(182,162,222,0.2)',
+            handleColor: '#008acd'
+        },
+
+        grid: {
+            borderColor: '#eee'
+        },
+
+        categoryAxis: {
+            axisLine: {
+                lineStyle: {
+                    color: '#008acd'
+                }
+            },
+            splitLine: {
+                lineStyle: {
+                    color: ['#eee']
+                }
+            }
+        },
+
+        valueAxis: {
+            axisLine: {
+                lineStyle: {
+                    color: '#008acd'
+                }
+            },
+            splitArea : {
+                show : true,
+                areaStyle : {
+                    color: ['rgba(250,250,250,0.1)','rgba(200,200,200,0.1)']
+                }
+            },
+            splitLine: {
+                lineStyle: {
+                    color: ['#eee']
+                }
+            }
+        },
+
+        timeline : {
+            lineStyle : {
+                color : '#008acd'
+            },
+            controlStyle : {
+                normal : { color : '#008acd'},
+                emphasis : { color : '#008acd'}
+            },
+            symbol : 'emptyCircle',
+            symbolSize : 3
+        },
+
+        line: {
+            smooth : true,
+            symbol: 'emptyCircle',
+            symbolSize: 3
+        },
+
+        candlestick: {
+            itemStyle: {
+                normal: {
+                    color: '#d87a80',
+                    color0: '#2ec7c9',
+                    lineStyle: {
+                        color: '#d87a80',
+                        color0: '#2ec7c9'
+                    }
+                }
+            }
+        },
+
+        scatter: {
+            symbol: 'circle',
+            symbolSize: 4
+        },
+
+        map: {
+            label: {
+                normal: {
+                    textStyle: {
+                        color: '#d87a80'
+                    }
+                }
+            },
+            itemStyle: {
+                normal: {
+                    borderColor: '#eee',
+                    areaColor: '#ddd'
+                },
+                emphasis: {
+                    areaColor: '#fe994e'
+                }
+            }
+        },
+
+        graph: {
+            color: colorPalette
+        },
+
+        gauge : {
+            axisLine: {
+                lineStyle: {
+                    color: [[0.2, '#2ec7c9'],[0.8, '#5ab1ef'],[1, '#d87a80']],
+                    width: 10
+                }
+            },
+            axisTick: {
+                splitNumber: 10,
+                length :15,
+                lineStyle: {
+                    color: 'auto'
+                }
+            },
+            splitLine: {
+                length :22,
+                lineStyle: {
+                    color: 'auto'
+                }
+            },
+            pointer : {
+                width : 5
+            }
+        }
+    };
+
+    echarts.registerTheme('macarons', theme);
+}));

watero-rst-web/src/main/webapp/common/lib/select2/dist/css/select2.css

@@ -0,0 +1,484 @@
+.select2-container {
+  box-sizing: border-box;
+  display: inline-block;
+  margin: 0;
+  position: relative;
+  vertical-align: middle; }
+  .select2-container .select2-selection--single {
+    box-sizing: border-box;
+    cursor: pointer;
+    display: block;
+    height: 28px;
+    user-select: none;
+    -webkit-user-select: none; }
+    .select2-container .select2-selection--single .select2-selection__rendered {
+      display: block;
+      padding-left: 8px;
+      padding-right: 20px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap; }
+    .select2-container .select2-selection--single .select2-selection__clear {
+      position: relative; }
+  .select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered {
+    padding-right: 8px;
+    padding-left: 20px; }
+  .select2-container .select2-selection--multiple {
+    box-sizing: border-box;
+    cursor: pointer;
+    display: block;
+    min-height: 32px;
+    user-select: none;
+    -webkit-user-select: none; }
+    .select2-container .select2-selection--multiple .select2-selection__rendered {
+      display: inline-block;
+      overflow: hidden;
+      padding-left: 8px;
+      text-overflow: ellipsis;
+      white-space: nowrap; }
+  .select2-container .select2-search--inline {
+    float: left; }
+    .select2-container .select2-search--inline .select2-search__field {
+      box-sizing: border-box;
+      border: none;
+      font-size: 100%;
+      margin-top: 5px;
+      padding: 0; }
+      .select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button {
+        -webkit-appearance: none; }
+
+.select2-dropdown {
+  background-color: white;
+  border: 1px solid #aaa;
+  border-radius: 4px;
+  box-sizing: border-box;
+  display: block;
+  position: absolute;
+  left: -100000px;
+  width: 100%;
+  z-index: 1051; }
+
+.select2-results {
+  display: block; }
+
+.select2-results__options {
+  list-style: none;
+  margin: 0;
+  padding: 0; }
+
+.select2-results__option {
+  padding: 6px;
+  user-select: none;
+  -webkit-user-select: none; }
+  .select2-results__option[aria-selected] {
+    cursor: pointer; }
+
+.select2-container--open .select2-dropdown {
+  left: 0; }
+
+.select2-container--open .select2-dropdown--above {
+  border-bottom: none;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0; }
+
+.select2-container--open .select2-dropdown--below {
+  border-top: none;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0; }
+
+.select2-search--dropdown {
+  display: block;
+  padding: 4px; }
+  .select2-search--dropdown .select2-search__field {
+    padding: 4px;
+    width: 100%;
+    box-sizing: border-box; }
+    .select2-search--dropdown .select2-search__field::-webkit-search-cancel-button {
+      -webkit-appearance: none; }
+  .select2-search--dropdown.select2-search--hide {
+    display: none; }
+
+.select2-close-mask {
+  border: 0;
+  margin: 0;
+  padding: 0;
+  display: block;
+  position: fixed;
+  left: 0;
+  top: 0;
+  min-height: 100%;
+  min-width: 100%;
+  height: auto;
+  width: auto;
+  opacity: 0;
+  z-index: 99;
+  background-color: #fff;
+  filter: alpha(opacity=0); }
+
+.select2-hidden-accessible {
+  border: 0 !important;
+  clip: rect(0 0 0 0) !important;
+  -webkit-clip-path: inset(50%) !important;
+  clip-path: inset(50%) !important;
+  height: 1px !important;
+  overflow: hidden !important;
+  padding: 0 !important;
+  position: absolute !important;
+  width: 1px !important;
+  white-space: nowrap !important; }
+
+.select2-container--default .select2-selection--single {
+  background-color: #fff;
+  border: 1px solid #aaa;
+  border-radius: 4px; }
+  .select2-container--default .select2-selection--single .select2-selection__rendered {
+    color: #444;
+    line-height: 28px; }
+  .select2-container--default .select2-selection--single .select2-selection__clear {
+    cursor: pointer;
+    float: right;
+    font-weight: bold; }
+  .select2-container--default .select2-selection--single .select2-selection__placeholder {
+    color: #999; }
+  .select2-container--default .select2-selection--single .select2-selection__arrow {
+    height: 26px;
+    position: absolute;
+    top: 1px;
+    right: 1px;
+    width: 20px; }
+    .select2-container--default .select2-selection--single .select2-selection__arrow b {
+      border-color: #888 transparent transparent transparent;
+      border-style: solid;
+      border-width: 5px 4px 0 4px;
+      height: 0;
+      left: 50%;
+      margin-left: -4px;
+      margin-top: -2px;
+      position: absolute;
+      top: 50%;
+      width: 0; }
+
+.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear {
+  float: left; }
+
+.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow {
+  left: 1px;
+  right: auto; }
+
+.select2-container--default.select2-container--disabled .select2-selection--single {
+  background-color: #eee;
+  cursor: default; }
+  .select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear {
+    display: none; }
+
+.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b {
+  border-color: transparent transparent #888 transparent;
+  border-width: 0 4px 5px 4px; }
+
+.select2-container--default .select2-selection--multiple {
+  background-color: white;
+  border: 1px solid #aaa;
+  border-radius: 4px;
+  cursor: text; }
+  .select2-container--default .select2-selection--multiple .select2-selection__rendered {
+    box-sizing: border-box;
+    list-style: none;
+    margin: 0;
+    padding: 0 5px;
+    width: 100%; }
+    .select2-container--default .select2-selection--multiple .select2-selection__rendered li {
+      list-style: none; }
+  .select2-container--default .select2-selection--multiple .select2-selection__placeholder {
+    color: #999;
+    margin-top: 5px;
+    float: left; }
+  .select2-container--default .select2-selection--multiple .select2-selection__clear {
+    cursor: pointer;
+    float: right;
+    font-weight: bold;
+    margin-top: 5px;
+    margin-right: 10px; }
+  .select2-container--default .select2-selection--multiple .select2-selection__choice {
+    background-color: #e4e4e4;
+    border: 1px solid #aaa;
+    border-radius: 4px;
+    cursor: default;
+    float: left;
+    margin-right: 5px;
+    margin-top: 5px;
+    padding: 0 5px; }
+  .select2-container--default .select2-selection--multiple .select2-selection__choice__remove {
+    color: #999;
+    cursor: pointer;
+    display: inline-block;
+    font-weight: bold;
+    margin-right: 2px; }
+    .select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover {
+      color: #333; }
+
+.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice, .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder, .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline {
+  float: right; }
+
+.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
+  margin-left: 5px;
+  margin-right: auto; }
+
+.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove {
+  margin-left: 2px;
+  margin-right: auto; }
+
+.select2-container--default.select2-container--focus .select2-selection--multiple {
+  border: solid black 1px;
+  outline: 0; }
+
+.select2-container--default.select2-container--disabled .select2-selection--multiple {
+  background-color: #eee;
+  cursor: default; }
+
+.select2-container--default.select2-container--disabled .select2-selection__choice__remove {
+  display: none; }
+
+.select2-container--default.select2-container--open.select2-container--above .select2-selection--single, .select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple {
+  border-top-left-radius: 0;
+  border-top-right-radius: 0; }
+
+.select2-container--default.select2-container--open.select2-container--below .select2-selection--single, .select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple {
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0; }
+
+.select2-container--default .select2-search--dropdown .select2-search__field {
+  border: 1px solid #aaa; }
+
+.select2-container--default .select2-search--inline .select2-search__field {
+  background: transparent;
+  border: none;
+  outline: 0;
+  box-shadow: none;
+  -webkit-appearance: textfield; }
+
+.select2-container--default .select2-results > .select2-results__options {
+  max-height: 200px;
+  overflow-y: auto; }
+
+.select2-container--default .select2-results__option[role=group] {
+  padding: 0; }
+
+.select2-container--default .select2-results__option[aria-disabled=true] {
+  color: #999; }
+
+.select2-container--default .select2-results__option[aria-selected=true] {
+  background-color: #ddd; }
+
+.select2-container--default .select2-results__option .select2-results__option {
+  padding-left: 1em; }
+  .select2-container--default .select2-results__option .select2-results__option .select2-results__group {
+    padding-left: 0; }
+  .select2-container--default .select2-results__option .select2-results__option .select2-results__option {
+    margin-left: -1em;
+    padding-left: 2em; }
+    .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+      margin-left: -2em;
+      padding-left: 3em; }
+      .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+        margin-left: -3em;
+        padding-left: 4em; }
+        .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+          margin-left: -4em;
+          padding-left: 5em; }
+          .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+            margin-left: -5em;
+            padding-left: 6em; }
+
+.select2-container--default .select2-results__option--highlighted[aria-selected] {
+  background-color: #5897fb;
+  color: white; }
+
+.select2-container--default .select2-results__group {
+  cursor: default;
+  display: block;
+  padding: 6px; }
+
+.select2-container--classic .select2-selection--single {
+  background-color: #f7f7f7;
+  border: 1px solid #aaa;
+  border-radius: 4px;
+  outline: 0;
+  background-image: -webkit-linear-gradient(top, white 50%, #eeeeee 100%);
+  background-image: -o-linear-gradient(top, white 50%, #eeeeee 100%);
+  background-image: linear-gradient(to bottom, white 50%, #eeeeee 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0); }
+  .select2-container--classic .select2-selection--single:focus {
+    border: 1px solid #5897fb; }
+  .select2-container--classic .select2-selection--single .select2-selection__rendered {
+    color: #444;
+    line-height: 28px; }
+  .select2-container--classic .select2-selection--single .select2-selection__clear {
+    cursor: pointer;
+    float: right;
+    font-weight: bold;
+    margin-right: 10px; }
+  .select2-container--classic .select2-selection--single .select2-selection__placeholder {
+    color: #999; }
+  .select2-container--classic .select2-selection--single .select2-selection__arrow {
+    background-color: #ddd;
+    border: none;
+    border-left: 1px solid #aaa;
+    border-top-right-radius: 4px;
+    border-bottom-right-radius: 4px;
+    height: 26px;
+    position: absolute;
+    top: 1px;
+    right: 1px;
+    width: 20px;
+    background-image: -webkit-linear-gradient(top, #eeeeee 50%, #cccccc 100%);
+    background-image: -o-linear-gradient(top, #eeeeee 50%, #cccccc 100%);
+    background-image: linear-gradient(to bottom, #eeeeee 50%, #cccccc 100%);
+    background-repeat: repeat-x;
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0); }
+    .select2-container--classic .select2-selection--single .select2-selection__arrow b {
+      border-color: #888 transparent transparent transparent;
+      border-style: solid;
+      border-width: 5px 4px 0 4px;
+      height: 0;
+      left: 50%;
+      margin-left: -4px;
+      margin-top: -2px;
+      position: absolute;
+      top: 50%;
+      width: 0; }
+
+.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__clear {
+  float: left; }
+
+.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__arrow {
+  border: none;
+  border-right: 1px solid #aaa;
+  border-radius: 0;
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+  left: 1px;
+  right: auto; }
+
+.select2-container--classic.select2-container--open .select2-selection--single {
+  border: 1px solid #5897fb; }
+  .select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow {
+    background: transparent;
+    border: none; }
+    .select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b {
+      border-color: transparent transparent #888 transparent;
+      border-width: 0 4px 5px 4px; }
+
+.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single {
+  border-top: none;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+  background-image: -webkit-linear-gradient(top, white 0%, #eeeeee 50%);
+  background-image: -o-linear-gradient(top, white 0%, #eeeeee 50%);
+  background-image: linear-gradient(to bottom, white 0%, #eeeeee 50%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0); }
+
+.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single {
+  border-bottom: none;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
+  background-image: -webkit-linear-gradient(top, #eeeeee 50%, white 100%);
+  background-image: -o-linear-gradient(top, #eeeeee 50%, white 100%);
+  background-image: linear-gradient(to bottom, #eeeeee 50%, white 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0); }
+
+.select2-container--classic .select2-selection--multiple {
+  background-color: white;
+  border: 1px solid #aaa;
+  border-radius: 4px;
+  cursor: text;
+  outline: 0; }
+  .select2-container--classic .select2-selection--multiple:focus {
+    border: 1px solid #5897fb; }
+  .select2-container--classic .select2-selection--multiple .select2-selection__rendered {
+    list-style: none;
+    margin: 0;
+    padding: 0 5px; }
+  .select2-container--classic .select2-selection--multiple .select2-selection__clear {
+    display: none; }
+  .select2-container--classic .select2-selection--multiple .select2-selection__choice {
+    background-color: #e4e4e4;
+    border: 1px solid #aaa;
+    border-radius: 4px;
+    cursor: default;
+    float: left;
+    margin-right: 5px;
+    margin-top: 5px;
+    padding: 0 5px; }
+  .select2-container--classic .select2-selection--multiple .select2-selection__choice__remove {
+    color: #888;
+    cursor: pointer;
+    display: inline-block;
+    font-weight: bold;
+    margin-right: 2px; }
+    .select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover {
+      color: #555; }
+
+.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
+  float: right;
+  margin-left: 5px;
+  margin-right: auto; }
+
+.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove {
+  margin-left: 2px;
+  margin-right: auto; }
+
+.select2-container--classic.select2-container--open .select2-selection--multiple {
+  border: 1px solid #5897fb; }
+
+.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple {
+  border-top: none;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0; }
+
+.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple {
+  border-bottom: none;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0; }
+
+.select2-container--classic .select2-search--dropdown .select2-search__field {
+  border: 1px solid #aaa;
+  outline: 0; }
+
+.select2-container--classic .select2-search--inline .select2-search__field {
+  outline: 0;
+  box-shadow: none; }
+
+.select2-container--classic .select2-dropdown {
+  background-color: white;
+  border: 1px solid transparent; }
+
+.select2-container--classic .select2-dropdown--above {
+  border-bottom: none; }
+
+.select2-container--classic .select2-dropdown--below {
+  border-top: none; }
+
+.select2-container--classic .select2-results > .select2-results__options {
+  max-height: 200px;
+  overflow-y: auto; }
+
+.select2-container--classic .select2-results__option[role=group] {
+  padding: 0; }
+
+.select2-container--classic .select2-results__option[aria-disabled=true] {
+  color: grey; }
+
+.select2-container--classic .select2-results__option--highlighted[aria-selected] {
+  background-color: #3875d7;
+  color: white; }
+
+.select2-container--classic .select2-results__group {
+  cursor: default;
+  display: block;
+  padding: 6px; }
+
+.select2-container--classic.select2-container--open .select2-dropdown {
+  border-color: #5897fb; }

watero-wechat-service/src/main/java/com/iamberry/wechat/service/wechat/WeChatServiceImpl.java

@@ -290,7 +290,7 @@ public class WeChatServiceImpl implements WeChatService {
 		Map<String,String> params = new HashMap<String,String>();
 		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
 		try {
-			//查询百胜订单信息
+			//查询rst订单信息
 			String resultJson = HttpClient431Util.doGet(params,url,null,null,null);
 			resultJson = StringEscapeUtils.unescapeJava(resultJson); // unicode
 			inLongLogger.info("==========================获取机器信息成功,返回值为:" + resultJson + "=========================");
@@ -307,7 +307,7 @@ public class WeChatServiceImpl implements WeChatService {
 			str.append("您的<");
 			str.append(jsonMessage.getString("productType"));
 			str.append(">为正品，生产日期为：");
-			str.append(format.format(new Date(jsonMessage.getLong("producedTime")*1000)));
+			str.append(format.format(new Date(jsonMessage.getLong("producedTime"))));
 			str.append("。请放心使用。");
 			return str.toString();
 		} catch (Exception e) {

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/cart/ProductInfoHandler.java

@@ -463,8 +463,8 @@ public class ProductInfoHandler {
 		if(StringUtils.isNotEmpty(shareOpenid)){
 			memberService.buildChildUser(shareOpenid, member,1,1);
 		}
-		//request.getRequestDispatcher(NameUtils.getConfig("WECHAT_SHOP_PRODUCT_DESC_PAGE")).forward(request, response);
-		response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_PRODUCT_DESC_PAGE"));
+		request.getRequestDispatcher(NameUtils.getConfig("WECHAT_SHOP_PRODUCT_DESC_PAGE")).forward(request, response);
+		//response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_PRODUCT_DESC_PAGE"));
 		return;
 	}
 	

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/pay/RequestWechatPayHandler.java

@@ -88,20 +88,22 @@ public class RequestWechatPayHandler {
 	 * @throws Exception 
 	 */
 	@RequestMapping(value = "/settlement", method = RequestMethod.GET)
-	public void settlement(
+	public ModelAndView settlement(
 			@RequestParam("cartId") String cartIds, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		//ModelAndView mv = new ModelAndView("forward:" + NameUtils.getConfig("WECHAT_SHOP_INDEX")); // 回到购物车页面
+		ModelAndView mv = new ModelAndView("forward:" + NameUtils.getConfig("WECHAT_SHOP_INDEX")); // 回到购物车页面
 		// 用户信息
-//		WechatUtils.getUserBySession(request);
+		//WechatUtils.getUserBySession(request);
 		// 清空数据
 		//request.getSession().removeAttribute("cartIds");
 		
 		if ((cartIds == null || cartIds.isEmpty()))
-			response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_INDEX"));
+			return mv;
+			//response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_INDEX"));
 		// split 购物车ID
 		String [] cartList = cartIds.split("-");
 		if (cartList == null || cartList.length <= 0) {
-			response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_INDEX"));
+			//response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_INDEX"));
+			return mv;
 		}
 		// 转化 String 类型的购物车ID集合 --> Integer 类型的购物车集合
 		Integer[] cartIntList = new Integer[cartList.length];
@@ -110,16 +112,19 @@ public class RequestWechatPayHandler {
 			try {
 				cartIntList[i] = Integer.parseInt(string);
 			} catch (Exception e) {
-				response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_INDEX"));
+				//response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_INDEX"));
+				return mv;
 			}
 		}
 		if (cartIntList.length <= 0) {
-			response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_INDEX"));
+			//response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_INDEX"));
+			return mv;
 		}
 		// 根据购物车ID，查询数据库中对应的产品信息（ID、产品状态）
 		List<CartDto> cartDtos = cartService.selectCartItemByListId(cartIntList);
 		if (cartDtos == null || cartDtos.size() <= 0) {
-			response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_INDEX"));
+			//response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_INDEX"));
+			return mv;
 		}
 		// 判断当前提交的购物车ID，有多少产品在售
 		int sum = 0;
@@ -128,11 +133,12 @@ public class RequestWechatPayHandler {
 				sum++;
 		}
 		if (sum <= 0) {
-			response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_INDEX"));
+			//response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_INDEX"));
+			return mv;
 		}
-		//mv.setViewName("forward:" + NameUtils.getConfig("WECHAT_SHOP_ORDER_PAY")); // 支付页面
-		response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_ORDER_PAY") + "?cartId="+cartIds);
-	
+		mv.setViewName("forward:" + NameUtils.getConfig("WECHAT_SHOP_ORDER_PAY")); // 支付页面
+		//response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_ORDER_PAY") + "?cartId="+cartIds);
+		return mv;
 	}
 	
 	/**

wateroPF-wechat-service/src/main/java/com/iamberry/wechat/service/wechat/WeChatServiceImpl.java

@@ -296,7 +296,7 @@ public class WeChatServiceImpl implements WeChatService {
 		Map<String,String> params = new HashMap<String,String>();
 		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
 		try {
-			//查询百胜订单信息
+			//查询rst订单信息
 			String resultJson = HttpClient431Util.doGet(params,url,null,null,null);
 			resultJson = StringEscapeUtils.unescapeJava(resultJson); // unicode
 			inLongLogger.info("==========================获取机器信息成功,返回值为:" + resultJson + "=========================");
@@ -313,7 +313,7 @@ public class WeChatServiceImpl implements WeChatService {
 			str.append("您的<");
 			str.append(jsonMessage.getString("productType"));
 			str.append(">为正品，生产日期为：");
-			str.append(format.format(new Date(jsonMessage.getLong("producedTime")*1000)));
+			str.append(format.format(new Date(jsonMessage.getLong("producedTime"))));
 			str.append("。请放心使用。");
 			return str.toString();
 		} catch (Exception e) {

wateroPF-wechat-web/src/main/webapp/WEB-INF/views/other/index.html

@@ -90,7 +90,7 @@
                 //在微信中打开
                 mask.show(); //显示遮罩
                 }else{
-                location.href='https://itunes.apple.com/cn/app/bi-bi-meng/id1117339790?mt=8';
+                location.href='//itunes.apple.com/cn/app/bi-bi-meng/id1117339790?mt=8';
                 }
 		});
 	});
@@ -107,7 +107,7 @@
 	}
 	
 	function toAibeiyuan(){
-		location.href='http://www.iamberry.com';
+		location.href='//www.iamberry.com';
 	}
 	
 	</script>

wateroPF-wechat-web/src/main/webapp/WEB-INF/views/wechat/gift_card_exchange_list.html

@@ -135,7 +135,7 @@
 								var urlStr = document.domain;
 								if(typeof(this.getAttribute("postFirm"))!="undefined" && typeof(this.getAttribute("postNum"))!="undefined"){
 									mui.openWindow({
-										url: 'http://m.kuaidi100.com/index_all.html?type=' + this.getAttribute("postFirm") + '&postid=' + this.getAttribute("postNum") + '&callbackurl=http://' + urlStr + this.getAttribute("gourl") + "&tiemstamp=" + new Date().getTime()
+										url: '//m.kuaidi100.com/index_all.html?type=' + this.getAttribute("postFirm") + '&postid=' + this.getAttribute("postNum") + '&callbackurl=//' + urlStr + this.getAttribute("gourl") + "&tiemstamp=" + new Date().getTime()
 									})
 								}
 							});

wateroPF-wechat-web/src/main/webapp/WEB-INF/views/wechat/iamberry_video.html

@@ -40,7 +40,7 @@
 		</a>
 	</nav>
 	<div class="mui-content">
-		<iframe class="my_iframe" src="https://v.qq.com/iframe/player.html?vid=o0344c2okps&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
+		<iframe class="my_iframe" src="//v.qq.com/iframe/player.html?vid=o0344c2okps&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
 		<div class="mui-content-padded">
 			<ul>
 				<li>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;迄今，现有水源被检测出有2221种有机污染物，其中自来水中发现65种，20种能致癌，56种能致突变。我们每喝一口的自来水，氯气净化下，烧开后残留的余氯会生成致癌物三氯甲烷，长期饮用对人体造成非常大的危害。所以直接饮用自来水烧开后的水也不是健康的选择，对自来水进行再净化已是普遍健康共识。</li><br/>

wateroPF-wechat-web/src/main/webapp/WEB-INF/views/wechat/iamberry_video_list.html

@@ -24,7 +24,7 @@
 		</div>
 
 		<div class="mui-content" style="background: #fff;">
-			<iframe class="my_iframe" src="https://v.qq.com/iframe/player.html?vid=z0318vtrn4c&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
+			<iframe class="my_iframe" src="//v.qq.com/iframe/player.html?vid=z0318vtrn4c&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
 			<div style="margin: 0 10px;">
 				<ul>
 					<li>爱贝源智能冲奶机</li>
@@ -36,19 +36,19 @@
 			<ul class="mui-table-view mui-grid-view">
 				
 		        <li class="mui-table-view-cell mui-media mui-col-xs-6">
-		            <iframe class="my_iframe1" src="https://v.qq.com/iframe/player.html?vid=t0313illa3u&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
+		            <iframe class="my_iframe1" src="//v.qq.com/iframe/player.html?vid=t0313illa3u&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
 		            <div class="mui-text-left ft-12 cl-9">爱贝源智能冲奶机——如何连接APP篇</div>
 		        </li>
 		        <li class="mui-table-view-cell mui-media mui-col-xs-6">
-		            <iframe class="my_iframe1" src="https://v.qq.com/iframe/player.html?vid=p0312bl06ak&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
+		            <iframe class="my_iframe1" src="//v.qq.com/iframe/player.html?vid=p0312bl06ak&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
 		            <div class="mui-text-left ft-12 cl-9">爱贝源智能冲奶机——温度测试篇</div>
 		        </li>
 		        <li class="mui-table-view-cell mui-media mui-col-xs-6">
-		            <iframe class="my_iframe1" src="https://v.qq.com/iframe/player.html?vid=y0315x9b86z&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
+		            <iframe class="my_iframe1" src="//v.qq.com/iframe/player.html?vid=y0315x9b86z&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
 		            <div class="mui-text-left ft-12 cl-9">爱贝源智能冲奶机——奶量测试篇</div>
 		        </li>
 		        <li class="mui-table-view-cell mui-media mui-col-xs-6">
-		            <iframe class="my_iframe1" src="https://v.qq.com/iframe/player.html?vid=g0317oa3yu3&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
+		            <iframe class="my_iframe1" src="//v.qq.com/iframe/player.html?vid=g0317oa3yu3&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
 		            <div class="mui-text-left ft-12 cl-9">爱贝源智能冲奶机——奶机的日常清洁 </div>
 		        </li>
 		    </ul>  

wateroPF-wechat-web/src/main/webapp/WEB-INF/views/wechat/wheel_log.html

@@ -145,7 +145,7 @@
 	});	
 	mui('body').on('tap', '#whell-bar .mui-btn', function() {
 		mui.openWindow({
-		url:'https://w.iamberry.com/wateroPF/wechat/index'
+		url:'//w.iamberry.com/wateroPF/wechat/index'
 		});
 	});
 		</script>

wateroPF-wechat-web/src/main/webapp/WEB-INF/views/wechat/zhuanpan.html

@@ -113,7 +113,7 @@
 			window.repleFlag = false;
 			window.wxFriend = {
 				    "appId": "",
-				    "imgUrl":'//s.iamberry.com/images/shop/8.png',
+				    "imgUrl":'https://s.iamberry.com/images/shop/8.png',
 				    "link":domanUrl+"/iamberry/wechat/activity/go_luck_draw",
 				    "desc":"万圣节8秒冲奶，一键搞定捣蛋宝宝，快来围观爱贝源智能冲奶机，有大奖品抽哦！",//描述
 				    "title":"3次免费抽，100%中奖，宝宝手推车抱回家，快来转转转！",			//标题
@@ -199,7 +199,7 @@
 					var r=confirm("您没有抽奖次数了，是否马上前往购买商品？");
 					if (r==true){
 						mui.openWindow({
-							url:'http://h5.iamberry.com/iamberry/wechat/product/desc?productId=26' //chanpin_details.html
+							url:'//h5.iamberry.com/iamberry/wechat/product/desc?productId=26' //chanpin_details.html
 						});
 					}
 					return;
@@ -243,7 +243,7 @@
 								setTimeout(function(){
 								mui.alert('<img src="'+img+'" /><span class="x-close"></span>','获得'+msg,'马上下单',function(){
 									mui.openWindow({
-										url:'http://h5.iamberry.com/iamberry/wechat/product/desc?productId=26' //chanpin_details.html
+										url:'//h5.iamberry.com/iamberry/wechat/product/desc?productId=26' //chanpin_details.html
 									});
 								});
 								},3000);

wateroPF-wechat-web/src/main/webapp/common/shop/js/page/chanpin_details.js

@@ -55,7 +55,7 @@ mui.ready(function() {
     window.repleFlag = false;
     window.wxFriend = {
         "appId": "",
-        "imgUrl": 'http://static.iamberry.com/wateroPF/images/logo_wateroPF.jpg',
+        "imgUrl": 'https://s.iamberry.com/wateroPF/images/logo_wateroPF.jpg',
         "link": url,
         "desc": "美国标准，4级净化，5档水温，水质TDS智能显示。",
         "title": "WaterO，美国可移动智能净水机代表，4级净化，5档水温，净化饮水一体；",

wateroPF-wechat-web/src/main/webapp/common/shop/js/page/chanpin_list.js

@@ -45,16 +45,16 @@ function pullupRefresh() {
 					var img='';
 					switch (this.colorId){
 					case 1:
-						img='http://static.iamberry.com/wateroPF/images/shop/cp-blue.png'
+						img='//s.iamberry.com/wateroPF/images/shop/cp-blue.png'
 						break;
 					case 2:
-						img='http://static.iamberry.com/wateroPF/images/shop/cp-black.png'
+						img='//s.iamberry.com/wateroPF/images/shop/cp-black.png'
 						break;
 					case 3:
-						img='http://static.iamberry.com/wateroPF/images/shop/cp-green.png'
+						img='//s.iamberry.com/wateroPF/images/shop/cp-green.png'
 						break;
 					case 4:
-						img='http://static.iamberry.com/wateroPF/images/shop/cp-red.png'
+						img='//s.iamberry.com/wateroPF/images/shop/cp-red.png'
 						break;
 					default:
 						break;

wateroPF-wechat-web/src/main/webapp/common/shop/js/page/clearing.js

@@ -106,7 +106,7 @@ mui.ready(function() {
 					liNote = liNote +
 						"<li class='mui-table-view-cell mui-media'>" +
 						"<a>" +
-						"<span class='mui-media-object mui-pull-left wh-100'> <img src='http://w.iamberry.com/wateroPF/common/images/uploadimages/image/20161202/2C83538AC3039E693358_20161202182946_8118.jpg'></span>" +
+						"<span class='mui-media-object mui-pull-left wh-100'> <img src='//w.iamberry.com/wateroPF/common/images/uploadimages/image/20161202/2C83538AC3039E693358_20161202182946_8118.jpg'></span>" +
 						"<div class='mui-media-body'>" +
 						"<div class='wt-space gwc_tit'>" +
 						'赠送' + "<span id='giveNum'>" + cNum + '</span>' + '套三年滤芯' +

wateroPF-wechat-web/src/main/webapp/common/shop/js/page/common_var.js

@@ -1 +1 @@
-var staticUrl = 'http://static.iamberry.com/wateroPF';
+var staticUrl = '//s.iamberry.com/wateroPF';

wateroPF-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_center.js

@@ -253,7 +253,7 @@ function fenxiao_center_data() {
 				window.repleFlag = false;
 				window.wxFriend = {
 					"appId": "",
-					"imgUrl": 'http://static.iamberry.com/wateroPF/images/shop/index.jpg',
+					"imgUrl": 'https://s.iamberry.com/wateroPF/images/shop/index.jpg',
 					"link": link,
 					"desc": "美国标准，4级净化，5档水温，废水比3:1，水质TDS智能显示。",
 					"title": "Watero，美国高端净水专家，4级净化，5档水温，免安装饮水一体机。",

wateroPF-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_center2.js

@@ -176,7 +176,7 @@ function fenxiao_center_data() {
 				window.repleFlag = false;
 				window.wxFriend = {
 					"appId": "",
-					"imgUrl": 'http://static.iamberry.com/wateroPF/images/shop/index.jpg',
+					"imgUrl": 'https://s.iamberry.com/wateroPF/images/shop/index.jpg',
 					"link": link,
 					"desc": "美国标准，4级净化，5档水温，废水比3:1，水质TDS智能显示。",
 					"title": "Watero，美国高端净水专家，4级净化，5档水温，免安装饮水一体机。",

wateroPF-wechat-web/src/main/webapp/common/shop/js/page/index.js

@@ -18,7 +18,7 @@ mui.ready(function() {
                 window.repleFlag = false;
                 window.wxFriend = {
                     "appId": "",
-                    "imgUrl": 'http://static.iamberry.com/wateroPF/images/logo_wateroPF.jpg',
+                    "imgUrl": 'https://s.iamberry.com/wateroPF/images/logo_wateroPF.jpg',
                     "link": link,
                     "desc": "美国标准，4级净化，5档水温，水质TDS智能显示。",
                     "title": "WaterO，美国可移动智能净水机代表，4级净化，5档水温，净化饮水一体；",

wateroPF-wechat-web/src/main/webapp/common/shop/js/page/layer.js

@@ -29,7 +29,7 @@ function incoldeCssFile() {
 	var fileref = document.createElement('link');
 	fileref.setAttribute("rel","stylesheet");
 	fileref.setAttribute("type","text/css");
-	fileref.setAttribute("href","http://static.iamberry.com/wateroPF/js/shop/layer.css"); // 地址可以改变
+	fileref.setAttribute("href","//s.iamberry.com/wateroPF/js/shop/layer.css"); // 地址可以改变
 	document.getElementsByTagName("head")[0].appendChild(fileref);
 }
 //incoldeCssFile();

wateroPF-wechat-web/src/main/webapp/common/shop/js/page/main.js

@@ -1,4 +1,4 @@
-var domanUrl = "http://" + window.location.host,
+var domanUrl = "//" + window.location.host,
 	base_path = "/wateroPF/wechat",
 	marquee = '';
 mui.each(document.querySelectorAll('#footer-bar .mui-tab-item'), function(index, el) {
@@ -459,19 +459,19 @@ function switchColorImg(colorId){
 	var img='';
 	switch (colorId){
 		case 1:
-			img='http://static.iamberry.com/wateroPF/images/shop/cp-blue.png'
+			img='//s.iamberry.com/wateroPF/images/shop/cp-blue.png'
 			break;
 		case 2:
-			img='http://static.iamberry.com/wateroPF/images/shop/cp-black.png'
+			img='//s.iamberry.com/wateroPF/images/shop/cp-black.png'
 			break;
 		case 3:
-			img='http://static.iamberry.com/wateroPF/images/shop/cp-green.png'
+			img='//s.iamberry.com/wateroPF/images/shop/cp-green.png'
 			break;
 		case 4:
-			img='http://static.iamberry.com/wateroPF/images/shop/cp-red.png'
+			img='//s.iamberry.com/wateroPF/images/shop/cp-red.png'
 			break;
 		default:
-			img='http://static.iamberry.com/wateroPF/images/shop/cp-blue.png'
+			img='//s.iamberry.com/wateroPF/images/shop/cp-blue.png'
 			break;
 	}
 	return img;

wateroPF-wechat-web/src/main/webapp/common/shop/js/page/shopping_cart.js

@@ -90,16 +90,16 @@ function selectCart() {
 						if(dt.data.cartList[i].productType==1){
 						switch (dt.data.cartList[i].cartColorId){
 						case 1:
-							img='http://static.iamberry.com/wateroPF/images/shop/cp-blue.png';pro_color='品蓝';
+							img='//s.iamberry.com/wateroPF/images/shop/cp-blue.png';pro_color='品蓝';
 							break;
 						case 2:
-							img='http://static.iamberry.com/wateroPF/images/shop/cp-black.png';pro_color='品黑';
+							img='//s.iamberry.com/wateroPF/images/shop/cp-black.png';pro_color='品黑';
 							break;
 						case 3:
-							img='http://static.iamberry.com/wateroPF/images/shop/cp-green.png';pro_color='苹果绿';
+							img='//s.iamberry.com/wateroPF/images/shop/cp-green.png';pro_color='苹果绿';
 							break;
 						case 4:
-							img='http://static.iamberry.com/wateroPF/images/shop/cp-red.png';pro_color='西瓜红';
+							img='//s.iamberry.com/wateroPF/images/shop/cp-red.png';pro_color='西瓜红';
 							break;
 						default:
 							break;

wateroPF-wechat-web/src/main/webapp/common/shop/js/page/vip_center.js

@@ -7,12 +7,12 @@ mui.ready(function() {
 			switch(index) {
 				case 0:
 					mui.openWindow({
-						url: 'https://s.iamberry.com/wateroPF/video/video.html'
+						url: '//s.iamberry.com/wateroPF/video/video.html'
 					});
 					break;
 				case 1:
 					mui.openWindow({
-						url: 'http://www.iamberry.com/iamberry_wechat/after_service_watero2.html'
+						url: '//www.iamberry.com/iamberry_wechat/after_service_watero2.html'
 					});
 					break;
 				case 2:
@@ -24,7 +24,7 @@ mui.ready(function() {
 					break;
 				case 3:
 					mui.openWindow({
-						url: 'http://w.iamberry.com/wateroPF/view/faq.html'
+						url: '//w.iamberry.com/wateroPF/view/faq.html'
 					});
 					break;
 				default:
@@ -193,22 +193,22 @@ mui('body').on('tap', '.go_try_order', function() {
 
 mui('body').on('tap', '#dansheng_deliver', function() {
     mui.openWindow({
-        url: 'http://s.iamberry.com/wateroPF/news/watero_ds.html'
+        url: '//s.iamberry.com/wateroPF/news/watero_ds.html'
     })
 });
 mui('body').on('tap', '#linian_deliver', function() {
     mui.openWindow({
-        url: 'http://s.iamberry.com/wateroPF/news/watero_ln.html'
+        url: '//s.iamberry.com/wateroPF/news/watero_ln.html'
     })
 });
 mui('body').on('tap', '#shiming_deliver', function() {
     mui.openWindow({
-        url: 'http://s.iamberry.com/wateroPF/news/watero_sm.html'
+        url: '//s.iamberry.com/wateroPF/news/watero_sm.html'
     })
 });
 mui('body').on('tap', '#zhinan_dalog', function() {
     mui.openWindow({
-        url: 'http://s.iamberry.com/wateroPF/video/video.html'
+        url: '//s.iamberry.com/wateroPF/video/video.html'
     })
 });
 function fenxiao_wm2() {

wateroPF-wechat-web/src/main/webapp/common/shop/js/page/wechat-utils-1.0.js

@@ -20,8 +20,8 @@ if (window.repleFlag) {
 	// 使用全局默认
 	window.wxFriend = {
 	    "appId": "",
-	    "imgUrl":'http://m.iamberry.com/common/goods/images/indexShare.jpg',
-	    "link":"http://www.iamberry.com/ratfw/index",
+	    "imgUrl":'https://m.iamberry.com/common/goods/images/indexShare.jpg',
+	    "link":"//www.iamberry.com/ratfw/index",
 	    "desc":"这里是分享描述",
 	    "title":"这里是分享标题",
 	    "netError":"您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
@@ -44,7 +44,7 @@ window.wechatAddr = {
 /** 引入JSSDK1.0基本组件,微信共享地址智能使用1.0版本，并且需要服务器返回参数支持 */
 //incoldeJSFile("http://res.wx.qq.com/open/js/jweixin-1.0.0.js");
 /** 引入JSSDK1.1基本组件 ，支持摇一摇、微信共享地址 */
-incoldeJSFile("http://res.wx.qq.com/open/js/jweixin-1.1.0.js"); 
+incoldeJSFile("//res.wx.qq.com/open/js/jweixin-1.1.0.js");
 getConfig(); // 配置JSSDK组件
 
 /** 获取服务器JSSDK参数配置 */

wateroPF-wechat-web/src/main/webapp/view/2017_51.html

@@ -15,7 +15,7 @@
 		<script>
 			// 屏蔽分享
 			//window.hiddenAllWechatMenu = true;
-	var url = 'http://'+document.domain+'/wateroPF/view/2017_51.html';
+	var url = '//'+document.domain+'/wateroPF/view/2017_51.html';
 	window.repleFlag = true;
 	window.repleWxData = {
 		"appId": "",

wateroPF-wechat-web/src/main/webapp/view/add_machine.html

@@ -101,7 +101,7 @@
 <script src="//s.iamberry.com/wateroPF/js/mui.picker.min.js"></script>
 <script src="//s.iamberry.com/wateroPF/js/jquery-2.1.1.min.js"></script>
 <script src="//s.iamberry.com/wateroPF/js/shop/main.js?v=2016101701"></script>
-<script src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
+<script src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
 <script src="//s.iamberry.com/wateroPF/js/shop/wechat-utils-1.0.js"></script>
 <script type="text/javascript">
 

wateroPF-wechat-web/src/main/webapp/view/gift_card_give_order_list.html

@@ -149,7 +149,7 @@
 							mui('body').on('tap', '.show_post_info', function() {
 								var urlStr = document.domain;
 								mui.openWindow({
-									url: 'http://m.kuaidi100.com/index_all.html?type=' + this.getAttribute("postFirm") + '&postid=' + this.getAttribute("postNum") + '&callbackurl=http://' + urlStr + this.getAttribute("gourl") + "&tiemstamp=" + new Date().getTime()
+									url: '//m.kuaidi100.com/index_all.html?type=' + this.getAttribute("postFirm") + '&postid=' + this.getAttribute("postNum") + '&callbackurl=//' + urlStr + this.getAttribute("gourl") + "&tiemstamp=" + new Date().getTime()
 								})
 							});
 						} else {

wateroPF-wechat-web/src/main/webapp/view/gift_card_user_exchange.html

@@ -103,7 +103,7 @@
 				</form>
 				<ul class="mui-table-view" style="border-top:1px solid rgba(0,0,0,.1);border-bottom:1px solid rgba(0,0,0,.1);margin:10px 0;">
 					<li class="mui-table-view-cell" style="padding: 15px 15px;">
-						<a class="mui-navigate-right" id="go-gift-details" href="https://w.iamberry.com/wateroPF/wechat/product/desc?productId=34&colorId=1">
+						<a class="mui-navigate-right" id="go-gift-details" href="//w.iamberry.com/wateroPF/wechat/product/desc?productId=34&colorId=1">
 						查看产品详情
 						</a>	
 					</li>

wateroPF-wechat-web/src/main/webapp/view/i_want_lease_test.html

@@ -72,7 +72,7 @@
 		<script>
 			// 屏蔽分享
 			//window.hiddenAllWechatMenu = true;
-	var url = 'http://'+document.domain+'/wateroPF/view/i_want_lease_test.html';
+	var url = '//'+document.domain+'/wateroPF/view/i_want_lease_test.html';
 	window.repleFlag = true;
 	window.repleWxData = {
 		"appId": "",

wateroPF-wechat-web/src/main/webapp/view/input_machine.html

@@ -84,7 +84,7 @@
 				}
 
 				// 发起请求
-				var url = "http://test.iamberry.com/wateroPF/wechat/factory/info_by_mac";
+				var url = "//test.iamberry.com/wateroPF/wechat/factory/info_by_mac";
 				$.post(url,{"mac":mac},function(result){
 					if (result.resultCode != 200 || result.returnCode != 200) {
 						mui.alert("没有查找到机器，请检查");
@@ -107,7 +107,7 @@
 				wx.invoke('getWXDeviceTicket', {'deviceId':deviceId,'type':'1', 'connType':'blue'}, function(res) {
 					if (res.err_msg == "getWXDeviceTicket:ok") {
 						var ticket = res.ticket;
-						var url = "http://test.iamberry.com/wateroPF/wechat/factory/bind";
+						var url = "//test.iamberry.com/wateroPF/wechat/factory/bind";
 						$.post(url,{"ticket":ticket, "device_id":deviceId},function(result){
 							if (result.resultCode != 200 || result.returnCode != 200) {
 								mui.alert("绑定失败，请检查");
@@ -128,7 +128,7 @@
 				wx.invoke('getWXDeviceTicket', {'deviceId':deviceId,'type':'2', 'connType':'blue'}, function(res) {
 					if (res.err_msg == "getWXDeviceTicket:ok") {
 						var ticket = res.ticket;
-						var url = "http://test.iamberry.com/wateroPF/wechat/factory/un_bind";
+						var url = "//test.iamberry.com/wateroPF/wechat/factory/un_bind";
 						$.post(url,{"ticket":ticket, "device_id":deviceId},function(result){
 							if (result.resultCode != 200 || result.returnCode != 200) {
 								mui.alert("解除绑定失败，请检查");

wateroPF-wechat-web/src/main/webapp/view/lease_desc.html

@@ -65,7 +65,7 @@
 					case 0:
 						//产品资质
 						mui.openWindow({
-							url: 'http://w.iamberry.com/wateroPF/view/product/certificate.html'
+							url: '//w.iamberry.com/wateroPF/view/product/certificate.html'
 						});
 						break;
 					case 1:
@@ -77,13 +77,13 @@
 					case 2:
 						//功能介绍视频
 						mui.openWindow({
-							url: 'https://m.v.qq.com/x/page/y/1/k/y0348fng61k.html?ptag=v_qq_com%23v.play.adaptor%233'
+							url: '//m.v.qq.com/x/page/y/1/k/y0348fng61k.html?ptag=v_qq_com%23v.play.adaptor%233'
 						});
 						break;
 					case 3:
 						//生活场景视频
 						mui.openWindow({
-							url: 'https://m.v.qq.com/x/page/o/p/s/o0344c2okps.html?ptag=v_qq_com%23v.play.adaptor%233'
+							url: '//m.v.qq.com/x/page/o/p/s/o0344c2okps.html?ptag=v_qq_com%23v.play.adaptor%233'
 						});
 						break;
 					default:

wateroPF-wechat-web/src/main/webapp/view/lease_order_win.html

@@ -25,7 +25,7 @@
 		<script>
 			// 屏蔽分享
 			//window.hiddenAllWechatMenu = true;
-	var url = 'http://'+document.domain+'/wateroPF/view/i_want_lease_test.html';
+	var url = '//'+document.domain+'/wateroPF/view/i_want_lease_test.html';
 	window.repleFlag = true;
 	window.repleWxData = {
 		"appId": "",

wateroPF-wechat-web/src/main/webapp/view/push_jiangli.html

@@ -74,7 +74,7 @@
 		window.repleFlag = false;
 		window.wxFriend = {
 			"appId": "",
-			"imgUrl": '//s.iamberry.com/wateroPF/images/shop/share_lease_0.jpg',
+			"imgUrl": 'https://s.iamberry.com/wateroPF/images/shop/share_lease_0.jpg',
 			"link": url,
 			"desc": "高端智能净水机不用买，可以直接拿回家用啦！这是一款可租赁的智能净水机！体验好了，分享出去，还可有千元现金可以拿！",
 			"title": "Watero智能净水机免费用！还可赢现金豪礼！",

wateroPF-wechat-web/src/main/webapp/view/rent/iot.html

@@ -104,7 +104,7 @@
 					wx.invoke('getWXDeviceTicket', {'deviceId':d,'type':'2', 'connType':'blue'}, function(res) {
 						try
 						{
-							new Image().src = "http://test.iamberry.com/wateroPF/ticket/" + JSON.stringify(res);
+							new Image().src = "//test.iamberry.com/wateroPF/ticket/" + JSON.stringify(res);
 						} catch (err) {
 						}
 					});

wateroPF-wechat-web/src/main/webapp/view/rent/lease_order_details.html

@@ -320,13 +320,13 @@
 						//console.log(dt);						
 						if(dt.status) {
 							mask.show();//显示遮罩
-							var url = encodeURI('http://' + window.location.host+'/wateroPF/view/rent/lease_for_my_equipment.html?shareId=' + dt.data);
+							var url = encodeURI('//' + window.location.host+'/wateroPF/view/rent/lease_for_my_equipment.html?shareId=' + dt.data);
 							var desc = userNickName + "送给你一台净水机，为你送上一份饮水健康。";
 							window.repleFlag = false;
 							window.hiddenAllWechatMenu = false;		//window.wxFriend window.repleWxData 
 							window.wxFriend = {
 								"appId": "",
-								"imgUrl": '//s.iamberry.com/wateroPF/images/shop/share-lease.png',
+								"imgUrl": 'https://s.iamberry.com/wateroPF/images/shop/share-lease.png',
 								"link": url,
 								"desc": desc,
 								"title": "给你送净水机了，快来领取吧!",

wateroPF-wechat-web/src/main/webapp/view/water_competition.html

@@ -26,7 +26,7 @@
             var shareId=getParam("shareId");
             // 屏蔽分享
             //window.hiddenAllWechatMenu = true;
-            var url = 'http://'+document.domain+'/wateroPF/view/water_competition.html?shareId='+shareId;
+            var url = '//'+document.domain+'/wateroPF/view/water_competition.html?shareId='+shareId;
             window.repleFlag = true;
             window.repleWxData = {
                 "appId": "",

wateroPF-wechat-web/src/main/webapp/view/water_competition_for_me.html

@@ -119,17 +119,17 @@
                 }else{
                     console.log(dt);
                     if(dt.status) {
-                        var url = 'http://'+document.domain+'/wateroPF/view/water_competition.html?shareId='+dt.data;
+                        var url = '//'+document.domain+'/wateroPF/view/water_competition.html?shareId='+dt.data;
                         window.wxData = {
                             "appId": "", // 服务号可以填写appId
-                            "imgUrl":'//s.iamberry.com/wateroPF/images/shop/share-lease.png',
+                            "imgUrl":'https://s.iamberry.com/wateroPF/images/shop/share-lease.png',
                             "link":url,
                             "desc":"快来围观吧，美国watero一款可移动的净水机!",
                             "title":"净水机可以租啦！"
                         };
                         window.wxFriend = {
                             "appId": "", // 服务号可以填写appId
-                            "imgUrl":'//s.iamberry.com/wateroPF/images/shop/share-lease.png',
+                            "imgUrl":'https://s.iamberry.com/wateroPF/images/shop/share-lease.png',
                             "link":url,
                             "desc":"快来围观吧，美国watero一款可移动的净水机！",
                             "title":"净水机可以租啦！"

wateroPF-wechat-web/src/main/webapp/wechat/test/index.html

@@ -7,13 +7,13 @@
 		<meta name="apple-mobile-web-app-capable" content="yes">
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
 		<title></title>
-		<link rel="stylesheet" href="http://h5.iamberry.com/iamberry/wechat/test/css/animate.css">
-		<link rel="stylesheet" href="http://h5.iamberry.com/iamberry/wechat/test/css/mobile.css">
-		<link rel="stylesheet" href="http://h5.iamberry.com/iamberry/wechat/test/css/newapp.css" />
-		<script src="http://h5.iamberry.com/iamberry/wechat/test/js/mobile.js"></script>
-		<script type="text/javascript" src="http://h5.iamberry.com/iamberry/wechat/test/js/zepto.min.js"></script>
-		<script type="text/javascript" src="http://h5.iamberry.com/iamberry/wechat/test/js/Touch.js"></script>
-		<script src="http://s95.cnzz.com/z_stat.php?id=1260151428&web_id=1260151428" language="JavaScript"></script>
+		<link rel="stylesheet" href="//h5.iamberry.com/iamberry/wechat/test/css/animate.css">
+		<link rel="stylesheet" href="//h5.iamberry.com/iamberry/wechat/test/css/mobile.css">
+		<link rel="stylesheet" href="//h5.iamberry.com/iamberry/wechat/test/css/newapp.css" />
+		<script src="//h5.iamberry.com/iamberry/wechat/test/js/mobile.js"></script>
+		<script type="text/javascript" src="//h5.iamberry.com/iamberry/wechat/test/js/zepto.min.js"></script>
+		<script type="text/javascript" src="//h5.iamberry.com/iamberry/wechat/test/js/Touch.js"></script>
+		<script src="//s95.cnzz.com/z_stat.php?id=1260151428&web_id=1260151428" language="JavaScript"></script>
 		<style>
 			#button{
 				background:pink;
@@ -48,21 +48,21 @@
 		</div>
 		<div id="page2" class="page out" data-form="slideup">
 			<div class="bg_2">
-				<div class="top_title"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
-				<div class="logo"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/logo.png" /></div>
-				<div class="two_1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/2-2.png" /></div>
+				<div class="top_title"><img src="//h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
+				<div class="logo"><img src="//h5.iamberry.com/iamberry/wechat/test/images/logo.png" /></div>
+				<div class="two_1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/2-2.png" /></div>
 				</div>
 				<div class="two_2">
-					<img class="smallbig1" src="http://h5.iamberry.com/iamberry/wechat/test/images/2-3.png" /><img class="smallbig2" src="http://h5.iamberry.com/iamberry/wechat/test/images/2-4.png" /><img class="smallbig3" src="http://h5.iamberry.com/iamberry/wechat/test/images/2-5.png" />
+					<img class="smallbig1" src="//h5.iamberry.com/iamberry/wechat/test/images/2-3.png" /><img class="smallbig2" src="//h5.iamberry.com/iamberry/wechat/test/images/2-4.png" /><img class="smallbig3" src="//h5.iamberry.com/iamberry/wechat/test/images/2-5.png" />
 				</div>
 			</div>
 			<a class="move"></a>
 		</div>
 		<div id="page3" class="page out" data-form="slideup">
 			<div class="bg_3">
-				<div class="top_title"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
-				<div class="logo1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
-				<div class="two_1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/3-2.png" /></div>
+				<div class="top_title"><img src="//h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
+				<div class="logo1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
+				<div class="two_1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/3-2.png" /></div>
 				</div>
 				<div style="text-align: center;">
 					<h1 class="cl-red">储存数千种奶粉品牌</h1>
@@ -73,9 +73,9 @@
 		</div>
 		<div id="page5" class="page out" data-form="slideup">
 			<div class="bg_4">
-				<div class="top_title"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
-				<div class="logo1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
-				<div class="two_1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/4-1.png" /></div>
+				<div class="top_title"><img src="//h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
+				<div class="logo1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
+				<div class="two_1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/4-1.png" /></div>
 				</div>
 				<div style="text-align: center;">
 					<h1 class="cl-red">美国FDA认证材质</h1>
@@ -86,9 +86,9 @@
 		</div>
 		<div id="page4" class="page out" data-form="slideup">
 			<div class="bg_5">
-				<div class="top_title"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
-				<div class="logo1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
-				<div class="two_1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/5-1.png" /></div>
+				<div class="top_title"><img src="//h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
+				<div class="logo1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
+				<div class="two_1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/5-1.png" /></div>
 				</div>
 				<div style="text-align: center;">
 					<h1 class="cl-red">3级温控系统</h1>
@@ -99,28 +99,28 @@
 		</div>
 		<div id="page6" class="page out" data-form="slideup">
 			<div class="bg_6">
-				<div class="top_title"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
-				<div class="logo1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
-				<div class="two_1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/6-1.png" /></div>
+				<div class="top_title"><img src="//h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
+				<div class="logo1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
+				<div class="two_1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/6-1.png" /></div>
 				</div>
 				<div style="text-align: left;padding-left: 8%;">
 					<h1 class="cl-red">多种母婴智能应用</h1>
-					<div class="six_2 leftin_1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/6-2.png" /></div>
-					<div class="six_2 leftin_2"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/6-3.png" /></div>
-					<div class="six_2 leftin_3"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/6-4.png" /></div>
+					<div class="six_2 leftin_1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/6-2.png" /></div>
+					<div class="six_2 leftin_2"><img src="//h5.iamberry.com/iamberry/wechat/test/images/6-3.png" /></div>
+					<div class="six_2 leftin_3"><img src="//h5.iamberry.com/iamberry/wechat/test/images/6-4.png" /></div>
 				</div>
 			</div>
 			<a class="move"></a>
 		</div>
 		<div id="page7" class="page out" data-form="slideup">
 			<div class="bg_7">
-				<div class="top_title"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
-				<div class="logo1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
-				<div class="two_1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/7-1.png" /></div>
+				<div class="top_title"><img src="//h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
+				<div class="logo1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
+				<div class="two_1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/7-1.png" /></div>
 				</div>
 				<div style="text-align: center;">
 					<h5 class="cl-gray">请长按识别二维码购买冲奶机</h5>
-					<div class="share-2wm"><img style="width: 50%;" src="http://h5.iamberry.com/iamberry/wechat/test/images/7-2.png" /></div>
+					<div class="share-2wm"><img style="width: 50%;" src="//h5.iamberry.com/iamberry/wechat/test/images/7-2.png" /></div>
 					<h5 class="cl-gray">今天不购买还可以</h5>
 					<div class="btn_box">
 							上滑参与调研抽大奖
@@ -131,7 +131,7 @@
 		</div>
 		<div id="page8" class="page out" data-form="slideup">
 			<div class="bg_8">
-				<div class="top_title"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/7-5.png" />
+				<div class="top_title"><img src="//h5.iamberry.com/iamberry/wechat/test/images/7-5.png" />
 				</div>
 				<div style="position:relative;padding:5px 20px;">
 					<ul>
@@ -168,13 +168,13 @@
 		</div>
 		<div id="page9" class="page out" data-form="slideup">
 			<div class="bg_9">
-				<div class="top_title"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
-				<div class="logo1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
-				<div class="two_1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/9-1.png" /></div>
+				<div class="top_title"><img src="//h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
+				<div class="logo1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
+				<div class="two_1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/9-1.png" /></div>
 				</div>
 				<div style="text-align: center;">
 					<h5 class="cl-gray"> 宝宝心里苦，爱贝源帮宝宝说出来</h5>
-					<div class="share-2wm"><img style="width: 50%;" src="http://h5.iamberry.com/iamberry/wechat/test/images/7-2.png" id="share-2wm-image"/></div>
+					<div class="share-2wm"><img style="width: 50%;" src="//h5.iamberry.com/iamberry/wechat/test/images/7-2.png" id="share-2wm-image"/></div>
 					<h5 class="cl-gray">请长按识别二维码</h5>
 					<div class="btn_box">
 							关注爱贝源
@@ -197,6 +197,6 @@
 			</div>
 		</div>-->
 	</body>
-	<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
-	<script type="text/javascript" src="http://h5.iamberry.com/iamberry/wechat/test/js/main.js?v=sdfasdfssfsdfsdfdasd" charset="utf-8"></script>
+	<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
+	<script type="text/javascript" src="//h5.iamberry.com/iamberry/wechat/test/js/main.js?v=sdfasdfssfsdfsdfdasd" charset="utf-8"></script>
 </html>