dev
parent
ba76cd5ec9
commit
345bdad842
|
|
@ -92,7 +92,7 @@ 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;
|
public static Prop dbprop = PropKit.use(ENV + "/db.properties", "UTF-8");
|
||||||
private WallFilter wallFilter;
|
private WallFilter wallFilter;
|
||||||
public static NettyClient nettyClient = null;
|
public static NettyClient nettyClient = null;
|
||||||
public static DeviceThread deviceThread = new DeviceThread();
|
public static DeviceThread deviceThread = new DeviceThread();
|
||||||
|
|
@ -131,12 +131,8 @@ public class Config extends JFinalConfig {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void initPropConfig() {
|
private void initPropConfig() {
|
||||||
|
dbprop = PropKit.use(ENV + "/db.properties", "UTF-8");
|
||||||
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");
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue