【log】整理登录日志业务

kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/constants/RuleConstants.java

@@ -1,3 +1,27 @@
+/*
+ * Copyright [2020-2030] [https://www.stylefeng.cn]
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
+ *
+ * 1.请不要删除和修改根目录下的LICENSE文件。
+ * 2.请不要删除和修改Guns源码头部的版权声明。
+ * 3.请保留源码和相关描述文件的项目出处，作者声明等。
+ * 4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns
+ * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns
+ * 6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
+ */
 package cn.stylefeng.roses.kernel.rule.constants;
 
 /**

kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/enums/StatusEnum.java

@@ -1,27 +1,3 @@
-/*
-Copyright [2020] [https://www.stylefeng.cn]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
-
-1.请不要删除和修改根目录下的LICENSE文件。
-2.请不要删除和修改Guns源码头部的版权声明。
-3.请保留源码和相关描述文件的项目出处，作者声明等。
-4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
- */
 package cn.stylefeng.roses.kernel.rule.enums;
 
 import lombok.Getter;

kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/exception/base/ServiceException.java

@@ -1,27 +1,3 @@
-/*
-Copyright [2020] [https://www.stylefeng.cn]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
-
-1.请不要删除和修改根目录下的LICENSE文件。
-2.请不要删除和修改Guns源码头部的版权声明。
-3.请保留源码和相关描述文件的项目出处，作者声明等。
-4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
- */
 package cn.stylefeng.roses.kernel.rule.exception.base;
 
 import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum;

kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/entity/SysConfig.java

@@ -1,27 +1,3 @@
-/*
-Copyright [2020] [https://www.stylefeng.cn]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
-
-1.请不要删除和修改根目录下的LICENSE文件。
-2.请不要删除和修改Guns源码头部的版权声明。
-3.请保留源码和相关描述文件的项目出处，作者声明等。
-4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
- */
 package cn.stylefeng.roses.kernel.config.modular.entity;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;

kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/service/SysConfigService.java

@@ -1,27 +1,3 @@
-/*
-Copyright [2020] [https://www.stylefeng.cn]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
-
-1.请不要删除和修改根目录下的LICENSE文件。
-2.请不要删除和修改Guns源码头部的版权声明。
-3.请保留源码和相关描述文件的项目出处，作者声明等。
-4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
- */
 package cn.stylefeng.roses.kernel.config.modular.service;
 
 import cn.stylefeng.roses.kernel.config.modular.entity.SysConfig;

kernel-d-sms/sms-business-validation/src/main/java/cn/stylefeng/roses/kernel/sms/modular/enums/SmsSendStatusEnum.java

@@ -1,27 +1,3 @@
-/*
-Copyright [2020] [https://www.stylefeng.cn]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
-
-1.请不要删除和修改根目录下的LICENSE文件。
-2.请不要删除和修改Guns源码头部的版权声明。
-3.请保留源码和相关描述文件的项目出处，作者声明等。
-4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
- */
 package cn.stylefeng.roses.kernel.sms.modular.enums;
 
 import lombok.Getter;

kernel-d-sms/sms-business-validation/src/main/java/cn/stylefeng/roses/kernel/sms/modular/enums/SmsTypeEnum.java

@@ -1,27 +1,3 @@
-/*
-Copyright [2020] [https://www.stylefeng.cn]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
-
-1.请不要删除和修改根目录下的LICENSE文件。
-2.请不要删除和修改Guns源码头部的版权声明。
-3.请保留源码和相关描述文件的项目出处，作者声明等。
-4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
- */
 package cn.stylefeng.roses.kernel.sms.modular.enums;
 
 import lombok.Getter;

kernel-d-timer/timer-api/src/main/java/cn/stylefeng/roses/kernel/timer/api/enums/TimerJobStatusEnum.java

@@ -1,27 +1,3 @@
-/*
-Copyright [2020] [https://www.stylefeng.cn]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
-
-1.请不要删除和修改根目录下的LICENSE文件。
-2.请不要删除和修改Guns源码头部的版权声明。
-3.请保留源码和相关描述文件的项目出处，作者声明等。
-4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
- */
 package cn.stylefeng.roses.kernel.timer.api.enums;
 
 import lombok.Getter;

kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/LoginLogServiceApi.java

