ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.添加项目-移除自动赋值version 

2.修改ehcache持久化磁盘的异常
This commit is contained in:
kingsfighter 2020-09-21 21:31:31 +08:00
parent 034c3d9522
commit 9afaf7bb79
2 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-admin/src/main/resources/ehcache/ehcache-shiro.xml
View File

@ -46,7 +46,7 @@
<cache name="sys-cache" <cache name="sys-cache"
maxEntriesLocalHeap="1000" maxEntriesLocalHeap="1000"
eternal="true" eternal="true"
overflowToDisk="true" overflowToDisk="false"
statistics="true"> statistics="true">
</cache> </cache>
@ -54,7 +54,7 @@
<cache name="sys-config" <cache name="sys-config"
maxEntriesLocalHeap="1000" maxEntriesLocalHeap="1000"
eternal="true" eternal="true"
overflowToDisk="true" overflowToDisk="false"
statistics="true"> statistics="true">
</cache> </cache>
@ -62,14 +62,14 @@
<cache name="sys-dict" <cache name="sys-dict"
maxEntriesLocalHeap="1000" maxEntriesLocalHeap="1000"
eternal="true" eternal="true"
overflowToDisk="true" overflowToDisk="false"
statistics="true"> statistics="true">
</cache> </cache>
<!-- 系统会话缓存 --> <!-- 系统会话缓存 -->
<cache name="shiro-activeSessionCache" <cache name="shiro-activeSessionCache"
maxElementsInMemory="10000" maxElementsInMemory="10000"
overflowToDisk="true" overflowToDisk="false"
eternal="true" eternal="true"
timeToLiveSeconds="0" timeToLiveSeconds="0"
timeToIdleSeconds="0" timeToIdleSeconds="0"

43
ruoyi-admin/src/main/resources/templates/dfm/addProject.html
View File

@ -179,7 +179,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">版本：</label> <label class="col-sm-4 control-label is-required">版本：</label>
<div class="col-sm-8"> <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> </div>
</div> </div>
@ -437,7 +437,10 @@
}, },
maxHeightBot:{ maxHeightBot:{
number: true number: true
} },
version:{
number: true
}
}, },
focusCleanup: true focusCleanup: true
}); });
@ -559,23 +562,23 @@
if (null == v || "" == v) { if (null == v || "" == v) {
return false; return false;
} }
$.ajax({ // $.ajax({
url: prefix + "/getLastVersion", // url: prefix + "/getLastVersion",
data: "projectName=" + v, // data: "projectName=" + v,
cache: false, // cache: false,
success: function (json) { // success: function (json) {
if (null == json || "" == json) { // if (null == json || "" == json) {
$("#version").val(1); // $("#version").val(1);
hasOldVersion = false; // hasOldVersion = false;
resetForm(); // resetForm();
} else //有相同项目，开始赋值 // } else //有相同项目，开始赋值
{ // {
hasOldVersion = true; // hasOldVersion = true;
oldProjectData = json; // oldProjectData = json;
fillParams(); // fillParams();
} // }
} // }
}); // });
} }
@ -594,7 +597,7 @@
function fillParams() function fillParams()
{ {
data = oldProjectData; data = oldProjectData;
$("#version").val(data.version + 1); // $("#version").val(data.version + 1);
var checkType = $("select[name='checkType']"); var checkType = $("select[name='checkType']");
checkType.val(data.checkType).trigger("change"); checkType.val(data.checkType).trigger("change");
var dfmCheck = checkType.children(":selected").text(); var dfmCheck = checkType.children(":selected").text();