yq пре 2 година
родитељ
комит
4a5c1404ed
40 измењених фајлова са 187 додато и 51 уклоњено
  1. 3 2
      service-system/service-system-api/src/main/java/com/usky/system/RemoteSystemService.java
  2. 5 5
      service-system/service-system-api/src/main/java/com/usky/system/factory/RemoteSystemFallbackFactory.java
  3. 6 0
      service-system/service-system-biz/pom.xml
  4. 63 0
      service-system/service-system-biz/src/main/java/com/usky/system/controller/web/TestController.java
  5. 1 1
      service-system/service-system-biz/src/main/java/com/usky/system/domain/SysLogininfor.java
  6. 3 0
      service-system/service-system-biz/src/main/java/com/usky/system/domain/SysMenu.java
  7. 3 1
      service-system/service-system-biz/src/main/java/com/usky/system/domain/SysOperLog.java
  8. 2 0
      service-system/service-system-biz/src/main/java/com/usky/system/domain/SysPost.java
  9. 3 1
      service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysConfigMapper.java
  10. 3 1
      service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysDictDataMapper.java
  11. 3 1
      service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysDictTypeMapper.java
  12. 3 1
      service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysLogininforMapper.java
  13. 3 1
      service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysMenuMapper.java
  14. 3 1
      service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysOperLogMapper.java
  15. 3 1
      service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysPostMapper.java
  16. 3 1
      service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysRoleDeptMapper.java
  17. 3 1
      service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysRoleMapper.java
  18. 3 1
      service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysRoleMenuMapper.java
  19. 3 1
      service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysUserPostMapper.java
  20. 3 1
      service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysUserRoleMapper.java
  21. 3 1
      service-system/service-system-biz/src/main/java/com/usky/system/service/ISysConfigService.java
  22. 3 1
      service-system/service-system-biz/src/main/java/com/usky/system/service/ISysDictDataService.java
  23. 3 1
      service-system/service-system-biz/src/main/java/com/usky/system/service/ISysDictTypeService.java
  24. 3 1
      service-system/service-system-biz/src/main/java/com/usky/system/service/ISysLogininforService.java
  25. 3 1
      service-system/service-system-biz/src/main/java/com/usky/system/service/ISysMenuService.java
  26. 3 1
      service-system/service-system-biz/src/main/java/com/usky/system/service/ISysOperLogService.java
  27. 3 1
      service-system/service-system-biz/src/main/java/com/usky/system/service/ISysPostService.java
  28. 3 1
      service-system/service-system-biz/src/main/java/com/usky/system/service/ISysRoleService.java
  29. 4 1
      service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysConfigServiceImpl.java
  30. 2 1
      service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysDeptServiceImpl.java
  31. 4 1
      service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysDictDataServiceImpl.java
  32. 4 1
      service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysDictTypeServiceImpl.java
  33. 4 1
      service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysLogininforServiceImpl.java
  34. 3 1
      service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysMenuServiceImpl.java
  35. 4 1
      service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysOperLogServiceImpl.java
  36. 4 1
      service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysPostServiceImpl.java
  37. 4 9
      service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysRoleServiceImpl.java
  38. 3 0
      service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysUserOnlineServiceImpl.java
  39. 2 2
      service-system/service-system-biz/src/main/resources/bootstrap.yml
  40. 3 3
      usky-module-demo/usky-module-demo-biz/src/main/resources/bootstrap.yml

+ 3 - 2
service-system/service-system-api/src/main/java/com/usky/system/RemoteUserService.java → service-system/service-system-api/src/main/java/com/usky/system/RemoteSystemService.java

@@ -3,6 +3,7 @@ package com.usky.system;
 
 import com.usky.common.core.bean.ApiResult;
 import com.usky.system.domain.SysUserVO;
