Merge branch 'develop' of http://192.168.0.144/dcuc-tjdsj/auth-back into feature/v2.3.0-sub-obj

pom.xml

@@ -43,7 +43,7 @@
         <dependency>
             <groupId>com.dragoninfo</groupId>
             <artifactId>dcuc-user-api</artifactId>
-            <version>2.0.3-tjdsj-SNAPSHOT</version>
+            <version>2.1.0-tjdsj-SNAPSHOT</version>
         </dependency>
         <!--监控配置-->
         <dependency>

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/audit/v2/AuthenticationLogController.java

@@ -0,0 +1,57 @@
+package com.dragoninfo.dcuc.authweb.restcontroller.audit.v2;
+
+import com.dragoninfo.dcuc.auth.audit.facade.IAuthenticationLogFacade;
+import com.dragoninfo.dcuc.auth.audit.vo.AuthenticationLogVo;
+import com.dragoninfo.dcuc.auth.audit.vo.AuthenticationStatisticsVo;
+import com.dragoninfo.duceap.core.response.Result;
+import com.dragonsoft.duceap.base.entity.search.SearchDTO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @Author: qiuyu
+ * @Date: 2021/5/25 14:31
+ * @Description:
+ */
+@Api(tags = {"服务鉴权日志"})
+@RestController
+@RequestMapping(value = "auditsvr/v2/authenticationLog")
+public class AuthenticationLogController {
+
+    public static Logger logger = LoggerFactory.getLogger(AuthenticationLogController.class);
+
+    @Autowired
+    private IAuthenticationLogFacade authenticationLogFacade;
+
+    @ApiOperation(value = "日志列表")
+    @ApiImplicitParam(name = "searchDTO", value = "查询条件")
+    @PostMapping(value = "_search")
+    public Result<List<AuthenticationLogVo>> paging(SearchDTO searchDTO) {
+        Page<AuthenticationLogVo> page = authenticationLogFacade.paging(searchDTO);
+        return Result.success(page.getTotalElements(), page.getContent());
+    }
+
+    @ApiOperation(value = "日志详情")
+    @ApiImplicitParam(name = "id", value = "方案id")
+    @GetMapping(value = "/{id}")
+    public Result<AuthenticationLogVo> findOne(@PathVariable(value = "id") Long id) {
+        return Result.success(authenticationLogFacade.findOne(id));
+    }
+
+    @ApiOperation(value = "统计信息")
+    @ApiImplicitParam(name = "searchDTO", value = "查询条件")
+    @PostMapping(value = "statistics")
+    public Result<List<AuthenticationStatisticsVo>> statistics(SearchDTO searchDTO) {
+        return Result.success(authenticationLogFacade.statistics(searchDTO));
+    }
+
+
+}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/audit/v2/AuthorizeLogController.java

@@ -0,0 +1,48 @@
+package com.dragoninfo.dcuc.authweb.restcontroller.audit.v2;
+
+import com.dragoninfo.dcuc.auth.audit.facade.IAuthorizeLogFacade;
+import com.dragoninfo.dcuc.auth.audit.vo.AuthorizeLogDetailVo;
+import com.dragoninfo.dcuc.auth.audit.vo.AuthorizeLogVo;
+import com.dragoninfo.duceap.core.response.Result;
+import com.dragonsoft.duceap.base.entity.search.SearchDTO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @Author: qiuyu
+ * @Date: 2021/5/25 14:31
+ * @Description:
+ */
+@Api(tags = {"服务授权日志"})
+@RestController
+@RequestMapping(value = "auditsvr/v2/authorizeLog")
+public class AuthorizeLogController {
+
+    public static Logger logger = LoggerFactory.getLogger(AuthorizeLogController.class);
+
+    @Autowired
+    private IAuthorizeLogFacade authorizeLogFacade;
+
+    @ApiOperation(value = "日志列表")
+    @ApiImplicitParam(name = "searchDTO", value = "查询条件")
+    @PostMapping(value = "_search")
+    public Result<List<AuthorizeLogVo>> paging(SearchDTO searchDTO) {
+        Page<AuthorizeLogVo> page = authorizeLogFacade.paging(searchDTO);
+        return Result.success(page.getTotalElements(), page.getContent());
+    }
+
+    @ApiOperation(value = "日志详情")
+    @ApiImplicitParam(name = "id", value = "方案id")
+    @GetMapping(value = "/{id}")
+    public Result<AuthorizeLogDetailVo> findOne(@PathVariable(value = "id") Long id) {
+        return Result.success(authorizeLogFacade.findOne(id));
+    }
+}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/audit/v2/RiskLogController.java

