Commit 89ec913c9d95e5d4eca86e50ad531ddcee978a11

Authored by zhangdaiscott
1 parent 82f208a1

单体和微服务启动类,加注释说明

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/JeecgOneGUI.java
@@ -11,7 +11,7 @@ import org.jeecgframework.codegenerate.window.CodeWindow; @@ -11,7 +11,7 @@ import org.jeecgframework.codegenerate.window.CodeWindow;
11 */ 11 */
12 public class JeecgOneGUI { 12 public class JeecgOneGUI {
13 13
14 - /** 详细使用手册: http://doc.jeecg.com/1275846 */ 14 + /** 详细使用手册: http://doc.jeecg.com/2043919 */
15 public static void main(String[] args) { 15 public static void main(String[] args) {
16 new CodeWindow().pack(); 16 new CodeWindow().pack();
17 } 17 }
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/JeecgSystemApplication.java
@@ -5,7 +5,6 @@ import org.apache.catalina.Context; @@ -5,7 +5,6 @@ import org.apache.catalina.Context;
5 import org.apache.tomcat.util.scan.StandardJarScanner; 5 import org.apache.tomcat.util.scan.StandardJarScanner;
6 import org.jeecg.common.util.oConvertUtils; 6 import org.jeecg.common.util.oConvertUtils;
7 import org.springframework.boot.SpringApplication; 7 import org.springframework.boot.SpringApplication;
8 -import org.springframework.boot.autoconfigure.EnableAutoConfiguration;  
9 import org.springframework.boot.autoconfigure.SpringBootApplication; 8 import org.springframework.boot.autoconfigure.SpringBootApplication;
10 import org.springframework.boot.builder.SpringApplicationBuilder; 9 import org.springframework.boot.builder.SpringApplicationBuilder;
11 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; 10 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
@@ -17,8 +16,12 @@ import org.springframework.core.env.Environment; @@ -17,8 +16,12 @@ import org.springframework.core.env.Environment;
17 import java.net.InetAddress; 16 import java.net.InetAddress;
18 import java.net.UnknownHostException; 17 import java.net.UnknownHostException;
19 18
  19 +/**
  20 +* 单体启动类(采用此类启动项目为单体模式)
  21 +*/
20 @Slf4j 22 @Slf4j
21 @SpringBootApplication 23 @SpringBootApplication
  24 +//@EnableAutoConfiguration(exclude={org.activiti.spring.boot.SecurityAutoConfiguration.class})
22 public class JeecgSystemApplication extends SpringBootServletInitializer { 25 public class JeecgSystemApplication extends SpringBootServletInitializer {
23 26
24 @Override 27 @Override
jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java
@@ -17,6 +17,10 @@ import org.springframework.core.env.Environment; @@ -17,6 +17,10 @@ import org.springframework.core.env.Environment;
17 import java.net.InetAddress; 17 import java.net.InetAddress;
18 import java.net.UnknownHostException; 18 import java.net.UnknownHostException;
19 19
  20 +/**
  21 + * 微服务启动类(采用此类启动项目为微服务模式)
  22 + * 注意: 需要先在naocs里面创建配置文件,参考文档 http://doc.jeecg.com/2043906
  23 + */
20 @Slf4j 24 @Slf4j
21 @SpringBootApplication 25 @SpringBootApplication
22 @EnableFeignClients(basePackages = {"org.jeecg"}) 26 @EnableFeignClients(basePackages = {"org.jeecg"})