- fix test bugs

apolloconfig · Oct 19, 2023 · a154f53 · a154f53
1 parent add5f0d
commit a154f53
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/.../src/test/java/com/ctrip/framework/apollo/audit/controller/ApolloAuditControllerTest.java b/.../src/test/java/com/ctrip/framework/apollo/audit/controller/ApolloAuditControllerTest.java
@@ -16,6 +16,7 @@
  */
 package com.ctrip.framework.apollo.audit.controller;
 
+import com.ctrip.framework.apollo.audit.ApolloAuditProperties;
 import com.ctrip.framework.apollo.audit.MockBeanFactory;
 import com.ctrip.framework.apollo.audit.api.ApolloAuditLogApi;
 import com.ctrip.framework.apollo.audit.dto.ApolloAuditLogDTO;
@@ -47,6 +48,8 @@ public class ApolloAuditControllerTest {
   private MockMvc mockMvc;
   @MockBean
   private ApolloAuditLogApi api;
+  @MockBean
+  private ApolloAuditProperties properties;
 
   @Test
   public void testFindAllAuditLogs() throws Exception {

diff --git a/...ain/java/com/ctrip/framework/apollo/audit/configuration/ApolloAuditAutoConfiguration.java b/...ain/java/com/ctrip/framework/apollo/audit/configuration/ApolloAuditAutoConfiguration.java
@@ -105,7 +105,7 @@ public ApolloAuditLogQueryApiPreAuthorizer apolloAuditLogQueryApiPreAuthorizer()
   }
 
   @Bean
-  public ApolloAuditController apolloAuditController(ApolloAuditLogApi api) {
+  public ApolloAuditController apolloAuditController(ApolloAuditLogApi api, ApolloAuditProperties apolloAuditProperties) {
     return new ApolloAuditController(api, apolloAuditProperties);
   }
 

diff --git a/...java/com/ctrip/framework/apollo/audit/configuration/ApolloAuditNoOpAutoConfiguration.java b/...java/com/ctrip/framework/apollo/audit/configuration/ApolloAuditNoOpAutoConfiguration.java
@@ -75,7 +75,7 @@ public ApolloAuditLogQueryApiPreAuthorizer apolloAuditLogQueryApiPreAuthorizer()
   }
 
   @Bean
-  public ApolloAuditController apolloAuditController(ApolloAuditLogApi api) {
+  public ApolloAuditController apolloAuditController(ApolloAuditLogApi api, ApolloAuditProperties apolloAuditProperties) {
     return new ApolloAuditController(api, apolloAuditProperties);
   }
 

diff --git a/apollo-portal/src/main/resources/static/scripts/services/AuditLogService.js b/apollo-portal/src/main/resources/static/scripts/services/AuditLogService.js
@@ -45,8 +45,8 @@ appService.service('AuditLogService', ['$resource', '$q', 'AppUtil', function ($
   return {
     is_enabled: function () {
       var d = $q.defer();
-      audit_resource.is_enabled({}
-           , function (result) {
+      audit_resource.is_enabled({
+          }, function (result) {
             d.resolve(result);
           }, function (result) {
             d.reject(result);
-Original file line number
+Diff line change
@@ Expand Up @@
       }
       @Bean
-      public ApolloAuditController apolloAuditController(ApolloAuditLogApi api) {
+      public ApolloAuditController apolloAuditController(ApolloAuditLogApi api, ApolloAuditProperties apolloAuditProperties) {
         return new ApolloAuditController(api, apolloAuditProperties);
       }
@@ Expand Down @@