Merge branch 'dev-init-20180808' into 'release'

mybatis



See merge request !4

server/src/main/java/com/pica/cloud/wechat/yunqueyilian/server/service/impl/CoreServiceImpl.java

@@ -144,7 +144,7 @@ public class CoreServiceImpl implements CoreService {
             } else {//更新
                 wechatUserMapper.updateById(wechatUser);
             }
-            return "您好！欢迎关注云鹊医联公众号。\n绑定个人资料后可以预约挂号、查看随访记录；还可以收到公众号推送患教和通知。\n<a href=\"https://test1-yunqueyilian.yunqueyi.com/goBind\">立即去绑定</a>";
+            return "您好！欢迎关注云鹊医联公众号。\n绑定个人资料后可以预约挂号、查看随访记录；还可以收到公众号推送患教和通知。\n<a href=\"https://uat-yunqueyilian.yunqueyi.com/goBind\">立即去绑定</a>";
         } else if (eventType.equals(Constants.EVENT_TYPE_UNSUBSCRIBE)) {//取消关注
             if (StringUtil.isNull(wechatUser)) {//新增
                 logger.error("取消关注未能从数据库中获取到用户信息异常");

server/src/main/java/com/pica/cloud/wechat/yunqueyilian/server/service/impl/MenuManagerServiceImpl.java

@@ -42,11 +42,11 @@ public class MenuManagerServiceImpl {
      */
     private static Menu getMenu() throws UnsupportedEncodingException {
         //test1
-        String btn11Url = "https://test1-yunqueyilian.yunqueyi.com/message";
+        String btn11Url = "https://uat-yunqueyilian.yunqueyi.com/message";
         String btn21Url = "http://mp.weixin.qq.com/mp/homepage?__biz=MzIzNjM5NDA1OQ==&hid=2&sn=f52aa8659aa75f32aae5ea62d23e64ca&scene=18#wechat_redirect";
-        String btn31Url = "https://test1-yunqueyilian.yunqueyi.com/goBind";
-        String btn32Url = "https://test1-yunqueyilian.yunqueyi.com/applyIndex";
-        String btn33Url = "https://test1-yunqueyilian.yunqueyi.com/followUp";
+        String btn31Url = "https://uat-yunqueyilian.yunqueyi.com/goBind";
+        String btn32Url = "https://uat-yunqueyilian.yunqueyi.com/applyIndex";
+        String btn33Url = "https://uat-yunqueyilian.yunqueyi.com/followUp";
 
         //pro
 //        String btn11Url = "https://yunqueyilian.yunqueyi.com/message";