@@ -0,0 +1,47 @@
+package com.dragoninfo.dcuc.authweb.restcontroller.audit.v2;
+
+import com.dragoninfo.dcuc.auth.audit.facade.IRiskLogFacade;
+import com.dragoninfo.dcuc.auth.audit.vo.RiskLogVo;
+import com.dragoninfo.duceap.core.response.Result;
+import com.dragonsoft.duceap.base.entity.search.SearchDTO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @Author: qiuyu
+ * @Date: 2021/5/25 14:31
+ * @Description:
+ */
+@Api(tags = {"鉴权风险日志"})
+@RestController
+@RequestMapping(value = "auditsvr/v2/riskLog")
+public class RiskLogController {
+
+    public static Logger logger = LoggerFactory.getLogger(RiskLogController.class);
+
+    @Autowired
+    private IRiskLogFacade riskLogFacade;
+
+    @ApiOperation(value = "日志列表")
+    @ApiImplicitParam(name = "searchDTO", value = "查询条件")
+    @PostMapping(value = "_search")
+    public Result<List<RiskLogVo>> paging(SearchDTO searchDTO) {
+        Page<RiskLogVo> page = riskLogFacade.paging(searchDTO);
+        return Result.success(page.getTotalElements(), page.getContent());
+    }
+
+    @ApiOperation(value = "日志详情")
+    @ApiImplicitParam(name = "id", value = "方案id")
+    @GetMapping(value = "/{id}")
+    public Result<RiskLogVo> findOne(@PathVariable(value = "id") Long id) {
+        return Result.success(riskLogFacade.findOne(id));
+    }
+}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/audit/v2/RiskProgrammeController.java

@@ -0,0 +1,60 @@
+package com.dragoninfo.dcuc.authweb.restcontroller.audit.v2;
+
+import com.dragoninfo.dcuc.auth.audit.dto.RiskProgrammeDto;
+import com.dragoninfo.dcuc.auth.audit.facade.IRiskProgrammeFacade;
+import com.dragoninfo.dcuc.auth.audit.vo.RiskProgrammeVo;
+import com.dragoninfo.duceap.core.response.Result;
+import com.dragonsoft.duceap.base.entity.search.SearchDTO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @Author: qiuyu
+ * @Date: 2021/5/25 14:31
+ * @Description:
+ */
+@Api(tags = {"鉴权风险方案"})
+@RestController
+@RequestMapping(value = "auditsvr/v2/riskProgramme")
+public class RiskProgrammeController {
+
+    public static Logger logger = LoggerFactory.getLogger(RiskProgrammeController.class);
+
+    @Autowired
+    private IRiskProgrammeFacade riskProgrammeFacade;
+
+    @ApiOperation(value = "方案列表")
+    @ApiImplicitParam(name = "searchDTO", value = "查询条件")
+    @PostMapping(value = "_search")
+    public Result<List<RiskProgrammeVo>> paging(SearchDTO searchDTO) {
+        Page<RiskProgrammeVo> page = riskProgrammeFacade.paging(searchDTO);
+        return Result.success(page.getTotalElements(), page.getContent());
+    }
+
+    @ApiOperation(value = "方案详情")
+    @ApiImplicitParam(name = "id", value = "方案id")
+    @GetMapping(value = "/{id}")
+    public Result<RiskProgrammeVo> findOne(@PathVariable(value = "id") Long id) {
+        return Result.success(riskProgrammeFacade.findOne(id));
+    }
+
+    @ApiOperation(value = "保存方案")
+    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "方案id"),
+            @ApiImplicitParam(name = "riskProgrammeDto", value = "方案内容"),
+    })
+    @PutMapping(value = "/{id}")
+    public Result save(@PathVariable(value = "id") Long id, @Valid @RequestBody RiskProgrammeDto riskProgrammeDto) {
+        riskProgrammeFacade.save(id, riskProgrammeDto);
+        return Result.success("成功");
+    }
+}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/audit/v2/WarningLogController.java

@@ -0,0 +1,47 @@
+package com.dragoninfo.dcuc.authweb.restcontroller.audit.v2;
+
+import com.dragoninfo.dcuc.auth.audit.facade.IWarningLogFacade;
+import com.dragoninfo.dcuc.auth.audit.vo.WarningLogVo;
+import com.dragoninfo.duceap.core.response.Result;
+import com.dragonsoft.duceap.base.entity.search.SearchDTO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @Author: qiuyu
+ * @Date: 2021/5/25 14:31
+ * @Description:
+ */
+@Api(tags = {"鉴权预警日志"})
+@RestController
+@RequestMapping(value = "auditsvr/v2/warningLog")
+public class WarningLogController {
+
+    public static Logger logger = LoggerFactory.getLogger(WarningLogController.class);
+
+    @Autowired
+    private IWarningLogFacade warningLogFacade;
+
+    @ApiOperation(value = "日志列表")
+    @ApiImplicitParam(name = "searchDTO", value = "查询条件")
+    @PostMapping(value = "_search")
+    public Result<List<WarningLogVo>> paging(SearchDTO searchDTO) {
+        Page<WarningLogVo> page = warningLogFacade.paging(searchDTO);
+        return Result.success(page.getTotalElements(), page.getContent());
+    }
+
+    @ApiOperation(value = "日志详情")
+    @ApiImplicitParam(name = "id", value = "日志id")
+    @GetMapping(value = "/{id}")
+    public Result<WarningLogVo> findOne(@PathVariable(value = "id") Long id) {
+        return Result.success(warningLogFacade.findOne(id));
+    }
+}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/audit/v2/WarningProgrammeController.java