+import com.usky.system.factory.RemoteSystemFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
@@ -10,8 +11,8 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
-@FeignClient(contextId = "remoteUserService", value = "usky-demo")
-public interface RemoteUserService {
+@FeignClient(contextId = "remoteSystemService", value = "usky-demo",fallbackFactory = RemoteSystemFallbackFactory.class)
+public interface RemoteSystemService {
 
 
 

+ 5 - 5
service-system/service-system-api/src/main/java/com/usky/system/factory/RemoteUserFallbackFactory.java → service-system/service-system-api/src/main/java/com/usky/system/factory/RemoteSystemFallbackFactory.java

@@ -2,7 +2,7 @@ package com.usky.system.factory;
 
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.exception.BusinessException;
-import com.usky.system.RemoteUserService;
+import com.usky.system.RemoteSystemService;
 import com.usky.system.domain.SysUserVO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -20,15 +20,15 @@ import java.util.List;
  * @author ruoyi
  */
 @Component
-public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserService>
+public class RemoteSystemFallbackFactory implements FallbackFactory<RemoteSystemService>
 {
-    private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class);
+    private static final Logger log = LoggerFactory.getLogger(RemoteSystemFallbackFactory.class);
 
     @Override
-    public RemoteUserService create(Throwable throwable)
+    public RemoteSystemService create(Throwable throwable)
     {
         log.error("用户服务调用失败:{}", throwable.getMessage());
-        return new RemoteUserService() {
+        return new RemoteSystemService() {
             @Override
             public ApiResult<List<SysUserVO>> getByUserName(String userName) {
                 throw new BusinessException(throwable.getMessage());

+ 6 - 0
service-system/service-system-biz/pom.xml

@@ -92,6 +92,12 @@
             <version>0.0.1</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>usky-module-demo-api</artifactId>
+            <version>0.0.1</version>
+        </dependency>
+
 
         <!-- Pagehelper -->
         <dependency>

+ 63 - 0
service-system/service-system-biz/src/main/java/com/usky/system/controller/web/TestController.java

@@ -0,0 +1,63 @@
+package com.usky.system.controller.web;
+
+import com.usky.demo.RemoteUserService;
+import com.usky.system.RemoteSystemService;
+import com.usky.system.domain.SysConfig;
+import com.usky.system.service.*;
+import com.usky.system.service.impl.SysConfigServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author yq
+ * @date 2022/6/23 13:12
+ */
+@RestController
+@RequestMapping("/test")
+public class TestController {
+
+    @Autowired
+    private ISysConfigService sysConfigService;
+    @Autowired
+    private ISysUserService sysUserService;
+    @Autowired
+    private ISysDeptService sysDeptService;
+    @Autowired
+    private ISysDictTypeService sysDictTypeService;
+    @Autowired
+    private ISysDictDataService sysDictDataService;
+    @Autowired
+    private ISysPostService iSysPostService;
+    @Autowired
+    private ISysMenuService sysMenuService;
+    @Autowired
+    private ISysLogininforService sysLogininforService;
+    @Autowired
+    private ISysOperLogService sysOperLogService;
+
+    @RequestMapping("/test")
+    public void test(){
+        SysConfig byId = sysConfigService.getById(1);
+        sysUserService.getById(1);
+        sysDeptService.getById(1);
+        sysDictTypeService.getById(1);
+        sysDictDataService.getById(1);
+        iSysPostService.getById(1);
+        sysMenuService.getById(1);
+        sysLogininforService.getById(1);
+        sysOperLogService.getById(1);
+
+    }
+
+
+    @Autowired
+    private RemoteUserService remoteUserService;
+
+    @RequestMapping("test2")
+    public void test2(){
+        remoteUserService.getByUserName("name");
+        System.out.println("远程调用成功");
+    }
+
+}

+ 1 - 1
service-system/service-system-biz/src/main/java/com/usky/system/domain/SysLogininfor.java

@@ -11,7 +11,7 @@ import java.util.Date;
  * 
  * @author yq
  */
-public class SysLogininfor extends BaseEntity
+public class SysLogininfor
 {
     private static final long serialVersionUID = 1L;
 

+ 3 - 0
service-system/service-system-biz/src/main/java/com/usky/system/domain/SysMenu.java

@@ -1,5 +1,6 @@
 package com.usky.system.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.usky.system.domain.core.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -26,6 +27,7 @@ public class SysMenu extends BaseEntity
     private String menuName;
 
     /** 父菜单名称 */
+    @TableField(exist = false)
     private String parentName;
 
     /** 父菜单ID */
@@ -62,6 +64,7 @@ public class SysMenu extends BaseEntity
     private String icon;
 
     /** 子菜单 */
+    @TableField(exist = false)
     private List<SysMenu> children = new ArrayList<SysMenu>();
 
     public Long getMenuId()

+ 3 - 1
service-system/service-system-biz/src/main/java/com/usky/system/domain/SysOperLog.java

@@ -1,5 +1,6 @@
 package com.usky.system.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import  com.fasterxml.jackson.annotation.JsonFormat;
 import com.usky.system.domain.core.BaseEntity;
 
@@ -11,7 +12,7 @@ import java.util.Date;
  * 
  * @author yq
  */
-public class SysOperLog extends BaseEntity
+public class SysOperLog
 {
     private static final long serialVersionUID = 1L;
 
@@ -25,6 +26,7 @@ public class SysOperLog extends BaseEntity
     private Integer businessType;
 
     /** 业务类型数组 */
+    @TableField(exist = false)
     private Integer[] businessTypes;
 
     /** 请求方法 */

+ 2 - 0
service-system/service-system-biz/src/main/java/com/usky/system/domain/SysPost.java

@@ -1,5 +1,6 @@
 package com.usky.system.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.usky.system.domain.core.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -33,6 +34,7 @@ public class SysPost extends BaseEntity
     private String status;
 
     /** 用户是否存在此岗位标识 默认不存在 */
+    @TableField(exist = false)
     private boolean flag = false;
 
     public Long getPostId()

+ 3 - 1
service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysConfigMapper.java

@@ -1,7 +1,9 @@
 package com.usky.system.mapper;
 
 
+import com.usky.common.mvc.base.CrudMapper;
 import com.usky.system.domain.SysConfig;
+import com.usky.system.domain.SysDictData;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -12,7 +14,7 @@ import java.util.List;
  * @author yq
  */
 @Repository
-public interface SysConfigMapper
+public interface SysConfigMapper extends CrudMapper<SysConfig>
 {
     /**
      * 查询参数配置信息

+ 3 - 1
service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysDictDataMapper.java

@@ -1,7 +1,9 @@
 package com.usky.system.mapper;
 
 
+import com.usky.common.mvc.base.CrudMapper;
 import com.usky.system.domain.SysDictData;
+import com.usky.system.domain.SysDictType;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -14,7 +16,7 @@ import java.util.List;
  * @author yq
  */
 @Repository
-public interface SysDictDataMapper
+public interface SysDictDataMapper extends CrudMapper<SysDictData>
 {
     /**
      * 根据条件分页查询字典数据

+ 3 - 1
service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysDictTypeMapper.java

@@ -1,7 +1,9 @@
 package com.usky.system.mapper;
 
 
+import com.usky.common.mvc.base.CrudMapper;
 import com.usky.system.domain.SysDictType;
+import com.usky.system.domain.SysLogininfor;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -13,7 +15,7 @@ import java.util.List;
  * @author yq
  */
 @Repository
-public interface SysDictTypeMapper
+public interface SysDictTypeMapper extends CrudMapper<SysDictType>
 {
     /**
      * 根据条件分页查询字典类型

+ 3 - 1
service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysLogininforMapper.java

@@ -1,7 +1,9 @@
 package com.usky.system.mapper;
 
 
+import com.usky.common.mvc.base.CrudMapper;
 import com.usky.system.domain.SysLogininfor;
+import com.usky.system.domain.SysMenu;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -13,7 +15,7 @@ import java.util.List;
  * @author yq
  */
 @Repository
-public interface SysLogininforMapper
+public interface SysLogininforMapper extends CrudMapper<SysLogininfor>
 {
     /**
      * 新增系统登录日志

+ 3 - 1
service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysMenuMapper.java

@@ -1,7 +1,9 @@
 package com.usky.system.mapper;
 
 
+import com.usky.common.mvc.base.CrudMapper;
 import com.usky.system.domain.SysMenu;
+import com.usky.system.domain.SysOperLog;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -14,7 +16,7 @@ import java.util.List;
  * @author yq
  */
 @Repository
-public interface SysMenuMapper
+public interface SysMenuMapper extends CrudMapper<SysMenu>
 {
     /**
      * 查询系统菜单列表

+ 3 - 1
service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysOperLogMapper.java

@@ -1,7 +1,9 @@
 package com.usky.system.mapper;
 
 
+import com.usky.common.mvc.base.CrudMapper;
 import com.usky.system.domain.SysOperLog;
+import com.usky.system.domain.SysPost;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -13,7 +15,7 @@ import java.util.List;
  * @author yq
  */
 @Repository
-public interface SysOperLogMapper
+public interface SysOperLogMapper extends CrudMapper<SysOperLog>
 {
     /**
      * 新增操作日志

+ 3 - 1
service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysPostMapper.java

@@ -1,7 +1,9 @@
 package com.usky.system.mapper;
 
 
+import com.usky.common.mvc.base.CrudMapper;
 import com.usky.system.domain.SysPost;
+import com.usky.system.domain.SysRole;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -12,7 +14,7 @@ import java.util.List;
  * @author yq
  */
 @Repository
-public interface SysPostMapper
+public interface SysPostMapper extends CrudMapper<SysPost>
 {
     /**
      * 查询岗位数据集合

+ 3 - 1
service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysRoleDeptMapper.java

@@ -1,6 +1,8 @@
 package com.usky.system.mapper;
 
 
+import com.usky.common.mvc.base.CrudMapper;
+import com.usky.system.domain.SysRole;
 import com.usky.system.domain.SysRoleDept;
 import org.springframework.stereotype.Repository;
 
@@ -12,7 +14,7 @@ import java.util.List;
  * @author yq
  */
 @Repository
-public interface SysRoleDeptMapper
+public interface SysRoleDeptMapper extends CrudMapper<SysRoleDept>
 {
     /**
      * 通过角色ID删除角色和部门关联

+ 3 - 1
service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysRoleMapper.java

@@ -1,7 +1,9 @@
 package com.usky.system.mapper;
 
 
+import com.usky.common.mvc.base.CrudMapper;
 import com.usky.system.domain.SysRole;
+import com.usky.system.domain.SysRoleMenu;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -12,7 +14,7 @@ import java.util.List;
  * @author yq
  */
 @Repository
-public interface SysRoleMapper
+public interface SysRoleMapper extends CrudMapper<SysRole>
 {
     /**
      * 根据条件分页查询角色数据

+ 3 - 1
service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysRoleMenuMapper.java

@@ -1,7 +1,9 @@
 package com.usky.system.mapper;
 
 
+import com.usky.common.mvc.base.CrudMapper;
 import com.usky.system.domain.SysRoleMenu;
+import com.usky.system.domain.SysUser;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -12,7 +14,7 @@ import java.util.List;
  * @author yq
  */
 @Repository
-public interface SysRoleMenuMapper
+public interface SysRoleMenuMapper extends CrudMapper<SysRoleMenu>
 {
     /**
      * 查询菜单使用数量

+ 3 - 1
service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysUserPostMapper.java

@@ -2,7 +2,9 @@ package com.usky.system.mapper;
 
 
 
+import com.usky.common.mvc.base.CrudMapper;
 import com.usky.system.domain.SysUserPost;
+import com.usky.system.domain.SysUserRole;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -13,7 +15,7 @@ import java.util.List;
  * @author yq
  */
 @Repository
-public interface SysUserPostMapper
+public interface SysUserPostMapper extends CrudMapper<SysUserPost>
 {
     /**
      * 通过用户ID删除用户和岗位关联

+ 3 - 1
service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysUserRoleMapper.java

@@ -1,6 +1,8 @@
 package com.usky.system.mapper;
 
 
+import com.usky.common.mvc.base.CrudMapper;
+import com.usky.system.domain.SysUser;
 import com.usky.system.domain.SysUserRole;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -13,7 +15,7 @@ import java.util.List;
  * @author yq
  */
 @Repository
-public interface SysUserRoleMapper
+public interface SysUserRoleMapper extends CrudMapper<SysUserRole>
 {
     /**
      * 通过用户ID删除用户和角色关联

+ 3 - 1
service-system/service-system-biz/src/main/java/com/usky/system/service/ISysConfigService.java

@@ -3,7 +3,9 @@ package com.usky.system.service;
 
 
 
+import com.usky.common.mvc.base.CrudService;
 import com.usky.system.domain.SysConfig;
+import com.usky.system.domain.SysDictType;
 
 import java.util.List;
 
@@ -13,7 +15,7 @@ import java.util.List;
  * 
  * @author yq
  */
-public interface ISysConfigService
+public interface ISysConfigService extends CrudService<SysConfig>
 {
     /**
      * 查询参数配置信息

+ 3 - 1
service-system/service-system-biz/src/main/java/com/usky/system/service/ISysDictDataService.java

@@ -1,7 +1,9 @@
 package com.usky.system.service;
 
 
+import com.usky.common.mvc.base.CrudService;
 import com.usky.system.domain.SysDictData;
+import com.usky.system.domain.SysDictType;
 
 import java.util.List;
 
@@ -10,7 +12,7 @@ import java.util.List;
  * 
  * @author yq
  */
-public interface ISysDictDataService
+public interface ISysDictDataService extends CrudService<SysDictData>
 {
     /**
      * 根据条件分页查询字典数据

+ 3 - 1
service-system/service-system-biz/src/main/java/com/usky/system/service/ISysDictTypeService.java

@@ -5,8 +5,10 @@ package com.usky.system.service;
 
 
 
+import com.usky.common.mvc.base.CrudService;
 import com.usky.system.domain.SysDictData;
 import com.usky.system.domain.SysDictType;
+import com.usky.system.domain.SysPost;
 
 import java.util.List;
 
@@ -16,7 +18,7 @@ import java.util.List;
  * 
  * @author yq
  */
-public interface ISysDictTypeService
+public interface ISysDictTypeService extends CrudService<SysDictType>
 {
     /**
      * 根据条件分页查询字典类型

+ 3 - 1
service-system/service-system-biz/src/main/java/com/usky/system/service/ISysLogininforService.java

@@ -3,7 +3,9 @@ package com.usky.system.service;
 
 
 
+import com.usky.common.mvc.base.CrudService;
 import com.usky.system.domain.SysLogininfor;
+import com.usky.system.domain.SysPost;
 
 import java.util.List;
 
@@ -12,7 +14,7 @@ import java.util.List;
  * 
  * @author yq
  */
-public interface ISysLogininforService
+public interface ISysLogininforService extends CrudService<SysLogininfor>
 {
     /**
      * 新增系统登录日志

+ 3 - 1
service-system/service-system-biz/src/main/java/com/usky/system/service/ISysMenuService.java

@@ -2,7 +2,9 @@ package com.usky.system.service;
 
 
 
+import com.usky.common.mvc.base.CrudService;
 import com.usky.system.domain.SysMenu;
+import com.usky.system.domain.SysPost;
 import com.usky.system.service.vo.RouterVo;
 import com.usky.system.service.vo.TreeSelect;
 
@@ -14,7 +16,7 @@ import java.util.Set;
  * 
  * @author yq
  */
-public interface ISysMenuService
+public interface ISysMenuService extends CrudService<SysMenu>
 {
     /**
      * 根据用户查询系统菜单列表

+ 3 - 1
service-system/service-system-biz/src/main/java/com/usky/system/service/ISysOperLogService.java

@@ -3,7 +3,9 @@ package com.usky.system.service;
 
 
 
+import com.usky.common.mvc.base.CrudService;
 import com.usky.system.domain.SysOperLog;
+import com.usky.system.domain.SysPost;
 
 import java.util.List;
 
@@ -12,7 +14,7 @@ import java.util.List;
  * 
  * @author yq
  */
-public interface ISysOperLogService
+public interface ISysOperLogService extends CrudService<SysOperLog>
 {
     /**
      * 新增操作日志

+ 3 - 1
service-system/service-system-biz/src/main/java/com/usky/system/service/ISysPostService.java

@@ -1,6 +1,8 @@
 package com.usky.system.service;
 
+import com.usky.common.mvc.base.CrudService;
 import com.usky.system.domain.SysPost;
+import com.usky.system.domain.SysRole;
 
 import java.util.List;
 
@@ -9,7 +11,7 @@ import java.util.List;
  * 
  * @author yq
  */
-public interface ISysPostService
+public interface ISysPostService extends CrudService<SysPost>
 {
     /**
      * 查询岗位信息集合

+ 3 - 1
service-system/service-system-biz/src/main/java/com/usky/system/service/ISysRoleService.java

@@ -1,7 +1,9 @@
 package com.usky.system.service;
 
 
+import com.usky.common.mvc.base.CrudService;
 import com.usky.system.domain.SysRole;
+import com.usky.system.domain.SysUser;
 import com.usky.system.domain.SysUserRole;
 
 import java.util.List;
@@ -12,7 +14,7 @@ import java.util.Set;
  * 
  * @author yq
  */
-public interface ISysRoleService
+public interface ISysRoleService extends CrudService<SysRole>
 {
     /**
      * 根据条件分页查询角色数据

+ 4 - 1
service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysConfigServiceImpl.java

@@ -5,11 +5,14 @@ package com.usky.system.service.impl;
 import com.usky.common.core.exception.BusinessException;
 import com.usky.common.core.util.Convert;
 import com.usky.common.core.util.StringUtils;
+import com.usky.common.mvc.base.AbstractCrudService;
 import com.usky.common.spring.config.redis.RedisHelper;
 import com.usky.system.domain.SysConfig;
+import com.usky.system.domain.SysUser;
 import com.usky.system.domain.constants.Constants;
 import com.usky.system.domain.constants.UserConstants;
 import com.usky.system.mapper.SysConfigMapper;
+import com.usky.system.mapper.SysUserMapper;
 import com.usky.system.service.ISysConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,7 +28,7 @@ import java.util.Objects;
  * @author yq
  */
 @Service
-public class SysConfigServiceImpl implements ISysConfigService
+public class SysConfigServiceImpl extends AbstractCrudService<SysConfigMapper, SysConfig> implements ISysConfigService
 {
     @Autowired
     private SysConfigMapper configMapper;

+ 2 - 1
service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysDeptServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.usky.common.core.exception.BusinessException;
 import com.usky.common.core.util.Convert;
 import com.usky.common.core.util.StringUtils;
+import com.usky.common.mvc.base.AbstractCrudService;
 import com.usky.system.domain.SysDept;
 import com.usky.system.domain.SysRole;
 import com.usky.system.domain.constants.UserConstants;
@@ -29,7 +30,7 @@ import java.util.stream.Collectors;
  * @author yq
  */
 @Service
-public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> implements ISysDeptService
+public class SysDeptServiceImpl extends AbstractCrudService<SysDeptMapper, SysDept> implements ISysDeptService
 {
     @Autowired
     private SysDeptMapper deptMapper;

+ 4 - 1
service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysDictDataServiceImpl.java

@@ -1,8 +1,11 @@
 package com.usky.system.service.impl;
 
 
+import com.usky.common.mvc.base.AbstractCrudService;
 import com.usky.system.domain.SysDictData;
+import com.usky.system.domain.SysUser;
 import com.usky.system.mapper.SysDictDataMapper;
+import com.usky.system.mapper.SysUserMapper;
 import com.usky.system.service.ISysDictDataService;
 import com.usky.system.service.util.DictUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +20,7 @@ import java.util.List;
  * @author yq
  */
 @Service
-public class SysDictDataServiceImpl implements ISysDictDataService
+public class SysDictDataServiceImpl extends AbstractCrudService<SysDictDataMapper, SysDictData> implements ISysDictDataService
 {
     @Autowired
     private SysDictDataMapper dictDataMapper;

+ 4 - 1
service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysDictTypeServiceImpl.java

@@ -3,11 +3,14 @@ package com.usky.system.service.impl;
 
 
 import com.usky.common.core.exception.BusinessException;
+import com.usky.common.mvc.base.AbstractCrudService;
 import com.usky.system.domain.SysDictData;
 import com.usky.system.domain.SysDictType;
+import com.usky.system.domain.SysUser;
 import com.usky.system.domain.constants.UserConstants;
 import com.usky.system.mapper.SysDictDataMapper;
 import com.usky.system.mapper.SysDictTypeMapper;
+import com.usky.system.mapper.SysUserMapper;
 import com.usky.system.service.ISysDictTypeService;
 import com.usky.system.service.util.DictUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +28,7 @@ import java.util.Objects;
  * @author yq
  */
 @Service
-public class SysDictTypeServiceImpl implements ISysDictTypeService
+public class SysDictTypeServiceImpl extends AbstractCrudService<SysDictTypeMapper, SysDictType> implements ISysDictTypeService
 {
     @Autowired
     private SysDictTypeMapper dictTypeMapper;

+ 4 - 1
service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysLogininforServiceImpl.java

@@ -2,8 +2,11 @@ package com.usky.system.service.impl;
 
 
 
+import com.usky.common.mvc.base.AbstractCrudService;
 import com.usky.system.domain.SysLogininfor;
+import com.usky.system.domain.SysUser;
 import com.usky.system.mapper.SysLogininforMapper;
+import com.usky.system.mapper.SysUserMapper;
 import com.usky.system.service.ISysLogininforService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -17,7 +20,7 @@ import java.util.List;
  * @author yq
  */
 @Service
-public class SysLogininforServiceImpl implements ISysLogininforService
+public class SysLogininforServiceImpl extends AbstractCrudService<SysLogininforMapper, SysLogininfor> implements ISysLogininforService
 {
 
     @Autowired

+ 3 - 1
service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysMenuServiceImpl.java

@@ -1,6 +1,7 @@
 package com.usky.system.service.impl;
 
 import com.usky.common.core.util.StringUtils;
+import com.usky.common.mvc.base.AbstractCrudService;
 import com.usky.system.domain.SysMenu;
 import com.usky.system.domain.SysRole;
 import com.usky.system.domain.SysUser;
@@ -9,6 +10,7 @@ import com.usky.system.domain.constants.UserConstants;
 import com.usky.system.mapper.SysMenuMapper;
 import com.usky.system.mapper.SysRoleMapper;
 import com.usky.system.mapper.SysRoleMenuMapper;
+import com.usky.system.mapper.SysUserMapper;
 import com.usky.system.service.ISysMenuService;
 import com.usky.system.service.vo.MetaVo;
 import com.usky.system.service.vo.RouterVo;
@@ -26,7 +28,7 @@ import java.util.stream.Collectors;
  * @author yq
  */
 @Service
-public class SysMenuServiceImpl implements ISysMenuService
+public class SysMenuServiceImpl extends AbstractCrudService<SysMenuMapper, SysMenu> implements ISysMenuService
 {
     public static final String PREMISSION_STRING = "perms[\"{0}\"]";
 

+ 4 - 1
service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysOperLogServiceImpl.java

@@ -2,8 +2,11 @@ package com.usky.system.service.impl;
 
 
 
+import com.usky.common.mvc.base.AbstractCrudService;
 import com.usky.system.domain.SysOperLog;
+import com.usky.system.domain.SysUser;
 import com.usky.system.mapper.SysOperLogMapper;
+import com.usky.system.mapper.SysUserMapper;
 import com.usky.system.service.ISysOperLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -16,7 +19,7 @@ import java.util.List;
  * @author yq
  */
 @Service
-public class SysOperLogServiceImpl implements ISysOperLogService
+public class SysOperLogServiceImpl extends AbstractCrudService<SysOperLogMapper, SysOperLog> implements ISysOperLogService
 {
     @Autowired
     private SysOperLogMapper operLogMapper;

+ 4 - 1
service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysPostServiceImpl.java

@@ -3,9 +3,12 @@ package com.usky.system.service.impl;
 
 
 import com.usky.common.core.exception.BusinessException;
+import com.usky.common.mvc.base.AbstractCrudService;
 import com.usky.system.domain.SysPost;
+import com.usky.system.domain.SysUser;
 import com.usky.system.domain.constants.UserConstants;
 import com.usky.system.mapper.SysPostMapper;
+import com.usky.system.mapper.SysUserMapper;
 import com.usky.system.mapper.SysUserPostMapper;
 import com.usky.system.service.ISysPostService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +23,7 @@ import java.util.Objects;
  * @author yq
  */
 @Service
-public class SysPostServiceImpl implements ISysPostService
+public class SysPostServiceImpl extends AbstractCrudService<SysPostMapper, SysPost> implements ISysPostService
 {
     @Autowired
     private SysPostMapper postMapper;

+ 4 - 9
service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysRoleServiceImpl.java

@@ -3,16 +3,11 @@ package com.usky.system.service.impl;
 
 
 import com.usky.common.core.exception.BusinessException;
+import com.usky.common.mvc.base.AbstractCrudService;
 import com.usky.common.spring.util.SpringContextUtils;
-import com.usky.system.domain.SysRole;
-import com.usky.system.domain.SysRoleDept;
-import com.usky.system.domain.SysRoleMenu;
-import com.usky.system.domain.SysUserRole;
+import com.usky.system.domain.*;
 import com.usky.system.domain.constants.UserConstants;
-import com.usky.system.mapper.SysRoleDeptMapper;
-import com.usky.system.mapper.SysRoleMapper;
-import com.usky.system.mapper.SysRoleMenuMapper;
-import com.usky.system.mapper.SysUserRoleMapper;
+import com.usky.system.mapper.*;
 import com.usky.system.service.ISysRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -26,7 +21,7 @@ import java.util.*;
  * @author yq
  */
 @Service
-public class SysRoleServiceImpl implements ISysRoleService
+public class SysRoleServiceImpl extends AbstractCrudService<SysRoleMapper, SysRole> implements ISysRoleService
 {
     @Autowired
     private SysRoleMapper roleMapper;

+ 3 - 0
service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysUserOnlineServiceImpl.java

@@ -2,7 +2,10 @@ package com.usky.system.service.impl;
 
 
 import com.usky.common.core.util.StringUtils;
+import com.usky.common.mvc.base.AbstractCrudService;
+import com.usky.system.domain.SysUser;
 import com.usky.system.domain.SysUserOnline;
+import com.usky.system.mapper.SysUserMapper;
 import com.usky.system.service.ISysUserOnlineService;
 import com.usky.system.service.vo.LoginUser;
 import org.springframework.stereotype.Service;

+ 2 - 2
service-system/service-system-biz/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 101.133.214.75:8848
+        server-addr: 172.16.120.165:8848
       config:
         # 配置中心地址
-        server-addr: 101.133.214.75:8848
+        server-addr: 172.16.120.165:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

+ 3 - 3
usky-module-demo/usky-module-demo-biz/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 9886
+  port: 9887
 
 # Spring
 spring: 
@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 101.133.214.75:8848
+        server-addr: 172.16.120.165:8848
       config:
         # 配置中心地址
-        server-addr: 101.133.214.75:8848
+        server-addr: 172.16.120.165:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置