Merge branch 'master' of 49.232.152.146:xhxy/smart_school

smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/api/WxApiController.java

@@ -10,9 +10,12 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.html.EscapeUtil;
 import com.ruoyi.common.utils.http.HttpUtils;
 
+import com.sun.deploy.util.URLUtil;
 import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.concurrent.TimeUnit;
@@ -322,7 +325,9 @@ public class WxApiController extends BaseController {
     @GetMapping("/getsignature")
     @ResponseBody
     public AjaxResult getsignature(String url) throws Exception {
+        log.info(url);
         //获取accesToken
+        url  = EscapeUtil.decode(url);
         String token = accessTokenUtil.getToken();
         //获取jsapi_ticket
         String ticket = null;