Merge remote-tracking branch 'origin/develop' into obf

health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/manager/HolidayManager.java

@@ -6,6 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.util.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -21,6 +22,9 @@ public class HolidayManager {
     @Autowired
     private RedisUtil redisUtil;
 
+    @Value("${transfer.server.url:101.201.149.156:8610}")
+    private String domainUrl;
+
     //@Scheduled(cron = "0 0 0 1 1 ? *")
     @Scheduled(cron = "0 0 0 1 1 ?")
     @PostConstruct
@@ -69,7 +73,7 @@ public class HolidayManager {
         //补班数据
         List<String> listRemove = new ArrayList<String>();
 
-        String url = "http://timor.tech/api/holiday/year/" + year + "/";
+        String url = "http://"+domainUrl+"/api/holiday/year/" + year + "/";
         String rsa = HttpUtil.get(url);
         Map map = JSONObject.parseObject(rsa, Map.class);
         Map holidayMap = (Map) map.get("holiday");