@@ -11,7 +11,7 @@ import cn.stylefeng.roses.kernel.system.pojo.SysLoginLogRequest;
 public interface LoginLogServiceApi {
 
     /**
-     * 添加日志
+     * 添加登录日志
      *
      * @param sysLoginLogRequest 参数
      * @author chenjinlong
@@ -20,7 +20,7 @@ public interface LoginLogServiceApi {
     void add(SysLoginLogRequest sysLoginLogRequest);
 
     /**
-     * 登录成功
+     * 增加登录成功日志
      *
      * @param userId 用户id
      * @author chenjinlong
@@ -29,7 +29,7 @@ public interface LoginLogServiceApi {
     void loginSuccess(Long userId);
 
     /**
-     * 登录失败
+     * 增加登录失败日志
      *
      * @param userId     用户id
      * @param llgMessage 错误信息
@@ -39,7 +39,7 @@ public interface LoginLogServiceApi {
     void loginFail(Long userId, String llgMessage);
 
     /**
-     * 登出成功
+     * 增加退出成功日志
      *
      * @param userId 用户id
      * @author chenjinlong
@@ -48,7 +48,7 @@ public interface LoginLogServiceApi {
     void loginOutSuccess(Long userId);
 
     /**
-     * 登出失败
+     * 增加退出失败日志
      *
      * @param userId 用户id
      * @author chenjinlong
@@ -57,10 +57,11 @@ public interface LoginLogServiceApi {
     void loginOutFail(Long userId);
 
     /**
-     * 清空
+     * 清空登录日志
      *
      * @author chenjinlong
      * @date 2021/1/13 10:55
      */
     void deleteAll();
+
 }

kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/NoticeExceptionEnum.java

@@ -1,27 +1,3 @@
-/*
-Copyright [2020] [https://www.stylefeng.cn]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
-
-1.请不要删除和修改根目录下的LICENSE文件。
-2.请不要删除和修改Guns源码头部的版权声明。
-3.请保留源码和相关描述文件的项目出处，作者声明等。
-4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
- */
 package cn.stylefeng.roses.kernel.system.exception.enums;
 
 import cn.stylefeng.roses.kernel.rule.constants.RuleConstants;

kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/SysRoleExceptionEnum.java

@@ -1,27 +1,3 @@
-/*
-Copyright [2020] [https://www.stylefeng.cn]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
-
-1.请不要删除和修改根目录下的LICENSE文件。
-2.请不要删除和修改Guns源码头部的版权声明。
-3.请保留源码和相关描述文件的项目出处，作者声明等。
-4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
- */
 package cn.stylefeng.roses.kernel.system.exception.enums;
 
 import cn.stylefeng.roses.kernel.rule.constants.RuleConstants;

kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/SysUserExceptionEnum.java

@@ -1,27 +1,3 @@
-/*
-Copyright [2020] [https://www.stylefeng.cn]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
-
-1.请不要删除和修改根目录下的LICENSE文件。
-2.请不要删除和修改Guns源码头部的版权声明。
-3.请保留源码和相关描述文件的项目出处，作者声明等。
-4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
- */
 package cn.stylefeng.roses.kernel.system.exception.enums;
 
 import cn.stylefeng.roses.kernel.rule.constants.RuleConstants;

kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/app/AppExceptionEnum.java

@@ -1,28 +1,4 @@
-/*
+package cn.stylefeng.roses.kernel.system.exception.enums.app;
-Copyright [2020] [https://www.stylefeng.cn]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
-
-1.请不要删除和修改根目录下的LICENSE文件。
-2.请不要删除和修改Guns源码头部的版权声明。
-3.请保留源码和相关描述文件的项目出处，作者声明等。
-4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
- */
-package cn.stylefeng.roses.kernel.system.exception.enums;
 
 import cn.stylefeng.roses.kernel.rule.constants.RuleConstants;
 import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum;

kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/log/LogExceptionEnum.java

@@ -0,0 +1,37 @@
+package cn.stylefeng.roses.kernel.system.exception.enums.log;
+
+import cn.stylefeng.roses.kernel.rule.constants.RuleConstants;
+import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum;
+import cn.stylefeng.roses.kernel.system.constants.SystemConstants;
+import lombok.Getter;
+
+/**
+ * 日志相关异常枚举
+ *
+ * @author fengshuonan
+ * @date 2021/2/8 17:45
+ */
+@Getter
+public enum LogExceptionEnum implements AbstractExceptionEnum {
+
+    /**
+     * 日志不存在
+     */
+    LOG_NOT_EXIST(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "21", "日志不存在");
+
+    /**
+     * 错误编码
+     */
+    private final String errorCode;
+
+    /**
+     * 提示用户信息
+     */
+    private final String userTip;
+
+    LogExceptionEnum(String errorCode, String userTip) {
+        this.errorCode = errorCode;
+        this.userTip = userTip;
+    }
+
+}

kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/role/request/SysRoleRequest.java

@@ -1,32 +1,7 @@
-/*
-Copyright [2020] [https://www.stylefeng.cn]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
-
-1.请不要删除和修改根目录下的LICENSE文件。
-2.请不要删除和修改Guns源码头部的版权声明。
-3.请保留源码和相关描述文件的项目出处，作者声明等。
-4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
- */
 package cn.stylefeng.roses.kernel.system.pojo.role.request;
 
 import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
 import cn.stylefeng.roses.kernel.validator.validators.unique.TableUniqueValue;
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/role/response/SysRoleResourceResponse.java

@@ -1,34 +1,6 @@
-/*
-Copyright [2020] [https://www.stylefeng.cn]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
-
-1.请不要删除和修改根目录下的LICENSE文件。
-2.请不要删除和修改Guns源码头部的版权声明。
-3.请保留源码和相关描述文件的项目出处，作者声明等。
-4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
- */
 package cn.stylefeng.roses.kernel.system.pojo.role.response;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 /**

kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/app/modular/mapper/SysAppMapper.java

@@ -1,27 +1,3 @@
-/*
-Copyright [2020] [https://www.stylefeng.cn]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
-
-1.请不要删除和修改根目录下的LICENSE文件。
-2.请不要删除和修改Guns源码头部的版权声明。
-3.请保留源码和相关描述文件的项目出处，作者声明等。
-4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
- */
 package cn.stylefeng.roses.kernel.app.modular.mapper;
 
 import cn.stylefeng.roses.kernel.app.modular.entity.SysApp;

kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/app/modular/service/SysAppService.java

@@ -1,27 +1,3 @@
-/*
-Copyright [2020] [https://www.stylefeng.cn]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
-
-1.请不要删除和修改根目录下的LICENSE文件。
-2.请不要删除和修改Guns源码头部的版权声明。
-3.请保留源码和相关描述文件的项目出处，作者声明等。
-4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
- */
 package cn.stylefeng.roses.kernel.app.modular.service;
 
 import cn.stylefeng.roses.kernel.app.modular.entity.SysApp;

kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/app/modular/service/impl/SysAppServiceImpl.java

@@ -15,7 +15,7 @@ import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict;
 import cn.stylefeng.roses.kernel.system.AppServiceApi;
 import cn.stylefeng.roses.kernel.system.MenuServiceApi;
 import cn.stylefeng.roses.kernel.system.exception.SystemModularException;
-import cn.stylefeng.roses.kernel.system.exception.enums.AppExceptionEnum;
+import cn.stylefeng.roses.kernel.system.exception.enums.app.AppExceptionEnum;
 import cn.stylefeng.roses.kernel.system.pojo.app.SysAppRequest;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;

kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/loginlog/modular/controller/SysLoginLogController.java

@@ -24,7 +24,6 @@ public class SysLoginLogController {
     @Resource
     private SysLoginLogService sysLoginLogService;
 
-
     /**
      * 清空登录日志
      *
@@ -37,7 +36,6 @@ public class SysLoginLogController {
         return new SuccessResponseData();
     }
 
-
     /**
      * 查询登录日志详情
      *
@@ -57,8 +55,7 @@ public class SysLoginLogController {
      */
     @GetResource(name = "分页查询登录日志", path = "/loginLog/page")
     public ResponseData page(SysLoginLogRequest sysLoginLogRequest) {
-        return new SuccessResponseData(sysLoginLogService.page(sysLoginLogRequest));
+        return new SuccessResponseData(sysLoginLogService.findPage(sysLoginLogRequest));
     }
 
-
 }

kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/loginlog/modular/mapper/SysLoginLogMapper.java

@@ -1,27 +1,3 @@
-/*
-Copyright [2020] [https://www.stylefeng.cn]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
-
-1.请不要删除和修改根目录下的LICENSE文件。
-2.请不要删除和修改Guns源码头部的版权声明。
-3.请保留源码和相关描述文件的项目出处，作者声明等。
-4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
- */
 package cn.stylefeng.roses.kernel.loginlog.modular.mapper;
 
 import cn.stylefeng.roses.kernel.loginlog.modular.entity.SysLoginLog;

kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/loginlog/modular/service/SysLoginLogService.java

@@ -1,27 +1,3 @@
-/*
-Copyright [2020] [https://www.stylefeng.cn]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
-
-1.请不要删除和修改根目录下的LICENSE文件。
-2.请不要删除和修改Guns源码头部的版权声明。
-3.请保留源码和相关描述文件的项目出处，作者声明等。
-4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
- */
 package cn.stylefeng.roses.kernel.loginlog.modular.service;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
@@ -38,7 +14,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface SysLoginLogService extends IService<SysLoginLog>, LoginLogServiceApi {
 
-
     /**
      * 删除
      *
@@ -48,7 +23,6 @@ public interface SysLoginLogService extends IService<SysLoginLog>, LoginLogServi
      */
     void del(SysLoginLogRequest sysLoginLogRequest);
 
-
     /**
      * 查看相信
      *
@@ -65,7 +39,6 @@ public interface SysLoginLogService extends IService<SysLoginLog>, LoginLogServi
      * @author chenjinlong
      * @date 2021/1/13 10:57
      */
-    PageResult<SysLoginLog> page(SysLoginLogRequest sysLoginLogRequest);
+    PageResult<SysLoginLog> findPage(SysLoginLogRequest sysLoginLogRequest);
-
 
 }

kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/loginlog/modular/service/impl/SysLoginLogServiceImpl.java

@@ -12,7 +12,7 @@ import cn.stylefeng.roses.kernel.loginlog.modular.mapper.SysLoginLogMapper;
 import cn.stylefeng.roses.kernel.loginlog.modular.service.SysLoginLogService;
 import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException;
 import cn.stylefeng.roses.kernel.rule.util.HttpServletUtil;
-import cn.stylefeng.roses.kernel.system.exception.enums.AppExceptionEnum;
+import cn.stylefeng.roses.kernel.system.exception.enums.log.LogExceptionEnum;
 import cn.stylefeng.roses.kernel.system.pojo.SysLoginLogRequest;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -28,6 +28,26 @@ import org.springframework.stereotype.Service;
 @Service
 public class SysLoginLogServiceImpl extends ServiceImpl<SysLoginLogMapper, SysLoginLog> implements SysLoginLogService {
 
+    @Override
+    public void del(SysLoginLogRequest sysLoginLogRequest) {
+        SysLoginLog sysLoginLog = this.querySysLoginLogById(sysLoginLogRequest);
+        this.removeById(sysLoginLog.getLlgId());
+    }
+
+    @Override
+    public SysLoginLog detail(SysLoginLogRequest sysLoginLogRequest) {
+        LambdaQueryWrapper<SysLoginLog> queryWrapper = this.createWrapper(sysLoginLogRequest);
+        return this.getOne(queryWrapper, false);
+    }
+
+    @Override
+    public PageResult<SysLoginLog> findPage(SysLoginLogRequest sysLoginLogRequest) {
+        LambdaQueryWrapper<SysLoginLog> wrapper = createWrapper(sysLoginLogRequest);
+        wrapper.orderByDesc(SysLoginLog::getCreateTime);
+        Page<SysLoginLog> page = this.page(PageFactory.defaultPage(), wrapper);
+        return PageResultFactory.createPageResult(page);
+    }
+
     @Override
     public void add(SysLoginLogRequest sysLoginLogRequest) {
         SysLoginLog sysLoginLog = new SysLoginLog();
@@ -84,26 +104,6 @@ public class SysLoginLogServiceImpl extends ServiceImpl<SysLoginLogMapper, SysLo
         this.remove(null);
     }
 
-    @Override
-    public void del(SysLoginLogRequest sysLoginLogRequest) {
-        SysLoginLog sysLoginLog = this.querySysLoginLogById(sysLoginLogRequest);
-        this.removeById(sysLoginLog.getLlgId());
-    }
-
-    @Override
-    public SysLoginLog detail(SysLoginLogRequest sysLoginLogRequest) {
-        LambdaQueryWrapper<SysLoginLog> queryWrapper = this.createWrapper(sysLoginLogRequest);
-        return this.getOne(queryWrapper, false);
-    }
-
-    @Override
-    public PageResult<SysLoginLog> page(SysLoginLogRequest sysLoginLogRequest) {
-        LambdaQueryWrapper<SysLoginLog> wrapper = createWrapper(sysLoginLogRequest);
-        wrapper.orderByDesc(SysLoginLog::getCreateTime);
-        Page<SysLoginLog> page = this.page(PageFactory.defaultPage(), wrapper);
-        return PageResultFactory.createPageResult(page);
-    }
-
     /**
      * 获取详细信息
      *
@@ -113,7 +113,7 @@ public class SysLoginLogServiceImpl extends ServiceImpl<SysLoginLogMapper, SysLo
     private SysLoginLog querySysLoginLogById(SysLoginLogRequest sysLoginLogRequest) {
         SysLoginLog sysLoginLog = this.getById(sysLoginLogRequest.getLlgId());
         if (ObjectUtil.isNull(sysLoginLog)) {
-            throw new ServiceException(AppExceptionEnum.APP_NOT_EXIST);
+            throw new ServiceException(LogExceptionEnum.LOG_NOT_EXIST);
         }
         return sysLoginLog;
     }
@@ -127,6 +127,10 @@ public class SysLoginLogServiceImpl extends ServiceImpl<SysLoginLogMapper, SysLo
     private LambdaQueryWrapper<SysLoginLog> createWrapper(SysLoginLogRequest sysLoginLogRequest) {
         LambdaQueryWrapper<SysLoginLog> queryWrapper = new LambdaQueryWrapper<>();
 
+        if (ObjectUtil.isEmpty(sysLoginLogRequest)) {
+            return queryWrapper;
+        }
+
         // SQL条件拼接
         queryWrapper.eq(StrUtil.isNotBlank(sysLoginLogRequest.getLlgName()), SysLoginLog::getLlgName, sysLoginLogRequest.getLlgName());
         queryWrapper.ge(StrUtil.isNotBlank(sysLoginLogRequest.getBeginTime()), SysLoginLog::getCreateTime, sysLoginLogRequest.getBeginTime());

kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/SysMenuService.java

@@ -1,27 +1,3 @@
-/*
-Copyright [2020] [https://www.stylefeng.cn]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
-
-1.请不要删除和修改根目录下的LICENSE文件。
-2.请不要删除和修改Guns源码头部的版权声明。
-3.请保留源码和相关描述文件的项目出处，作者声明等。
-4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
- */
 package cn.stylefeng.roses.kernel.menu.modular.service;
 
 import cn.stylefeng.roses.kernel.menu.modular.entity.SysMenu;

kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuServiceImpl.java

@@ -1,27 +1,3 @@
-/*
-Copyright [2020] [https://www.stylefeng.cn]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
-
-1.请不要删除和修改根目录下的LICENSE文件。
-2.请不要删除和修改Guns源码头部的版权声明。
-3.请保留源码和相关描述文件的项目出处，作者声明等。
-4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
- */
 package cn.stylefeng.roses.kernel.menu.modular.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;

kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/entity/SysRole.java

@@ -1,27 +1,3 @@
-/*
-Copyright [2020] [https://www.stylefeng.cn]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
-
-1.请不要删除和修改根目录下的LICENSE文件。
-2.请不要删除和修改Guns源码头部的版权声明。
-3.请保留源码和相关描述文件的项目出处，作者声明等。
-4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
- */
 package cn.stylefeng.roses.kernel.role.modular.entity;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;

kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/entity/SysRoleDataScope.java

@@ -1,27 +1,3 @@
-/*
-Copyright [2020] [https://www.stylefeng.cn]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
-
-1.请不要删除和修改根目录下的LICENSE文件。
-2.请不要删除和修改Guns源码头部的版权声明。
-3.请保留源码和相关描述文件的项目出处，作者声明等。
-4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
- */
 package cn.stylefeng.roses.kernel.role.modular.entity;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;

kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/entity/SysRoleResource.java

@@ -1,27 +1,3 @@
-/*
-Copyright [2020] [https://www.stylefeng.cn]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
-
-1.请不要删除和修改根目录下的LICENSE文件。
-2.请不要删除和修改Guns源码头部的版权声明。
-3.请保留源码和相关描述文件的项目出处，作者声明等。
-4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
- */
 package cn.stylefeng.roses.kernel.role.modular.entity;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;

kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/SysRoleDataScopeMapper.java

@@ -1,27 +1,3 @@
-/*
-Copyright [2020] [https://www.stylefeng.cn]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
-
-1.请不要删除和修改根目录下的LICENSE文件。
-2.请不要删除和修改Guns源码头部的版权声明。
-3.请保留源码和相关描述文件的项目出处，作者声明等。
-4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
- */
 package cn.stylefeng.roses.kernel.role.modular.mapper;
 
 import cn.stylefeng.roses.kernel.role.modular.entity.SysRoleDataScope;

kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/SysRoleMapper.java

@@ -1,31 +1,7 @@
-/*
-Copyright [2020] [https://www.stylefeng.cn]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
-
-1.请不要删除和修改根目录下的LICENSE文件。
-2.请不要删除和修改Guns源码头部的版权声明。
-3.请保留源码和相关描述文件的项目出处，作者声明等。
-4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
- */
 package cn.stylefeng.roses.kernel.role.modular.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import cn.stylefeng.roses.kernel.role.modular.entity.SysRole;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * 系统角色mapper接口

kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/SysRoleResourceMapper.java

@@ -1,27 +1,3 @@
-/*
-Copyright [2020] [https://www.stylefeng.cn]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
-
-1.请不要删除和修改根目录下的LICENSE文件。
-2.请不要删除和修改Guns源码头部的版权声明。
-3.请保留源码和相关描述文件的项目出处，作者声明等。
-4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
- */
 package cn.stylefeng.roses.kernel.role.modular.mapper;
 
 import cn.stylefeng.roses.kernel.role.modular.entity.SysRoleResource;

kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/SysRoleResourceService.java

@@ -1,27 +1,3 @@
-/*
-Copyright [2020] [https://www.stylefeng.cn]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
-
-1.请不要删除和修改根目录下的LICENSE文件。
-2.请不要删除和修改Guns源码头部的版权声明。
-3.请保留源码和相关描述文件的项目出处，作者声明等。
-4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
- */
 package cn.stylefeng.roses.kernel.role.modular.service;
 
 import cn.stylefeng.roses.kernel.role.modular.entity.SysRoleResource;

kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/SysRoleService.java

@@ -1,27 +1,3 @@
-/*
-Copyright [2020] [https://www.stylefeng.cn]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
-
-1.请不要删除和修改根目录下的LICENSE文件。
-2.请不要删除和修改Guns源码头部的版权声明。
-3.请保留源码和相关描述文件的项目出处，作者声明等。
-4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
- */
 package cn.stylefeng.roses.kernel.role.modular.service;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;

kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/impl/SysRoleDataScopeServiceImpl.java

@@ -1,27 +1,3 @@
-/*
-Copyright [2020] [https://www.stylefeng.cn]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
-
-1.请不要删除和修改根目录下的LICENSE文件。
-2.请不要删除和修改Guns源码头部的版权声明。
-3.请保留源码和相关描述文件的项目出处，作者声明等。
-4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
- */
 package cn.stylefeng.roses.kernel.role.modular.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;

kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/impl/SysRoleResourceServiceImpl.java

@@ -1,30 +1,5 @@
-/*
-Copyright [2020] [https://www.stylefeng.cn]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
-
-1.请不要删除和修改根目录下的LICENSE文件。
-2.请不要删除和修改Guns源码头部的版权声明。
-3.请保留源码和相关描述文件的项目出处，作者声明等。
-4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
- */
 package cn.stylefeng.roses.kernel.role.modular.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
 import cn.stylefeng.roses.kernel.role.modular.entity.SysRoleResource;
 import cn.stylefeng.roses.kernel.role.modular.mapper.SysRoleResourceMapper;
 import cn.stylefeng.roses.kernel.role.modular.service.SysRoleResourceService;
@@ -47,7 +22,6 @@ import java.util.List;
 public class SysRoleResourceServiceImpl extends ServiceImpl<SysRoleResourceMapper, SysRoleResource> implements SysRoleResourceService {
 
 
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void grantResource(SysRoleRequest sysRoleRequest) {

kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/impl/SysRoleServiceImpl.java

@@ -1,27 +1,3 @@
-/*
-Copyright [2020] [https://www.stylefeng.cn]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
-
-1.请不要删除和修改根目录下的LICENSE文件。
-2.请不要删除和修改Guns源码头部的版权声明。
-3.请保留源码和相关描述文件的项目出处，作者声明等。
-4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns-separation
-6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
- */
 package cn.stylefeng.roses.kernel.role.modular.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;