ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: ak:24ab5dd06a2d5587a42211f9668b98440c4c8e56
Branches Tags
ak:dev
ak:prod
ak:dev-aikai-开支日报导出
ak:dev-补录附件
ak:frx
ak:工单-dev
ak:frx_export
ak:dev-erp
ak:crm-业绩目标
...
compare: ak:3b4b422aeaffd3784eeb4e32df4a4ec15afb0f68
Branches Tags
ak:dev
ak:prod
ak:dev-aikai-开支日报导出
ak:dev-补录附件
ak:frx
ak:工单-dev
ak:frx_export
ak:dev-erp
ak:crm-业绩目标

3 Commits
24ab5dd06a ... 3b4b422aea

Author SHA1 Message Date
aikai
3b4b422aea 解决获取假期ssl证书信任错误 2024-12-19 14:44:18 +08:00
aikai
e61477af60 Merge branch 'dev' of http://git.znkjfw.com/ak/zn-cloud into dev 2024-12-19 14:43:54 +08:00
aikai
15a50cc52f 解决获取假期ssl证书信任错误 2024-12-19 14:43:50 +08:00
1 changed files with 2 additions and 2 deletions
Show Stats Expand all files Collapse all files

4
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceServiceImpl.java
View File

@ -282,7 +282,7 @@ public class AttendanceServiceImpl implements AttendanceService {
Boolean flag = stringRedisTemplate.hasKey(key); Boolean flag = stringRedisTemplate.hasKey(key);
// 缓存不存在 // 缓存不存在
if (Boolean.FALSE.equals(flag)) { if (Boolean.FALSE.equals(flag)) {
String url = "https://timor.tech/api/holiday/year/" + year; String url = "http://timor.tech/api/holiday/year/" + year;
String json = HttpUtil.get(url, 3000); String json = HttpUtil.get(url, 3000);
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
JSONObject jsonObject = JSONUtil.parseObj(json); JSONObject jsonObject = JSONUtil.parseObj(json);
@ -1190,7 +1190,7 @@ public class AttendanceServiceImpl implements AttendanceService {
Boolean flag = stringRedisTemplate.hasKey(key); Boolean flag = stringRedisTemplate.hasKey(key);
// 缓存不存在 // 缓存不存在
if (Boolean.FALSE.equals(flag)) { if (Boolean.FALSE.equals(flag)) {
String url = "https://timor.tech/api/holiday/year/" + year; String url = "http://timor.tech/api/holiday/year/" + year;
String json = HttpUtil.get(url, 3000); String json = HttpUtil.get(url, 3000);
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
JSONObject jsonObject = JSONUtil.parseObj(json); JSONObject jsonObject = JSONUtil.parseObj(json);