diff --git a/dsBase/src/main/java/com/dsideal/dsBase/BaseApplication.java b/dsBase/src/main/java/com/dsideal/dsBase/BaseApplication.java index 85ae4ddd..e6ec3a52 100644 --- a/dsBase/src/main/java/com/dsideal/dsBase/BaseApplication.java +++ b/dsBase/src/main/java/com/dsideal/dsBase/BaseApplication.java @@ -113,8 +113,8 @@ public class BaseApplication extends JFinalConfig { */ @Override public void configPlugin(Plugins me) { - DruidPlugin druid = new DruidPlugin(PropKit.get("jdbcUrl"), - PropKit.get("user"), PropKit.get("password"), PropKit.get("driverClassName")); + DruidPlugin druid = new DruidPlugin(PropKit.get("mysql.jdbcUrl"), + PropKit.get("mysql.user"), PropKit.get("mysql.password"), PropKit.get("mysql.driverClassName")); me.add(druid); ActiveRecordPlugin arp = new ActiveRecordPlugin(druid); arp.setDialect(new PostgreSqlDialect()); diff --git a/dsWeb/logs/nginx.pid b/dsWeb/logs/nginx.pid index 48c84299..a05ce72a 100644 --- a/dsWeb/logs/nginx.pid +++ b/dsWeb/logs/nginx.pid @@ -1 +1 @@ -25868 +196476