Merge remote-tracking branch 'origin/master'

2 years ago · f2e08b1fc1
5 changed files with 8 additions and 7 deletions
--- a/src/main/java/com/spring/common/aop/RepeatSubmitAspect.java
+++ b/src/main/java/com/spring/common/aop/RepeatSubmitAspect.java
@ -32,7 +32,8 @@ public class RepeatSubmitAspect {
 	//缓存数据存放 后续要改小时间 目前十秒钟
 	private static final Cache<String, Object> caches = CacheBuilder.newBuilder()
 			.maximumSize(10000).expireAfterWrite(5, TimeUnit.SECONDS).build();
-	
+
+
 	//切点
 	@Pointcut("@annotation(com.spring.common.annotation.RepeatSubmit)")
 	public void pointCut() {}
--- a/target/classes/logback.xml
+++ b/target/classes/logback.xml
@ -19,7 +19,7 @@
       <!-- <File>logs/xujie-erp/xujie2021.log</File>--><!-- 设置日志不超过${log.max.size}时的保存路径，注意如果 是web项目会保存到Tomcat的bin目录 下 -->
        <!-- 滚动记录文件，先将日志记录到指定文件，当符合某个条件时，将日志记录到其他文件。-->  
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">  
-            <FileNamePattern>logs/rongxin/RONXING%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <FileNamePattern>logs/cclPlm/cclPlm%d{yyyy-MM-dd}.%i.log</FileNamePattern>
            <!-- 当天的日志大小 超过${log.max.size}时,压缩日志并保存 -->  
            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">  
                <maxFileSize>${log.max.size}</maxFileSize>  
--- a/target/classes/templates/login.ftl
+++ b/target/classes/templates/login.ftl
@ -7,7 +7,7 @@
    <meta name="description" content="">
    <meta name="author" content="">
    <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
-    <title>${project_title!"RongXin-PDA"}</title>
+    <title>${project_title!"PLM-PDA"}</title>
    <!-- Bootstrap core CSS -->
    <link rel="stylesheet" type="text/css" href="/js/bootstrap-3.3.7/css/bootstrap.min.css">
    <link rel="stylesheet" type="text/css" href="/js/bootstrap-3.3.7/css/bootstrap-theme.min.css">
@ -29,7 +29,7 @@
 </head>
 <body>
 <div class="container" style="margin-top: 30%;">
-    <h4 class="form-signin-heading" >RongXin-PDA</h4>
+    <h4 class="form-signin-heading" >PLM-PDA</h4>
    <label for="username" class="sr-only">用户名</label>
    <input type="text" id="username" name="username" class="form-control" autocomplete="off" placeholder="用户名" required autofocus><br>
    <label for="inputPassword" class="sr-only">Password</label>
--- a/target/classes/templates/pda/publicMenu.ftl
+++ b/target/classes/templates/pda/publicMenu.ftl
@ -6,7 +6,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<meta name="description" content="">
 	<meta name="author" content="">
-	<title>${projectTitle!"RongXin-PDA"}</title>
+	<title>${projectTitle!"PLM-PDA"}</title>
 	<!-- Bootstrap core CSS -->
 	<link rel="stylesheet" type="text/css" href="/js/bootstrap-3.3.7/css/bootstrap.css">

--- a/target/classes/templates/pdaBase.ftl
+++ b/target/classes/templates/pdaBase.ftl
@ -6,7 +6,7 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="">
 <meta name="author" content="">
-<title>${projectTitle!"RongXin-PDA"}</title>
+<title>${projectTitle!"PLM-PDA"}</title>
 <!-- Bootstrap core CSS -->
 <link rel="stylesheet" type="text/css" href="/js/bootstrap-3.3.7/css/bootstrap.css">

@ -36,7 +36,7 @@
 			<header data-v-45aee492="" class="mint-header is-fixed" style="background-color: #17b3a3">  <#--style="background-color: #FF7F24"-->
 				<div class="mint-header-button is-left">
 					<div data-v-45aee492="" class="header-title">
-						<span data-v-45aee492="" style="font-size: 18px;">RongXin-PDA</span>
+						<span data-v-45aee492="" style="font-size: 18px;">PLM-PDA</span>
 <#--						<img data-v-45aee492=""-->
 <#--							 src="data:image/png;base64,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"-->
 <#--							 class="logo" style="width: 11%;height: 23px;margin-left: 10px;">-->