caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop

Browse Source
This commit is contained in:
lifenlong 2021-06-07 15:50:45 +08:00
commit 762a7335fe
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
framework/src/main/java/cn/lili/modules/base/serviceimpl/RegionServiceImpl.java
View File

@ -1,8 +1,9 @@
package cn.lili.modules.base.serviceimpl; package cn.lili.modules.base.serviceimpl;
import cn.lili.common.cache.Cache;
import cn.lili.common.utils.StringUtils;
import cn.lili.common.utils.HttpClientUtils; import cn.lili.common.utils.HttpClientUtils;
import cn.lili.common.utils.SnowFlake; import cn.lili.common.utils.SnowFlake;
import cn.lili.common.utils.StringUtils;
import cn.lili.modules.base.mapper.RegionMapper; import cn.lili.modules.base.mapper.RegionMapper;
import cn.lili.modules.base.service.RegionService; import cn.lili.modules.base.service.RegionService;
import cn.lili.modules.system.entity.dos.Region; import cn.lili.modules.system.entity.dos.Region;
@ -13,6 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -33,6 +35,8 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
*/ */
private String syncUrl = "https://restapi.amap.com/v3/config/district?subdistrict=4&key=e456d77800e2084a326f7b777278f89d"; private String syncUrl = "https://restapi.amap.com/v3/config/district?subdistrict=4&key=e456d77800e2084a326f7b777278f89d";
@Autowired
private Cache cache;
@Override @Override
public void synchronizationData(String url) { public void synchronizationData(String url) {
try { try {
@ -51,6 +55,8 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
int endPoint = Math.min((100 + (i * 100)), regions.size()); int endPoint = Math.min((100 + (i * 100)), regions.size());
this.saveBatch(regions.subList(i * 100, endPoint)); this.saveBatch(regions.subList(i * 100, endPoint));
} }
//删除缓存
cache.vagueDel("{regions}");
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }

1
manager-api/src/main/java/cn/lili/security/ManagerSecurityConfig.java
View File

@ -49,7 +49,6 @@ public class ManagerSecurityConfig extends WebSecurityConfigurerAdapter {
.authorizeRequests(); .authorizeRequests();
// 配置的url 不需要授权 // 配置的url 不需要授权
for (String url : ignoredUrlsProperties.getUrls()) { for (String url : ignoredUrlsProperties.getUrls()) {
log.error(url);
registry.antMatchers(url).permitAll(); registry.antMatchers(url).permitAll();
} }
registry registry