Browse Source

Pull request #14582: REPORT-130377 fbp通过demo启动还是会进入起始页 & REPORT-130404 fbp设计器远程82,已有用户、部门、角色都拿不到数据

Merge in DESIGN/design from ~DESTINY.LIN/design:fbp-1.0 to fbp-1.0

* commit '49371411dc8e78469543729a5d22c04bbb368dfe':
  REPORT-130377 fbp通过demo启动还是会进入起始页
  REPORT-130404 fbp设计器远程82,已有用户、部门、角色都拿不到数据
fbp-1.0
Destiny.Lin-林锦龙 3 months ago
parent
commit
f61c8c9615
  1. 1
      build.gradle
  2. 4
      designer-realize/src/main/java/com/fanruan/boot/init/DesignerInitComponent.java
  3. 2
      designer-realize/src/main/java/com/fr/start/CarinaDesigner.java

1
build.gradle

@ -43,6 +43,7 @@ allprojects {
tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
options.compilerArgs << "-parameters"
}
repositories {

4
designer-realize/src/main/java/com/fanruan/boot/init/DesignerInitComponent.java

@ -58,7 +58,9 @@ public class DesignerInitComponent {
@NotNull
@Override
protected StartupArgs compute() {
return Carina.getApplicationContext().singleton(StartupArgsShell.class).get();
StartupArgs startupArgs = Carina.getApplicationContext().singleton(StartupArgsShell.class).get();
FineLoggerFactory.getLogger().info("[designer init args : {} ]", startupArgs);
return startupArgs;
}
};

2
designer-realize/src/main/java/com/fr/start/CarinaDesigner.java

@ -17,6 +17,7 @@ import com.fr.start.common.DesignerStartupContext;
import com.fr.start.module.StartupArgs;
import com.fr.start.server.ServletContextWrapper;
import java.util.Arrays;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
@ -45,6 +46,7 @@ public class CarinaDesigner extends MainDesigner{
Carina.setPartitionManager(manager);
DesignLauncher.setContext(carinaApplicationContext);
Carina.getApplicationContext().singleton(StartupArgsShell.class).set(new StartupArgs(args));
FineLoggerFactory.getLogger().info("start args : {} ", Arrays.toString(args));
Carina.getApplicationContext().singleton(LaunchType.class).set(LaunchType.DESIGNER);
DesignLauncher launch = new DesignLauncher("/com/fr/config/starter/designer-startup-carina.xml");
FineRuntime.start();

Loading…
Cancel
Save