diff --git a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java b/src/main/java/com/cetc32/dh/controller/rest/AuthController.java index fadb8c632c3f4aa8d585b4cb215cfacf87b6e49a..0256f49c2312ba28013d5c5f80dc49f41a1d5031 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/AuthController.java @@ -891,14 +891,28 @@ public class AuthController { } return ResponseData.success(users); } + SysInfoService sysInfoService; @Autowired public void setSysInfoService(SysInfoService sysInfoService) { this.sysInfoService = sysInfoService; } + @LoginSkipped @GetMapping("/systems") public ResponseData systems(){ return ResponseData.success(sysInfoService.selectAll()); } + + @Value("${safeSysCode:S005}") + String safeSysCode; + @GetMapping("/del/{sysCode}") + public ResponseData systemsDelete(@PathVariable String sysCode){ + if(StringUtils.isBlank(sysCode)){ + return ResponseData.error(-100,"无效的Code"); + }else if( safeSysCode.compareToIgnoreCase(sysCode)>0){ + return ResponseData.error(-1,"操作被拒绝，所操作对象为内置系统，禁止删除！"); + } + return ResponseData.success(sysInfoService.deleteByCode(sysCode)); + } } diff --git a/src/main/java/com/cetc32/dh/controller/rest/UserAuditController.java b/src/main/java/com/cetc32/dh/controller/rest/UserAuditController.java index cff617ac8574ab5110e202adf28007fe9861d426..893bb495a0ab3ba07f0a62b285fa063c1951813d 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/UserAuditController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/UserAuditController.java @@ -15,7 +15,6 @@ import com.cetc32.dh.entity.BaseAdminUser; import com.cetc32.dh.service.ActiveUserService; import com.cetc32.dh.service.AdminUserService; import com.cetc32.webutil.common.annotations.LoginRequired; -import com.cetc32.webutil.common.annotations.LoginSkipped; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -282,7 +281,7 @@ public class UserAuditController { @GetMapping("/onlinesum") public ResponseData onlinesum(){ - int count = adminUserService.getLoginUser(); + int count = adminUserService.countLoginUser(); return ResponseData.success(count); } diff --git a/src/main/java/com/cetc32/dh/controller/views/IndexController.java b/src/main/java/com/cetc32/dh/controller/views/IndexController.java index b266af5b253591863cc361f6d40d0c57f92eb15a..0a364671f8a1012edb56330e27e146d71ccdbbdf 100644 --- a/src/main/java/com/cetc32/dh/controller/views/IndexController.java +++ b/src/main/java/com/cetc32/dh/controller/views/IndexController.java @@ -48,6 +48,8 @@ public class IndexController { String eip = "http://www.baidu.com/"; @Value("${title}") String title; + @Value("${sso.tokeAge:7200000}") + Integer tokenAge; private Logger logger = LoggerFactory.getLogger(this.getClass()); @RequestMapping({"/index","/"}) @@ -76,6 +78,7 @@ public class IndexController { map.put("originUrl", req.getRequestURL()); map.put("eip",eip); map.put("cate",cate); + map.put("tokenAge",tokenAge); return "index"; } /** @@ -167,6 +170,7 @@ public class IndexController { adminUserService.updateUserInfo(baseAdminUser); logger.debug("{} code: {}",code.size() ,code); } + CookieUtil.setCookie(req,response,"token",token,tokenAge,false); logger.debug("status 1002 wizard token: {}",token); return "redirect:"+eip+"?token="+token; } diff --git a/src/main/java/com/cetc32/dh/mybatis/BaseAdminUserMapper.java b/src/main/java/com/cetc32/dh/mybatis/BaseAdminUserMapper.java index c088a60f83c473aaaa8fc1886d689fd9133b5cec..e49c8f070db19726467f47190d32aeeb9324fd5f 100644 --- a/src/main/java/com/cetc32/dh/mybatis/BaseAdminUserMapper.java +++ b/src/main/java/com/cetc32/dh/mybatis/BaseAdminUserMapper.java @@ -55,7 +55,9 @@ public interface BaseAdminUserMapper extends MyMapper { List getAllUserList(); - Integer getLoginUser(); + Integer countLoginUser(); + + List getLoginUser(); Integer getWebLoginCount(); diff --git a/src/main/java/com/cetc32/dh/mybatis/SysInfoMapper.java b/src/main/java/com/cetc32/dh/mybatis/SysInfoMapper.java index 7dcc455f437e1d22c5ada3bb6d15cf3ec7ecf3f0..94bf542c412bf3a623b7abe87cf4f3564c8f4e71 100644 --- a/src/main/java/com/cetc32/dh/mybatis/SysInfoMapper.java +++ b/src/main/java/com/cetc32/dh/mybatis/SysInfoMapper.java @@ -23,4 +23,5 @@ public interface SysInfoMapper { ,@Param("keyWord")String keyWord); public Integer countAllAppsInCodes(@Param("sysCode") String sysCodes ,@Param("keyWord")String keyWord); + public Integer deleteByCode(@Param("sysCode")String sysCode); } diff --git a/src/main/java/com/cetc32/dh/service/AdminUserService.java b/src/main/java/com/cetc32/dh/service/AdminUserService.java index d97fb3b2b3984a540b3393cdc2251a3827c8959b..989b6bdd6304683e30ae6d6698f10aec96def8d1 100644 --- a/src/main/java/com/cetc32/dh/service/AdminUserService.java +++ b/src/main/java/com/cetc32/dh/service/AdminUserService.java @@ -49,7 +49,9 @@ public interface AdminUserService { List getAllUserList(); - Integer getLoginUser(); + Integer countLoginUser(); + + ListgetLoginUser(); Integer getWebLoginCount(); diff --git a/src/main/java/com/cetc32/dh/service/SysInfoService.java b/src/main/java/com/cetc32/dh/service/SysInfoService.java index 6c4108e6824bddcd6fe296fb5dd78fb61676405c..7e0a3650dbca234e1ad782964e7d74468dd9917b 100644 --- a/src/main/java/com/cetc32/dh/service/SysInfoService.java +++ b/src/main/java/com/cetc32/dh/service/SysInfoService.java @@ -24,4 +24,5 @@ public interface SysInfoService { public List selectAllMyApps(Integer limit,Integer offset,String keyWord); public Integer countAllMyApps(String keyWord); public List selectLatest7Days(); + public Integer deleteByCode(String sysCode); } diff --git a/src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java index 90bac7ff8d6d0fe150186268e4ec0239d61111df..9e1dcd335353353b42c61c01826238e3a5093e71 100644 --- a/src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java @@ -9,12 +9,7 @@ package com.cetc32.dh.service.impl; import com.cetc32.dh.beans.ResultUserInfoDe; import com.cetc32.dh.beans.ResultUserRole; -import com.cetc32.dh.entity.BaseAdminRole; -import com.cetc32.dh.common.response.PageDataResult; -import com.cetc32.dh.common.utils.DateUtils; import com.cetc32.dh.common.utils.DigestUtils; -import com.cetc32.dh.dto.AdminUserDTO; -import com.cetc32.dh.dto.UserSearchDTO; import com.cetc32.dh.entity.AreaCommon; import com.cetc32.dh.entity.BaseAdminUser; import com.cetc32.dh.entity.Department; @@ -22,9 +17,6 @@ import com.cetc32.dh.listener.ContainerStartedListener; import com.cetc32.dh.mybatis.*; import com.cetc32.dh.service.AdminUserService; import com.cetc32.dh.utils.CommonVariable; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import io.swagger.models.auth.In; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -307,7 +299,12 @@ public class AdminUserServiceImpl implements AdminUserService { * @return List */ @Override - public Integer getLoginUser(){ + public Integer countLoginUser(){ + return baseAdminUserMapper.countLoginUser(); + } + + @Override + public List getLoginUser(){ return baseAdminUserMapper.getLoginUser(); } diff --git a/src/main/java/com/cetc32/dh/service/impl/SysInfoServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/SysInfoServiceImpl.java index af1f57977216f4b5a7ac5f806c4075aaf3de7726..694e88717ec82ad92708cce48369b9fc40ea172d 100644 --- a/src/main/java/com/cetc32/dh/service/impl/SysInfoServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/SysInfoServiceImpl.java @@ -160,7 +160,10 @@ public class SysInfoServiceImpl implements SysInfoService { return false; } - + @Override + public Integer deleteByCode(String sysCode) { + return sysInfoMapper.deleteByCode(sysCode); + } } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 997d84dd492103dc04485d77b4c177443ceee9c8..cbb4c72fe053aec862ae0cbcc798e601bfdb5204 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -55,7 +55,7 @@ logging: storePath: /root/ upLoadPath: ${storePath}upLoad -rootPath: /root/daohang/data +rootPath: /root/daohang/data/ myPath: ${rootPath}myPath writePath: ${rootPath}/product eip: http://192.168.1.209:8080/ diff --git a/src/main/resources/application-xwy.yml b/src/main/resources/application-xwy.yml index ac12edabeb74db5e35cf7a5faf92cacdccb9c92a..cd13fd0175b74e1cd8843be6e63a79d453013137 100644 --- a/src/main/resources/application-xwy.yml +++ b/src/main/resources/application-xwy.yml @@ -10,7 +10,7 @@ spring: name: dhManager datasource: #url: jdbc:postgresql://180.184.65.203:5432/dhmanage - url: jdbc:postgresql://192.168.1.8:5432/huludaosso + url: jdbc:postgresql://192.168.1.60:5432/huludaosso username: postgres password: 123456 #password: Zdk@824. diff --git a/src/main/resources/application-xwybjb.yml b/src/main/resources/application-xwybjb.yml index 9879ac4b217aaa4fbee4885d942e64b4b7e1689a..06d8a39074dc497d96d35e5c5d21529aa08a3375 100644 --- a/src/main/resources/application-xwybjb.yml +++ b/src/main/resources/application-xwybjb.yml @@ -8,7 +8,7 @@ spring: name: dhManager datasource: #url: jdbc:postgresql://180.184.65.203:5432/dhmanage - url: jdbc:postgresql://192.168.1.60:5432/dhmanage + url: jdbc:postgresql://localhost:5432/dhmanage #url: jdbc:postgresql://127.0.0.1:5432/dhmanage username: postgres #password: 123456 @@ -57,7 +57,7 @@ logging: storePath: /root/ upLoadPath: ${storePath}upLoad -rootPath: /root/daohang/data +rootPath: /root/daohang/data/ myPath: ${rootPath}myPath writePath: ${rootPath}/product eip: http://localhost:8080/ @@ -79,6 +79,7 @@ sso: syscode: S000 basePermission: S000接口用户 #单位是毫秒 - tokeAge : 3600000 + tokeAge : -1 departmentRoot: 1 thirdRole: 1 +title: 公共信息门户系统 \ No newline at end of file diff --git a/src/main/resources/mapper/BaseAdminUserMapper.xml b/src/main/resources/mapper/BaseAdminUserMapper.xml index 337e836c467e0f74d8b3d3184eee10558a15d358..e8023fc1f1d5647b8d2770ac3cffcb10e52b5111 100644 --- a/src/main/resources/mapper/BaseAdminUserMapper.xml +++ b/src/main/resources/mapper/BaseAdminUserMapper.xml @@ -167,6 +167,12 @@ and loginfailed >= #{loginFailed} + + and (( web_login_status = 1 and web_login_time>= now()::timestamp + '-2 hour')) + + + and (( app_login_status = 1 and app_login_time>= now()::timestamp + '-2 hour')) + @@ -356,23 +362,28 @@ or (app_login_time between #{startTime}::timestamp and #{endTime}::timestamp) + - - + - + + + delete from sysinfos where syscode = ${sysCode} + diff --git a/src/main/resources/templates/changepwd.html b/src/main/resources/templates/changepwd.html index 27354475aa0c22a9566299dba0c51ee613ea55cd..7b2b6df49cc2afe309cf375528ca2aa3009380a3 100644 --- a/src/main/resources/templates/changepwd.html +++ b/src/main/resources/templates/changepwd.html @@ -17,7 +17,7 @@
- +
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 0dcfa99b312d367710466869cd35cfac5587afd7..cae904e67f6bede3eb25df3e1b2cdf186f6ca4c0 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -103,7 +103,6 @@
-
立即注册 @@ -116,6 +115,8 @@ + +