diff --git a/pom.xml b/pom.xml
index 79047dc2e..37bbae534 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,6 +195,19 @@
${ruoyi.version}
+
+
+
+
+ org.codehaus.janino
+ janino
+ 2.7.8
+
+
+ org.codehaus.janino
+ commons-compiler
+ 2.7.8
+
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 32dea1fb3..9e4c7db43 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -73,6 +73,19 @@
ruoyi-generator
+
+
+
+ org.codehaus.janino
+ janino
+ 2.7.8
+
+
+ org.codehaus.janino
+ commons-compiler
+ 2.7.8
+
+
diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml
index d69a57207..68fd6bae6 100644
--- a/ruoyi-admin/src/main/resources/logback.xml
+++ b/ruoyi-admin/src/main/resources/logback.xml
@@ -1,93 +1,97 @@
-
-
-
-
-
-
-
-
-
-
- ${log.pattern}
-
-
-
-
-
- ${log.path}/sys-info.log
-
-
-
- ${log.path}/sys-info.%d{yyyy-MM-dd}.log
-
- 60
-
-
- ${log.pattern}
-
-
-
- INFO
-
- ACCEPT
-
- DENY
-
-
-
-
- ${log.path}/sys-error.log
-
-
-
- ${log.path}/sys-error.%d{yyyy-MM-dd}.log
-
- 60
-
-
- ${log.pattern}
-
-
-
- ERROR
-
- ACCEPT
-
- DENY
-
-
-
-
-
- ${log.path}/sys-user.log
-
-
- ${log.path}/sys-user.%d{yyyy-MM-dd}.log
-
- 60
-
-
- ${log.pattern}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${LOG_HOME}/%d{yyyy-MM-dd}.%i.log
+
+ 100MB
+
+
+
+ 10
+
+ 3GB
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n
+
+
+
+
+
+
+
+ ERROR
+ ACCEPT
+ DENY
+
+
+
+ ${LOG_HOME}/%d{yyyy-MM-dd}.%i.error.log
+
+ 100MB
+
+
+
+ 15
+
+ 3GB
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n
+
+
+
+
+
+ ${LOG_HOME}/sys-user.log
+
+
+ ${LOG_HOME}/sys-user.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+ ${log.pattern}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/dfm/queueManage.html b/ruoyi-admin/src/main/resources/templates/dfm/queueManage.html
index 2902c414c..a4f431e50 100644
--- a/ruoyi-admin/src/main/resources/templates/dfm/queueManage.html
+++ b/ruoyi-admin/src/main/resources/templates/dfm/queueManage.html
@@ -152,28 +152,28 @@
//获取列表中所有数据
var rows = $('#bootstrap-table').bootstrapTable('getData',{useCurrentPage:true,includeHiddenRows:true});
- var upImg = "/img/up.gif";
- var downImg = "/img/down.gif";
+ var upImg = "";
+ var downImg = "";
if(index == 0) {
if(hasPre) {
- html += "![]()
";
+ html += ""+upImg+"";
}
} else {
if(PROJECT_STATE_DAICHA == rows[index-1].state)
{
- html += "![]()
";
+ html += ""+upImg+"";
}
}
if(index == rows.length-1) {
if(hasNext) {
- html += "![]()
";
+ html += ""+downImg+"";
}
} else {
if(PROJECT_STATE_DAICHA == rows[index+1].state)
{
- html += "![]()
";
+ html += ""+downImg+"";
}
}
return html;