Merge branch 'develop'

Author: chanjarster

pom.xml

@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>me.chanjar</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>1.1.6</version>
+  <version>1.1.7</version>
   <packaging>pom</packaging>
   <name>WeiXin Java Tools - Parent</name>
   <description>微信公众号、企业号上级POM</description>

weixin-java-common/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>me.chanjar</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>1.1.6</version>
+    <version>1.1.7</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>

weixin-java-cp/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>me.chanjar</groupId>
         <artifactId>weixin-java-parent</artifactId>
-        <version>1.1.6</version>
+        <version>1.1.7</version>
     </parent>
 
     <artifactId>weixin-java-cp</artifactId>

weixin-java-mp/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>me.chanjar</groupId>
         <artifactId>weixin-java-parent</artifactId>
-        <version>1.1.6</version>
+        <version>1.1.7</version>
     </parent>
     <artifactId>weixin-java-mp</artifactId>
     <name>WeiXin Java Tools - MP</name>

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpInMemoryConfigStorage.java

@@ -192,26 +192,31 @@ public String toString() {
         '}';
   }
 
-    @Override
-    public String getPartnerId() {
-        return partnerId;
-    }
-
-    public void setPartnerId(String partnerId) {
-        this.partnerId = partnerId;
-    }
-
-    @Override
-    public String getPartnerKey() {
-        return partnerKey;
-    }
-
-    public void setPartnerKey(String partnerKey) {
-        this.partnerKey = partnerKey;
-    }
-
-    @Override
-    public File getTmpDirFile() {
-      return this.getTmpDirFile();
-    }
+  @Override
+  public String getPartnerId() {
+      return partnerId;
+  }
+
+  public void setPartnerId(String partnerId) {
+      this.partnerId = partnerId;
+  }
+
+  @Override
+  public String getPartnerKey() {
+      return partnerKey;
+  }
+
+  public void setPartnerKey(String partnerKey) {
+      this.partnerKey = partnerKey;
+  }
+
+  @Override
+  public File getTmpDirFile() {
+    return this.tmpDirFile;
+  }
+
+  public void setTmpDirFile(File tmpDirFile) {
+    this.tmpDirFile = tmpDirFile;
+  }
+
 }