Merge branch 'develop' into 'master'

测试时设置setParallelism代码删除

See merge request galaxy/tsg_olap/app-protocol-stat-traffic-merge!12

src/main/java/com/zdjizhi/topology/ApplicationProtocolTopology.java

@@ -51,7 +51,6 @@ public class ApplicationProtocolTopology {
         }
 
         final StreamExecutionEnvironment environment = StreamExecutionEnvironment.getExecutionEnvironment();
-        environment.setParallelism(1);
 
         ParameterTool tool = ParameterTool.fromPropertiesFile(args[0]);
         final Configuration config = tool.getConfiguration();