From 89ec913c9d95e5d4eca86e50ad531ddcee978a11 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Wed, 2 Dec 2020 20:11:24 +0800
Subject: [PATCH] 单体和微服务启动类，加注释说明
---
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/JeecgOneGUI.java | 2 +-
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/JeecgSystemApplication.java | 5 ++++-
jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java | 4 ++++
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/JeecgOneGUI.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/JeecgOneGUI.java
index 3626773..920808e 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/JeecgOneGUI.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/JeecgOneGUI.java
@@ -11,7 +11,7 @@ import org.jeecgframework.codegenerate.window.CodeWindow;
*/
public class JeecgOneGUI {
- /** 详细使用手册： http://doc.jeecg.com/1275846 */
+ /** 详细使用手册： http://doc.jeecg.com/2043919 */
public static void main(String[] args) {
new CodeWindow().pack();
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/JeecgSystemApplication.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/JeecgSystemApplication.java
index ddfb488..3657896 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/JeecgSystemApplication.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/JeecgSystemApplication.java
@@ -5,7 +5,6 @@ import org.apache.catalina.Context;
import org.apache.tomcat.util.scan.StandardJarScanner;
import org.jeecg.common.util.oConvertUtils;
import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
@@ -17,8 +16,12 @@ import org.springframework.core.env.Environment;
import java.net.InetAddress;
import java.net.UnknownHostException;
+/**
+* 单体启动类（采用此类启动项目为单体模式）
+*/
@Slf4j
@SpringBootApplication
+//@EnableAutoConfiguration(exclude={org.activiti.spring.boot.SecurityAutoConfiguration.class})
public class JeecgSystemApplication extends SpringBootServletInitializer {
@Override
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java
index 19fcca8..4ac909b 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java
+++ b/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;
import java.net.InetAddress;
import java.net.UnknownHostException;
+/**
+ * 微服务启动类（采用此类启动项目为微服务模式）
+ * 注意： 需要先在naocs里面创建配置文件，参考文档 http://doc.jeecg.com/2043906
+ */
@Slf4j
@SpringBootApplication
@EnableFeignClients(basePackages = {"org.jeecg"})
--
libgit2 0.22.2