1、重构系统业务至core模块

2、新增测试全跨域

application/pom.xml

@@ -75,11 +75,6 @@
             <artifactId>mysql-connector-j</artifactId>
             <version>8.2.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.mindrot</groupId>
-            <artifactId>jbcrypt</artifactId>
-            <version>0.4</version>
-        </dependency>
         <!-- 提供Redis连接池 -->
         <dependency>
             <groupId>org.apache.commons</groupId>

application/src/main/java/com/ctsi/config/CorsConfig.java

@@ -0,0 +1,29 @@
+package com.ctsi.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+
+@Configuration
+public class CorsConfig {
+    @Bean
+    public CorsFilter corsFilter() {
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        CorsConfiguration config = new CorsConfiguration();
+
+        // 允许所有域进行跨域调用
+        config.addAllowedOrigin("*");
+        // 允许跨域发送cookie
+        config.setAllowCredentials(true);
+        // 允许所有请求方法
+        config.addAllowedMethod("*");
+        // 允许所有头部信息
+        config.addAllowedHeader("*");
+
+        source.registerCorsConfiguration("/**", config);
+        return new CorsFilter(source);
+    }
+}
+

core/pom.xml

@@ -62,6 +62,16 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
         </dependency>
+        <dependency>
+            <groupId>cn.dev33</groupId>
+            <artifactId>sa-token-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mindrot</groupId>
+            <artifactId>jbcrypt</artifactId>
+            <version>0.4</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>

application/src/main/java/com/ctsi/Auth/entity/UpdatePasswordVO.java → core/src/main/java/com/ctsi/System/Password/entity/UpdatePasswordVO.java

@@ -1,4 +1,4 @@
-package com.ctsi.Auth.entity;
+package com.ctsi.System.Password.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

application/src/main/java/com/ctsi/Auth/web/password.java → core/src/main/java/com/ctsi/System/Password/password.java

@@ -1,12 +1,12 @@
-package com.ctsi.Auth.web;
+package com.ctsi.System.Password;
 
-import com.ctsi.Auth.entity.UpdatePasswordVO;
+import com.ctsi.System.Password.entity.UpdatePasswordVO;
 import com.ctsi.System.SysUser.service.SysUserService;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 

application/src/main/java/com/ctsi/System/SysUser/service/SysUserService.java → core/src/main/java/com/ctsi/System/SysUser/service/SysUserService.java

@@ -1,7 +1,7 @@
 package com.ctsi.System.SysUser.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.Auth.entity.UpdatePasswordVO;
+import com.ctsi.System.Password.entity.UpdatePasswordVO;
 import com.ctsi.System.SysUser.entity.PO.UserDetailPO;
 import com.ctsi.System.SysUser.entity.SysUser;
 import com.ctsi.System.SysUser.entity.VO.UserSearchVO;

application/src/main/java/com/ctsi/System/SysUser/service/impl/SysUserServiceImpl.java → core/src/main/java/com/ctsi/System/SysUser/service/impl/SysUserServiceImpl.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.Auth.entity.UpdatePasswordVO;
+import com.ctsi.System.Password.entity.UpdatePasswordVO;
 import com.ctsi.System.SysOrg.entity.SysOrg;
 import com.ctsi.System.SysUser.entity.PO.UserDetailPO;
 import com.ctsi.System.SysUser.entity.SysUser;

work/src/main/java/com/ctsi/work/WorkClock/entity/WorkClockPO.java

@@ -26,6 +26,9 @@ public class WorkClockPO implements Serializable,Cloneable{
    /** 用户id */
    @ApiModelProperty(value = "用户id",notes = "")
    private Long userId ;
+   /** 姓名 */
+   @ApiModelProperty(value = "姓名",notes = "")
+   private String name ;
    /** 打卡类型 */
    @ApiModelProperty(value = "打卡类型",notes = "")
    private String clockType ;
@@ -133,4 +136,12 @@ public class WorkClockPO implements Serializable,Cloneable{
    public void setClockStatusName(String clockStatusName) {
       this.clockStatusName = clockStatusName;
    }
+
+   public String getName() {
+      return name;
+   }
+
+   public void setName(String name) {
+      this.name = name;
+   }
 }

work/src/main/java/com/ctsi/work/WorkClock/service/impl/WorkClockServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ctsi.System.SysUserDetail.entity.SysUserDetail;
 import com.ctsi.utils.ApiResult;
 import com.ctsi.work.WorkClock.entity.WorkClock;
 import com.ctsi.work.WorkClock.entity.WorkClockPO;
@@ -60,6 +61,9 @@ public class WorkClockServiceImpl implements WorkClockService{
         if(StrUtil.isNotBlank(workClock.getLat())){
             queryWrapper.eq(WorkClock::getLat, workClock.getLat());
         }
+        queryWrapper.leftJoin(SysUserDetail.class, SysUserDetail::getId, WorkClock::getUserId);
+        queryWrapper.select(SysUserDetail::getName);
+        queryWrapper.selectAll(WorkClock.class);
         queryWrapper.orderByDesc(WorkClock::getClockTime);
         //2. 执行分页查询
         Page<WorkClockPO> pagin = new Page<>(current , size , true);