1、index优化

Former-commit-id: 25a38ac64f0d9df03a7d4992458aa92d2f7b0bda

src/main/resources/modules/SpringBoot/java/action/ajax/system/UserAjax.java

@@ -95,7 +95,7 @@ public class UserAjax {
                 Date current = new Date();
                 Calendar instance = Calendar.getInstance();
                 instance.setTime(current);
-                instance.add(Calendar.HOUR_OF_DAY, 1);//默认一个小时内有效
+                instance.add(Calendar.HOUR_OF_DAY, 3);//默认一个小时内有效
 
                 TokensCreateRequest tokensCreateRequest = new TokensCreateRequest();
                 tokensCreateRequest.setToken(UUID.randomUUID().toString());
@@ -148,7 +148,7 @@ public class UserAjax {
             Date current = new Date();
             Calendar instance = Calendar.getInstance();
             instance.setTime(current);
-            instance.add(Calendar.HOUR_OF_DAY, 1);//默认一个小时内有效
+            instance.add(Calendar.HOUR_OF_DAY, 3);//默认一个小时内有效
 
             TokensCreateRequest tokensCreateRequest = new TokensCreateRequest();
             tokensCreateRequest.setToken(UUID.randomUUID().toString());

src/main/resources/modules/SpringBoot/java/module/system/ent/ResTree.java

@@ -16,6 +16,8 @@ public class ResTree extends Res {
 
     private String value;
 
+    private boolean disabled;
+
     private List<ResTree> children;
 
     public String getLabel() {
@@ -34,6 +36,14 @@ public class ResTree extends Res {
         this.value = value;
     }
 
+    public boolean getDisabled() {
+        return disabled;
+    }
+
+    public void setDisabled(boolean disabled) {
+        this.disabled = disabled;
+    }
+
     public List<ResTree> getChildren() {
         return children;
     }

src/main/resources/modules/SpringBoot/java/module/system/mgr/ResManagerImpl.java

@@ -255,9 +255,11 @@ public class ResManagerImpl implements ResManager {
                 tree.setResName(next.getResName());
                 tree.setResType(next.getResType());
                 tree.setResValue(next.getResValue());
+                tree.setFree(next.getFree());
                 tree.setValid(next.getValid());
                 tree.setRowVersion(next.getRowVersion());
                 tree.setLabel(next.getResName());
+                tree.setDisabled(next.getFree());
 
                 allMap.put(tree.getResCode(), tree);
                 iterator.remove();

src/main/resources/modules/SpringBoot/java/module/system/mgr/RoleResManagerImpl.java

@@ -185,7 +185,7 @@ public class RoleResManagerImpl implements RoleResManager {
      * @param token   令牌
      * @return 响应
      */
-    public RoleResCheckResponse check(RoleResCheckRequest request, Token token) {
+    public synchronized RoleResCheckResponse check(RoleResCheckRequest request, Token token) {
         RoleResCheckResponse response = new RoleResCheckResponse();
 
         ValidationUtil.validate(request, response);

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/res.ftl

@@ -190,8 +190,9 @@
                         <span>
                             <el-button type="text" size="mini" icon="el-icon-plus"
                                        @click="onTreeCreate(data)"></el-button>
-                            {{ data.resName }}<span style="color: #409EFF"
+                            {{ data.resName }}
-                                                    @click="onTreeEdit(data)">[{{data.resCode}}]</span>
+                            <span style="color: #409EFF" @click="onTreeEdit(data)">[{{data.resCode}}]</span>
+                            <span style="color: #ff0000" v-if="data.free">[免费]</span>
                         </span>
                     </div>
                 </el-tree>

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/role.ftl

@@ -260,51 +260,41 @@
                     }
                 }.bind(this))
             },
+
             onCheck: function (item, status) {
+                var roleId = this.formResource.roleId;
+                var roleCode = this.formResource.roleCode;
                 var isChecked = status.checkedKeys.indexOf(item.id) !== -1;
 
+                this.doCheck(roleId, roleCode, item.id, item.resCode, isChecked);
+
+                (function fetch(children, _this) {
+                    if (children && children.length > 0) {
+                        for (var i = 0; i < children.length; i++) {
+                            var obj = children[i];
+                            if ((status.checkedKeys.indexOf(obj.id) !== -1) !== isChecked && !obj.disabled) {
+                                _this.doCheck(roleId, roleCode, obj.id, obj.resCode, isChecked);
+                            }
+                            fetch(obj.children, _this);
+                        }
+                    }
+                })(item.children, this);
+            },
+            doCheck: function (roleId, roleCode, resId, resCode, checked) {
                 // 优先处理当前节点
                 new Ajax("system", "roleRes").method("check").post({
-                    roleId: this.formResource.roleId,
+                    roleId: roleId,
-                    roleCode: this.formResource.roleCode,
+                    roleCode: roleCode,
-                    resId: item.id,
+                    resId: resId,
-                    resCode: item.resCode,
+                    resCode: resCode,
-                    checked: isChecked,
+                    checked: checked,
                 }, function (response) {
                     if (response.errors.length > 0) {
                         nav.e(response.errors[0].message);
                     } else {
-
+                        this.$refs.tree.setChecked(resId, checked);
                     }
                 }.bind(this));
-
-                if (item.children && item.children.length > 0){//处理子节点
-                    (function fetch(children) {
-                        for (var i = 0; i < children.length; i++) {
-                            var obj = children[i];
-                            if ((status.checkedKeys.indexOf(obj.id) !== -1) !== isChecked){
-                                (function (obj) {
-                                    new Ajax("system", "roleRes").method("check").post({
-                                        roleId: this.formResource.roleId,
-                                        roleCode: this.formResource.roleCode,
-                                        resId: obj.id,
-                                        resCode: obj.resCode,
-                                        checked: isChecked,
-                                    }, function (response) {
-                                        if (response.errors.length > 0) {
-                                            nav.e(response.errors[0].message);
-                                        } else {
-                                            this.$refs.tree.setChecked(obj.id,isChecked);
-                                        }
-                                    }.bind(this))
-                                }.bind(this))(obj);
-                            }
-                            if(obj.children && obj.children.length > 0){
-                                fetch(obj.children)
-                            }
-                        }
-                    }.bind(this))(item.children);
-                }
             },
             onLoadTree: function () {
                 new Ajax("system", "res").method("tree").post({}, function (response) {