From 9afaf7bb79afb5684d729283358488eff35aa216 Mon Sep 17 00:00:00 2001
From: kingsfighter <dave.wang@activenetwork.com>
Date: Mon, 21 Sep 2020 21:31:31 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE-?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4=E8=87=AA=E5=8A=A8=E8=B5=8B=E5=80=BCversion?=
 =?UTF-8?q?=202.=E4=BF=AE=E6=94=B9ehcache=E6=8C=81=E4=B9=85=E5=8C=96?=
 =?UTF-8?q?=E7=A3=81=E7=9B=98=E7=9A=84=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/ehcache/ehcache-shiro.xml  |  8 ++--
 .../resources/templates/dfm/addProject.html   | 43 ++++++++++---------
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/ehcache/ehcache-shiro.xml b/ruoyi-admin/src/main/resources/ehcache/ehcache-shiro.xml
index 72469e13a..ab7af8469 100644
--- a/ruoyi-admin/src/main/resources/ehcache/ehcache-shiro.xml
+++ b/ruoyi-admin/src/main/resources/ehcache/ehcache-shiro.xml
@@ -46,7 +46,7 @@
     <cache name="sys-cache"
            maxEntriesLocalHeap="1000"
            eternal="true"
-           overflowToDisk="true"
+           overflowToDisk="false"
            statistics="true">
     </cache>
     
@@ -54,7 +54,7 @@
     <cache name="sys-config"
            maxEntriesLocalHeap="1000"
            eternal="true"
-           overflowToDisk="true"
+           overflowToDisk="false"
            statistics="true">
     </cache>
     
@@ -62,14 +62,14 @@
     <cache name="sys-dict"
            maxEntriesLocalHeap="1000"
            eternal="true"
-           overflowToDisk="true"
+           overflowToDisk="false"
            statistics="true">
     </cache>
     
     <!-- 系统会话缓存 -->
     <cache name="shiro-activeSessionCache"
            maxElementsInMemory="10000"
-           overflowToDisk="true"
+           overflowToDisk="false"
            eternal="true"
            timeToLiveSeconds="0"
            timeToIdleSeconds="0"
diff --git a/ruoyi-admin/src/main/resources/templates/dfm/addProject.html b/ruoyi-admin/src/main/resources/templates/dfm/addProject.html
index 2edf1a76d..b6e201053 100644
--- a/ruoyi-admin/src/main/resources/templates/dfm/addProject.html
+++ b/ruoyi-admin/src/main/resources/templates/dfm/addProject.html
@@ -179,7 +179,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label is-required">版本：</label>
                         <div class="col-sm-8">
-                            <input name="version" id="version"  class="form-control" type="text" maxlength="30" readOnly>
+                            <input name="version" id="version"  class="form-control" type="text" maxlength="30" required>
                         </div>
                     </div>
                 </div>
@@ -437,7 +437,10 @@
                 },
                 maxHeightBot:{
                     number: true
-        		}
+        		},
+                version:{
+                    number: true
+                }
         	},
             focusCleanup: true
         });
@@ -559,23 +562,23 @@
             if (null == v || "" == v) {
                 return false;
             }
-            $.ajax({
-                url:  prefix + "/getLastVersion",
-                data: "projectName=" + v,
-                cache: false,
-                success: function (json) {
-                    if (null == json || "" == json) {
-                        $("#version").val(1);
-                        hasOldVersion = false;
-                        resetForm();
-                    } else //有相同项目，开始赋值
-                    {
-                        hasOldVersion = true;
-                        oldProjectData = json;
-                        fillParams();
-                    }
-                }
-            });
+            // $.ajax({
+            //     url:  prefix + "/getLastVersion",
+            //     data: "projectName=" + v,
+            //     cache: false,
+            //     success: function (json) {
+            //         if (null == json || "" == json) {
+            //             $("#version").val(1);
+            //             hasOldVersion = false;
+            //             resetForm();
+            //         } else //有相同项目，开始赋值
+            //         {
+            //             hasOldVersion = true;
+            //             oldProjectData = json;
+            //             fillParams();
+            //         }
+            //     }
+            // });
         }
 
 
@@ -594,7 +597,7 @@
         function fillParams()
         {
             data = oldProjectData;
-            $("#version").val(data.version + 1);
+            // $("#version").val(data.version + 1);
             var checkType = $("select[name='checkType']");
             checkType.val(data.checkType).trigger("change");
             var dfmCheck = checkType.children(":selected").text();