lisai17@sina.com 2021-03-14 21:49:37 +08:00
parent 4271b2cd2b
commit ba76cd5ec9
1 changed files with 7 additions and 2 deletions

View File

@ -81,13 +81,14 @@ import com.jfinal.plugin.druid.DruidStatViewHandler;
import com.jfinal.plugin.redis.RedisPlugin; import com.jfinal.plugin.redis.RedisPlugin;
import com.jfinal.template.Engine; import com.jfinal.template.Engine;
import java.io.File;
import java.sql.Connection; import java.sql.Connection;
public class Config extends JFinalConfig { public class Config extends JFinalConfig {
private static Log log = Log.getLog(Config.class); private static Log log = Log.getLog(Config.class);
public static String ENV = "dev"; public static String ENV = "dev";
public static Prop configprop = PropKit.use(ENV + "/config.properties", "UTF-8"); public static Prop configprop = PropKit.use(ENV + "/config.properties", "UTF-8");
public static Prop dbprop = PropKit.use(ENV + "/db.properties", "UTF-8"); public static Prop dbprop;
private WallFilter wallFilter; private WallFilter wallFilter;
public static NettyServer nettyServer = null; public static NettyServer nettyServer = null;
public static boolean server_run = true; public static boolean server_run = true;
@ -113,8 +114,12 @@ public class Config extends JFinalConfig {
} }
private void initPropConfig() { private void initPropConfig() {
dbprop = PropKit.use(ENV + "/db.properties");
configprop = PropKit.use(ENV + "/config.properties", "UTF-8"); configprop = PropKit.use(ENV + "/config.properties", "UTF-8");
if ("prod".equals(ENV)) {
dbprop = PropKit.use(new File(configprop.get("dbconfpath")), "UTF-8");
} else {
dbprop = PropKit.use(ENV + "/db.properties");
}
CacheData.print_vendor = configprop.get("print.vendor"); CacheData.print_vendor = configprop.get("print.vendor");
CacheData.print_vendorTaxId = configprop.get("print.vendorTaxId"); CacheData.print_vendorTaxId = configprop.get("print.vendorTaxId");