会员标签4.0

src/main/dev/application.properties

@@ -5,4 +5,6 @@ marketing.sharding=marketing_sharding_test
 mq.zk.host=10.105.70.186
 mq.zk.port=2199
 mq.secret.id=AKIDnV4ThRrApLformrMwOfopiT3Vmx1LeCY
-mq.secret.key=JRiqnbEi8iloggEes692mcREC8uY1V5b
+mq.secret.key=JRiqnbEi8iloggEes692mcREC8uY1V5b
\ No newline at end of file
+
+es.nodes=10.0.2.48:9200
\ No newline at end of file

src/main/java/com/gic/spark/tag/TagProcess.java

@@ -15,6 +15,7 @@ import com.gic.spark.entity.TagGroupInfo;
 import com.gic.spark.entity.request.AbstractFilterRequest;
 import com.gic.spark.entity.table.TabSceneCrowd;
 import com.gic.spark.filter.*;
+import com.gic.spark.util.AppEnvUtil;
 import com.gic.spark.util.DingtalkMessageUtil;
 import com.gic.spark.util.EsRequestUtil;
 import com.google.common.base.Joiner;
@@ -224,11 +225,7 @@ public class TagProcess {
         String indexName = EsRequestUtil.getESIindexName(enterpriseId);
         System.out.println("indexName===>" + indexName);
         conf.put("es.resource", indexName + "/mapper_type");
-        if (this.isProduction()) {
-            conf.put("es.nodes", "10.0.2.48:9200");
-        } else {
-            conf.put("es.nodes", "10.0.2.48:9200");
-        }
+        conf.put("es.nodes", AppEnvUtil.ES_NODES);
         conf.put("es.mapping.date.rich", "false");
         conf.put("es.index.auto.create", "true");
         conf.put("es.mapping.id", "memberId");

src/main/java/com/gic/spark/util/AppEnvUtil.java

@@ -12,12 +12,14 @@ import java.util.Properties;
 public class AppEnvUtil {
     public static String MEMBER_SHARDING_4;
     public static String  MARKETING_SHARDING;
+    public static String ES_NODES;
     static {
             try {
                 Properties properties = new Properties();
                 properties.load(AppEnvUtil.class.getClassLoader().getResourceAsStream("application.properties"));
                 MEMBER_SHARDING_4=properties.getProperty("member.sharding.4");
                 MARKETING_SHARDING=properties.getProperty("marketing.sharding");
+                ES_NODES=properties.getProperty("es.nodes");
             } catch (Exception e) {
                 e.printStackTrace();
                 System.out.println("读取配置信息失败！");

src/main/prod/application.properties

@@ -10,5 +10,5 @@ mq.zk.port=2199
 mq.secret.id=AKIDb6PWWN8gYIuKYaobq00qV1PglIl46Ynq
 mq.secret.key=0oiSuCLJ8uX0BGUsBJIg0EKEw25TileO
 
-
+es.nodes=10.0.2.48:9200