Merge branch 'master' into rxsocks

daemon/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.github.rockylomo</groupId>
         <artifactId>rx</artifactId>
-        <version>2.20.4</version>>
+        <version>2.20.4-SNAPSHOT</version>
     </parent>
     <artifactId>daemon</artifactId>
 

rxlib/src/test/java/org/rx/util/TestUtil.java

@@ -94,7 +94,7 @@ public void normalMapBean() {
         f.setIndex(2);
         f.setName(str_name_wyf);
         f.setAge(6);
-        f.setBirth(new DateTime(2020, Month.FEBRUARY, 20, 0, 0, 0));
+        f.setBirth(new DateTime(2020, Month.FEBRUARY, 20, 0, 0, 0, TimeZone.getDefault()));
         f.setGender(PersonGender.BOY);
         f.setCashCent(200L);
         GirlBean t = new GirlBean();
@@ -276,7 +276,7 @@ public void other() {
         String s = "{\"data\":{\"row\":{\"buyerTelephone\":\"18575686257\",\"deliveryTime\":\"2024-4-23 15:00-18:00\",\"coldChainStatus\":1,\"orderPaymentType\":3,\"orderOmsId\":\"102448352115074461\",\"deliveryStartTemperature\":\"0\",\"storePhone\":\"028-65239611\",\"deliveryEndTemperature\":\"0\",\"buyerFullName\":\"陈先生\",\"channelOrderId\":\"20009346551090415\",\"deliverTime\":\"2024-04-23 18:18:01\",\"deliveryBillItemId\":1062,\"deliveryManId\":92,\"serialNo\":\"TESTA001\",\"replySlip\":\"https://gjscrm-1256038144.cos.ap-beijing.myqcloud.com/mobile/050d022daed64bf2b0092515f354631a.jpg\",\"dispatchTime\":\"2024-04-23 18:17:52\",\"orderJson\":{\"orderBase\":{\"orderId\":20009346551090415,\"type\":10,\"userId\":-171386619041599999,\"businessId\":99999,\"storeId\":87446199999,\"orderStatus\":524352,\"orderStatusCur\":14,\"payAmount\":100,\"totalAmount\":100,\"couponAmount\":0,\"expressFee\":0,\"consigneeId\":0,\"consignee\":\"陈先生\",\"consigneePhone\":\"185****6257\",\"consigneeProvince\":\"\",\"consigneeCity\":\"\",\"consigneeArea\":\"\",\"consigneeAddress\":\"上海市四安***\",\"payChannel\":\"1\",\"status\":0,\"extend\":\"{\\\"advanceBookingType\\\":0,\\\"advancePayment\\\":0,\\\"appointmentFlag\\\":0,\\\"b2cSource\\\":0,\\\"coldchainind\\\":1,\\\"consigneeAddress\\\":\\\"\\\",\\\"coverPostAge\\\":false,\\\"dataSource\\\":0,\\\"deliveryMode\\\":3,\\\"ebaoCardPaidAmount\\\":0,\\\"epidemicFlag\\\":0,\\\"erpShiftId\\\":\\\"A\\\",\\\"extendTable\\\":1,\\\"fromCart\\\":0,\\\"fromOms\\\":0,\\\"fullAddress\\\":\\\"\\\",\\\"goodsOrderType\\\":1,\\\"hasAfterSale\\\":0,\\\"hmoCardPayStatus\\\":0,\\\"hmoPayFullNotifyStatus\\\":0,\\\"hmoPayFullStatus\\\":0,\\\"isAppointment\\\":0,\\\"isImagePrescription\\\":0,\\\"isNotify\\\":0,\\\"isRegisterEpidemic\\\":0,\\\"lossType\\\":1,\\\"newUserOnly\\\":false,\\\"notifyPos\\\":0,\\\"offSale\\\":false,\\\"orderWxPointsOverdue\\\":0,\\\"payJumpType\\\":1,\\\"payNo\\\":\\\"20020102404231818492473101990415\\\",\\\"pointsGiven\\\":false,\\\"posDeliveryEndTime\\\":\\\"18:00\\\",\\\"posDeliveryId\\\":\\\"92\\\",\\\"posDeliveryName\\\":\\\"连锁药师测试专用001\\\",\\\"posDeliveryStartTime\\\":\\\"15:00\\\",\\\"posDeliveryTime\\\":\\\"2024-4-23 15:00-18:00\\\",\\\"preCardPaidAmount\\\":0,\\\"preOrderId\\\":\\\"54af7987eef24ac78ee29270e1ff443c\\\",\\\"prescriptionFlag\\\":0,\\\"prescriptionProvid\\\":0,\\\"processId\\\":\\\"b410c62867a7443fa1f2016d2866462a\\\",\\\"processStartTime\\\":\\\"2024-04-23 17:56:18\\\",\\\"productName\\\":\\\"200\\\",\\\"productType\\\":200,\\\"promotionPayPoint\\\":0,\\\"realTimeAppointment\\\":0,\\\"relationRuleShow\\\":0,\\\"retureCouponFlag\\\":false,\\\"rxsalesind\\\":2,\\\"saleSaveCard\\\":false,\\\"scanType\\\":\\\"0\\\",\\\"selfPickupSiteGroupImg\\\":\\\"\\\",\\\"sendCouponFlag\\\":false,\\\"sendIntegralLimit\\\":0,\\\"stockLock\\\":false,\\\"storeExpressType\\\":0,\\\"tongChouPay\\\":true,\\\"totalFair\\\":0,\\\"transferGoodsFlag\\\":false,\\\"useMemberPrice\\\":1,\\\"useNewPromotion\\\":0,\\\"zdtUserCode\\\":\\\"16591565\\\",\\\"zdtUserId\\\":193893723199999,\\\"zdtUserName\\\":\\\"连锁药师测试专用001\\\"}\",\"version\":0,\"payPoints\":0,\"thirdPartyOrderNo\":\"610234722902\",\"promotionDiscounts\":0,\"memberPlusDiscounts\":0,\"itemType\":1,\"wipeMoney\":0,\"payType\":1,\"storeName\":\"01-scrm001测试\",\"totalOriginalAmount\":100,\"promotionLabel\":\"|S_0|\",\"cashier\":\"连锁药师测试专用001\",\"cashierId\":16591565,\"purchasePayAmount\":0,\"orderSign\":\"000000000\",\"offlineCouponAmount\":0,\"pointsDiscountAmount\":0,\"orderSource\":83,\"presentPoints\":0,\"payTime\":1713867930000,\"gmtCreate\":\"2024-04-23T09:56:31\",\"createdAt\":\"2024-04-23 17:56:31\"},\"orderDetails\":[{\"detailId\":20005657961190415,\"orderId\":20009346551090415,\"skuId\":1029942,\"skuName\":\"六神曲\",\"specificationsName\":\"无\",\"skuImage\":\"\",\"skuPrice\":100,\"couponAmount\":0,\"settlePrice\":100,\"points\":0,\"skuCount\":1,\"status\":0,\"extend\":\"{\\\"commonProperty\\\":\\\"{\\\\\\\"orderType\\\\\\\":\\\\\\\"10\\\\\\\"}\\\",\\\"healthInsurance\\\":false,\\\"isRx\\\":2,\\\"expectDays\\\":0,\\\"hasMappingCode\\\":false,\\\"transferGoodsFlag\\\":false,\\\"minPriceSaleState\\\":0,\\\"coldchainind\\\":2,\\\"isSpecial\\\":0,\\\"planWhole\\\":false,\\\"relationAdd\\\":0,\\\"pushLevel\\\":\\\"A5\\\",\\\"otcType\\\":2,\\\"packageGoods\\\":0,\\\"isBreakPrice\\\":0,\\\"isSimulatedGoods\\\":0}\",\"version\":0,\"itemId\":1029942,\"salesman\":\"连锁药师测试专用001\",\"salesmanId\":\"16591565\",\"itemCode\":\"1029942\",\"batchNo\":\"20180906\",\"promotionPrice\":100,\"displayPrice\":100,\"displayPriceType\":0,\"promotionDiscounts\":0,\"dismantled\":0,\"goodsUnit\":\"克\",\"goodsNo\":\"1029942\",\"promotionGift\":0,\"batchCode\":\"1932700001\",\"skuLabel\":\"\",\"pointsTimes\":100,\"businessId\":99999,\"storeId\":87446199999,\"orderStatusCur\":14,\"storeName\":\"01-scrm001测试\",\"cashier\":\"连锁药师测试专用001\",\"cashierId\":193893723199999,\"userCardNum\":\"\",\"username\":\"\",\"userPhone\":\"\",\"name\":\"六神曲\",\"expireDate\":\"2025-12-30 00:00:00\",\"producter\":\"四川弘升药业有限公司\",\"promotionInfo\":\"{}\",\"promotionShareTotal\":0,\"type\":10}]},\"coldNumber\":\"004\",\"buyerFllDetails\":\"陈先生 18575686257 上海市四安里8号\",\"buyerFullAddress\":\"上海市四安里8号\",\"payDetails\":[{\"id\":109,\"payId\":109,\"payNo\":\"20020102404231818492473101990415\",\"merchantOrderNo\":\"20009346551090415\",\"orderAmount\":100,\"orderPayAmount\":100,\"payAmount\":100,\"payTime\":1713867529000,\"refundAmount\":100,\"successAmount\":100,\"successTime\":1713867529000,\"payStatus\":1,\"channelType\":6,\"productType\":200,\"merchantId\":20,\"businessId\":99999,\"storeId\":87446199999,\"description\":\"\",\"settleType\":1,\"billingStatus\":0,\"payUserId\":-171386619041599999,\"requestIp\":\"127.0.0.2\",\"requestUserIp\":\"127.0.0.2\",\"status\":0,\"gmtCreate\":1713867529000,\"gmtUpdate\":1713867529000,\"extend\":\"{\\\"businessName\\\":\\\"00积分商城连锁\\\",\\\"cashierUserId\\\":\\\"16591565\\\",\\\"deviceInfoId\\\":0,\\\"mdmComId\\\":\\\"3000\\\",\\\"mdmStoreNo\\\":\\\"A00Z\\\",\\\"orderSource\\\":0,\\\"posOrderId\\\":\\\"20009346551090415\\\",\\\"riskFundAmount\\\":0,\\\"shareSubBusinessId\\\":0,\\\"storeName\\\":\\\"scrm001测试\\\"}\",\"version\":3,\"createdBy\":0,\"sapChannelType\":\"1000\",\"mchId\":\"123\"}],\"prescription\":{\"doctorHospital\":\"首都医科大学附属北京安贞医院\",\"doctorName\":\"陈志超\",\"medicines\":[{\"medicineCode\":\"1029942\",\"singleDosageUnit\":\"片\",\"unit\":\"盒\",\"medicineUsage\":\"口服\",\"medicineCommonName\":\"六神曲\",\"num\":1.0,\"specification\":\"无\",\"singleDosage\":\"1\",\"frequency\":\"1日1次\"}],\"presDoctorName\":\"朱一龙\",\"prescriptionDate\":\"2024-04-23 14:37:38\",\"doctorId\":229527513620001,\"prescriptionNumber\":\"610234722902\",\"diseaseDescription\":\"肠炎\",\"department\":\"内科\",\"patientInfoDTO\":{\"sex\":1,\"name\":\"苏欣荣\",\"age\":43.0}},\"deliveryName\":\"连锁药师测试专用001\",\"deliveryStatus\":50,\"coldBoxNumber\":\"A3333\"}},\"status\":0}";
 
         JSONObject sx = JSONObject.parseObject(s);
-        System.out.println("asd:"+ Sys.readJsonValue(sx,"data.row").toString());
+        System.out.println("asd:" + Sys.readJsonValue(sx, "data.row").toString());
 
         //compareVersion
         assert Strings.compareVersion("1.01", "1.001") == 0;
@@ -433,7 +433,7 @@ public void third() {
         assert "ROW_ID".equals(CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, "rowId"));
         assert "ROW_ID".equals(CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, "RowId"));
 
-        String  s = "http://x.f-li.cn/asd";
+        String s = "http://x.f-li.cn/asd";
         System.out.println(HttpUrl.get(s).host());
         System.out.println(HttpUrl.get(s).topPrivateDomain());
         System.out.println(URI.create(s).getHost());