bug修复
This commit is contained in:
parent
41e82056d1
commit
55a2be9cde
@ -118,6 +118,7 @@ public class JwtTokenProvider {
|
|||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
} catch (JwtException | IllegalArgumentException e) {
|
} catch (JwtException | IllegalArgumentException e) {
|
||||||
|
e.printStackTrace();
|
||||||
throw new CustomException("Expired or invalid JWT token", HttpStatus.FORBIDDEN);
|
throw new CustomException("Expired or invalid JWT token", HttpStatus.FORBIDDEN);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -11,6 +11,7 @@ import com.zhgd.xmgl.modules.basicdata.mapper.SystemCitiesMapper;
|
|||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
@ -34,11 +35,17 @@ public class AqiUtil {
|
|||||||
private static RedisRepository redisRepository;
|
private static RedisRepository redisRepository;
|
||||||
public static String SYSTEM_CITIES_KEY = "SYSTEM_CITIES";
|
public static String SYSTEM_CITIES_KEY = "SYSTEM_CITIES";
|
||||||
public static String WEATHER_DATA = "WEATHER_DATA:";
|
public static String WEATHER_DATA = "WEATHER_DATA:";
|
||||||
|
private static String tianqiUrl;
|
||||||
/**
|
/**
|
||||||
* 天气质量
|
* 天气质量
|
||||||
*/
|
*/
|
||||||
public static String WEATHER_QUALITY = "WEATHER_QUALITY:";
|
public static String WEATHER_QUALITY = "WEATHER_QUALITY:";
|
||||||
|
|
||||||
|
@Value("${tianqiUrl}")
|
||||||
|
public void setTianqiUrl(String tianqiUrl) {
|
||||||
|
AqiUtil.tianqiUrl = tianqiUrl;
|
||||||
|
}
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
public void setSystemCitiesMapper(SystemCitiesMapper systemCitiesMapper) {
|
public void setSystemCitiesMapper(SystemCitiesMapper systemCitiesMapper) {
|
||||||
AqiUtil.systemCitiesMapper = systemCitiesMapper;
|
AqiUtil.systemCitiesMapper = systemCitiesMapper;
|
||||||
@ -213,7 +220,7 @@ public class AqiUtil {
|
|||||||
if (StringUtils.isNotEmpty(cityid)) {
|
if (StringUtils.isNotEmpty(cityid)) {
|
||||||
param.put("cityid", cityid);
|
param.put("cityid", cityid);
|
||||||
}
|
}
|
||||||
String r = HttpUtil.get("https://v0.yiketianqi.com/free/week", param);
|
String r = HttpUtil.get(tianqiUrl, param);
|
||||||
JSONObject jsonObject = JSONObject.parseObject(r);
|
JSONObject jsonObject = JSONObject.parseObject(r);
|
||||||
JSONArray sevenDataArr = jsonObject.getJSONArray("data");
|
JSONArray sevenDataArr = jsonObject.getJSONArray("data");
|
||||||
for (Object o : sevenDataArr) {
|
for (Object o : sevenDataArr) {
|
||||||
@ -234,7 +241,7 @@ public class AqiUtil {
|
|||||||
}, 60 * 60L);
|
}, 60 * 60L);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
result = "[{\"date\":\"2023-07-10\",\"tem_day\":\"37\",\"tem2\":\"29\",\"tem1\":\"37\",\"city\":\"南昌\",\"tem_night\":\"29\",\"cityid\":\"101240101\",\"wea\":\"晴\",\"update_time\":\"2023-07-10 16:39:39\",\"wea_img\":\"qing\",\"win_speed\":\"3-4级\",\"win\":\"西南风\",\"day\":\"2023-07-10\"},{\"date\":\"2023-07-11\",\"tem_day\":\"38\",\"tem2\":\"30\",\"tem1\":\"38\",\"city\":\"南昌\",\"tem_night\":\"30\",\"cityid\":\"101240101\",\"wea\":\"晴\",\"update_time\":\"2023-07-10 16:39:39\",\"wea_img\":\"qing\",\"win_speed\":\"3-4级\",\"win\":\"西南风\",\"day\":\"2023-07-11\"},{\"date\":\"2023-07-12\",\"tem_day\":\"38\",\"tem2\":\"30\",\"tem1\":\"38\",\"city\":\"南昌\",\"tem_night\":\"30\",\"cityid\":\"101240101\",\"wea\":\"晴\",\"update_time\":\"2023-07-10 16:39:39\",\"wea_img\":\"qing\",\"win_speed\":\"3-4级\",\"win\":\"西南风\",\"day\":\"2023-07-12\"},{\"date\":\"2023-07-13\",\"tem_day\":\"37\",\"tem2\":\"30\",\"tem1\":\"37\",\"city\":\"南昌\",\"tem_night\":\"30\",\"cityid\":\"101240101\",\"wea\":\"晴转多云\",\"update_time\":\"2023-07-10 16:39:39\",\"wea_img\":\"yun\",\"win_speed\":\"3-4级\",\"win\":\"西南风\",\"day\":\"2023-07-13\"},{\"date\":\"2023-07-14\",\"tem_day\":\"37\",\"tem2\":\"29\",\"tem1\":\"37\",\"city\":\"南昌\",\"tem_night\":\"29\",\"cityid\":\"101240101\",\"wea\":\"多云转小雨\",\"update_time\":\"2023-07-10 16:39:39\",\"wea_img\":\"yun\",\"win_speed\":\"3-4级转<3级\",\"win\":\"西南风\",\"day\":\"2023-07-14\"},{\"date\":\"2023-07-15\",\"tem_day\":\"35\",\"tem2\":\"27\",\"tem1\":\"35\",\"city\":\"南昌\",\"tem_night\":\"27\",\"cityid\":\"101240101\",\"wea\":\"小雨\",\"update_time\":\"2023-07-10 16:39:39\",\"wea_img\":\"yu\",\"win_speed\":\"3-4级转<3级\",\"win\":\"西南风\",\"day\":\"2023-07-15\"},{\"date\":\"2023-07-16\",\"tem_day\":\"29\",\"tem2\":\"27\",\"tem1\":\"29\",\"city\":\"南昌\",\"tem_night\":\"27\",\"cityid\":\"101240101\",\"wea\":\"中雨转小雨\",\"update_time\":\"2023-07-10 16:39:39\",\"wea_img\":\"yu\",\"win_speed\":\"<3级\",\"win\":\"无持续风向\",\"day\":\"2023-07-16\"}]\n";
|
result = "[{\"date\":\"2023-12-11\",\"tem_day\":\"29\",\"tem2\":\"20\",\"tem1\":\"29\",\"city\":\"深圳\",\"tem_night\":\"20\",\"cityid\":\"101280601\",\"wea\":\"多云\",\"update_time\":\"2023-12-11 10:47:17\",\"wea_img\":\"yun\",\"win_speed\":\"<3级\",\"win\":\"无持续风向\",\"day\":\"2023-12-11\"},{\"date\":\"2023-12-12\",\"tem_day\":\"27\",\"tem2\":\"20\",\"tem1\":\"27\",\"city\":\"深圳\",\"tem_night\":\"20\",\"cityid\":\"101280601\",\"wea\":\"多云转阴\",\"update_time\":\"2023-12-11 10:47:17\",\"wea_img\":\"yun\",\"win_speed\":\"<3级转3-4级\",\"win\":\"无持续风向\",\"day\":\"2023-12-12\"},{\"date\":\"2023-12-13\",\"tem_day\":\"25\",\"tem2\":\"20\",\"tem1\":\"25\",\"city\":\"深圳\",\"tem_night\":\"20\",\"cityid\":\"101280601\",\"wea\":\"多云\",\"update_time\":\"2023-12-11 10:47:17\",\"wea_img\":\"yun\",\"win_speed\":\"3-4级转<3级\",\"win\":\"东风\",\"day\":\"2023-12-13\"},{\"date\":\"2023-12-14\",\"tem_day\":\"26\",\"tem2\":\"23\",\"tem1\":\"26\",\"city\":\"深圳\",\"tem_night\":\"23\",\"cityid\":\"101280601\",\"wea\":\"阴\",\"update_time\":\"2023-12-11 10:47:17\",\"wea_img\":\"yin\",\"win_speed\":\"3-4级转<3级\",\"win\":\"东风\",\"day\":\"2023-12-14\"},{\"date\":\"2023-12-15\",\"tem_day\":\"28\",\"tem2\":\"16\",\"tem1\":\"28\",\"city\":\"深圳\",\"tem_night\":\"16\",\"cityid\":\"101280601\",\"wea\":\"多云转阴\",\"update_time\":\"2023-12-11 10:47:17\",\"wea_img\":\"yun\",\"win_speed\":\"<3级\",\"win\":\"无持续风向\",\"day\":\"2023-12-15\"},{\"date\":\"2023-12-16\",\"tem_day\":\"25\",\"tem2\":\"11\",\"tem1\":\"25\",\"city\":\"深圳\",\"tem_night\":\"11\",\"cityid\":\"101280601\",\"wea\":\"阴\",\"update_time\":\"2023-12-11 10:47:17\",\"wea_img\":\"yin\",\"win_speed\":\"3-4级\",\"win\":\"东北风\",\"day\":\"2023-12-16\"},{\"date\":\"2023-12-17\",\"tem_day\":\"15\",\"tem2\":\"10\",\"tem1\":\"15\",\"city\":\"深圳\",\"tem_night\":\"10\",\"cityid\":\"101280601\",\"wea\":\"小雨\",\"update_time\":\"2023-12-11 10:47:17\",\"wea_img\":\"yu\",\"win_speed\":\"3-4级\",\"win\":\"北风\",\"day\":\"2023-12-17\"}]";
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -153,3 +153,5 @@ koyoe.get-token=${koyoe.base-url}/third-party/api/token?grant_type=client_creden
|
|||||||
koyoe.nowData=${koyoe.base-url}/third-party/api/nowData?sn=%s
|
koyoe.nowData=${koyoe.base-url}/third-party/api/nowData?sn=%s
|
||||||
# 是否证书验证
|
# 是否证书验证
|
||||||
is-license=false
|
is-license=false
|
||||||
|
#天气url
|
||||||
|
tianqiUrl=http://v1.yiketianqi.com/free/week
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user