update

application.pid

@@ -1 +1 @@
-32124
+31832

src/main/resources/application-dev.yml

@@ -200,26 +200,26 @@ center:
   terminal-id: 999999999999
 
 #  # 用户账户体系
-#  account:
-#    url: https://uscp-dev.zgglyun.com/ucsp/
-#    app-id: 52010101
-#    channel-id: guizhou003
-#    secret-key: riw2N7w6e7k4s3A2
-#    rsa-private-key: MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAMI+8s48qSEip/A2xaNckcN2eeWq0t8eNQI1o8pMKt8OUeWfrLsuedygSDynA+DTVis8gUIWxRgoAW6rqMLpyG0Amx7DguiQvWFLunlQrMDmCFdpP1/dnIhzwHHPKW5ZKVad2lskrutgmK52iJtzlv81oYBxCkAnyh39NLb4ZgKpAgMBAAECgYANZ/Dz2mcVfhyR59nSk+o3JQdghN5lCeLrL4lfG3bO/7WXxTd+O1orklVXTZ3nJ6F4E5wxKTyk6ufpu90GcheZYrO+7fDaYuxkshb1hXdePFGySu8eMktFW7byn2NAwqLn1/EU9wj+qttKJ/0PUEEarXW4I/HIds83C+ZUP4hsDQJBAPUO2LfHuqavUxvLFryxBbpbk57wLZGZ9rs2th2etY2pzyrpQzwI29/M5XniBybhn2tCN4iaNh5Cez9tkaaPTiUCQQDK60pZ1KO91emPO80NuUEO3FC/DldehjpLtvW9bNkqhvVzxESU/lovEyojAfDJmQ4f5gHc307GkXy/bSLiYvE1AkEA6bHI1inwQ7j6xox8GGGwlrFyK6XbrvhmpM5eCg0qEfiYCdH9PikslVZumDcGnvuW7dBt6SU26tB3fFtfBLmwyQJBALqJbcICnbunZ5uKZ8gT4uCcW4Ym0t5MGk78FA9cfo5/nigb5sfowlLAFV41LHrGvptIP7IhfjNADyOSWh0uw3kCQQDfDBHX2htY5t7BZ5G+eYW9s0b40no3ZTRa9PbbkSpTQTBOhbmAH5uMuKE6Q0f9nuiDiad8YLQ6sX2K2RPFoFwQ
-#    rsa-public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmmfVQqh5I9cqpklM4MON8SrT27JohzyGtVC3X0shwp0qXI7YoNJvtgS08GYtkwPiUu8inx/uvSUrX+uJeNo0lJ+aIY5Z36TSMewzY1GRLkXiVKctMP4f0Cy9wVf8uMXD2p0vuutRnXn2o1SchuHdQygNE+puLoASQrFBi8FikrQIDAQAB
-#    center-rsa-private-key: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKaZ9VCqHkj1yqmSUzgw43xKtPbsmiHPIa1ULdfSyHCnSpcjtig0m+2BLTwZi2TA+JS7yKfH+69JStf64l42jSUn5ohjlnfpNIx7DNjUZEuReJUpy0w/h/QLL3BV/y4xcPanS+661GdefajVJyG4d1DKA0T6m4ugBJCsUGLwWKStAgMBAAECgYADLgNncjpuFGQ1VKnKSUNA6eDGqQu6DczWlOQ5Gc33OczWfKPV5Eco7c28t2oYgVxdOQZNOX0Swo3Z+HEIm6GZpi/3hV+TTml3nnozfqjCeFdek6z5vv9lpP1P4lnaPkYamUGK2K52HzQ0GBsSe1q/POhUVV2s9s+rMYgO927AKwJBAOTr6igEq3rCuTjEIeuOQXbzaFKTG2CIE8S+Tz2aaYkipTqbrbf+fRD0PlnitNJZD86eBLyHMGQMvojUABqEH7sCQQC6TuWXNHglkAG6mEQfML9HRaTVIMXfJAnPnAg6uol722Q2zIt2ecnl6RG7Dd1XqNxBg1r6tZBQImPRbrVIS4K3AkB8/Y6JMRuL2JwXMYevvKlj0D0KsQWGrGXWy24qnY+377G1kWDFkG8q/aC5pT3DiBtIXiEJ6upyBj9WKCKyV6eXAkAfvtfSJueeBua0g8N/yQ+etlg61KXCuuJNFNo2H5jTmPN/fuT4oBHt8gPKardfe29kXlx/QbbAYMu/YOzUz8ELAkEAg4UK6bhjZ0W97M9HqO/GBZMe0/PufScVFIYsQ8lde7oStY8N/TqkX5GdNr6ry1B7A94NaUmdaCOItawrmj3pZQ==
-#    center-rsa-public-key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDCPvLOPKkhIqfwNsWjXJHDdnnlqtLfHjUCNaPKTCrfDlHln6y7LnncoEg8pwPg01YrPIFCFsUYKAFuq6jC6chtAJsew4LokL1hS7p5UKzA5ghXaT9f3ZyIc8BxzyluWSlWndpbJK7rYJiudoibc5b/NaGAcQpAJ8od/TS2+GYCqQIDAQAB
-  # 用户账户体系
   account:
