diff --git a/framework/src/main/java/cn/lili/modules/base/serviceimpl/RegionServiceImpl.java b/framework/src/main/java/cn/lili/modules/base/serviceimpl/RegionServiceImpl.java index 183fbe64..1eb80925 100644 --- a/framework/src/main/java/cn/lili/modules/base/serviceimpl/RegionServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/base/serviceimpl/RegionServiceImpl.java @@ -1,8 +1,7 @@ package cn.lili.modules.base.serviceimpl; -import cn.lili.common.utils.HttpClientUtils; +import cn.lili.common.cache.Cache; import cn.lili.common.utils.SnowFlake; -import cn.lili.common.utils.StringUtils; import cn.lili.modules.base.mapper.RegionMapper; import cn.lili.modules.base.service.RegionService; import cn.lili.modules.system.entity.dos.Region; @@ -13,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.ArrayUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -33,24 +33,28 @@ public class RegionServiceImpl extends ServiceImpl impleme */ private String syncUrl = "https://restapi.amap.com/v3/config/district?subdistrict=4&key=e456d77800e2084a326f7b777278f89d"; + @Autowired + private Cache cache; @Override public void synchronizationData(String url) { try { - //清空数据 - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.ne("id", "-1"); - this.remove(queryWrapper); - - //读取数据 - String jsonString = HttpClientUtils.doGet(StringUtils.isEmpty(url) ? syncUrl : url, null); - - //构造存储数据库的对象集合 - List regions = this.initData(jsonString); - for (int i = 0; i < (regions.size() / 100 + (regions.size() % 100 == 0 ? 0 : 1)); i++) { - int endPoint = Math.min((100 + (i * 100)), regions.size()); - this.saveBatch(regions.subList(i * 100, endPoint)); - } +// //清空数据 +// QueryWrapper queryWrapper = new QueryWrapper(); +// queryWrapper.ne("id", "-1"); +// this.remove(queryWrapper); +// +// //读取数据 +// String jsonString = HttpClientUtils.doGet(StringUtils.isEmpty(url) ? syncUrl : url, null); +// +// //构造存储数据库的对象集合 +// List regions = this.initData(jsonString); +// for (int i = 0; i < (regions.size() / 100 + (regions.size() % 100 == 0 ? 0 : 1)); i++) { +// int endPoint = Math.min((100 + (i * 100)), regions.size()); +// this.saveBatch(regions.subList(i * 100, endPoint)); +// } + //删除缓存 + cache.vagueDel("{regions}"); } catch (Exception e) { e.printStackTrace(); } diff --git a/manager-api/src/main/java/cn/lili/security/ManagerSecurityConfig.java b/manager-api/src/main/java/cn/lili/security/ManagerSecurityConfig.java index aac90fec..b4fc86b4 100644 --- a/manager-api/src/main/java/cn/lili/security/ManagerSecurityConfig.java +++ b/manager-api/src/main/java/cn/lili/security/ManagerSecurityConfig.java @@ -49,7 +49,6 @@ public class ManagerSecurityConfig extends WebSecurityConfigurerAdapter { .authorizeRequests(); // 配置的url 不需要授权 for (String url : ignoredUrlsProperties.getUrls()) { - log.error(url); registry.antMatchers(url).permitAll(); } registry