From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java | 69 ++++++++++++++++++++++++++++++++++
1 files changed, 69 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
new file mode 100644
index 0000000..558fe10
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
@@ -0,0 +1,69 @@
+package com.ruoyi;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.core.env.Environment;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.web.client.RestTemplate;
+import springfox.documentation.oas.annotations.EnableOpenApi;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+/**
+ * 启动程序
+ *
+ * @author ruoyi
+ */
+@Slf4j
+@EnableOpenApi
+@EnableCaching
+@EnableScheduling//开启定时任务
+@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
+public class RuoYiApplication
+{
+ public static void main(String[] args) {
+
+
+ ConfigurableApplicationContext application = SpringApplication.run(RuoYiApplication.class, args);
+ try {
+
+ Environment env = application.getEnvironment();
+ log.info("\n----------------------------------------------------------\n\t" +
+ "应用 '{}' 运行成功! 访问连接:\n\t" +
+ "Swagger文档: \t\thttp://{}:{}/doc.html\n" +
+ "----------------------------------------------------------",
+ env.getProperty("spring.application.name", "后台"),
+ InetAddress.getLocalHost().getHostAddress(),
+ env.getProperty("server.port", "8081"));
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 当不存在此 wxRestTemplate 使用此方法的bean注入
+ *
+ * @return
+ */
+ @Bean
+ @ConditionalOnMissingBean(name = "restTemplate")
+ public RestTemplate wxRestTemplate() {
+ //复杂构造函数的使用
+ SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
+ // 设置超时
+ requestFactory.setConnectTimeout(6000);
+ requestFactory.setReadTimeout(6000);
+ RestTemplate restTemplate = new RestTemplate();
+ restTemplate.setRequestFactory(requestFactory);
+ return restTemplate;
+ }
+
+}
--
Gitblit v1.7.1