依赖配置

service-system/service-system-biz/pom.xml

@@ -9,110 +9,23 @@
 
     <artifactId>service-system-biz</artifactId>
     <dependencies>
-<!--        &lt;!&ndash; SpringCloud Alibaba Nacos &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>com.alibaba.cloud</groupId>-->
-<!--            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>-->
-<!--        </dependency>-->
 
-<!--        &lt;!&ndash; SpringCloud Alibaba Nacos Config &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>com.alibaba.cloud</groupId>-->
-<!--            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>-->
-<!--        </dependency>-->
-
-<!--&lt;!&ndash;        &lt;!&ndash; SpringCloud Alibaba Sentinel &ndash;&gt;&ndash;&gt;-->
-<!--&lt;!&ndash;        <dependency>&ndash;&gt;-->
-<!--&lt;!&ndash;            <groupId>com.alibaba.cloud</groupId>&ndash;&gt;-->
-<!--&lt;!&ndash;            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>&ndash;&gt;-->
-<!--&lt;!&ndash;        </dependency>&ndash;&gt;-->
-
-<!--        &lt;!&ndash; SpringBoot Actuator &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-actuator</artifactId>-->
-<!--        </dependency>-->
-
-<!--        <dependency>-->
-<!--            <groupId>com.baomidou</groupId>-->
-<!--            <artifactId>mybatis-plus-boot-starter</artifactId>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>com.usky</groupId>-->
-<!--            <artifactId>usky-common-core</artifactId>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>com.usky</groupId>-->
-<!--            <artifactId>usky-common-spring</artifactId>-->
-<!--        </dependency>-->
-
-<!--        <dependency>-->
-<!--            <groupId>com.usky</groupId>-->
-<!--            <artifactId>usky-common-mvc</artifactId>-->
-<!--        </dependency>-->
-
-<!--        <dependency>-->
-<!--            <groupId>org.hibernate</groupId>-->
-<!--            <artifactId>hibernate-validator</artifactId>-->
-<!--            <version>6.0.18.Final</version>-->
-<!--        </dependency>-->
-
-
-<!--        <dependency>-->
-<!--            <groupId>com.baomidou</groupId>-->
-<!--            <artifactId>mybatis-plus-generator</artifactId>-->
-<!--            <version>3.3.0</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>org.apache.velocity</groupId>-->
-<!--            <artifactId>velocity-engine-core</artifactId>-->
-<!--            <version>2.1</version>-->
-<!--        </dependency>-->
-
-<!--        &lt;!&ndash; mysql 驱动 &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>mysql</groupId>-->
-<!--            <artifactId>mysql-connector-java</artifactId>-->
-<!--        </dependency>-->
-
-<!--        <dependency>-->
-<!--            <groupId>com.alibaba</groupId>-->
-<!--            <artifactId>druid-spring-boot-starter</artifactId>-->
-<!--        </dependency>-->
-
-<!--        <dependency>-->
-<!--            <groupId>com.baomidou</groupId>-->
-<!--            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>-->
-<!--        </dependency>-->
 
         <dependency>
             <groupId>com.usky</groupId>
             <artifactId>common-cloud-starter</artifactId>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>com.usky</groupId>-->
-<!--            <artifactId>usky-module-demo-api</artifactId>-->
-<!--            <version>0.0.1</version>-->
-<!--        </dependency>-->
-
-
-        <!-- Pagehelper -->
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.usky</groupId>
-            <artifactId>ruoyi-common-security</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- Pagehelper -->
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+        </dependency>
 
     </dependencies>
 

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

@@ -11,4 +11,6 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/test")
 public class TestController {
 
+
+
 }

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

@@ -1,16 +1,18 @@
 package com.usky.system.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.usky.common.mvc.domain.BaseEntity;
 
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 系统访问记录表 sys_logininfor
  *
  * @author ruoyi
  */
