Merge remote-tracking branch 'origin/master'

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/tools/wx/WxRequestUrls.java

@@ -15,23 +15,23 @@ public class WxRequestUrls {
     //2、小程序-订阅通知
     //微信小程序-发布订阅消息url
 //    public static final String MINI_SEND_MESSAGE_URL = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=%s";
-    public static final String MINI_SEND_MESSAGE_URL = "http://192.168.100.63:7098/cgi-bin/message/subscribe/send?access_token=%s"; //nginx内网映射
+    public static final String MINI_SEND_MESSAGE_URL = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=%s"; //nginx内网映射
     //微信小程序-获取模板列表url
 //    public static final String MINI_MESSAGE_TEMPLATE_LIST_URL = "https://api.weixin.qq.com/wxaapi/newtmpl/gettemplate?access_token=%s";
-    public static final String MINI_MESSAGE_TEMPLATE_LIST_URL = "http://192.168.100.63:7098/wxaapi/newtmpl/gettemplate?access_token=%s"; //nginx内网映射
+    public static final String MINI_MESSAGE_TEMPLATE_LIST_URL = "https://api.weixin.qq.com/wxaapi/newtmpl/gettemplate?access_token=%s"; //nginx内网映射
 
     //2、公众号-模板消息（非订阅通知）
     //微信公众号-发布模板消息url
 //    public static final String MP_SEND_MESSAGE_URL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=%s";
-    public static final String MP_SEND_MESSAGE_URL = "http://192.168.100.63:7098/cgi-bin/message/template/send?access_token=%s"; //nginx内网映射
+    public static final String MP_SEND_MESSAGE_URL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=%s"; //nginx内网映射
     //微信公众号-获取模板列表rul
 //    public static final String MP_MESSAGE_TEMPLATE_LIST_URL = "https://api.weixin.qq.com/cgi-bin/template/get_all_private_template?access_token=%s";
-    public static final String MP_MESSAGE_TEMPLATE_LIST_URL = "http://192.168.100.63:7098/cgi-bin/template/get_all_private_template?access_token=%s"; //nginx内网映射
+    public static final String MP_MESSAGE_TEMPLATE_LIST_URL = "https://api.weixin.qq.com/cgi-bin/template/get_all_private_template?access_token=%s"; //nginx内网映射
     //微信公众号-一次性订阅消息模板
 //    public static final String MP_MESSAGE_TEMPLATE_SUBSCRIBE_URL = "https://mp.weixin.qq.com/mp/subscribemsg?action=get_confirm&appid=%s&scene=%s&template_id=%s&redirect_url=%s#wechat_redirect";
-    public static final String MP_MESSAGE_TEMPLATE_SUBSCRIBE_URL = "http://192.168.100.167:7076/mp/subscribemsg?action=get_confirm&appid=%s&scene=%s&template_id=%s&redirect_url=%s#wechat_redirect"; //nginx内网映射
+    public static final String MP_MESSAGE_TEMPLATE_SUBSCRIBE_URL = "https://api.weixin.qq.com/mp/subscribemsg?action=get_confirm&appid=%s&scene=%s&template_id=%s&redirect_url=%s#wechat_redirect"; //nginx内网映射
     //微信公总号-获取该用户的微信基本信息类(包含是否订阅公众号)
 //    public static final String MP_GET_USERINFO_URL = "https://192.168.100.63:7098/cgi-bin/user/info?access_token=%s&openid=%s&lang=zh_CN";
-    public static final String MP_GET_USERINFO_URL = "http://192.168.100.63:7098/cgi-bin/user/info?access_token=%s&openid=%s&lang=zh_CN";
+    public static final String MP_GET_USERINFO_URL = "https://api.weixin.qq.com/cgi-bin/user/info?access_token=%s&openid=%s&lang=zh_CN";
 
 }

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/tools/WxRequestUrls.java

@@ -5,12 +5,12 @@ public class WxRequestUrls {
     //1、token获取
     //微信获取调用后台接口的accessToken的url
 //    public static final String STABLE_ACCESS_TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/stable_token";
-    public static final String STABLE_ACCESS_TOKEN_URL = "http://192.168.100.63:7098/cgi-bin/stable_token"; //nginx内网映射
+    public static final String STABLE_ACCESS_TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/stable_token"; //nginx内网映射
 
     //2、公众号-模板消息（非订阅通知）
 
     //微信公总号-获取该用户的微信基本信息类(包含是否订阅公众号)
 //    public static final String MP_GET_USERINFO_URL = "https://api.weixin.qq.com/cgi-bin/user/info?access_token=%s&openid=%s&lang=zh_CN";
-    public static final String MP_GET_USERINFO_URL = "http://192.168.100.63:7098/cgi-bin/user/info?access_token=%s&openid=%s&lang=zh_CN";
+    public static final String MP_GET_USERINFO_URL = "https://api.weixin.qq.com/cgi-bin/user/info?access_token=%s&openid=%s&lang=zh_CN";
 
 }