diff --git a/newfiber-gateway/src/main/resources/bootstrap.yml b/newfiber-gateway/src/main/resources/bootstrap.yml index 588a2ff..27aa5b6 100644 --- a/newfiber-gateway/src/main/resources/bootstrap.yml +++ b/newfiber-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-gateway/src/main/resources/bootstrap.yml b/newfiber-gateway/src/main/resources/bootstrap.yml index 588a2ff..27aa5b6 100644 --- a/newfiber-gateway/src/main/resources/bootstrap.yml +++ b/newfiber-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-system/newfiber-system-core/src/main/java/com/newfiber/system/service/impl/SysUserServiceImpl.java b/newfiber-system/newfiber-system-core/src/main/java/com/newfiber/system/service/impl/SysUserServiceImpl.java index 60617d8..5eaf9cb 100644 --- a/newfiber-system/newfiber-system-core/src/main/java/com/newfiber/system/service/impl/SysUserServiceImpl.java +++ b/newfiber-system/newfiber-system-core/src/main/java/com/newfiber/system/service/impl/SysUserServiceImpl.java @@ -296,6 +296,7 @@ insertUserPost(user); redisService.setCacheObject(ESystemRedisKey.User, user.getUserId().toString(), user); redisService.setCacheObject(ESystemRedisKey.USER_NAME,user.getUserName(),user); + user.setPassword(null); return userMapper.updateUser(user); } diff --git a/newfiber-gateway/src/main/resources/bootstrap.yml b/newfiber-gateway/src/main/resources/bootstrap.yml index 588a2ff..27aa5b6 100644 --- a/newfiber-gateway/src/main/resources/bootstrap.yml +++ b/newfiber-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-system/newfiber-system-core/src/main/java/com/newfiber/system/service/impl/SysUserServiceImpl.java b/newfiber-system/newfiber-system-core/src/main/java/com/newfiber/system/service/impl/SysUserServiceImpl.java index 60617d8..5eaf9cb 100644 --- a/newfiber-system/newfiber-system-core/src/main/java/com/newfiber/system/service/impl/SysUserServiceImpl.java +++ b/newfiber-system/newfiber-system-core/src/main/java/com/newfiber/system/service/impl/SysUserServiceImpl.java @@ -296,6 +296,7 @@ insertUserPost(user); redisService.setCacheObject(ESystemRedisKey.User, user.getUserId().toString(), user); redisService.setCacheObject(ESystemRedisKey.USER_NAME,user.getUserName(),user); + user.setPassword(null); return userMapper.updateUser(user); } diff --git a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml index 2d44f4d..c795659 100644 --- a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml +++ b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml @@ -15,15 +15,13 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # server-addr: 118.24.129.71:8848 - # namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # server-addr: 118.24.129.71:8848 - # namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-gateway/src/main/resources/bootstrap.yml b/newfiber-gateway/src/main/resources/bootstrap.yml index 588a2ff..27aa5b6 100644 --- a/newfiber-gateway/src/main/resources/bootstrap.yml +++ b/newfiber-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-system/newfiber-system-core/src/main/java/com/newfiber/system/service/impl/SysUserServiceImpl.java b/newfiber-system/newfiber-system-core/src/main/java/com/newfiber/system/service/impl/SysUserServiceImpl.java index 60617d8..5eaf9cb 100644 --- a/newfiber-system/newfiber-system-core/src/main/java/com/newfiber/system/service/impl/SysUserServiceImpl.java +++ b/newfiber-system/newfiber-system-core/src/main/java/com/newfiber/system/service/impl/SysUserServiceImpl.java @@ -296,6 +296,7 @@ insertUserPost(user); redisService.setCacheObject(ESystemRedisKey.User, user.getUserId().toString(), user); redisService.setCacheObject(ESystemRedisKey.USER_NAME,user.getUserName(),user); + user.setPassword(null); return userMapper.updateUser(user); } diff --git a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml index 2d44f4d..c795659 100644 --- a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml +++ b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml @@ -15,15 +15,13 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # server-addr: 118.24.129.71:8848 - # namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # server-addr: 118.24.129.71:8848 - # namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java index 8949e5a..8e02669 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java @@ -60,7 +60,6 @@ @PostMapping("/querytermiteData") @ApiOperation(value = "分页查询数据", position = 60) public PageResult> querytermiteData(TermiteInfoQueryRequest request){ - startPage(); List list = termiteService.querytermiteData(request); return pageResult(list); } diff --git a/newfiber-gateway/src/main/resources/bootstrap.yml b/newfiber-gateway/src/main/resources/bootstrap.yml index 588a2ff..27aa5b6 100644 --- a/newfiber-gateway/src/main/resources/bootstrap.yml +++ b/newfiber-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-system/newfiber-system-core/src/main/java/com/newfiber/system/service/impl/SysUserServiceImpl.java b/newfiber-system/newfiber-system-core/src/main/java/com/newfiber/system/service/impl/SysUserServiceImpl.java index 60617d8..5eaf9cb 100644 --- a/newfiber-system/newfiber-system-core/src/main/java/com/newfiber/system/service/impl/SysUserServiceImpl.java +++ b/newfiber-system/newfiber-system-core/src/main/java/com/newfiber/system/service/impl/SysUserServiceImpl.java @@ -296,6 +296,7 @@ insertUserPost(user); redisService.setCacheObject(ESystemRedisKey.User, user.getUserId().toString(), user); redisService.setCacheObject(ESystemRedisKey.USER_NAME,user.getUserName(),user); + user.setPassword(null); return userMapper.updateUser(user); } diff --git a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml index 2d44f4d..c795659 100644 --- a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml +++ b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml @@ -15,15 +15,13 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # server-addr: 118.24.129.71:8848 - # namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # server-addr: 118.24.129.71:8848 - # namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java index 8949e5a..8e02669 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java @@ -60,7 +60,6 @@ @PostMapping("/querytermiteData") @ApiOperation(value = "分页查询数据", position = 60) public PageResult> querytermiteData(TermiteInfoQueryRequest request){ - startPage(); List list = termiteService.querytermiteData(request); return pageResult(list); } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java index c029d89..1482b13 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.newfiber.common.core.utils.PageUtils; import com.newfiber.common.core.web.service.BaseServiceImpl; import com.newfiber.common.security.utils.SecurityUtils; import com.newfiber.termite.domain.OneByOneNow; @@ -95,9 +96,11 @@ @Override public List querytermiteData(TermiteInfoQueryRequest request){ + Long userId = SecurityUtils.getUserId(); if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){ request.setProjectCodeList(projectInfoService.getUserProjectCodeList(SecurityUtils.getUserId())); } + PageUtils.startPage(); return termiteMapper.querytermiteData(request); } diff --git a/newfiber-gateway/src/main/resources/bootstrap.yml b/newfiber-gateway/src/main/resources/bootstrap.yml index 588a2ff..27aa5b6 100644 --- a/newfiber-gateway/src/main/resources/bootstrap.yml +++ b/newfiber-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-system/newfiber-system-core/src/main/java/com/newfiber/system/service/impl/SysUserServiceImpl.java b/newfiber-system/newfiber-system-core/src/main/java/com/newfiber/system/service/impl/SysUserServiceImpl.java index 60617d8..5eaf9cb 100644 --- a/newfiber-system/newfiber-system-core/src/main/java/com/newfiber/system/service/impl/SysUserServiceImpl.java +++ b/newfiber-system/newfiber-system-core/src/main/java/com/newfiber/system/service/impl/SysUserServiceImpl.java @@ -296,6 +296,7 @@ insertUserPost(user); redisService.setCacheObject(ESystemRedisKey.User, user.getUserId().toString(), user); redisService.setCacheObject(ESystemRedisKey.USER_NAME,user.getUserName(),user); + user.setPassword(null); return userMapper.updateUser(user); } diff --git a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml index 2d44f4d..c795659 100644 --- a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml +++ b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml @@ -15,15 +15,13 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # server-addr: 118.24.129.71:8848 - # namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # server-addr: 118.24.129.71:8848 - # namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java index 8949e5a..8e02669 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java @@ -60,7 +60,6 @@ @PostMapping("/querytermiteData") @ApiOperation(value = "分页查询数据", position = 60) public PageResult> querytermiteData(TermiteInfoQueryRequest request){ - startPage(); List list = termiteService.querytermiteData(request); return pageResult(list); } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java index c029d89..1482b13 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.newfiber.common.core.utils.PageUtils; import com.newfiber.common.core.web.service.BaseServiceImpl; import com.newfiber.common.security.utils.SecurityUtils; import com.newfiber.termite.domain.OneByOneNow; @@ -95,9 +96,11 @@ @Override public List querytermiteData(TermiteInfoQueryRequest request){ + Long userId = SecurityUtils.getUserId(); if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){ request.setProjectCodeList(projectInfoService.getUserProjectCodeList(SecurityUtils.getUserId())); } + PageUtils.startPage(); return termiteMapper.querytermiteData(request); } diff --git a/newfiber-termites/newfiber-termites-package/src/main/resources/bootstrap.yml b/newfiber-termites/newfiber-termites-package/src/main/resources/bootstrap.yml index 1a6ddea..fb6dfd3 100644 --- a/newfiber-termites/newfiber-termites-package/src/main/resources/bootstrap.yml +++ b/newfiber-termites/newfiber-termites-package/src/main/resources/bootstrap.yml @@ -15,15 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard - # server-addr: 118.24.129.71:8848 - # namespace: newfiber-termite + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard - # server-addr: 118.24.129.71:8848 - # namespace: newfiber-termite + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置