Merge branch 'wei_master' into '105'

update

See merge request !47

src/main/java/com/server/web/controller/WeixinIndexController.java

@@ -177,12 +177,21 @@ public class WeixinIndexController extends BaseController{
         }
         }
     }
     }
 
 
+    public static void main(String[] args) {
+        String urlTicket = "http://kzy-wx.jimijiayuan.cn/home?shareFlag=true";
+        urlTicket = urlTicket.substring(0,urlTicket.indexOf("?"));
+        System.out.println(urlTicket);
+    }
+
     @ResponseBody
     @ResponseBody
     @RequestMapping(value = "/jsApiSignature", method = {RequestMethod.POST, RequestMethod.GET}, produces = "application/json")
     @RequestMapping(value = "/jsApiSignature", method = {RequestMethod.POST, RequestMethod.GET}, produces = "application/json")
     public Map<String,Object> jsApiSignature(HttpServletRequest request) throws Exception{
     public Map<String,Object> jsApiSignature(HttpServletRequest request) throws Exception{
         try{
         try{
             String urlTicket = request.getParameter("url");
             String urlTicket = request.getParameter("url");
             if(StringUtils.hasText(urlTicket)){
             if(StringUtils.hasText(urlTicket)){
+                if(urlTicket.contains("?")){
+                    urlTicket = urlTicket.substring(0,urlTicket.indexOf("?"));
+                }
                 Map<String, Object> signature = jsApiSignature(urlTicket);
                 Map<String, Object> signature = jsApiSignature(urlTicket);
                 if(signature!=null) {
                 if(signature!=null) {
                     return returnSuccess(signature);
                     return returnSuccess(signature);