Merge branch 'dev-20200702' into 'release'

自动回复yunqueyilian地址配置



See merge request !9

server/src/main/java/com/pica/cloud/wechat/yunqueyilian/server/configuration/BeanConfiguration.java

@@ -3,6 +3,7 @@ package com.pica.cloud.wechat.yunqueyilian.server.configuration;
 import com.pica.cloud.foundation.redis.CacheClient;
 import com.pica.cloud.foundation.redis.ICacheClient;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -13,6 +14,13 @@ public class BeanConfiguration {
     @Autowired
     SpringContextAware springContextAware;
 
+    @Value("${wechat_url}")
+    private String wechatUrl;
+
+    public String getWechatUrl() {
+        return wechatUrl;
+    }
+
     @Bean
     public ICacheClient cacheClient() {
         return new CacheClient(springContextAware.getActiveProfile());

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

@@ -9,6 +9,7 @@ import com.pica.cloud.wechat.yunqueyilian.common.CommonUtils;
 import com.pica.cloud.wechat.yunqueyilian.common.Constants;
 import com.pica.cloud.wechat.yunqueyilian.common.req.TextMessage;
 import com.pica.cloud.wechat.yunqueyilian.server.client.IWechatsServiceClient;
+import com.pica.cloud.wechat.yunqueyilian.server.configuration.BeanConfiguration;
 import com.pica.cloud.wechat.yunqueyilian.server.entity.PWechatUser;
 import com.pica.cloud.wechat.yunqueyilian.server.mapper.PWechatUserMapper;
 import com.pica.cloud.wechat.yunqueyilian.server.service.CoreService;
@@ -37,6 +38,9 @@ public class CoreServiceImpl implements CoreService {
     @Autowired
     PWechatUserMapper wechatUserMapper;
 
+    @Autowired
+    BeanConfiguration beanConfigurationl;
+
     @Override
     public String requestCheck(HttpServletRequest request) {
         // 微信加密签名
@@ -114,7 +118,7 @@ public class CoreServiceImpl implements CoreService {
         return respMessage;
     }
 
-    private String insertOrUpdataWechatUser(Map<String, String> requestMap, Map map, PWechatUser wechatUser) throws UnsupportedEncodingException{
+    private String insertOrUpdataWechatUser(Map<String, String> requestMap, Map map, PWechatUser wechatUser) throws UnsupportedEncodingException {
         String eventType = requestMap.get("Event");
         if (eventType.equals(Constants.EVENT_TYPE_SUBSCRIBE)) {//关注
             boolean newFlag = false;
@@ -150,7 +154,7 @@ public class CoreServiceImpl implements CoreService {
             }
 
             String url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxcf79dbdc24cb684b"
-                    + "&redirect_uri=https://yunqueyilian.yunqueyi.com/goBind"
+                    + "&redirect_uri=" + beanConfigurationl.getWechatUrl() + "/goBind"
                     + "&response_type=code&scope=snsapi_userinfo&state=1#wechat_redirect";
             String resContent = "您好！欢迎关注云鹊医联公众号。\n绑定个人资料后可以预约挂号、查看随访记录；还可以收到公众号推送患教和通知。\n<a href='" + url + "'>立即去绑定</a>";