fix config issue

poyi-app/src/main/java/com/tzy/config/AppCommonConfig.java

@@ -17,11 +17,11 @@ import java.sql.SQLException;
 @Configuration
 public class AppCommonConfig {
 
-	@Value("${spring.datasource.druid.master.url}")
+	@Value("${spring.datasource.url}")
 	private String dbUrl;
-	@Value("${spring.datasource.druid.master.username}")
+	@Value("${spring.datasource.username}")
 	private String username;
-	@Value("${spring.datasource.druid.master.password}")
+	@Value("${spring.datasource.password}")
 	private String password;
 
 	//@Bean

poyi-app/src/main/resources/application.yml

@@ -101,12 +101,10 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driverClassName: org.postgresql.Driver
+    url: jdbc:postgresql://192.168.50.8:5432/ahx_app
+    username: postgres
+    password: 123456
     druid:
-      # 主库数据源
-      master:
-        url: jdbc:postgresql://192.168.50.8:5432/ahx_app
-        username: postgres
-        password: 123456
       # 初始连接数
       initialSize: 5
       # 最小连接池数量

tzy-framework/src/main/java/com/tzy/framework/config/DruidConfig.java

@@ -50,11 +50,11 @@ public class DruidConfig
 	
 	private final Logger log = LoggerFactory.getLogger(getClass());
 	//数据库连接信息
-    @Value("${spring.datasource.druid.master.url}")
+    @Value("${spring.datasource.url}")
     private String dbUrl;
-    @Value("${spring.datasource.druid.master.username}")
+    @Value("${spring.datasource.username}")
     private String username;
-    @Value("${spring.datasource.druid.master.password}")
+    @Value("${spring.datasource.password}")
     private String password;
     @Value("${spring.datasource.driverClassName}")
     private String driverClassName;

tzy-framework/src/main/java/com/tzy/framework/datasource/DBChangeServiceImpl.java

@@ -20,11 +20,11 @@ import java.util.List;
 public class DBChangeServiceImpl implements DBChangeService {
 
 		//数据库连接信息
-	    @Value("${spring.datasource.druid.master.url}")
+	    @Value("${spring.datasource.url}")
 	    private String dbUrl;
-	    @Value("${spring.datasource.druid.master.username}")
+	    @Value("${spring.datasource.username}")
 	    private String username;
-	    @Value("${spring.datasource.druid.master.password}")
+	    @Value("${spring.datasource.password}")
 	    private String password;
 	    @Value("${spring.datasource.driverClassName}")
 	    private String driverClassName;