Merge branch 'master' of http://gitlab.ioubuy.cn/yaobenzhang/jz-dmp-cmdexectool

pom.xml

@@ -53,10 +53,12 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
+		<!-- 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-redis</artifactId>
 		</dependency>
+		 -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
@@ -265,6 +267,7 @@
 	        <scope>test</scope>
 	    </dependency>
 	    <!-- spring security redis管理session -->
+	    <!-- 
 		<dependency>
 			<groupId>org.springframework.session</groupId>
 			<artifactId>spring-session-data-redis</artifactId>
@@ -273,6 +276,7 @@
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
         </dependency>
+         -->
 		
 		<!-- *************************************************************************** -->
 		

src/main/resources/application-test.yml

@@ -21,81 +21,6 @@ spring:
       maximumPoolSize: 20
       connectionTimeout: 30000
       idleTimeout: 600000
-  datasource2:
-    url: jdbc:mysql://192.168.1.221:3306/azkaban?characterEncoding=utf8&autoReconnect=true&useSSL=false
-    driver-class-name: com.mysql.jdbc.Driver
-    username: root
-    password: 
-    hikari:
-      maxLifetime: 1765000
-      maximumPoolSize: 20
-      connectionTimeout: 30000
-      idleTimeout: 600000
-  cache:
-    type: CAFFEINE
-    caffeine:
-      spec: maximumSize=1000,expireAfterWrite=30s
-  public-key: rajZdV0xpCox+2vEHFLsKq2o2XVdMaQq
-  #gatewayIP
-  gateway-url: http://localhost:8088
-  #API配置--大数据查询，数据源支持类型条件
-  api-bigData-setting: Hive,MySQL,Oracle
-  redis:
-    #database: 0
-    #host: 119.23.13.83
-    #port: 8007
-    #timeout: 5000
-    cluster:
-      nodes:
-        - 192.168.1.146:6379
-        - 192.168.1.146:6380
-        - 192.168.1.146:6381
-        - 192.168.1.146:6382
-        - 192.168.1.146:6383
-        - 192.168.1.146:6384
-  mail:
-    host: smtp.exmail.qq.com
-    username: service@mail.cn
-    password: myPassword
-    properties:
-      mail:
-        smtp:
-          auth: true
-          starttls:
-            enable: true
-            required: true
-
-remote:
-  execute:
-    command:
-      server: 192.168.204.121
-      user: root
-      password: 123
-      submit-sycning-task-cmd: "source /etc/profile;/data/disk4/run_new_bigdata_etl_process.sh "
-      query-sycning-task-status: "yarn application -status "
-      stop-sycning-task-cmd: "yarn application -kill "
-      cat-sycning-task-log: "source /etc/profile;cat /data/disk4/log/"
-
-#openApi 信息
-#rePrefix redis存储的前缀
-#ignoreRedis true存入 false不存  api.timeout.default
-#url 测试地址
-#estag 已废弃 改成配置数据源
-#url 已废弃改成系统配置
-#eslog api日志管理
-dmp:
-  eslog: http://119.23.13.83:9560/_xpack/sql
-  ignoreRedis: true
-  rePrefix: test
-  openapi:
-    user: d68ddb5352854a0baab1cffe82ac69d2
-    sysId: T0000020
-    timeout:
-      default: 5000
-      max: 5000
-    evn:
-      open: false
-      name:
 
 #日志打印
 logging: