Merge remote-tracking branch 'origin/master'

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

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

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

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