Merge branch 'master' of http://git.wanmeizhensuo.com/ML/ffm-baseline

eda/feededa/src/main/scala/com/gmei/GmeiConfig.scala

@@ -37,7 +37,7 @@ object GmeiConfig extends Serializable {
     sparkConf.set("spark.debug.maxToStringFields", "130")
     sparkConf.set("spark.sql.broadcastTimeout",  "6000")
 
-    if (!sparkConf.contains("spark.master")) {
+    if (!sparkConf.contains("""spark.master""")) {
       sparkConf.setMaster("local[3]")
     }
 

eda/feededa/src/main/scala/com/gmei/testt.scala

@@ -7,7 +7,7 @@ import org.apache.spark.sql.{SaveMode, TiContext}
 import org.apache.log4j.{Level, Logger}
 import scopt.OptionParser
 import com.gmei.lib.AbstractParams
-import com.gmei.GmeiConfig.{writeToJDBCTable,getMinusNDate}
+import com.gmei.GmeiConfig.{getMinusNDate, writeToJDBCTable}
 
 object testt {
 

eda/gray_stat/.gitignore

+venv/