机器设备修改

adm.iml

@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="web" name="Web">
+      <configuration>
+        <descriptors>
+          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
+        </descriptors>
+        <webroots>
+          <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
+        </webroots>
+      </configuration>
+    </facet>
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <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" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/src/main/webapp/WEB-INF/lib/aliyun-java-sdk-core-3.2.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/src/main/webapp/WEB-INF/lib/commons-fileupload-1.3.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/src/main/webapp/WEB-INF/lib/aliyun-java-sdk-dysmsapi-1.0.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/src/main/webapp/WEB-INF/lib/commons-io-2.4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/src/main/webapp/WEB-INF/lib/min-1.0.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/src/main/webapp/WEB-INF/lib/minencrypt-1.0.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/src/main/webapp/WEB-INF/lib/ueditor.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="library" name="Maven: junit:junit:4.10" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.13" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-amqp:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:1.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:1.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-core:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-event:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-file:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-ftp:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-net:commons-net:3.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-groovy:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.groovy:groovy-all:1.8.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-http:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-ip:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-jdbc:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-jms:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-jmx:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.6.8" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.6.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-mail:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-mongodb:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-mongodb:1.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-redis:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: redis.clients:jedis:2.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-rmi:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-scripting:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-security:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:3.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:3.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:3.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-sftp:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-stream:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-test:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-all:1.9.0" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit-dep:4.8.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-ws:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.ws:spring-ws-core:2.0.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: wsdl4j:wsdl4j:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-xml:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.ws:spring-xml:2.0.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-xmpp:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.igniterealtime.smack:smackx:3.2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.igniterealtime.smack:smack:3.2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.5.4" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid:1.0.18" level="project" />
+    <orderEntry type="module-library">
+      <library name="Maven: com.alibaba:jconsole:1.8.0">
+        <CLASSES>
+          <root url="jar://E:/jdk1.8.0_171/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://E:/jdk1.8.0_171/lib/tools.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.0" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.25" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:3.2.17.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:3.2.17.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:3.2.17.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:3.2.17.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:3.2.17.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:3.2.17.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:3.2.17.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:3.2.17.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:3.2.17.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:3.2.17.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:3.2.17.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jms:3.2.17.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:3.2.17.RELEASE" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="library" name="Maven: org.json:json:20160810" level="project" />
+    <orderEntry type="library" name="Maven: cglib:cglib:2.2" level="project" />
+    <orderEntry type="library" name="Maven: asm:asm:3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxws:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: xml-resolver:xml-resolver:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-api:2.7.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.1.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.woodstox:stax2-api:3.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.ws.xmlschema:xmlschema-core:2.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-javamail_1.4_spec:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-core:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.1.13" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-soap:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-databinding-jaxb:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-xml:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-simple:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-addr:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-policy:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.neethi:neethi:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-transports-http:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.2" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache:2.8.1" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.5" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15:1.46" level="project" />
+    <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.51" level="project" />
+    <orderEntry type="library" name="Maven: com.jcraft:jzlib:1.0.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-excelant:3.9" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.9" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.9" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.9" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: stax:stax-api:1.0.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.0.b2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.ant:ant:1.8.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.8.2" level="project" />
+    <orderEntry type="library" name="Maven: com.itextpdf.tool:xmlworker:5.5.9" level="project" />
+    <orderEntry type="library" name="Maven: com.itextpdf:itextpdf:5.5.13" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+    <orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch:5.2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:6.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:6.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-backward-codecs:6.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-grouping:6.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:6.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-join:6.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:6.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-misc:6.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:6.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:6.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:6.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial:6.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial-extras:6.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial3d:6.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-suggest:6.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.elasticsearch:securesm:1.1" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.jopt-simple:jopt-simple:5.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.carrotsearch:hppc:0.7.1" level="project" />
+    <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.5" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.15" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.6" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.8.6" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.6" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.8.6" 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: net.java.dev.jna:jna:4.2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.elasticsearch.client:transport:5.2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.elasticsearch.plugin:transport-netty3-client:5.2.1" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty:3.10.6.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.elasticsearch.plugin:transport-netty4-client:5.2.1" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.7.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.7.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec-http:4.1.7.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.7.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.7.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.7.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.7.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.elasticsearch.plugin:reindex-client:5.2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.elasticsearch.client:rest:5.2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.5" level="project" />
+    <orderEntry type="library" name="Maven: org.elasticsearch.plugin:lang-mustache-client:5.2.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.spullara.mustache.java:compiler:0.9.3" level="project" />
+    <orderEntry type="library" name="Maven: org.elasticsearch.plugin:percolator-client:5.2.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
+    <orderEntry type="library" name="Maven: net.coobird:thumbnailator:0.4.8" level="project" />
+    <orderEntry type="library" name="Maven: com.itextpdf:itext-asian:5.2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.zxing:core:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.zxing:javase:3.1.0" level="project" />
+  </component>
+</module>

