Tenlion/cm-cloud
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
cuibaocheng 2020-09-11 17:23:04 +08:00
commit a1756cde69
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cloud-common-plugin/src/main/resources/templates/common/list-select-user.html
View File

@ -52,6 +52,14 @@
var newSelectedUserList = []; var newSelectedUserList = [];
var tableData = []; var tableData = [];
// 初始化选择列表
function initNewSelectedUserList() {
for(var i = 0, item; item = oldSelectedUserList[i++];) {
newSelectedUserList.push(item);
}
}
initNewSelectedUserList();
// 初始化表格 // 初始化表格
function initTable() { function initTable() {
$.extend(table, {config: {checkName: 'checked'}}); $.extend(table, {config: {checkName: 'checked'}});
@ -112,12 +120,12 @@
page: true, page: true,
parseData: function(data) { parseData: function(data) {
for(var i = 0, item; item = data.rows[i++];) { for(var i = 0, item; item = data.rows[i++];) {
if(!oldSelectedUserList) { if(!newSelectedUserList) {
item.checked = false; item.checked = false;
continue; continue;
} }
var isSelected = false; var isSelected = false;
for(var j = 0, jItem; jItem = oldSelectedUserList[j++];) { for(var j = 0, jItem; jItem = newSelectedUserList[j++];) {
if(item.userId === jItem.userId) { if(item.userId === jItem.userId) {
isSelected = true; isSelected = true;
break; break;

2
cloud-common/src/main/java/com/cm/common/utils/email/SimpleMailSenderUtil.java
View File

@ -129,7 +129,7 @@ public class SimpleMailSenderUtil {
mailInfo.setMailServerPort(587); mailInfo.setMailServerPort(587);
mailInfo.setValidate(true); mailInfo.setValidate(true);
mailInfo.setUserName("450292408@qq.com"); mailInfo.setUserName("450292408@qq.com");
mailInfo.setPassword("bvtzzosemkuubiij"); mailInfo.setPassword("pezxpunlxzqgbhhd");
mailInfo.setFromAddress("450292408@qq.com"); mailInfo.setFromAddress("450292408@qq.com");
mailInfo.setToAddress("450292408@qq.com"); mailInfo.setToAddress("450292408@qq.com");
mailInfo.setSubject("123"); mailInfo.setSubject("123");