@@ -0,0 +1,60 @@
+package com.dragoninfo.dcuc.authweb.restcontroller.audit.v2;
+
+import com.dragoninfo.dcuc.auth.audit.dto.WarningProgrammeDto;
+import com.dragoninfo.dcuc.auth.audit.facade.IWarningProgrammeFacade;
+import com.dragoninfo.dcuc.auth.audit.vo.WarningProgrammeVo;
+import com.dragoninfo.duceap.core.response.Result;
+import com.dragonsoft.duceap.base.entity.search.SearchDTO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @Author: qiuyu
+ * @Date: 2021/5/25 14:31
+ * @Description:
+ */
+@Api(tags = {"鉴权预警方案"})
+@RestController
+@RequestMapping(value = "auditsvr/v2/warningProgramme")
+public class WarningProgrammeController {
+
+    public static Logger logger = LoggerFactory.getLogger(WarningProgrammeController.class);
+
+    @Autowired
+    private IWarningProgrammeFacade warningProgrammeFacade;
+
+    @ApiOperation(value = "方案列表")
+    @ApiImplicitParam(name = "searchDTO", value = "查询条件")
+    @PostMapping(value = "_search")
+    public Result<List<WarningProgrammeVo>> paging(SearchDTO searchDTO) {
+        Page<WarningProgrammeVo> page = warningProgrammeFacade.paging(searchDTO);
+        return Result.success(page.getTotalElements(), page.getContent());
+    }
+
+    @ApiOperation(value = "方案详情")
+    @ApiImplicitParam(name = "id", value = "方案id")
+    @GetMapping(value = "/{id}")
+    public Result<WarningProgrammeVo> findOne(@PathVariable(value = "id") Long id) {
+        return Result.success(warningProgrammeFacade.findOne(id));
+    }
+
+    @ApiOperation(value = "保存方案")
+    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "方案id"),
+            @ApiImplicitParam(name = "warningProgrammeDto", value = "方案内容"),
+    })
+    @PutMapping(value = "/{id}")
+    public Result save(@PathVariable Long id, @Valid @RequestBody WarningProgrammeDto warningProgrammeDto) {
+        warningProgrammeFacade.save(id, warningProgrammeDto);
+        return Result.success("成功");
+    }
+}

src/main/resources/application-base.yml

@@ -35,7 +35,7 @@ management:
 duceap:
   swagger:
     enabled: true
-    package-path: com.dragoninfo.dcuc.authweb.restcontroller.api
+    package-path: com.dragoninfo.dcuc.authweb.restcontroller.audit.v2
   license:
     #配置用来指定license对接的后端项目地址(格式：ip:port/context，如http://10.10.10.10:8080/ctx)，
     #默认使用HttpServletRequest.getLocalAddr()方法获取ip地址，
@@ -49,11 +49,11 @@ duceap:
       enabled: true
       user-token-header-name: userToken
   security:
-    #    type: dcuc ## 注解掉不开启认证登录
+    type: dcuc # 注解掉不开启认证登录
     dcuc:
       cas-server-url-prefix: http://192.168.10.2:8877/sso
-      server-name: 10.11.1.151:8000
-      ignore-pattern: '/js/*|/img/*|/css/*|/api/*|/*.png|/rest/*|/webSocket/*|/oauthLogin/*|/authorizationPage.html|/importAuthorizationFile.html|/license/LicenseManagerServlet|/authorizationFile/'
+      server-name: 10.11.1.25:8871 10.11.1.151:8000 10.11.0.233:8871 10.11.1.22:8871 10.11.1.63:8871
+      ignore-pattern: '/js/*|/img/*|/css/*|/api/*|/*.png|/rest/*|/webSocket/*|/oauthLogin/*|/authorizationPage.html|/importAuthorizationFile.html|/license/LicenseManagerServlet|/authorizationFile/|/auditsvr/|/authsvr/|/codelist/|/swagger-ui.html'
       app-code: QXXT0000000000000001
       api-url: http://192.168.10.2:8860/dcuc
     dids2:
@@ -65,7 +65,7 @@ duceap:
       SSOServiceUrl: http://10.11.0.240:18871/dcuc/login
       #单点登录服务接口地址
       webServiceUrl: http://192.168.6.128:9995/didsserver/webservices/
-      noFilterUrl: services,hessian,commons,install.action,.xml,/install,/widgets-src/,/authorizationPage.html,/importAuthorizationFile.html,/license/LicenseManagerServlet,/authorizationFile/,/api/,/js/,/png/,/rest/
+      noFilterUrl: services,hessian,commons,install.action,.xml,/install,/widgets-src/,/authorizationPage.html,/importAuthorizationFile.html,/license/LicenseManagerServlet,/authorizationFile/,/api/,/js/,/png/,/rest/,/dataresourcesrv/
 hystrix:
   command:
     default: