diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java index 7521085..ae3e0bf 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java +++ b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java @@ -67,8 +67,8 @@ public class UserController { @PostMapping("/login") @ApiOperation("登录接口") @AnonymousAccess - public ResultEntity login(@RequestParam String passwordEncode, - @RequestParam String userName, + public ResultEntity login(@RequestParam(required = false) String passwordEncode, + @RequestParam(required = false) String userName, HttpServletRequest request, @RequestParam(required = false) int roleId, @RequestParam(required = false) String TOKEN) { diff --git a/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaUserServiceImpl.java b/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaUserServiceImpl.java index 4433452..0fca722 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaUserServiceImpl.java +++ b/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaUserServiceImpl.java @@ -101,7 +101,7 @@ public class TeaUserServiceImpl implements ITeaUserService { } if (searcher == null) { try { - File file = ResourceUtils.getFile("/usr/local/tianzeProject/financial_bigdata/ipdb/ip2region.xdb"); + File file = ResourceUtils.getFile("/usr/local/tianzeProject/financial_bigdata/uploadFile/ipdb/ip2region.xdb"); String dbPath = file.getPath(); searcher = Searcher.newWithFileOnly(dbPath); } catch (FileNotFoundException e) {