Merge remote-tracking branch 'origin/develop' into develop

server/like-common/src/main/java/com/mdd/common/plugin/wechat/WxMnpDriver.java

@@ -77,6 +77,25 @@ public class WxMnpDriver {
         return wxMpService;
     }
 
+    /**
+     * 微信开放平台
+     *
+     * @author fzr
+     * @return WxMpService
+     */
+    public static WxMpService openSetting() {
+        Map<String, String> config = ConfigUtils.get("open_platform");
+
+        WxMpDefaultConfigImpl wxMpDefaultConfig = new WxMpDefaultConfigImpl();
+        wxMpDefaultConfig.setAppId(config.getOrDefault("app_id", "").trim());
+        wxMpDefaultConfig.setSecret(config.getOrDefault("app_secret", "").trim());
+        wxMpDefaultConfig.setToken(config.getOrDefault("token", "").trim());
+        wxMpDefaultConfig.setAesKey(config.getOrDefault("encoding_aes_key", "").trim());
+        wxMpService.setWxMpConfigStorage(wxMpDefaultConfig);
+
+        return wxMpService;
+    }
+
     /**
      * 获取授权页ticket
      *

server/like-front/src/main/java/com/mdd/front/LikeFrontThreadLocal.java

@@ -1,5 +1,7 @@
 package com.mdd.front;
 
+import com.mdd.common.util.StringUtils;
+
 import java.util.Map;
 import java.util.concurrent.ConcurrentSkipListMap;
 
@@ -25,6 +27,9 @@ public class LikeFrontThreadLocal {
                 map = new ConcurrentSkipListMap<>();
             }
         }
+        if (StringUtils.isNull(val)) {
+            return;
+        }
         map.put(key, val);
         MY_LOCAL.set(map);
     }