Merge branch 'grok_inner' into pre

netflix-service/src/main/java/com/cyksj/service/grok/impl/GrokServiceImpl.java

@@ -307,7 +307,7 @@ public class GrokServiceImpl implements GrokService {
 
     public JSONObject getConversationCount(String userToken) {
         try {
-            String res = HttpUtil.get("http://147.79.20.183:9611/grok/getConversationCount?userToken=" + userToken);
+            String res = HttpUtil.get("http://64.32.11.94:9611/grok/getConversationCount?userToken=" + userToken);
             return new JSONObject(res);
         }catch (Exception e){
             return new JSONObject("{\"count\": 0}");