From 82f208a133a37c19024855bb2f629647fcf6d105 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Wed, 2 Dec 2020 13:38:01 +0800
Subject: [PATCH] system微服务启动类更名,方便区分单机和微服务
---
jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java | 57 ---------------------------------------------------------
jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 57 insertions(+), 57 deletions(-)
delete mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java
create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java
deleted file mode 100644
index c6250dd..0000000
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.jeecg;
-
-import lombok.extern.slf4j.Slf4j;
-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.SpringBootApplication;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.core.env.Environment;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-@Slf4j
-@SpringBootApplication
-@EnableFeignClients(basePackages = {"org.jeecg"})
-public class JeecgSystemApplication extends SpringBootServletInitializer {
-
- @Override
- protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
- return application.sources(JeecgSystemApplication.class);
- }
-
- public static void main(String[] args) throws UnknownHostException {
- ConfigurableApplicationContext application = SpringApplication.run(JeecgSystemApplication.class, args);
- Environment env = application.getEnvironment();
- String ip = InetAddress.getLocalHost().getHostAddress();
- String port = env.getProperty("server.port");
- String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
- log.info("\n----------------------------------------------------------\n\t" +
- "Application Jeecg-Boot is running! Access URLs:\n\t" +
- "Local: \t\thttp://localhost:" + port + path + "/doc.html\n" +
- "External: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
- "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
- "----------------------------------------------------------");
-
- }
-
- /**
- * tomcat-embed-jasper引用后提示jar找不到的问题
- */
- @Bean
- public TomcatServletWebServerFactory tomcatFactory() {
- return new TomcatServletWebServerFactory() {
- @Override
- protected void postProcessContext(Context context) {
- ((StandardJarScanner) context.getJarScanner()).setScanManifest(false);
- }
- };
- }
-}
\ No newline at end of file
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
new file mode 100644
index 0000000..19fcca8
--- /dev/null
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java
@@ -0,0 +1,57 @@
+package org.jeecg;
+
+import lombok.extern.slf4j.Slf4j;
+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.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.core.env.Environment;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+@Slf4j
+@SpringBootApplication
+@EnableFeignClients(basePackages = {"org.jeecg"})
+public class JeecgSystemCloudApplication extends SpringBootServletInitializer {
+
+ @Override
+ protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+ return application.sources(JeecgSystemCloudApplication.class);
+ }
+
+ public static void main(String[] args) throws UnknownHostException {
+ ConfigurableApplicationContext application = SpringApplication.run(JeecgSystemCloudApplication.class, args);
+ Environment env = application.getEnvironment();
+ String ip = InetAddress.getLocalHost().getHostAddress();
+ String port = env.getProperty("server.port");
+ String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
+ log.info("\n----------------------------------------------------------\n\t" +
+ "Application Jeecg-Boot is running! Access URLs:\n\t" +
+ "Local: \t\thttp://localhost:" + port + path + "/doc.html\n" +
+ "External: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
+ "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
+ "----------------------------------------------------------");
+
+ }
+
+ /**
+ * tomcat-embed-jasper引用后提示jar找不到的问题
+ */
+ @Bean
+ public TomcatServletWebServerFactory tomcatFactory() {
+ return new TomcatServletWebServerFactory() {
+ @Override
+ protected void postProcessContext(Context context) {
+ ((StandardJarScanner) context.getJarScanner()).setScanManifest(false);
+ }
+ };
+ }
+}
\ No newline at end of file
--
libgit2 0.22.2