-    url: https://etcxzuc.zgglyun.com/ucsp/
-    channel-id: 52010101
+    url: https://uscp-dev.zgglyun.com/ucsp/
     app-id: 52010101
-    secret-key: r5O9Ue4D7X375WNi
-    rsa-private-key: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKg9bCs0sL9gqPlZ2JRfDSUkCWPGTw2NYsR7oWGECilpa3KVpAe4wdUFyafyMzjKkXp12nvWEqMnh7xRMPe1Ce4FaamrFgs9DyF4Wb2F2jI9zxDy50RVuWkCQbUZElG4sksVkPvER9NtDyiFat+OIEeHNx4FwpIgGb0WNTZsuMCbAgMBAAECgYAI35R3zAzIuPRnbdGxWIIPQ/69ErpAqeBcRuIm+fT/P95wDmxtfh5IwyOrqtVufWCiVWzzcx1L9abt8FgJ+I+ZbU52cKr/Qy7xxhvbr0Ozmmv6yu6yoGs/1USM7jdIDLUYN0RVoDZsFYaXPzvtSLLRZ9U4EYY+4hmu9qu98q9WgQJBAOpdfAkj6KeR2GyrKQf1u7UDe4DyjbAqHePlzeNkOY/JZon1wrhVF89rfBiTSmt3SYsFIO7qXmHBRzuEBz61d/ECQQC3xURWuDPmqsB7dTqqtqu+cmh0LFW2WWZrcIUdwMJrDrOjQ+7cFFsrg1NJ8jTZ3EGhIznUD1D2Na2mRIAWTW1LAkBlw6v9KAt435pTLUsGuswDwHxbNHcTnGYYNAvfhgB8j94nX4BqnABXv3tGDIbO/SAA7nwrYbcTyWIN1Ll0oEVxAkACPv371VqFCjc6Cw/BgGQO+tT9/oC5rtQKoiBuYam+pzpY13623+TRXlSJRdWRiBihQI33YoyJxdQugQ3Tt/SLAkEA1llvtXsFCaux7yWIhDRCCa6wNiWSVeYk3Pk1bDaoJDkp8mUY5N3cLTsOVytG4WV/E9l7Nkr3t3CpCpI3U7wQ7Q==
-    rsa-public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCW4wvitZs5PCTz/vBT9VCm6b3E/zngp/us65PdssDqCPsDyyu5gq9Tze/MrrgkRezOq4CLmk6ip68S+zXL7lURlfU8dPLV+lKsTeKbnSgXstFscmCaNMyn1vlc3lr1b1zp4UL5kVG0KQ0wmpznb5+yXRd/Fujc681enbwHHD1FeQIDAQAB
-    center-rsa-private-key: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJbjC+K1mzk8JPP+8FP1UKbpvcT/OeCn+6zrk92ywOoI+wPLK7mCr1PN78yuuCRF7M6rgIuaTqKnrxL7NcvuVRGV9Tx08tX6UqxN4pudKBey0WxyYJo0zKfW+VzeWvVvXOnhQvmRUbQpDTCanOdvn7JdF38W6NzrzV6dvAccPUV5AgMBAAECgYAQC3rDE966uluPmqeBtg9qgGaOoTlNW2+W1sI1jAGZoXTX1W4D3xK3zalXUakBKnJhE7mqnrEH+N7UHOR+mAxxlV/NPwx/Y+MPiE0BQW5vMqMx6Ljr8HyQ0sQSpYlsGVmBXmupPeZvMA9TfG9p32Y9dzSYQV51BF0Q4OoU0mWFhQJBANOiTvpzSHFcJUeppEIXIE6numBEmp6veq1oXyKEjE/Fzv/e7tMdT5Hz7C8qOl8CnEwKKXNFGThxu1qegIzYS6MCQQC2hKSRGWESltHWodJZNEgOhW/zz1jDBW9O7cQvjCXMVBzBsCrdXfkDvUPXOsFivzeWpt29jD2N4tjbowbtpDwzAkBic+d565eP5OYS6IBZnpiQ/sZdcozbtZbEhQF89Vyw37zkm7lOzRvvMiJ17pcpC/XaCgAud76722zlQ0daPmUxAkEAoGWtIf7FukpkmlSXwOEbOfe2TPM5NBoAmcKGGKr3RLvekbC52tSM0+ZuSiVOcfNNbM20LLGkHp7uqQZ6PjmI1QJAK6Tav7BeqcNQrfUcqmm55huDZT6e4dibrmILzPUrtmHDihIfZOOnuk+p4M/gbGgbZRZ08YZPuzknl6455pcYiQ==
-    center-rsa-public-key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCoPWwrNLC/YKj5WdiUXw0lJAljxk8NjWLEe6FhhAopaWtylaQHuMHVBcmn8jM4ypF6ddp71hKjJ4e8UTD3tQnuBWmpqxYLPQ8heFm9hdoyPc8Q8udEVblpAkG1GRJRuLJLFZD7xEfTbQ8ohWrfjiBHhzceBcKSIBm9FjU2bLjAmwIDAQAB
-
+    channel-id: guizhou003
+    secret-key: riw2N7w6e7k4s3A2
+    rsa-private-key: MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAMI+8s48qSEip/A2xaNckcN2eeWq0t8eNQI1o8pMKt8OUeWfrLsuedygSDynA+DTVis8gUIWxRgoAW6rqMLpyG0Amx7DguiQvWFLunlQrMDmCFdpP1/dnIhzwHHPKW5ZKVad2lskrutgmK52iJtzlv81oYBxCkAnyh39NLb4ZgKpAgMBAAECgYANZ/Dz2mcVfhyR59nSk+o3JQdghN5lCeLrL4lfG3bO/7WXxTd+O1orklVXTZ3nJ6F4E5wxKTyk6ufpu90GcheZYrO+7fDaYuxkshb1hXdePFGySu8eMktFW7byn2NAwqLn1/EU9wj+qttKJ/0PUEEarXW4I/HIds83C+ZUP4hsDQJBAPUO2LfHuqavUxvLFryxBbpbk57wLZGZ9rs2th2etY2pzyrpQzwI29/M5XniBybhn2tCN4iaNh5Cez9tkaaPTiUCQQDK60pZ1KO91emPO80NuUEO3FC/DldehjpLtvW9bNkqhvVzxESU/lovEyojAfDJmQ4f5gHc307GkXy/bSLiYvE1AkEA6bHI1inwQ7j6xox8GGGwlrFyK6XbrvhmpM5eCg0qEfiYCdH9PikslVZumDcGnvuW7dBt6SU26tB3fFtfBLmwyQJBALqJbcICnbunZ5uKZ8gT4uCcW4Ym0t5MGk78FA9cfo5/nigb5sfowlLAFV41LHrGvptIP7IhfjNADyOSWh0uw3kCQQDfDBHX2htY5t7BZ5G+eYW9s0b40no3ZTRa9PbbkSpTQTBOhbmAH5uMuKE6Q0f9nuiDiad8YLQ6sX2K2RPFoFwQ
+    rsa-public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmmfVQqh5I9cqpklM4MON8SrT27JohzyGtVC3X0shwp0qXI7YoNJvtgS08GYtkwPiUu8inx/uvSUrX+uJeNo0lJ+aIY5Z36TSMewzY1GRLkXiVKctMP4f0Cy9wVf8uMXD2p0vuutRnXn2o1SchuHdQygNE+puLoASQrFBi8FikrQIDAQAB
+    center-rsa-private-key: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKaZ9VCqHkj1yqmSUzgw43xKtPbsmiHPIa1ULdfSyHCnSpcjtig0m+2BLTwZi2TA+JS7yKfH+69JStf64l42jSUn5ohjlnfpNIx7DNjUZEuReJUpy0w/h/QLL3BV/y4xcPanS+661GdefajVJyG4d1DKA0T6m4ugBJCsUGLwWKStAgMBAAECgYADLgNncjpuFGQ1VKnKSUNA6eDGqQu6DczWlOQ5Gc33OczWfKPV5Eco7c28t2oYgVxdOQZNOX0Swo3Z+HEIm6GZpi/3hV+TTml3nnozfqjCeFdek6z5vv9lpP1P4lnaPkYamUGK2K52HzQ0GBsSe1q/POhUVV2s9s+rMYgO927AKwJBAOTr6igEq3rCuTjEIeuOQXbzaFKTG2CIE8S+Tz2aaYkipTqbrbf+fRD0PlnitNJZD86eBLyHMGQMvojUABqEH7sCQQC6TuWXNHglkAG6mEQfML9HRaTVIMXfJAnPnAg6uol722Q2zIt2ecnl6RG7Dd1XqNxBg1r6tZBQImPRbrVIS4K3AkB8/Y6JMRuL2JwXMYevvKlj0D0KsQWGrGXWy24qnY+377G1kWDFkG8q/aC5pT3DiBtIXiEJ6upyBj9WKCKyV6eXAkAfvtfSJueeBua0g8N/yQ+etlg61KXCuuJNFNo2H5jTmPN/fuT4oBHt8gPKardfe29kXlx/QbbAYMu/YOzUz8ELAkEAg4UK6bhjZ0W97M9HqO/GBZMe0/PufScVFIYsQ8lde7oStY8N/TqkX5GdNr6ry1B7A94NaUmdaCOItawrmj3pZQ==
+    center-rsa-public-key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDCPvLOPKkhIqfwNsWjXJHDdnnlqtLfHjUCNaPKTCrfDlHln6y7LnncoEg8pwPg01YrPIFCFsUYKAFuq6jC6chtAJsew4LokL1hS7p5UKzA5ghXaT9f3ZyIc8BxzyluWSlWndpbJK7rYJiudoibc5b/NaGAcQpAJ8od/TS2+GYCqQIDAQAB
+  # 用户账户体系
+#  account:
+#    url: https://etcxzuc.zgglyun.com/ucsp/
+#    channel-id: 52010101
+#    app-id: 52010101
+#    secret-key: r5O9Ue4D7X375WNi
+#    rsa-private-key: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKg9bCs0sL9gqPlZ2JRfDSUkCWPGTw2NYsR7oWGECilpa3KVpAe4wdUFyafyMzjKkXp12nvWEqMnh7xRMPe1Ce4FaamrFgs9DyF4Wb2F2jI9zxDy50RVuWkCQbUZElG4sksVkPvER9NtDyiFat+OIEeHNx4FwpIgGb0WNTZsuMCbAgMBAAECgYAI35R3zAzIuPRnbdGxWIIPQ/69ErpAqeBcRuIm+fT/P95wDmxtfh5IwyOrqtVufWCiVWzzcx1L9abt8FgJ+I+ZbU52cKr/Qy7xxhvbr0Ozmmv6yu6yoGs/1USM7jdIDLUYN0RVoDZsFYaXPzvtSLLRZ9U4EYY+4hmu9qu98q9WgQJBAOpdfAkj6KeR2GyrKQf1u7UDe4DyjbAqHePlzeNkOY/JZon1wrhVF89rfBiTSmt3SYsFIO7qXmHBRzuEBz61d/ECQQC3xURWuDPmqsB7dTqqtqu+cmh0LFW2WWZrcIUdwMJrDrOjQ+7cFFsrg1NJ8jTZ3EGhIznUD1D2Na2mRIAWTW1LAkBlw6v9KAt435pTLUsGuswDwHxbNHcTnGYYNAvfhgB8j94nX4BqnABXv3tGDIbO/SAA7nwrYbcTyWIN1Ll0oEVxAkACPv371VqFCjc6Cw/BgGQO+tT9/oC5rtQKoiBuYam+pzpY13623+TRXlSJRdWRiBihQI33YoyJxdQugQ3Tt/SLAkEA1llvtXsFCaux7yWIhDRCCa6wNiWSVeYk3Pk1bDaoJDkp8mUY5N3cLTsOVytG4WV/E9l7Nkr3t3CpCpI3U7wQ7Q==
+#    rsa-public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCW4wvitZs5PCTz/vBT9VCm6b3E/zngp/us65PdssDqCPsDyyu5gq9Tze/MrrgkRezOq4CLmk6ip68S+zXL7lURlfU8dPLV+lKsTeKbnSgXstFscmCaNMyn1vlc3lr1b1zp4UL5kVG0KQ0wmpznb5+yXRd/Fujc681enbwHHD1FeQIDAQAB
+#    center-rsa-private-key: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJbjC+K1mzk8JPP+8FP1UKbpvcT/OeCn+6zrk92ywOoI+wPLK7mCr1PN78yuuCRF7M6rgIuaTqKnrxL7NcvuVRGV9Tx08tX6UqxN4pudKBey0WxyYJo0zKfW+VzeWvVvXOnhQvmRUbQpDTCanOdvn7JdF38W6NzrzV6dvAccPUV5AgMBAAECgYAQC3rDE966uluPmqeBtg9qgGaOoTlNW2+W1sI1jAGZoXTX1W4D3xK3zalXUakBKnJhE7mqnrEH+N7UHOR+mAxxlV/NPwx/Y+MPiE0BQW5vMqMx6Ljr8HyQ0sQSpYlsGVmBXmupPeZvMA9TfG9p32Y9dzSYQV51BF0Q4OoU0mWFhQJBANOiTvpzSHFcJUeppEIXIE6numBEmp6veq1oXyKEjE/Fzv/e7tMdT5Hz7C8qOl8CnEwKKXNFGThxu1qegIzYS6MCQQC2hKSRGWESltHWodJZNEgOhW/zz1jDBW9O7cQvjCXMVBzBsCrdXfkDvUPXOsFivzeWpt29jD2N4tjbowbtpDwzAkBic+d565eP5OYS6IBZnpiQ/sZdcozbtZbEhQF89Vyw37zkm7lOzRvvMiJ17pcpC/XaCgAud76722zlQ0daPmUxAkEAoGWtIf7FukpkmlSXwOEbOfe2TPM5NBoAmcKGGKr3RLvekbC52tSM0+ZuSiVOcfNNbM20LLGkHp7uqQZ6PjmI1QJAK6Tav7BeqcNQrfUcqmm55huDZT6e4dibrmILzPUrtmHDihIfZOOnuk+p4M/gbGgbZRZ08YZPuzknl6455pcYiQ==
+#    center-rsa-public-key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCoPWwrNLC/YKj5WdiUXw0lJAljxk8NjWLEe6FhhAopaWtylaQHuMHVBcmn8jM4ypF6ddp71hKjJ4e8UTD3tQnuBWmpqxYLPQ8heFm9hdoyPc8Q8udEVblpAkG1GRJRuLJLFZD7xEfTbQ8ohWrfjiBHhzceBcKSIBm9FjU2bLjAmwIDAQAB
+#
 
 # 比亚迪配置
 byd:

