Merge branch 'master_activity' into base-modify

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

@@ -43,6 +43,9 @@ public class WeixinController {
     @Value("${wx.url}")
     private String  url;
 
+    @Value("${wx.domainUrl}")
+    private String  domainUrl;
+
 
 
 
@@ -53,7 +56,7 @@ public class WeixinController {
             redirec_url="";
         }
 
-        redirec_url=request.getServerName()+"/"+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"));