-public class SysLogininfor extends BaseEntity
+public class SysLogininfor
 {
     private static final long serialVersionUID = 1L;
 
@@ -33,6 +35,34 @@ public class SysLogininfor extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date accessTime;
 
+    public String getSearchValue() {
+        return searchValue;
+    }
+
+    public void setSearchValue(String searchValue) {
+        this.searchValue = searchValue;
+    }
+
+    public Map<String, Object> getParams() {
+        if (this.params == null) {
+            this.params = new HashMap();
+        }
+
+        return this.params;
+    }
+
+    public void setParams(Map<String, Object> params) {
+        this.params = params;
+    }
+
+    /** 搜索值 */
+    @TableField(exist = false)
+    private String searchValue;
+
+    /** 请求参数 */
+    @TableField(exist = false)
+    private Map<String, Object> params;
+
     public Long getInfoId()
     {
         return infoId;

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

@@ -1,10 +1,11 @@
 package com.usky.system.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import  com.fasterxml.jackson.annotation.JsonFormat;
-import com.usky.common.mvc.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -12,7 +13,7 @@ import java.util.Date;
  * 
  * @author yq
  */
-public class SysOperLog extends BaseEntity
+public class SysOperLog
 {
     private static final long serialVersionUID = 1L;
 
@@ -69,6 +70,35 @@ public class SysOperLog extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date operTime;
 
+    public String getSearchValue() {
+        return searchValue;
+    }
+
+    public void setSearchValue(String searchValue) {
+        this.searchValue = searchValue;
+    }
+
+    public Map<String, Object> getParams() {
+        if (this.params == null) {
+            this.params = new HashMap();
+        }
+
+        return this.params;
+    }
+
+    public void setParams(Map<String, Object> params) {
+        this.params = params;
+    }
+
+    /** 搜索值 */
+    @TableField(exist = false)
+    private String searchValue;
+
+    /** 请求参数 */
+    @TableField(exist = false)
+    private Map<String, Object> params;
+
+
     public Long getOperId()
     {
         return operId;

service-system/service-system-biz/src/main/java/com/usky/system/service/SysLoginService.java

@@ -1,18 +1,18 @@
 package com.usky.system.service;
 
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.enums.UserStatus;
-import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.core.utils.ServletUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.ip.IpUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
+import com.usky.common.core.exception.BusinessException;
 import com.usky.common.core.util.BeanMapperUtils;
+import com.usky.common.core.util.StringUtils;
+import com.usky.common.mvc.utils.IpUtils;
+import com.usky.common.mvc.utils.ServletUtils;
 import com.usky.system.domain.SysLogininfor;
 import com.usky.system.domain.SysLogininforVO;
 import com.usky.system.domain.SysUser;
 import com.usky.system.domain.SysUserVO;
+import com.usky.system.domain.constants.Constants;
+import com.usky.system.domain.constants.UserConstants;
 import com.usky.system.model.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -41,21 +41,21 @@ public class SysLoginService
         if (StringUtils.isAnyBlank(username, password))
         {
             recordLogininfor(username, Constants.LOGIN_FAIL, "用户/密码必须填写");
-            throw new ServiceException("用户/密码必须填写");
+            throw new BusinessException("用户/密码必须填写");
         }
         // 密码如果不在指定范围内 错误
         if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
                 || password.length() > UserConstants.PASSWORD_MAX_LENGTH)
         {
             recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码不在指定范围");
-            throw new ServiceException("用户密码不在指定范围");
+            throw new BusinessException("用户密码不在指定范围");
         }
         // 用户名不在指定范围内 错误
         if (username.length() < UserConstants.USERNAME_MIN_LENGTH
                 || username.length() > UserConstants.USERNAME_MAX_LENGTH)
         {
             recordLogininfor(username, Constants.LOGIN_FAIL, "用户名不在指定范围");
-            throw new ServiceException("用户名不在指定范围");
+            throw new BusinessException("用户名不在指定范围");
         }
 
         // 查询用户信息
@@ -64,17 +64,17 @@ public class SysLoginService
         if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
         {
             recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
-            throw new ServiceException("对不起，您的账号：" + username + " 已被删除");
+            throw new BusinessException("对不起，您的账号：" + username + " 已被删除");
         }
         if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
         {
             recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
-            throw new ServiceException("对不起，您的账号：" + username + " 已停用");
+            throw new BusinessException("对不起，您的账号：" + username + " 已停用");
         }
         if (!SecurityUtils.matchesPassword(password, user.getPassword()))
         {
             recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码错误");
-            throw new ServiceException("用户不存在/密码错误");
+            throw new BusinessException("用户不存在/密码错误");
         }
         recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
         return loginUser;
@@ -93,17 +93,17 @@ public class SysLoginService
         // 用户名或密码为空 错误
         if (StringUtils.isAnyBlank(username, password))
         {
-            throw new ServiceException("用户/密码必须填写");
+            throw new BusinessException("用户/密码必须填写");
         }
         if (username.length() < UserConstants.USERNAME_MIN_LENGTH
                 || username.length() > UserConstants.USERNAME_MAX_LENGTH)
         {
-            throw new ServiceException("账户长度必须在2到20个字符之间");
+            throw new BusinessException("账户长度必须在2到20个字符之间");
         }
         if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
                 || password.length() > UserConstants.PASSWORD_MAX_LENGTH)
         {
-            throw new ServiceException("密码长度必须在5到20个字符之间");
+            throw new BusinessException("密码长度必须在5到20个字符之间");
         }
 
         // 注册用户信息
@@ -132,11 +132,11 @@ public class SysLoginService
         // 日志状态
         if (StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER))
         {
-            logininfor.setStatus(Constants.LOGIN_SUCCESS_STATUS);
+            logininfor.setStatus(Constants.LOGIN_SUCCESS);
         }
         else if (Constants.LOGIN_FAIL.equals(status))
         {
-            logininfor.setStatus(Constants.LOGIN_FAIL_STATUS);
+            logininfor.setStatus(Constants.LOGIN_FAIL);
         }
         sysLogininforService.insertLogininfor(BeanMapperUtils.map(logininfor, SysLogininfor.class));
     }

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

@@ -214,7 +214,7 @@ public class SysDictTypeServiceImpl extends AbstractCrudService<SysDictTypeMappe
     @Override
     public String checkDictTypeUnique(SysDictType dict)
     {
-        Long dictId = null != dict.getDictId() ? -1L : dict.getDictId();
+        Long dictId = null == dict.getDictId() ? -1L : dict.getDictId();
         SysDictType dictType = dictTypeMapper.checkDictTypeUnique(dict.getDictType());
         if (Objects.nonNull(dictType) && dictType.getDictId().longValue() != dictId.longValue())
         {

service-system/service-system-biz/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/var/log/uskycloud/usky-demo" />
+	<property name="log.path" value="/var/log/uskycloud/usky-system" />
    <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

service-system/service-system-biz/src/test/java/com/usky/dm/controller/DcsArchetypeApplicationTests.java

@@ -1,9 +0,0 @@
-package com.usky.dm.controller;
-
-
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class DcsArchetypeApplicationTests {
-
-}

service-system/service-system-biz/src/test/java/com/usky/system/DcsArchetypeApplicationTests.java

@@ -0,0 +1,49 @@
+package com.usky.system;
+
+
+import com.usky.system.domain.SysConfig;
+import com.usky.system.service.*;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+
+@SpringBootTest
+class DcsArchetypeApplicationTests {
+
+
+
+
+    @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;
+
+    @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);
+
+    }
+}