xjm
/
ssjygl-xsct-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

dev
lisai17@sina.com 2021-03-14 21:51:11 +08:00
parent ba76cd5ec9
commit 345bdad842
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java
View File

@ -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");