Bladeren bron

修改默认打成模式

wkeyuan 4 jaren geleden
bovenliggende
commit
d1cc1004cd

+ 4 - 17
pom.xml

@@ -11,7 +11,7 @@
     <groupId>net.diaowen</groupId>
     <artifactId>dwsurvey-oss</artifactId>
     <version>v.4.0</version>
-    <packaging>jar</packaging>
+    <packaging>war</packaging>
     <name>dwsurvey</name>
     <description>DWSurvey project for Spring Boot</description>
     <properties>
@@ -29,20 +29,19 @@
         </dependency>
 
         <!--war 模式添加-->
-        <!--
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-tomcat</artifactId>
             <scope>provided</scope>
         </dependency>
-        -->
+
         <!--jar模式开启热部署,便于修改后自动发布,生产环境推荐关掉此项配置-->
-        <dependency>
+        <!--<dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
             <scope>runtime</scope>
             <optional>true</optional>
-        </dependency>
+        </dependency>-->
 
         <!-- 添加servlet依赖模块 -->
         <dependency>
@@ -54,11 +53,6 @@
             <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>
         </dependency>
-        <!--添加tomcat依赖模块.-->
-        <!--<dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-tomcat</artifactId>
-        </dependency>-->
         <!-- 使用jsp引擎,springboot内置tomcat没有此依赖 -->
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
@@ -238,12 +232,6 @@
             <classifier>jdk15</classifier>
         </dependency>
 
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.6.0</version>
-        </dependency>
-
         <!-- https://mvnrepository.com/artifact/org.json/json -->
         <dependency>
             <groupId>org.json</groupId>
@@ -316,7 +304,6 @@
         </dependency>
 
 
-
     </dependencies>
 
     <build>

+ 0 - 1
src/main/java/net/diaowen/dwsurvey/DwsurveyApplication.java

@@ -7,7 +7,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @SpringBootApplication
 @ComponentScan(basePackages = {"net.diaowen.common","net.diaowen.dwsurvey"})

+ 7 - 0
src/main/resources/application-dev.yml

@@ -56,3 +56,10 @@ spring:
         cache:
           use_second_level_cache: false
           use_query_cache: false
+logging:
+  level:
+    net:
+      diaowen: INFO
+    org:
+      hibernate: ERROR
+      apache: ERROR

+ 7 - 0
src/main/resources/application-prod.yml

@@ -56,3 +56,10 @@ spring:
         cache:
           use_second_level_cache: false
           use_query_cache: false
+logging:
+  level:
+    net:
+      diaowen: INFO
+    org:
+      hibernate: ERROR
+      apache: ERROR

+ 7 - 0
src/main/resources/application-test.yml

@@ -56,3 +56,10 @@ spring:
         cache:
           use_second_level_cache: false
           use_query_cache: false
+logging:
+  level:
+    net:
+      diaowen: INFO
+    org:
+      hibernate: ERROR
+      apache: ERROR

+ 9 - 7
src/main/webapp/WEB-INF/page/content/diaowen-design/survey.jsp

@@ -1310,7 +1310,7 @@
 </div>
 </div>
 
-<div id="dw_body">
+<div id="dw_body" style="padding-bottom: 20px;">
 	<div id="dw_body_left">
 		<div class="dw_body_title" style="text-align: center;">设计目录</div>
 		<div id="dwBodyLeftContent">
@@ -2425,14 +2425,16 @@
 </script>
 <%@ include file="../../layouts/other.jsp"%>
 <div style="text-align: center;">
-<div class="dw_foot" style="padding-bottom: 30px;">
-	<div class="footer-copyright" style="color: gray;padding-top: 0px;font-size: 16px;">
-		Powered by <a href="http://www.diaowen.net" target="_blank" style="text-decoration: none;color: gray;"> <%=FooterInfo.getVersionInfo()%></a>
-		Copyright © 2012-2017
-		<a href="http://www.diaowen.net" target="_blank" style="text-decoration: none;color: rgb(53, 117, 136);">调问网</a>
+	<div class="dw_foot" style="padding-bottom: 20px;">
+		<%@ include file="../../layouts/footer-1.jsp" %>
+		<!-- 必须保留声明 start -->
+		<div class="footer-copyright" style="color: #666;padding-top: 0px;font-size: 13px;padding-bottom: 16px;text-align: center;">
+			Powered by <a href="http://www.diaowen.net" style="text-decoration: none;color: #333;"><strong>DWSurvey</strong></a>
+			<%=FooterInfo.getVersionNumber()%> © 2012-2022 <a href="http://www.diaowen.net" style="text-decoration: none;color: #333;"><strong>调问网</strong></a>
+		</div>
+		<!-- 必须保留声明 end -->
 	</div>
 </div>
-</div>
 
 </body>
 </html>