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 651bd30..ccfdb01 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 @@ -2,31 +2,31 @@ package com.cowr.local.ssjygl.main; import com.alibaba.druid.filter.stat.StatFilter; import com.alibaba.druid.wall.WallFilter; +import com.cowr.common.Interceptor.ReporterInterceptor; import com.cowr.common.ctrl.HomeController; +import com.cowr.common.handler.GlobalHandler; import com.cowr.common.oss.OSSKit; -import com.cowr.local.ssjygl.customer.pact.CustomerPactController; -import com.cowr.local.ssjygl.customer.supermarketproduct.CustomerSupermarketProductController; -import com.cowr.local.ssjygl.invoice.invalidverify.InvoiceInvalidVerifyController; -import com.cowr.local.ssjygl.order.invalidverify.OrderInvalidVerifyController; -import com.cowr.local.ssjygl.ticket.invalidverify.TicketInvalidVerifyController; -import com.cowr.local.ssjygl.ticket.log.TicketLogController; -import com.cowr.local.ssjygl.ticket.receive.TicketReceiveController; -import com.cowr.ssjygl.actioncmdlog.ActionCmdLogController; +import com.cowr.common.plugin.QuartzPlugin; +import com.cowr.common.view.JsonRenderFactory; import com.cowr.local.ssjygl.authlicense.AuthLicenseController; import com.cowr.local.ssjygl.authlicense.AuthLicenseSyncService; import com.cowr.local.ssjygl.blacklist.BlacklistController; import com.cowr.local.ssjygl.cache.CacheController; import com.cowr.local.ssjygl.customer.CustomerController; import com.cowr.local.ssjygl.customer.contact.CustomerContactController; +import com.cowr.local.ssjygl.customer.pact.CustomerPactController; import com.cowr.local.ssjygl.customer.receiver.CustomerReceiverController; +import com.cowr.local.ssjygl.customer.supermarketproduct.CustomerSupermarketProductController; import com.cowr.local.ssjygl.devicectrl.common.Const; import com.cowr.local.ssjygl.devicectrl.common.DeviceThread; import com.cowr.local.ssjygl.devicectrl.device.CameraController; import com.cowr.local.ssjygl.driver.DriverController; +import com.cowr.local.ssjygl.invoice.invalidverify.InvoiceInvalidVerifyController; import com.cowr.local.ssjygl.invoice.log.InvoiceLogController; import com.cowr.local.ssjygl.invoice.receive.InvoiceReceiveController; import com.cowr.local.ssjygl.netty.NettyClient; import com.cowr.local.ssjygl.netty.SocketIOService; +import com.cowr.local.ssjygl.order.invalidverify.OrderInvalidVerifyController; import com.cowr.local.ssjygl.order.ordercluster.OrderclusterController; import com.cowr.local.ssjygl.order.ordercluster.truck.OrderclusterTruckController; import com.cowr.local.ssjygl.order.orderpurchase.OrderPurchaseController; @@ -34,6 +34,8 @@ import com.cowr.local.ssjygl.order.ordersale.OrderSaleController; import com.cowr.local.ssjygl.order.ordertemp.OrderTempController; import com.cowr.local.ssjygl.order.ordertransfer.OrderTransferController; import com.cowr.local.ssjygl.order.ordertrash.OrderTrashController; +import com.cowr.local.ssjygl.overall.OverallController; +import com.cowr.local.ssjygl.prepay.PrepayController; import com.cowr.local.ssjygl.prepay.prepaydetail.PrepayDetailController; import com.cowr.local.ssjygl.prepay.prepaytruck.PrepayTruckController; import com.cowr.local.ssjygl.prepay.refunddetail.RefundDetailController; @@ -41,6 +43,7 @@ import com.cowr.local.ssjygl.product.ProductController; import com.cowr.local.ssjygl.purchase.PurchaseController; import com.cowr.local.ssjygl.sandfarm.SandfarmController; import com.cowr.local.ssjygl.sms.log.SmsLogController; +import com.cowr.local.ssjygl.stat.sale.OrderStatController; import com.cowr.local.ssjygl.supermarket.SupermarketController; import com.cowr.local.ssjygl.supermarket.customerdistance.SupermarketCustomerDistanceController; import com.cowr.local.ssjygl.supermarket.receiverdistance.SupermarketReceiverDistanceController; @@ -48,22 +51,23 @@ import com.cowr.local.ssjygl.supermarket.sandfarmdistance.SupermarketSandfarmDis import com.cowr.local.ssjygl.supermarket.stock.StockController; import com.cowr.local.ssjygl.supermarket.stock.StockSyncService; import com.cowr.local.ssjygl.synctask.SyncTaskService; -import com.cowr.common.plugin.QuartzPlugin; +import com.cowr.local.ssjygl.system.sysuser.SysuserController; +import com.cowr.local.ssjygl.ticket.invalidverify.TicketInvalidVerifyController; +import com.cowr.local.ssjygl.ticket.log.TicketLogController; +import com.cowr.local.ssjygl.ticket.receive.TicketReceiveController; import com.cowr.local.ssjygl.transport.TransportController; import com.cowr.local.ssjygl.transport.TransportQueryController; import com.cowr.local.ssjygl.transportcompany.TransportCompanyController; import com.cowr.local.ssjygl.truck.TruckController; import com.cowr.model.Supermarket; +import com.cowr.model._MappingKit; import com.cowr.ssjygl.CacheData; +import com.cowr.ssjygl.actioncmdlog.ActionCmdLogController; import com.cowr.ssjygl.cctv.CctvController; -import com.cowr.local.ssjygl.prepay.PrepayController; -import com.cowr.local.ssjygl.overall.OverallController; import com.cowr.ssjygl.modifylog.ModifyLogController; import com.cowr.ssjygl.stat.invoice.InvoiceUseController; import com.cowr.ssjygl.stat.purchase.OrderPurchaseStatController; -import com.cowr.local.ssjygl.stat.sale.OrderStatController; import com.cowr.ssjygl.stat.transfer.OrderTransferStatController; -import com.cowr.local.ssjygl.system.sysuser.SysuserController; import com.cowr.ssjygl.transportcompany.TransportCompanyService; import com.cowr.ssjygl.transprice.TransPriceService; import com.jfinal.config.*; @@ -80,10 +84,6 @@ import com.jfinal.plugin.druid.DruidPlugin; import com.jfinal.plugin.druid.DruidStatViewHandler; import com.jfinal.plugin.redis.RedisPlugin; import com.jfinal.template.Engine; -import com.cowr.common.Interceptor.ReporterInterceptor; -import com.cowr.common.handler.GlobalHandler; -import com.cowr.common.view.JsonRenderFactory; -import com.cowr.model._MappingKit; import java.io.File; import java.sql.Connection; @@ -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 = PropKit.use(ENV + "/db.properties", "UTF-8"); + public static Prop dbprop; private WallFilter wallFilter; public static NettyClient nettyClient = null; public static DeviceThread deviceThread = new DeviceThread(); @@ -131,8 +131,12 @@ public class Config extends JFinalConfig { } private void initPropConfig() { - dbprop = PropKit.use(ENV + "/db.properties"); 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"); @@ -262,7 +266,7 @@ public class Config extends JFinalConfig { { String jdbcUrl = dbprop.get("jdbcUrl"); - if(isDev() && !jdbcUrl.contains("_dev")){ + if (isDev() && !jdbcUrl.contains("_dev")) { log.error("dev 的开发环境，连的不是 dev 库"); log.error("dev 的开发环境，连的不是 dev 库"); log.error("dev 的开发环境，连的不是 dev 库"); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Main.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Main.java index f12a130..521c233 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Main.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Main.java @@ -3,8 +3,14 @@ package com.cowr.local.ssjygl.main; import com.jfinal.kit.PathKit; import com.jfinal.log.Log; import com.jfinal.server.undertow.UndertowServer; +import io.undertow.server.HandlerWrapper; +import io.undertow.server.HttpHandler; +import io.undertow.server.handlers.DisallowedMethodsHandler; +import io.undertow.servlet.api.DeploymentInfo; +import io.undertow.util.HttpString; import java.lang.management.ManagementFactory; +import java.util.function.BiConsumer; public class Main { private static Log log = Log.getLog(Main.class); @@ -44,10 +50,25 @@ public class Main { log.info("Running directory: " + path); // 相关配置见 undertow.txt - UndertowServer + UndertowServer server = UndertowServer .create(Config.class, Config.ENV + "/undertow.txt") - .addHotSwapClassPrefix("com.cowr.") - .start(); + .addHotSwapClassPrefix("com.cowr."); + + server.onDeploy(new BiConsumer() { + @Override + public void accept(ClassLoader classLoader, DeploymentInfo deploymentInfo) { + deploymentInfo.addInitialHandlerChainWrapper(new HandlerWrapper() { + + @Override + public HttpHandler wrap(HttpHandler handler) { + HttpString[] disallowedHttpMethods = {HttpString.tryFromString("TRACE"), HttpString.tryFromString("TRACK")}; + return new DisallowedMethodsHandler(handler, disallowedHttpMethods); + } + }); + } + }); + + server.start(); } } } diff --git a/ssjygl-xsx-service/src/main/resources/prod/config.properties b/ssjygl-xsx-service/src/main/resources/prod/config.properties index 2fac9f3..6467143 100644 --- a/ssjygl-xsx-service/src/main/resources/prod/config.properties +++ b/ssjygl-xsx-service/src/main/resources/prod/config.properties @@ -13,4 +13,7 @@ socketserver.port=21002 endpoint=oss-cn-shenzhen.aliyuncs.com #清理备份用 -bucketName=shbak \ No newline at end of file +bucketName=shbak + +#读服务器磁盘上的配置文件 +dbconfpath=/home/lisai/ssjygl-xsx/db.properties \ No newline at end of file diff --git a/ssjygl-xsx-service/src/main/resources/prod/db.properties b/ssjygl-xsx-service/src/main/resources/prod/db.properties deleted file mode 100644 index 7b2518b..0000000 --- a/ssjygl-xsx-service/src/main/resources/prod/db.properties +++ /dev/null @@ -1,11 +0,0 @@ -# mysql -jdbcUrl=jdbc:mysql://rm-wz9wa070076b2uge2ro.mysql.rds.aliyuncs.com:3306/ssjy_xsx_service?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true -user=ssjy_xsx -password=Ssjy_xs_890 - -# redis -redis.basekey=ssjcgl_xsx -redis.ip=r-wz9168ab2f2f7ec4pd.redis.rds.aliyuncs.com -redis.port=6379 -redis.pwd=CoWR1111 -redis.db=13 \ No newline at end of file