Merge remote-tracking branch 'origin/beta-prop-all' into beta-prop-all

jianshui-common/src/main/java/com/jianshui/common/utils/encrypt/JianshuiInvoiceDecryptUtil.java

@@ -575,8 +575,8 @@ public class JianshuiInvoiceDecryptUtil {
 //        String str = "53316a496c4a524c58424e74567fa67fbca2984d30f04309cf9887a8c1f9de11287b4c8a41b5640888243d0f9de16e335281925cf48eb07d28b241228bb27af3bb9bb21328b9967f5219cb9c7ff3f818f0dbfbb8c6246eeda7909b8057a305b9fa4c95b8c98bf67300300b6e2e3c7acbb353289bb0496125698cf5719dcbbd2f81b6627e25b040c883866f290ee75d7931bf00c0f8fd6b89ffaab386f22114275687fe618458da978b8bc3bc302fdaa3bb8c06199a877bd5fdb1c628d0c18ad1b7e9038ad88ff3f37f9c212c31a994696d910e9ee403db58c9f557ac051c4bd7b441f5ba6e53eec828191545a3cd1f82a0a9bab46cc42c271ee7d6043f35d32ee9ec9014a015333f9f0cbc2cf0db816d44424606ea4370364cccd303c369efef51870a2bfe7c80d680f3ff9a40619e2bf94e3407a5315cd3ca7086489481c4004cf8ab90ed29e1c942b275ad956ef045efa5d6950036091f02d2165a7a1953e00bbe2d0e276ba5b7b9e47f106d8addfcef2d1e7bed39ab6b1a25de650f068596dbefd6cf9be4c7e3b50cadc0d49e370b3d6d9268ee73b3d5b1fcbf253f2785743484e9fd213582b7866d58672afb8603ec0f1a730b98469355d98c05205a7b497fb91e67b85af1fb2e5c388655819af08f5bea958704eb637f00073439aa968ea345f6befce238e65cb4d753483c94f58898991d0e096508350c56589ac2abe4b6e9f901cf414992d2a1f38887d885e0cecea164794ebdbd6dde7102a70a4ff1174b8791e824699b740cdf9d8c217f667ca209bcc7a927495036ed21ce280dfc2c1eb1a740d4021a5378cf11d1ac105a4b5107ee5831b831b2f30adf79527603578cd9d875fb0d5a974ec57354ef2a8e82ec23b0172a4d56f8d50898096c6bc6e6f5ebf49f1109f756be881457b206db1905b88d8922fc78507705dec5706e6d18d31b413e55541f4b394ea6f2a906e902dfea104efe30c0f909e25cba571be6703da5f589fe488bdb810cd9ed426f3a73476128a8393e9b40c96ec430a66412be6f613c63a9e94091f87a7daa6043b1be37fa6e7cc0520352cae8aaa7cbd26dce78f2a9419d39bf1f109249d64d5f34454dab0f3c9b1466192104790a9371794c6ea73838ec6197a87c87f328bc0921cc8e0d060b1d757fee0d59df84b1116519935c16d7b89655c78eb782c08fdcc04d60c8b7df32852a90cf72a10aace001fd0d56b2036a2f614fa695c506e96859c4227e09f4ec3f05cdaabd41127063b150b825a1905b1c26bf17cac02cefaefeb4265a531de3ccc1507609717418d34628542a6a95d49e1126d590b921c360ae18896d715bb5f9770e962966e6059693d8e7cdfed5dc1452b709ee5dfc96f9e679a40ec6e937792aa9f8c9268e31ebf21788352eb98cb658707b844f859c21aa2b62d2ff247f1b2e81b49e2028bc759bf2df4e54c151650ad0147c7e9e23d0d7364db0fa0810a404412c07f13389310200b114917c42a4ab7542170d5176b927972910b359b2fdb9809ae087f3edccab738f01ea5df1a7a2e05964363194ebdcd5dcb5d36b20621f4bb0837f8c9938aa6c8250e5430b0485c7aac982b83dc91c691d0d98fe110a7a0b31b324469887659b87ea4116f5039b4419816ff6a3dfc28431fd0c00360ac9bc1536ed11f1d9fde938fd057a5b9e4a4a87af81d72399b4475d431b7c65f1ce1626e696a45a7186b01e26b1c3710df3efd098af0e396c5c117294e81a6ea1874a396736207d9c92a7db2a92c2adc5061498d11a167915a34536d38f29c2a7e5574fbf1e2d8e3cc1c621305fdf97e0b64cfbbc94b76aa66b20a82b189894b5b3e369bdb639a55ab40f7afed7840eb836bc9a54ffdd228476b1085855e883975526826d2efbbb1aadf7c10f1441e28d7d515846";
 //        String str = "543071746f37496638525641668e5246a6a424c1bd74a49fab978c707fd3b1aa3112a3134dbe42fb0108eccf0a4025cf3b173b77f6a32d0992f053062b56a60854e644add6a9da006690a43edeaf6e16ea8ee48a6eb23a6cc2da19bc8dcae068061fc6a292aa170770c050b370bcf7df2b5092b2212855ed15f0d4fe6159b0be9536ffcb32c2ec50bcbc899994b0be2d78a55b6a996d1e14384301e5676b9e2aac878eded4d7f2e19096b27662f4881123032ff8a80e096db65db55329400a1fdcd0aa8798be857020e93ca310a285169500d7ee51f527d85c4ace198717fb0831978f266fba0fc92191b6298f441cc7d6c17b178483a250444afd98f3255e032b482b6dbfe19b89067cda1d5b9be23e7b305b74cc9df481cbddc22119c84f7d59ed9286e91fd5c4187c81b9858e06354ccb384f64269c42b4f36c03ede6a2a9b350fa1bd57a61d353fa25a2e1f34bd896587824a10493fe19df3b41d22e0e2c298c4c0e827595763d4c7d93787b2e32baf6d571d0676a8178059bbeebe7dd00b76c31da713c750f00cf48034df6c958e830fada5fc57fcc728111ac3dc8fb28b3c134eb3aa1b7247085bd6eaca3461002a710209992079502a52869a0e7ad0f632de6ee118f05f9de9caffaa17467c88c3cdaea47f0a5da3925502d1cef3b67a0d0fbdc7752c975cf28ad1c92c93c21d6e3fc2d92e565f2f23131328c10a92e1843e9155b7cb01a5c7ec79dc6ab77644056bbae76696f6babad6725dcf181130733aaf4eeec7cca4ce060e2fef448a4ee2b8b970546f919538738ed0140bb507b66f7599aa2437245ac772756f0e4d6fe9a917932612082667bf07c908646148c7ca0c3d8bdd4ff0717f1226d4e321dbe4cb584dfca0669f8f00dd53d04b4e3d4114e390fecd49e3e4733f493f6097de40254b7bc0fe29ed603cb041563ac75380d8a90fd090f10407c5b4f158ef7f0690698f54ab3162aa44df33577a295c87cda736cf55cca6e9ef8b8230577b69b864557cb38de63fcfc6129d1224a002c2677460b05a6bb7b2fd9170ae6837838b843ea26eac966300f4f07a5caf88d92bc252a495fd73df59ba37d961b43d3845e1a40deeccaa82fd0456cd2db89201951bc737455f78e5dd15024acf411bf5df82db7e74b0f7f8dbe9787fa3cae7de1a993bca5ea37ccd8eba5783cfe43d2d2075780243685d8499d1a66dcc846d617a44f0d1968e456c6a4f4701a3ee77d26a3bcc030f162798214849af65e4a38bffa769354181c623238eb8f885ada17551c840d844d785b1c138664dcdb584bee88d372fb863ad3bb064ffe03c6e503c7216bb5d2a8c8bc50b3c0fd8e331972093447390496904393fc397c6dc147f4a177dd76c9ff0ba43cb8039a1d14f6ed1b165cca33a92d71af5ed26a484962aa6cbe8f906f8370adf7127c5b8a2b4d98099605c0a26735475c080fc3cbfe23a6902ea912ef813c74a915b1bb3ed116a65ccd7aa0943a5b2867b6b03eed0f30d4060dcebc791a4c46ab3e64ca583192b053a6d7aa99cf9c395a3ba155477b5e788dc28f6f431772faf192334602d084bdb908a21841ac1402649cc9c12440603f5488de41a2a9bd2e3da4ed153fa41740e94f92966c853957499f6125b88769abb0dc8e0123d852baac0ef1300f5c07ad9854c38861f8d17d9f98545f32ef4c397571d91996bb6f56bd3071df71915186ca65607e12c1241e647593cd16f637e5cb19eac64080f6917a4ce82aaa66bccd140d9df8d79f6e44d00a81d457e81f284ceddec827f1e589963fddf7c4636f033590076d8759c03e39370efd8c6740529785e594f7594f2f8bf9a5d5a4862eb9ca13ffcd2449f890359ebbca702d44dd28b4f392714788b3bc8321dcb55d9a7dc46718c84ae40711c2d8b52ca99f5d89b6d20888e9a5cf62a0c295aa566b0617ff8bf6c9e4a634ae62f4fa3cd3935315e9cc98aa98af0c895a7b0778cc703d176ca0a24abff161e193d8ac8cbe5fe469104992c7b2217834ddf77e59df32d2ce9e0f99bb6bfa89a680fad18882a3210466789356087a0f3ce9351d1aaaf667a67166a9049de4290f506f6f1bf0c5dd37b69eff7f7e8935408da8ff41c09d07f7345b23fc5f615021651f81c16f143f7e85b3c5b16f0a967964659754ec180d96a37c0854443f2d1bcbd55ea63a33b7981479588a27f033c4da5bc6900be68cc98e5c7e44b1f56b2bbe4ad527de711d3ce6c43addf740036fcb289120e89309b6c64b997f969c6937d26f6bb8245dd3c8c3af183aa12497a909372c977845d3eefafdb5523188834401903d1626cf3d5499f06af7658de591ca88";
 //        String str = "LifVh2BkgTOsVG5PKvxdg11JvJMmZwIb46fuDbMTJexZ1D6DbJQqEvw0OGxwOQGMOwUHNS15yB9unCNiCI7qf6ccSkIQGWHvysrTaz4R2yZ+WGo9HzXeqYUGya/1bUp9zgF5cNQY0tJ7LVbMNJWYG9OvLn7PvLtV8Oas/OR9AGpKgKXLpzFQqmu9d89bltxRRs";
-        String str = "4f765574726c6b314c554e4d238f9239fe700385e027976a9faf2ca9a053b3aa802496c4a03522eddbfce50f6bde5beaee4c8d628e004fb9b6fdece92aa6be9642a964c835138a2e73d34ff1e96ffea7ad6dcc4556b4cbcbf51727e3f47cd6ccbc3ed7eec3c190f770c5b4265e7d572318a652952c701613c4dc9f9695b0d0e7f4b0a53b967ab323d58f965b2033e36f3f89e7c1307762ec98a62a8355e40f0a1254962e2cd2a74226d1f2";
-        str=decrypt(str,"OvUtrlk1LUNMIs1oCdzTQ==");
+        String str = "4c54454f2b6f4f67574d73751b5200ab409db26ffdbb4ef286e1a84fa4ea057eb73e108d5f944b82401d410c624aca791de950d24f8c756f339e26bf34799af1fd72b462ba68b72d0fd85157a8330b07fd96b83d85634dd7dcfb6ad1eb9bd546536d13c80662a149da57e4dee736c4233859cae86fe03c6444d42880e7a4fb4a951aeef73d051209745016adabcdc99dc6eff0e4fb1106188f7b84640a36a114e16149ed89904af2";
+        str=decrypt(str,"LTEO+oOgWMsuQAOUglqXuQ==");
 		System.out.println(str);
 //		str=decrypt(str);
 //		System.out.println(str);

jianshui-common/src/main/java/com/jianshui/common/utils/encrypt/JianshuiInvoiceEncryptUtil.java

@@ -190,8 +190,8 @@ public class JianshuiInvoiceEncryptUtil {
 
 
     public static void main(String[] args) throws Exception {
-        String str = "{\"taxNo\":\"91370100664851254J\",\"fpdm\":\"\",\"fphm\":\"25152000000011784979\",\"kprq\":\"20250311\",\"fpje\":\"267810\",\"fpzl\":\"21\",\"jym\":null}";
-        String key = "OvUtrlk1LUNMIs1oCdzTQ==";
+        String str = "{\"taxNo\":\"91460000MAA98L5F9M\",\"fpdm\":\"\",\"fphm\":\"25359199026000016292\",\"kprq\":\"20250326\",\"fpje\":\"102\",\"fpzl\":\"83\",\"jym\":null}";
+        String key = "LTEO+oOgWMsuQAOUglqXuQ==";
         System.out.println(encryptAES(str, key));
     }
 }