From 5567cfce22b9e6589d2f94f185c1e6051e55727f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=A6=E5=A2=83=E8=BF=B7=E7=A6=BB?=
 <dreamylost@outlook.com>
Date: Mon, 29 Nov 2021 14:41:02 +0800
Subject: [PATCH] gg

---
 deploy.sh                                     |  3 ++-
 .../io/github/dreamylost/Application.scala    |  5 ++---
 .../dreamylost/config/SpringMVCConfig.scala   | 21 ++++++++++++-------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/deploy.sh b/deploy.sh
index 21139d3..5baf6d2 100644
--- a/deploy.sh
+++ b/deploy.sh
@@ -7,7 +7,8 @@ git pull origin master
 
 ./gradlew bootRepackage
 
-nohup java -jar -Dspring.mail.username=568845948@qq.com \
+nohup java -jar \
+ -Dserver.port=8989 -Dspring.mail.username=568845948@qq.com \
  -Dspring.mail.password=aklbpawjeosybdfb \
  -Dspring.datasource.username=root \
  -Dspring.datasource.password=  \
diff --git a/src/main/scala/io/github/dreamylost/Application.scala b/src/main/scala/io/github/dreamylost/Application.scala
index b124345..20bf289 100644
--- a/src/main/scala/io/github/dreamylost/Application.scala
+++ b/src/main/scala/io/github/dreamylost/Application.scala
@@ -17,16 +17,15 @@ import scala.beans.BeanProperty
 @MapperScan(Array("io.github.dreamylost.repository"))
 class ApplicationConfig
 
-
 object Application extends SpringBootServletInitializer {
 
   @BeanProperty
   var applicationContext: ApplicationContext = _
 
   def main(args: Array[String]): Unit =
-    applicationContext = SpringApplication.run(classOf[ApplicationConfig], args:_*)
+    applicationContext = SpringApplication.run(classOf[ApplicationConfig], args: _*)
 
   override protected def configure(builder: SpringApplicationBuilder): SpringApplicationBuilder =
     builder.sources(Application)
 
-}
\ No newline at end of file
+}
diff --git a/src/main/scala/io/github/dreamylost/config/SpringMVCConfig.scala b/src/main/scala/io/github/dreamylost/config/SpringMVCConfig.scala
index 23cac3a..c8a38ed 100644
--- a/src/main/scala/io/github/dreamylost/config/SpringMVCConfig.scala
+++ b/src/main/scala/io/github/dreamylost/config/SpringMVCConfig.scala
@@ -3,8 +3,13 @@ package io.github.dreamylost.config
 import com.fasterxml.jackson.databind.ObjectMapper
 import io.github.dreamylost.util.Jackson
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
-import org.springframework.context.annotation.{ Bean, Configuration, Primary }
-import org.springframework.web.servlet.config.annotation.{ InterceptorRegistry, ResourceHandlerRegistry, ViewControllerRegistry, WebMvcConfigurerAdapter }
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.context.annotation.Primary
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
+import org.springframework.web.servlet.config.annotation.ViewControllerRegistry
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
 import org.springframework.web.servlet.config.annotation.CorsRegistry
 
 /** SpringMVC配置
@@ -65,14 +70,16 @@ class SpringMVCConfig extends WebMvcConfigurerAdapter {
   def jacksonObjectMapper(): ObjectMapper = {
     Jackson.mapper
   }
-  
-  /**
-    * 允许跨域
+
+  /** 允许跨域
     */
   override def addCorsMappings(registry: CorsRegistry): Unit = {
-    registry.addMapping("/**").allowedOrigins("*")
+    registry
+      .addMapping("/**")
+      .allowedOrigins("*")
       .allowedMethods("GET", "POST", "PUT", "OPTIONS", "DELETE", "PATCH")
-      .allowCredentials(true).maxAge(3600)
+      .allowCredentials(true)
+      .maxAge(3600)
   }
 
 }
-- 
GitLab