Merge branch 'master_activity' into base-modify

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/controller/WeixinController.java

@@ -42,21 +42,17 @@ public class WeixinController {
 
     @Value("${wx.url}")
     private String  url;
-
-    @Value("${wx.domainUrl}")
-    private String  domainUrl;
+    ;
 
 
 
 
     @RequestMapping(value ="/app/unauth/wxLogin",method = RequestMethod.GET)
     @IgnoreUserToken
-    public String wxLogin(@RequestParam(value = "callback",defaultValue = "")String redirec_url,HttpServletRequest request){
+    public String wxLogin(@RequestParam(value = "callback",defaultValue = "")String redirec_url){
         if (StringUtils.isBlank(redirec_url)){
             redirec_url="";
         }
-
-        redirec_url=domainUrl+"/"+redirec_url;
         log.info("-----微信wxLogin---redirec_url=="+redirec_url);
         try {
         String encrypt_curr_url = Base64.encode(redirec_url.getBytes("utf-8"));