From 345bdad84200f0932a73e0eba40b9d7298b4d047 Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Sun, 14 Mar 2021 21:51:11 +0800 Subject: [PATCH] . --- .../src/main/java/com/cowr/local/ssjygl/main/Config.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java index ccfdb01..fee8e85 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java @@ -92,7 +92,7 @@ public class Config extends JFinalConfig { private static Log log = Log.getLog(Config.class); public static String ENV = "dev"; public static Prop configprop = PropKit.use(ENV + "/config.properties", "UTF-8"); - public static Prop dbprop; + public static Prop dbprop = PropKit.use(ENV + "/db.properties", "UTF-8"); private WallFilter wallFilter; public static NettyClient nettyClient = null; public static DeviceThread deviceThread = new DeviceThread(); @@ -131,12 +131,8 @@ public class Config extends JFinalConfig { } private void initPropConfig() { + dbprop = PropKit.use(ENV + "/db.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_vendorTaxId = configprop.get("print.vendorTaxId");