nft修改购买异常逻辑

liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-zxlnft/src/main/java/com/liquidnet/common/third/zxlnft/config/ZxlnftConfig.java

@@ -17,22 +17,22 @@ import java.io.UnsupportedEncodingException;
  */
 @Configuration
 public class ZxlnftConfig {
-    @Value("${liquidnet.zxlnft.appId:220214000100001}")
+    @Value("${liquidnet.service.galaxy.zxlnft.appId}")
     private String appId;
-    @Value("${liquidnet.zxlnft.appKey:82b561110c4b4f4d91ad2a2b0d5b7908}")
+    @Value("${liquidnet.service.galaxy.zxlnft.appKey}")
     private String appKey;
-    @Value("${liquidnet.zxlnft.nftPlatformAddress:ZXa66c8a684727d0f9aaa434044362aa8a18b61bb4}")
+    @Value("${liquidnet.service.galaxy.zxlnft.nftPlatformAddress}")
     private String nftPlatformAddress;
-    @Value("${liquidnet.zxlnft.nftPlatformPubKey:LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUZrd0V3WUhLb1pJemowQ0FRWUlLb0VjejFVQmdpMERRZ0FFbFNTQk00MHJIZlJFa0NjWUxlRm1RZzE0SHlIcAp5Rk9uSktzblFqbDBCL2JXOStFWnZPblArNW0vMEdkUCtXM29yeG5Kd3p5OHNoYS9OYkQ4QVBmNXlBPT0KLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0tCg==}")
+    @Value("${liquidnet.service.galaxy.zxlnft.nftPlatformPubKey}")
     private String nftPlatformPubKey;
-    @Value("${liquidnet.zxlnft.nftPlatformPriKey:LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JR1RBZ0VBTUJNR0J5cUdTTTQ5QWdFR0NDcUJITTlWQVlJdEJIa3dkd0lCQVFRZ1VhbTVWM2V6ZFZJTmNoZ28KVDRKL28zMHArMGJCd3hQWUZFL01FdEU3MTZhZ0NnWUlLb0VjejFVQmdpMmhSQU5DQUFTVkpJRXpqU3NkOUVTUQpKeGd0NFdaQ0RYZ2ZJZW5JVTZja3F5ZENPWFFIOXRiMzRSbTg2Yy83bWIvUVowLzViZWl2R2NuRFBMeXlGcjgxCnNQd0E5L25JCi0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K}")
+    @Value("${liquidnet.service.galaxy.zxlnft.nftPlatformPriKey}")
     private String nftPlatformPriKey;
-    @Value("${liquidnet.zxlnft.walletSdkUrl:http://127.0.0.1:30505}")
+    @Value("${liquidnet.service.galaxy.zxlnft.walletSdkUrl}")
     private String walletSdkUrl;
-    @Value("${liquidnet.zxlnft.nftApiUrl:https://nfttest2.zxinchain.com}")
+    @Value("${liquidnet.service.galaxy.zxlnft.nftApiUrl}")
     private String nftApiUrl;
 
-    @Value("${liquidnet.zxlnft.platformIdentification:4e40d5f6f65aa8ec9bc33ab424e0167e68783bbe95d4d265086314d749808eef}")
+    @Value("${liquidnet.service.galaxy.zxlnft.platformIdentification}")
     private String platformIdentification;
 
     public String getAppId(){

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -137,6 +137,17 @@ liquidnet:
       url: http://devchime.zhengzai.tv
     galaxy:
       url: http://devgalaxy.zhengzai.tv
+      temp-file-path: /data/galaxy/tempFilePath
+      router: zxinchain,eth
+      zxlnft:
+        walletSdkUrl: http://127.0.0.1:30505
+        nftApiUrl: https://nfttest2.zxinchain.com
+        appId: 220214000100001
+        appKey: 82b561110c4b4f4d91ad2a2b0d5b7908
+        nftPlatformAddress: ZXa66c8a684727d0f9aaa434044362aa8a18b61bb4
+        nftPlatformPubKey: LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUZrd0V3WUhLb1pJemowQ0FRWUlLb0VjejFVQmdpMERRZ0FFbFNTQk00MHJIZlJFa0NjWUxlRm1RZzE0SHlIcAp5Rk9uSktzblFqbDBCL2JXOStFWnZPblArNW0vMEdkUCtXM29yeG5Kd3p5OHNoYS9OYkQ4QVBmNXlBPT0KLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0tCg==
+        nftPlatformPriKey: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JR1RBZ0VBTUJNR0J5cUdTTTQ5QWdFR0NDcUJITTlWQVlJdEJIa3dkd0lCQVFRZ1VhbTVWM2V6ZFZJTmNoZ28KVDRKL28zMHArMGJCd3hQWUZFL01FdEU3MTZhZ0NnWUlLb0VjejFVQmdpMmhSQU5DQUFTVkpJRXpqU3NkOUVTUQpKeGd0NFdaQ0RYZ2ZJZW5JVTZja3F5ZENPWFFIOXRiMzRSbTg2Yy83bWIvUVowLzViZWl2R2NuRFBMeXlGcjgxCnNQd0E5L25JCi0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K
+        platformIdentification: 4e40d5f6f65aa8ec9bc33ab424e0167e68783bbe95d4d265086314d749808eef
     other:
       ticketSystemUrl: http://dev-report.capapiao.com
       appId: 11920532
@@ -215,9 +226,6 @@ liquidnet:
     app-name: demo
     client-id: YXA6x4Xs7cYDQcOv6BPuM3hUDA
     client-secret: YXA6olr2qaW65xlkFixS81kiWnplrW4
-  zxlnft:
-    walletSdkUrl: http://127.0.0.1:30505
-    nftApiUrl: https://nfttest2.zxinchain.com
   express:
     shunfeng:
       url: "https://butler-dev.sit.sf-express.com"

liquidnet-bus-config/liquidnet-config/liquidnet-service-galaxy-dev.yml

@@ -15,7 +15,3 @@ liquidnet:
   mongodb:
     sslEnabled: false
     database: dev_ln_scene
-  galaxy:
-    temp-file-path: /data/galaxy/tempFilePath
-#    temp-file-path: /Users/anjiabin/mdsky_gitlab/galaxy/tempFilePath
-    router: zxinchain,eth

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/main/java/com/liquidnet/service/galaxy/biz/GalaxyCommonBiz.java

@@ -23,7 +23,7 @@ import java.net.URL;
 @Slf4j
 @Component
 public class GalaxyCommonBiz {
-    @Value("${liquidnet.galaxy.temp-file-path:/Users/anjiabin/mdsky_gitlab/galaxy/tempFilePath}")
+    @Value("${liquidnet.service.galaxy.temp-file-path}")
     private String tempFilePath;
 
     /**

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/main/java/com/liquidnet/service/galaxy/router/strategy/config/GalaxyConfig.java

@@ -17,7 +17,7 @@ import java.util.List;
  */
 @Configuration
 public class GalaxyConfig {
-    @Value("${liquidnet.galaxy.router:zxinchain}")
+    @Value("${liquidnet.service.galaxy.router}")
     private String router;
 
     public List<String> getRouterList() {