Sfoglia il codice sorgente

feature(实体类扫描注解添加): 实体类扫描注解添加

1.实体类扫描注解添加
2.审计日志打印ip地址
mazq 3 anni fa
parent
commit
d9c715c4ac

+ 2 - 0
dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/DcucAuthApplication.java

@@ -3,6 +3,7 @@ package com.dragoninfo.dcuc.auth;
 import com.dragonsoft.duceap.core.persistent.repository.BaseRepositoryFactoryBean;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.PropertySource;
@@ -14,6 +15,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 @EnableJpaRepositories(basePackages = {"com.dragonsoft.*", "com.dragoninfo.*"}, repositoryFactoryBeanClass = BaseRepositoryFactoryBean.class)
 @PropertySource(value = {"classpath:nosql/huweikafka-nosql.properties",
 "classpath:application.yml"})
+@EntityScan(basePackages = {"com.dragonsoft.*", "com.dragoninfo.*"})
 public class DcucAuthApplication {
 
     public static void main(String[] args) {

+ 2 - 2
dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/audit/service/log/DataAuthLogHandler.java

@@ -78,7 +78,7 @@ public class DataAuthLogHandler {
 
 
     public void sendDataAuthLog(AuthResultEnum state, String subId, String subType, List<SubDataDTO> addList, String realIp) {
-        logger.debug("DataAuthLogHandler sendDataAuthLog client ip :{}", realIp);
+        logger.info("DataAuthLogHandler sendDataAuthLog client ip :{}", realIp);
         //主体
         AuthorizeSubjectDto authorizeSubjectDto = new AuthorizeSubjectDto();
         //业务域数据授权
@@ -128,7 +128,7 @@ public class DataAuthLogHandler {
     }
 
     public void sendDataDelAuthLog(AuthResultEnum state, List<DataAuth> delList, String realIp) {
-        logger.debug("DataAuthLogHandler sendDataAuthLog client ip :{}", realIp);
+        logger.info("DataAuthLogHandler sendDataAuthLog client ip :{}", realIp);
         //主体
         AuthorizeSubjectDto authorizeSubjectDto = new AuthorizeSubjectDto();
         if (!CollectionUtils.isEmpty(delList)) {

+ 1 - 1
dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/audit/service/log/RoleViewAuthLogHandler.java

@@ -56,7 +56,7 @@ public class RoleViewAuthLogHandler {
      * @param realIp
      */
     public void sendLog(AuthResultEnum state, RoleAuthDto dto, Set<String> oldStaffIds, String realIp) {
-        logger.debug("RoleViewAuthLogHandler sendLog client ip:{}", realIp);
+        logger.info("RoleViewAuthLogHandler sendLog client ip:{}", realIp);
         JSONArray staffObjList = JSONArray.parseArray(dto.getStaffJson());//保存人员列表,有userId,orgId,activeTime
         JSONArray delStaffList = JSONArray.parseArray(dto.getDelStaffJson());//删除人员列表,有userId,orgId
         SecurityUser securityUser = (SecurityUser) ContextUtils.getUserInfo();

+ 4 - 4
dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/audit/service/log/ServiceAuthLogHandler.java

@@ -55,7 +55,7 @@ public class ServiceAuthLogHandler {
     private IUserInfoFacade userInfoFacade;
 
     public void sendAuthLog(AuthResultEnum state, String appId, String serviceCode, String realIp) {
-        logger.debug("ServiceAuthLogHandler sendAuthLog client ip :{}", realIp);
+        logger.info("ServiceAuthLogHandler sendAuthLog client ip :{}", realIp);
         ApplyInfo app = applyInfoFacade.applyDetail(appId);
         String appName = app.getApplyName();
         ServiceResource serviceResource = serviceResourceFacade.detailByCode(serviceCode);
@@ -131,7 +131,7 @@ public class ServiceAuthLogHandler {
     }
 
     public void sendDelAuthLog(AuthResultEnum state, String appId, String serviceCode, String realIp) {
-        logger.debug("ServiceAuthLogHandler ServiceAuthLogHandler sendDelAuthLog client ip:{}", realIp);
+        logger.info("ServiceAuthLogHandler ServiceAuthLogHandler sendDelAuthLog client ip:{}", realIp);
 
         ApplyInfo app = applyInfoFacade.applyDetail(appId);
         String appName = app.getApplyName();
@@ -168,7 +168,7 @@ public class ServiceAuthLogHandler {
 
     public void sendAuthLogByFlow(AuthResultEnum state, String idcard, String appId, List<String> serviceCodes) {
         String ip = IpUtils.getIp();
-        logger.debug("ServiceAuthLogHandler sendAuthLogByFlow client ip :{}", ip);
+        logger.info("ServiceAuthLogHandler sendAuthLogByFlow client ip :{}", ip);
         AuthorizeHandlerDto authorizeHandlerDto = new AuthorizeHandlerDto();
         authorizeHandlerDto.setHandlerName(AuditConstance.SYS_USER_NAME);
         authorizeHandlerDto.setHandlerId(AuditConstance.SYS_USER_ID);
@@ -204,7 +204,7 @@ public class ServiceAuthLogHandler {
 
     public void sendDelAuthLogByFlow(AuthResultEnum state, String idcard, String appId, List<String> serviceCodes) {
         String ip = IpUtils.getIp();
-        logger.debug("sendDelAuthLogByFlow client ip :{}", ip);
+        logger.info("sendDelAuthLogByFlow client ip :{}", ip);
         AuthorizeHandlerDto authorizeHandlerDto = new AuthorizeHandlerDto();
         authorizeHandlerDto.setHandlerName(AuditConstance.SYS_USER_NAME);
         authorizeHandlerDto.setHandlerId(AuditConstance.SYS_USER_ID);

+ 1 - 1
dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/audit/service/log/UserViewAuthLogHandler.java

@@ -57,7 +57,7 @@ public class UserViewAuthLogHandler {
      * @param realIp
      */
     public void sendLog(AuthResultEnum state, StaffAssignDTO dto, List<StaffAssignAuthInfo> oldUserRoles, String realIp) {
-        logger.debug("UserViewAuthLogHandler sendLog client ip :{}", realIp);
+        logger.info("UserViewAuthLogHandler sendLog client ip :{}", realIp);
         JSONArray saveList = JSONArray.parseArray(dto.getSaveIds());
         JSONArray deleteList = JSONArray.parseArray(dto.getDeleteIds());
         SecurityUser securityUser = (SecurityUser) ContextUtils.getUserInfo();

+ 12 - 0
dcuc-auth-service/src/test/java/com/dragoninfo/dcuc/auth/auth/service/IAuthFlowServiceTest.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.dragoninfo.dcuc.auth.DcucAuthApplication;
+import com.dragoninfo.dcuc.auth.auth.bpo.StaffAssignAuthInfoBPO;
 import com.dragoninfo.dcuc.auth.auth.business.IAuthAprResultBusiness;
 import com.dragoninfo.dcuc.auth.auth.business.IServiceAuthBusiness;
 import com.dragoninfo.dcuc.auth.auth.dto.ApprovalWorkFlowDTO;
@@ -46,6 +47,17 @@ public class IAuthFlowServiceTest {
     @Autowired
     private DcucAuthConfig config;
 
+    @Autowired
+    private StaffAssignAuthInfoBPO staffAssignAuthInfoBPO;
+
+
+    @Test
+    public void getStaffAuth() {
+        List<String> staffIdsByAppId = staffAssignAuthInfoBPO.getStaffIdsByAppId("40288a8b69a49a990169b8e5f9da0000");
+        System.out.println(staffIdsByAppId);
+    }
+
+
     @Test
     public void getByFlowId() {