Merge branch 'jenkins_with_weblogic' of ssh://git@192.168.240.178:18081/eapim/eapim-admin.git into features/sync-hs04-apifullpath
This commit is contained in:
@@ -1313,6 +1313,8 @@
|
|||||||
|
|
||||||
$('#functionComboDialog').val($('#functionCombo').val());
|
$('#functionComboDialog').val($('#functionCombo').val());
|
||||||
|
|
||||||
|
setSearchable("functionComboDialog");
|
||||||
|
|
||||||
mouseoverEndpoint(endpoint, 'click-endpoint');
|
mouseoverEndpoint(endpoint, 'click-endpoint');
|
||||||
moveDialogPosition(false);
|
moveDialogPosition(false);
|
||||||
},
|
},
|
||||||
|
|||||||
+2
-1
@@ -17,11 +17,12 @@ import org.springframework.web.servlet.ModelAndView;
|
|||||||
|
|
||||||
import com.eactive.eai.agent.command.CommonCommand;
|
import com.eactive.eai.agent.command.CommonCommand;
|
||||||
import com.eactive.eai.rms.common.base.OnlBaseAnnotationController;
|
import com.eactive.eai.rms.common.base.OnlBaseAnnotationController;
|
||||||
|
import com.eactive.eai.rms.common.interceptor.InterceptorSkipController;
|
||||||
import com.eactive.eai.rms.common.login.SessionManager;
|
import com.eactive.eai.rms.common.login.SessionManager;
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
|
|
||||||
@Controller
|
@Controller
|
||||||
public class ControlManController extends OnlBaseAnnotationController {
|
public class ControlManController extends OnlBaseAnnotationController implements InterceptorSkipController {
|
||||||
|
|
||||||
private static final String RELOAD_RESTRICT_INFO_COMMAND = "com.eactive.eai.agent.restrict.ReloadRestrictInfoCommand";
|
private static final String RELOAD_RESTRICT_INFO_COMMAND = "com.eactive.eai.agent.restrict.ReloadRestrictInfoCommand";
|
||||||
private static final String ERROR_RESULT_STATUS = "<font color='#ff0000'>에러</font>";
|
private static final String ERROR_RESULT_STATUS = "<font color='#ff0000'>에러</font>";
|
||||||
|
|||||||
Reference in New Issue
Block a user