src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: prod
+    active: dev
   # Redis数据源
 #  redis:
 #    # Redis数据库索引（默认为0）

src/test/java/SaleTest.java

@@ -3,11 +3,9 @@ import com.alibaba.fastjson2.JSON;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.qtzl.alterSales.UserApplication;
 import com.qtzl.alterSales.dao.entity.second.AflBydDashboard;
-import com.qtzl.alterSales.dao.entity.second.AflMchConfig;
 import com.qtzl.alterSales.dao.repo.jpa.second.AflBydDashboardRepo;
 import com.qtzl.alterSales.dao.repo.jpa.third.EtcOrderVehicleInfoRepo;
 import com.qtzl.alterSales.manager.enums.AflBydDashboardPushStateEnum;
-import com.qtzl.alterSales.manager.quartz.AflApPayOrderTask;
 import com.qtzl.alterSales.manager.quartz.AflCancelOrderTask;
 import com.qtzl.alterSales.manager.quartz.AflPapersDesensitizationTask;
 import com.qtzl.alterSales.manager.quartz.BydDashboardBatchSyncTask;
@@ -18,9 +16,7 @@ import com.qtzl.alterSales.manager.service.AflMchConfigManager;
 import com.qtzl.alterSales.manager.service.byd.BydService;
 import com.qtzl.alterSales.manager.service.byd.vo.BydDashBoardResponse;
 import com.qtzl.alterSales.manager.service.byd.vo.BydPushDataResultRequest;
-import com.qtzl.alterSales.manager.tools.DateTools;
 import com.qtzl.alterSales.manager.tools.RedisUtils;
-import com.qtzl.alterSales.manager.vo.AflMchConfigVo;
 import com.qtzl.alterSales.manager.vo.BydOrderVehicleInfoVo;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -31,7 +27,6 @@ import javax.annotation.Resource;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
-import java.util.Date;
 import java.util.List;
 
 /***
@@ -68,6 +63,12 @@ public class SaleTest {
     @Resource
     private BydDashboardResultTask dashboardResultTask;
 
+    @Test
+    public void urlToBase64() throws Exception {
+//        String fileUrl = "https://etcfile.etcjz.cn/v1/file/downlodFile?fileId=e728c662-98f3-43e4-a140-77e34029d8ba";
+//        System.out.println(Base64.getEncoder().encodeToString(IOUtils.toByteArray(new URL(fileUrl))));
+    }
+
     @Test
     public void setBydService(){
         aflBydExceptionManager.handler("贵ZBYN066_4");