Merge branch 'master' of ssh://10.10.100.21/source/uas-eis

src/main/java/com/uas/eis/core/config/DynamicDataSourceRegister.java

@@ -74,7 +74,7 @@ public class DynamicDataSourceRegister  implements ImportBeanDefinitionRegistrar
         //创建数据源;
         defaultDataSource = buildDataSource(dsMap);
         dataBinder(defaultDataSource, env);
-        customDataSources.put(propertyResolver.getProperty("name"), defaultDataSource);
+        customDataSources.put(propertyResolver.getProperty("username"), defaultDataSource);
     }
    
     /**
@@ -87,7 +87,7 @@ public class DynamicDataSourceRegister  implements ImportBeanDefinitionRegistrar
     	List<Map<String , Object>> master = jdbcTemplate.queryForList("select MA_USER,MA_PWD from master");
     	System.out.println(master);*/
     	JdbcTemplate jdbcTemplate = new JdbcTemplate(defaultDataSource);  
-    	List<Map<String , Object>> master = jdbcTemplate.queryForList("select MA_USER,MA_PWD from master");
+    	List<Map<String , Object>> master = jdbcTemplate.queryForList("select MA_USER,MS_PWD from master");
     	// 读取主数据源
         RelaxedPropertyResolver propertyResolver = new RelaxedPropertyResolver(env, "spring.datasource.");
     	for(Map<String , Object> map : master){

src/main/resources/application.yml

@@ -1,6 +1,5 @@
 spring:
     datasource:
-        name: UAS_DEV
         type: org.apache.tomcat.jdbc.pool.DataSource
         driverClassName: oracle.jdbc.OracleDriver
         username: UAS_DEV