优化代码，增加dubbo qos端口配置

jboot-admin-base/src/main/java/io/jboot/admin/base/web/base/JsonValidator.java

@@ -21,7 +21,9 @@ public abstract class JsonValidator extends BaseValidator {
 
     @Override
     protected void handleError(Controller c) {
-        c.renderJson(RestResult.buildError(c.getAttr(ERROR_MSG_KEY)));
+        RestResult<String> result = new RestResult<String>();
+        result.error(c.getAttr(ERROR_MSG_KEY).toString());
+        c.renderJson(result);
     }
 
     /**
@@ -52,14 +54,26 @@ public abstract class JsonValidator extends BaseValidator {
         super.validateCaptcha(field, ERROR_MSG_KEY, errorMessage);
     }
 
+    protected void validateInteger(String field, String errorMessage) {
+        super.validateInteger(field, ERROR_MSG_KEY, errorMessage);
+    }
+
     protected void validateInteger(String field, int min, int max, String errorMessage) {
         super.validateInteger(field, min, max, ERROR_MSG_KEY, errorMessage);
     }
 
+    protected void validateLong(String field, String errorMessage) {
+        super.validateLong(field, ERROR_MSG_KEY, errorMessage);
+    }
+
     protected void validateLong(String field, long min, long max, String errorMessage) {
         super.validateLong(field, min, max, ERROR_MSG_KEY, errorMessage);
     }
 
+    protected void validateDate(String field, String errorMessage) {
+        super.validateDate(field, ERROR_MSG_KEY, errorMessage);
+    }
+
     protected void validateDate(String field, String min, String max, String errorMessage) {
         super.validateDate(field, min, max, ERROR_MSG_KEY, errorMessage);
     }
@@ -87,4 +101,5 @@ public abstract class JsonValidator extends BaseValidator {
     protected void validateToken(String errorMessage) {
         super.validateToken(ERROR_MSG_KEY, errorMessage);
     }
+
 }

jboot-admin-service/jboot-admin-service-api/src/main/java/io/jboot/admin/service/api/RoleResService.java

@@ -8,7 +8,18 @@ import java.util.List;
 
 public interface RoleResService  {
 
+    /**
+     * 根据roleId删除model
+     * @param roleId
+     */
+    public int deleteByRoleId(Long roleId);
 
+    /**
+     * 批量保存 model
+     * @param list
+     * @return
+     */
+    public int[] batchSave(List<RoleRes> list);
 
     /**
      * 根据ID查找model

jboot-admin-service/jboot-admin-service-api/src/main/java/io/jboot/admin/service/api/RoleService.java

@@ -27,7 +27,7 @@ public interface RoleService  {
      * @param id 角色id
      * @param resIds 角色资源树 ids
      */
-    public void auth(Long id, String resIds);
+    public boolean auth(Long id, String resIds);
 
     /**
      * 查询可用角色列表

jboot-admin-service/jboot-admin-service-provider/src/main/java/io/jboot/admin/service/provider/RoleResServiceImpl.java

@@ -1,5 +1,6 @@
 package io.jboot.admin.service.provider;
 
+import com.jfinal.plugin.activerecord.Db;
 import io.jboot.aop.annotation.Bean;
 import io.jboot.admin.service.api.RoleResService;
 import io.jboot.admin.service.entity.model.RoleRes;
@@ -7,10 +8,20 @@ import io.jboot.core.rpc.annotation.JbootrpcService;
 import io.jboot.service.JbootServiceBase;
 
 import javax.inject.Singleton;
+import java.util.List;
 
 @Bean
 @Singleton
 @JbootrpcService
 public class RoleResServiceImpl extends JbootServiceBase<RoleRes> implements RoleResService {
 
+    @Override
+    public int deleteByRoleId(Long roleId) {
+        return Db.update("delete from sys_role_res where role_id = ?", roleId);
+    }
+
+    @Override
+    public int[] batchSave(List<RoleRes> list) {
+        return  Db.batchSave(list, list.size());
+    }
 }

jboot-admin-service/jboot-admin-service-provider/src/main/java/io/jboot/admin/service/provider/RoleServiceImpl.java

@@ -2,8 +2,10 @@ package io.jboot.admin.service.provider;
 
 import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.Db;
+import com.jfinal.plugin.activerecord.IAtom;
 import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.activerecord.SqlPara;
+import io.jboot.admin.service.api.RoleResService;
 import io.jboot.admin.service.entity.model.RoleRes;
 import io.jboot.admin.service.entity.status.system.RoleStatus;
 import io.jboot.aop.annotation.Bean;
@@ -15,6 +17,7 @@ import io.jboot.service.JbootServiceBase;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -23,6 +26,9 @@ import java.util.List;
 @JbootrpcService
 public class RoleServiceImpl extends JbootServiceBase<Role> implements RoleService {
 
+    @Inject
+    private RoleResService roleResService;
+
     @Override
     public Page<Role> findPage(Role sysRole, int pageNumber, int pageSize) {
         Columns columns = Columns.create();
@@ -42,23 +48,35 @@ public class RoleServiceImpl extends JbootServiceBase<Role> implements RoleServi
     }
 
     @Override
-    public void auth(Long id, String resIds) {
-        Role _sysRole = DAO.findById(id);
-
-        Db.update("delete from sys_role_res where role_id = ?", id);
+    public boolean auth(Long id, String resIds) {
         List<RoleRes> roleResList = new ArrayList<RoleRes>();
-        if (StrKit.notBlank(resIds)) {
-            String[] ress = resIds.split(",");
 
-            for (String resId : ress) {
-                RoleRes roleRes = new RoleRes();
-                roleRes.setRoleId(id);
-                roleRes.setResId(Long.parseLong(resId));
-                roleResList.add(roleRes);
-            }
+        return Db.tx(new IAtom() {
+            @Override
+            public boolean run() throws SQLException {
+                roleResService.deleteById(id);
 
-            Db.batchSave(roleResList, roleResList.size());
-        }
+                if (StrKit.notBlank(resIds)) {
+                    String[] ress = resIds.split(",");
+
+                    for (String resId : ress) {
+                        RoleRes roleRes = new RoleRes();
+                        roleRes.setRoleId(id);
+                        roleRes.setResId(Long.parseLong(resId));
+                        roleResList.add(roleRes);
+                    }
+
+                    int[] rets = Db.batchSave(roleResList, roleResList.size());
+                    for (int ret : rets) {
+                        if (ret < 1) {
+                            return false;
+                        }
+                    }
+                }
+
+                return true;
+            }
+        });
     }
 
     @Override

jboot-admin-service/jboot-admin-service-provider/src/main/resources/jboot.properties

@@ -25,7 +25,7 @@ jboot.cron4jFile=cron4j.properties
 #type default undertow (support:undertow)
 jboot.server.type=undertow
 jboot.server.host=
-jboot.server.port=9001
+jboot.server.port=9002
 jboot.server.contextPath=
 #---------------------------------------------------------------------------------#
 
@@ -48,7 +48,7 @@ jboot.datasource.excludeTable=
 #---------------------------------------------------------------------------------#
 
 #---------------------------------------------------------------------------------#
-#type default motan (support:local,motan,grpc,thrift)
+#type default motan (support:local,motan,dubbo)
 #use motan + consul
 jboot.rpc.type = motan
 jboot.rpc.registryType = consul
@@ -58,6 +58,7 @@ jboot.rpc.registryAddress = 127.0.0.1:8500
 #jboot.rpc.type = dubbo
 #jboot.rpc.registryType = zookeeper
 #jboot.rpc.registryAddress = 127.0.0.1:2181
+#jboot.rpc.dubbo.qosPort = 33333;
 
 jboot.rpc.requestTimeOut=5000
 jboot.rpc.callMode=registry
@@ -66,7 +67,7 @@ jboot.rpc.registryUserName
 jboot.rpc.registryPassword
 #rpc service config
 jboot.rpc.host=127.0.0.1
-jboot.rpc.defaultPort=9011
+jboot.rpc.defaultPort=9013
 jboot.rpc.defaultGroup=system-service
 jboot.rpc.defaultVersion=1.0
 jboot.rpc.proxy

jboot-admin/src/main/java/io/jboot/admin/controller/system/RoleController.java

@@ -131,7 +131,9 @@ public class RoleController extends BaseController {
         String resIds = getPara("resIds");
         Long id = getParaToLong("id");
 
-        roleService.auth(id, resIds);
+        if (!roleService.auth(id, resIds)) {
+            throw new BusinessException("赋权失败");
+        }
 
         ShiroCacheUtils.clearAuthorizationInfoAll();
         renderJson(RestResult.buildSuccess());

jboot-admin/src/main/resources/jboot.properties

@@ -1,8 +1,8 @@
 #---------------------------------------------------------------------------------#
 # app info
 jboot.admin.app.name=jboot-admin管理系统
-jboot.admin.app.org=jboot-admin
-jboot.admin.app.orgWebsite=https://github.com/pkanyue/jboot-admin
+jboot.admin.app.org=Rlax
+jboot.admin.app.orgWebsite=https://gitee.com/rlaxuc/jboot-admin
 jboot.admin.app.resourceHost
 jboot.admin.app.copyRight=2017 © copyright 京ICP备12345678号
 #---------------------------------------------------------------------------------#
@@ -85,9 +85,9 @@ jboot.config.exclude
 
 #---------------------------------------------------------------------------------#
 # shiro config
-#jboot.shiro.loginUrl=/login
-#jboot.shiro.successUrl
-#jboot.shiro.unauthorizedUrl=/login
+jboot.shiro.loginUrl=/login
+jboot.shiro.successUrl
+jboot.shiro.unauthorizedUrl=/login
 #---------------------------------------------------------------------------------#
 
 #---------------------------------------------------------------------------------#

jboot-admin/src/main/resources/template/index.html

@@ -47,8 +47,12 @@
                     #end
                 </a>
                 <dl class="layui-nav-child">
-                    <dd><a href="">基本资料</a></dd>
-                    <dd><a href="">安全设置</a></dd>
+                    #shiroHasPermission('/system/user/profile')
+                    <dd><a href="javascript:;" href-url="/system/user/profile">个人资料</a></dd>
+                    #end
+                    #shiroHasPermission('/system/user/changepwd')
+                    <dd><a href="javascript:;" href-url="/system/user/changepwd">修改密码</a></dd>
+                    #end
                     <dd><a href="#(ctxPath)/logout"><i class="layui-icon">&#x1006;</i>退出</a></dd>
                 </dl>
             </li>

jboot-admin/src/main/resources/template/welcome.html

@@ -14,6 +14,10 @@
 #define content()
 <div class="layui-fluid">
     <h3>欢迎登录</h3>
+    <br>
+    <p>jboot-admin开源地址：欢迎star</p>
+    <p>gitee：<a href="https://gitee.com/rlaxuc/jboot-admin">https://gitee.com/rlaxuc/jboot-admin</a></p>
+    <p>github：<a href="https://github.com/pkanyue/jboot-admin">https://github.com/pkanyue/jboot-admin</a></p>
 </div>
 
 #end