Commit 1f39b884 by WeiCong

针对新版本bd底层进行调整

parent 20bdfd90
...@@ -325,13 +325,13 @@ public class NoUiPresentation extends AbstractNullPresentation { ...@@ -325,13 +325,13 @@ public class NoUiPresentation extends AbstractNullPresentation {
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
public final void setModified(IAttribute paramIAttribute) throws ContainerException { public final void setModified(IAttribute paramIAttribute) throws ContainerException {
paramIAttribute.setAttribute("MODIFY", Boolean.valueOf(true)); //paramIAttribute.setAttribute("MODIFY", Boolean.valueOf(true));
setModified(paramIAttribute, true); setModified(paramIAttribute, true);
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
public final void resetModified(IAttribute paramIAttribute) throws ContainerException { public final void resetModified(IAttribute paramIAttribute) throws ContainerException {
paramIAttribute.setAttribute("MODIFY", Boolean.valueOf(false)); // paramIAttribute.setAttribute("MODIFY", Boolean.valueOf(false));
setModified(paramIAttribute, false); setModified(paramIAttribute, false);
} }
...@@ -506,7 +506,7 @@ public class NoUiPresentation extends AbstractNullPresentation { ...@@ -506,7 +506,7 @@ public class NoUiPresentation extends AbstractNullPresentation {
} }
@Override @Override
public void saveDisplay(IPanel[] panels, String fileName, String cssUrl) throws ContainerException { public void saveDisplay(IPanel[] panels, String fileName, String cssUrl, String jsUrl) throws ContainerException {
saveDisplay(panels, fileName); saveDisplay(panels, fileName);
} }
......
...@@ -36,6 +36,7 @@ public class NoUiUtils { ...@@ -36,6 +36,7 @@ public class NoUiUtils {
public static II18n i18n; public static II18n i18n;
public static IFilter passwordFilter; public static IFilter passwordFilter;
public static boolean connectKeeped; public static boolean connectKeeped;
public static String serviceDbName;
private static final ThreadGroup threadGroup = new ThreadGroup("eIBS"); private static final ThreadGroup threadGroup = new ThreadGroup("eIBS");
...@@ -56,13 +57,13 @@ public class NoUiUtils { ...@@ -56,13 +57,13 @@ public class NoUiUtils {
String str2 = (userNames == null) || (userNames.length <= i) || (ContainerUtils.isEmpty(userNames[i])) ? userName : userNames[i]; String str2 = (userNames == null) || (userNames.length <= i) || (ContainerUtils.isEmpty(userNames[i])) ? userName : userNames[i];
log.debug("userName:" + str2); log.debug("userName:" + str2);
localContext.setAuth(new DefaultLoginContext(str2)); localContext.setAuth(new DefaultLoginContext(str2));
IModuleSession localIModuleSession = (IModuleSession) factory.newInstance(localContext); IModuleSession localIModuleSession = (IModuleSession) factory.newInstance(localContext,NoUiUtils.connectKeeped);
localContext.setSession(localIModuleSession); localContext.setSession(localIModuleSession);
long l1 = (timeouts == null) || (timeouts.length <= i) ? timeout : timeouts[i]; long l1 = (timeouts == null) || (timeouts.length <= i) ? timeout : timeouts[i];
log.debug("timeout:" + l1); log.debug("timeout:" + l1);
long l2 = (millises == null) || (millises.length <= i) ? millis : millises[i]; long l2 = (millises == null) || (millises.length <= i) ? millis : millises[i];
log.debug("millis:" + l2); log.debug("millis:" + l2);
ServiceThread localServiceThread = new ServiceThread(threadGroup, localContext, localIModuleSession, str1, l1, l2); ServiceThread localServiceThread = new ServiceThread(threadGroup, localContext, localIModuleSession, serviceDbName,str1, l1, l2);
localServiceThread.start(); localServiceThread.start();
log.info("started service:" + str1); log.info("started service:" + str1);
services.add(localServiceThread); services.add(localServiceThread);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment