From 9b857ed9a9c6e07cc656622b0664109e61638041 Mon Sep 17 00:00:00 2001
From: jack <zengjieli93@163.com>
Date: Wed, 27 Mar 2024 19:34:10 +0800
Subject: [PATCH] 分支1

---
 src/main/java/com/nq/enums/EStockType.java |   26 +++++++++++++++++++++-----
 1 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/nq/enums/EStockType.java b/src/main/java/com/nq/enums/EStockType.java
index d567b68..2b965f2 100644
--- a/src/main/java/com/nq/enums/EStockType.java
+++ b/src/main/java/com/nq/enums/EStockType.java
@@ -1,8 +1,7 @@
 package com.nq.enums;
 
 
-import com.nq.constant.StockConstant;
-import lombok.Data;
+import com.nq.utils.PropertiesUtil;
 
 /**
  * 股票类型
@@ -11,8 +10,17 @@
 public enum EStockType {
 
 
-    IN("IN","印度股票","14", StockConstant.HTTP_API,StockConstant.KEY),
-    US("US","美国股票","5",StockConstant.US_API_URL,StockConstant.US_KEY);
+    IN("IN","印度股票","14", PropertiesUtil.getProperty("IN_HTTP_API"),PropertiesUtil.getProperty("IN_KEY")),
+    US("US","美国股票","5",PropertiesUtil.getProperty("US_HTTP_API"),PropertiesUtil.getProperty("US_KEY")),
+    HK("HK","香港股票","39",PropertiesUtil.getProperty("HK_HTTP_API"),PropertiesUtil.getProperty("HK_KEY")),
+    MAS("MAS","马来西亚股票","42",PropertiesUtil.getProperty("MAS_HTTP_API"),PropertiesUtil.getProperty("MAS_KEY")),
+    TH("TH","泰国股票","41",PropertiesUtil.getProperty("TH_HTTP_API"),PropertiesUtil.getProperty("TH_KEY")),
+
+
+
+    HG("HG","韩国股票","11",PropertiesUtil.getProperty("HG_HTTP_API"),PropertiesUtil.getProperty("TG_KEY")),
+
+    SZHB("SZHB","数字货币","41",PropertiesUtil.getProperty("SZHB_HTTP_API"),PropertiesUtil.getProperty("SZHB_KEY"));
     private String code;
     private String typeDesc;
     public String contryId;
@@ -32,8 +40,16 @@
     public static EStockType getEStockTypeByCode(String code){
         if(EStockType.US.getCode().equals(code)){
             return US;
-        }else{
+        }else if(EStockType.IN.getCode().equals(code)){
             return  IN;
+        }else if(EStockType.HK.getCode().equals(code)){
+            return  HK;
+        }else if(EStockType.MAS.getCode().equals(code)){
+            return  MAS;
+        }else if(EStockType.SZHB.getCode().equals(code)){
+            return  SZHB;
+        }else {
+            return TH;
         }
     }
 

--
Gitblit v1.9.3