src/main/java/com/minpay/mt/machine/action/MachineManageAction.java

@@ -259,7 +259,7 @@ public class MachineManageAction implements IMINAction {
         OutputStream outputStream = new FileOutputStream(file);
         String serviceUrl = Service.lookup(IPropertiesService.class)
                 .getSystemProperties().get(channel+"_TO_MACHINE_ERWERMA").getKey();
-        serviceUrl = "http://".concat(serviceUrl.concat("/admin/h5/index.html?equId=").concat(id));
+        serviceUrl = "http://".concat(serviceUrl.concat("/admin/h5/index.html?equId=").concat(id).concat("&equType=00"));
         //String urlString = URLEncoder.encode(, "GBK");
 
         // 生成二维码图片到本地
@@ -288,13 +288,14 @@ public class MachineManageAction implements IMINAction {
         pro.setRows(temRow);
         pro.setLines(temLine);
         pro.setUrlCode(url);
+        pro.setEquType("00"); //默认支付盒子售货机
         pro.setBranchid(user.getBranchid());
         Service.lookup(IMINDataBaseService.class)
                 .getMybatisMapper(VmEquipmentInfMapper.class)
                 .insertSelective(pro);
         for (int i = 1; i < size; i++) {
             String ids = Service.lookup(IPublicService.class).getSequence("EQU_MACHINE_NO");
-            serviceUrl = "http://".concat(serviceUrl.concat("/admin/h5/index.html?equId=").concat(ids));
+            serviceUrl = "http://".concat(serviceUrl.concat("/admin/h5/index.html?equId=").concat(ids).concat("&equType=00"));
             //String urlString = URLEncoder.encode(, "GBK");
             OutputStream outputStreams = new FileOutputStream(file);
             // 生成二维码图片到本地
@@ -1158,6 +1159,8 @@ public class MachineManageAction implements IMINAction {
     @MINAction(value = ADD_PROEQUREL_NUM, transaction = IMINTransactionEnum.CMT)
     public MINActionResult addProEquRelNum(
             @MINParam(key = "equId") String equId,
+            @MINParam(key = "proNum") String proNum,
+            @MINParam(key = "proState") String proState,
             MINSession session
     ) throws MINBusinessException {
 
@@ -1188,7 +1191,11 @@ public class MachineManageAction implements IMINAction {
                 .selectByExample(proEquRelExample);
         for (int i = 0; i < list2.size(); i++) {
             VmProEquRel equRel = list2.get(i);
-            equRel.setProductNums(equRel.getCargoWayNums());		//商品余量修改为货道容量
+            if(proState.equals("222")) {
+                equRel.setProductNums(equRel.getCargoWayNums());        //商品余量修改为货道容量
+            }else{
+                equRel.setProductNums(proNum);
+            }
             equRel.setModifyUser(userId);							//最后修改人
             equRel.setModifyTime(dateTime);							//最后修改时间
             Service.lookup(IMINDataBaseService.class)
@@ -1292,8 +1299,10 @@ public class MachineManageAction implements IMINAction {
     public static MINActionResult createQrCode(
             @MINParam(key = "flash") String flash,
             @MINParam(key = "equId") String equId,
+            @MINParam(key = "equType") String equType,
             MINSession session)throws MINBusinessException, FileNotFoundException, WriterException, IOException {
         MINActionResult res = new MINActionResult();
+        //如果equType
         //获取当前用户信息
         User u = session.getUser();
         //获取用户id
@@ -1322,7 +1331,7 @@ public class MachineManageAction implements IMINAction {
         OutputStream outputStream = new FileOutputStream(file);
         String serviceUrl = Service.lookup(IPropertiesService.class)
                 .getSystemProperties().get(channel+"_TO_MACHINE_ERWERMA").getKey();
-        serviceUrl = "http://".concat(serviceUrl.concat("/admin/h5/index.html?equId=").concat(equId));
+        serviceUrl = "http://".concat(serviceUrl.concat("/admin/h5/index.html?equId=").concat(equId).concat("&equType=").concat(equType));
         //String urlString = URLEncoder.encode(, "GBK");
 
         // 生成二维码图片到本地

src/main/webapp/admin/machineManage/addEquproductNum.html

@@ -51,33 +51,28 @@
 	//手动输入
 	$(document).on('click','#addNum',function(){
 		layer.prompt({title: '请输入补充至多少'},function(value, index, elem){
-			$.request({
-				action : "ProEquRelManageAction/editProEquRelNumAll",
-				data : {
-					equId : equId,
-					proNum:value
-				},
-				success : function(resData) {
-					if (resData.MINStatus == 0) {
-						
-						layer.alert('操作成功！', {icon: 1});
-						 window.parent.location.reload(); 
-  		                 parent. layer.close(layer.index);  
-					} else {
-						layer.alert(resData.MINErrorMessage, {
-	  						icon: 5,
-	  						title: "提示"
-	  					}); 
-					}
-				},
-				error : function(data2){
-					layer.alert(data2.MINErrorMessage, {
-  						icon: 5,
-  						title: "提示"
-  					}); 
-				}
-	      	});
-		});
+
+            $.request({
+                action : '../../MachineManageAction/addProEquRelNum',
+                data : {
+                    equId : equId,
+                    proNum:value,
+                    proState:'111'
+                },
+                success : function(data) {
+                    layer.alert('操作成功!',  function(){
+                        window.parent.location.reload();
+                        parent. layer.close(layer.index);
+                    });
+                },
+                error : function(data) {
+                    layer.alert(data.MINErrorMessage, {
+                        icon: 5,
+                        title: "提示"
+                    });
+                }
+            });
+        });
 	});
 	//获取url参数
 	function getQueryString(name){

src/main/webapp/admin/machineManage/editEquproduct.html

@@ -41,10 +41,10 @@
 		    	<input type="text" name="perNum" maxlength="30" id ="perNum" lay-verify="perNum" autocomplete="off" placeholder="请输入货道容量" class="layui-input">
 		    </div>
 		
-		    <!-- <label class="layui-form-label">商品余量:</label>
+		    <label class="layui-form-label">商品余量:</label>
 		    <div class="layui-input-inline">
 		    	<input type="text" name="numbers" maxlength="30" id ="numbers" lay-verify="numbers" autocomplete="off" placeholder="请输入商品余量" class="layui-input">
-		    </div> -->
+		    </div>
 		</div>
 		<div class="layui-form-item">
 		    <label class="layui-form-label">*售货价:</label>
@@ -215,7 +215,6 @@
 	  				data : data.field ,
 	  				success : function(data) {
 	  					 layer.alert('操作成功!',  function(){
-
 							 deleteTabPage('201001-03-05');
 	  					}); 	
 	  				},

src/main/webapp/admin/machineManage/editmachine.html

@@ -97,9 +97,9 @@
             <div class="layui-form-item">
                 <label class="layui-form-label fap-form-item-require" >收款通道：</label>
                 <div class="layui-input-block">
-                    <input type="checkbox" name="creditChannel" title="富有扫呗" lay-skin="primary" value = "00" lay-verify="required">
-                    <input type="checkbox" name="creditChannel" title="合利宝" lay-skin="primary" value = "01" lay-verify="required">
-                    <input type="checkbox" name="creditChannel" title="收钱吧" lay-skin="primary" value = "02" lay-verify="required">
+                    <input type="radio" name="creditChannel" title="富有扫呗" lay-skin="primary" value = "00" lay-verify="required">
+                    <input type="radio" name="creditChannel" title="合利宝" lay-skin="primary" value = "01" lay-verify="required">
+                    <input type="radio" name="creditChannel" title="收钱吧" lay-skin="primary" value = "02" lay-verify="required">
                 </div>
             </div>
             <div class="layui-form-item">
@@ -209,21 +209,20 @@
                 }
                 form.render();
             }
+
             var creditCheckbox = $("form").find("input[name='creditChannel']");
-            if ( rowData.creditChannel != null){
-                var creditChannel = rowData.creditChannel.split(',')
-                for(var i = 0;i<creditChannel.length;i++){
-                    var j = creditChannel[i];
-                    if (j == "00"){
-                        $(creditCheckbox[00]).attr("checked", true);
-                    }else if (j == "01"){
-                        $(creditCheckbox[01]).attr("checked", true);
-                    }else if (j == "02"){
-                        $(creditCheckbox[02]).attr("checked", true);
-                    }
+            // 渠道
+            if (rowData.creditChannel != null) {
+                if (rowData.creditChannel == "00") {
+                    $(creditCheckbox[00]).attr("checked", true);
+                } else if (rowData.creditChannel == "01") {
+                    $(creditCheckbox[01]).attr("checked", true);
+                }else if (rowData.creditChannel == "02"){
+                    $(creditCheckbox[02]).attr("checked", true);
                 }
                 form.render();
             }
+
             var paymentCheckbox = $("form").find("input[name='paymentType']");
             // 渠道
             if (rowData.paymentType != null) {
@@ -234,7 +233,7 @@
                 }
                 form.render();
             }
-            var supportCheckbox = $("form").find("input[name='paymentType']");
+            var supportCheckbox = $("form").find("input[name='supportBalance']");
             // 渠道
             if (rowData.supportBalance != null) {
                 if (rowData.supportBalance == "00") {
@@ -335,16 +334,6 @@
                     }
                 });
                 data.field.versionType = versionType;
-                var creditChannel = "";
-                //获取渠道
-                $("#form input:checkbox[name='creditChannel']:checked").each(function(i){
-                    if (creditChannel != "") {
-                        creditChannel += ("," + $(this).val());
-                    } else {
-                        creditChannel += $(this).val();
-                    }
-                });
-                data.field.creditChannel = creditChannel;
 				$.request({
 					action : '../../MachineManageAction/modifyProductInf',
 					data :  data.field ,

src/main/webapp/admin/machineManage/erWm.html

@@ -37,7 +37,7 @@
 	function createCode() {
 		$.request({
 			action : '../../MachineManageAction/createQrCode',
-			data : { equId: rowData.id,flash:"1"},
+			data : { equId: rowData.id,flash:"1",equType: rowData.equType},
 			success : function(data) {
 
 				$("#equCode").attr("src",data.url);

src/main/webapp/admin/machineManage/machineDetail.html

@@ -99,13 +99,14 @@
 			}
 		});	
 		form.on('submit(demo1)', function(data) {
+			debugger;
 			layer.open({
 		   	      type: 2,
 		   	      title: '一键补货',
 		   	      shade: 0.8,
 		   	      //maxmin: true, //开启最大化最小化按钮
 		   	      area: ['40%', '50%'],
-		   	      content: 'addEquproductNum.html?&equId='+rowData.id
+		   	      content: 'addEquproductNum.html?perId='+data.perId+'&equId='+rowData.id
 			});
   	        return false;
   	    });
@@ -203,11 +204,11 @@
 	});
 	//设备新增商品
 	function addProEquRel(row,line) {
-		openMainTabPage('201001-03-04', ' 添加商品', 'machineManage/addEquproduct.html?perRow='+row+'&perLine='+line+'&equId='+rowData.id, '', '201001-03');
+		openMainTabPage('201001-03-04', ' 添加商品', 'machineManage/addEquproduct.html?perRow='+row+'&perLine='+line+'&equId='+rowData.id, '', '201001-03',reload);
 	}
 	//设备编辑商品
 	function editProEquRel(row,line,perId,proId) {
-		openMainTabPage('201001-03-05', ' 编辑货道商品', 'machineManage/editEquproduct.html?perRow='+row+'&perLine='+line+'&perId='+perId+'&equId='+rowData.id+'&proId='+proId, '', '201001-03');
+		openMainTabPage('201001-03-05', ' 编辑货道商品', 'machineManage/editEquproduct.html?perRow='+row+'&perLine='+line+'&perId='+perId+'&equId='+rowData.id+'&proId='+proId,'', '201001-03',reload);
 	}
 	//补货
 	function addProEquRelNum(row,line,perId,perNum) {
@@ -357,6 +358,9 @@
 			});	
       	});
 	}
+	function reload() {
+		window.location.reload();
+	}
 </script>