weiye c05b17a924 Merge branch 'dev' into v2.1.1 ... # Conflicts: # datax-admin/src/main/java/com/wugui/datax/admin/config/SecurityConfig.java # datax-admin/src/main/java/com/wugui/datax/admin/controller/JobInfoController.java # datax-admin/src/main/java/com/wugui/datax/admin/exception/JWTAuthenticationEntryPoint.java # datax-admin/src/main/java/com/wugui/datax/admin/mapper/JobJdbcDatasourceMapper.java # datax-admin/src/main/java/com/wugui/datax/admin/service/IJobJdbcDatasourceService.java # datax-admin/src/main/java/com/wugui/datax/admin/service/impl/JobJdbcDatasourceServiceImpl.java # datax-admin/src/main/java/com/wugui/datax/admin/service/impl/LoginService.java # datax-admin/src/main/java/com/wugui/datax/admin/tool/datax/reader/BaseReaderPlugin.java # datax-admin/src/main/java/com/wugui/datax/admin/tool/datax/writer/BaseWriterPlugin.java		2020-03-23 13:41:08 +08:00
..
src	Merge branch 'dev' into v2.1.1	2020-03-23 13:41:08 +08:00
pom.xml	合并dev分支	2020-03-19 15:03:10 +08:00