diff --git a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java index 3ae85a354..94b91dc14 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java @@ -163,7 +163,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/logout", "authc"); filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); - filterChainDefinitionMap.put("/**", "anon"); +// filterChainDefinitionMap.put("/**", "anon"); shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java index a23e79ddd..721376afc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java @@ -254,13 +254,13 @@ public class TtMerchantPoiController extends DouyinBaseController { //@SystemControllerLog(description = "poi-来客模版补齐地理位置信息") public void addLocationInfo(@RequestParam("poiFile") MultipartFile mFile,HttpServletRequest request, HttpServletResponse response) { try { -// boolean isSaas = this.isGoodLifeSaas(); -// if (!isSaas) { -// //return addLocationInfo(mFile,false); -// throw new MallinkException(Result.ERROR,"当前版本无需补齐地理位置信息"); -// }else { + boolean isSaas = this.isGoodLifeSaas(); + if (!isSaas) { + //return addLocationInfo(mFile,false); + throw new MallinkException(Result.ERROR,"当前版本无需补齐地理位置信息"); + }else { addLocationInfo(mFile,true,"1bdc087fc6f72820dc5c848a033de7f9",request,response); -// } + } } catch (Exception e) { logger.error("addLocationInfo error.",e); throw new MallinkException(Result.ERROR,e.getMessage()); @@ -273,7 +273,6 @@ public class TtMerchantPoiController extends DouyinBaseController { throw new MallinkException(Result.ERROR, "上传文件不能为空"); } //得到当前用户ID -// final MallUserInfo user = getUser(); String fpath = fmUploadDir; File targetFile = new File(fpath); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java index dee4da156..9dd2ebe45 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java @@ -289,14 +289,6 @@ public class AsyncTask { logger.error("session :"+ue.getMessage()); } }); - - if (tlist.size() <= 0 ) { - MerchantPoiTNew t = new MerchantPoiTNew(); - t.setPoiId("adafdasdf"); - t.setGaodeRemark("怎么没有啊"); - tlist.add(t); - } - ExportParams exportParams = new ExportParams(); //exportParams.setCreateHeadRows(true); //exportParams.setExclusions(headers);