Merge remote-tracking branch 'origin/rb' into rb

zj

2024-08-21 98ab2fc7accdfa1747b37de77c2fd7a0c0721f65

Merge remote-tracking branch 'origin/rb' into rb

# Conflicts:
#	src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java

 src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java

@@ -132,7 +132,7 @@

    @Override
    public void grabNews() {
        addNews(1, PropertiesUtil.getProperty("JP_HTTP_API") + "stock-markets?country_id=35&key=" + PropertiesUtil.getProperty("JP_KEY") + "&type=6");
        addNews(1, PropertiesUtil.getProperty("JP_HTTP_API") + "stock-markets?country_id=35&key=" + PropertiesUtil.getProperty("JP_KEY") + "&type=1");
    }

    private void addNews(Integer type, String url) {