瀏覽代碼

1、尝试修改跨域问题

machaoyi 1 年之前
父節點
當前提交
0eb86118a2

+ 1 - 1
application/src/main/java/com/ctsi/config/CorsConfig.java

@@ -17,7 +17,7 @@ public class CorsConfig {
         CorsConfiguration config = new CorsConfiguration();
 
         // 允许所有域进行跨域调用
-        config.addAllowedOrigin("*");
+        config.addAllowedOriginPattern("*");
         // 允许跨域发送cookie
         config.setAllowCredentials(true);
         // 允许所有请求方法

+ 3 - 1
work/src/main/java/com/ctsi/work/WorkClock/service/impl/WorkClockServiceImpl.java

@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 员工打卡表;(work_clock)表服务实现类
@@ -99,7 +100,8 @@ public class WorkClockServiceImpl implements WorkClockService{
         queryWrapper.eq(WorkClock::getClockType, workClock.getClockType());
         List<WorkClock> workClockList = workClockMapper.selectList(queryWrapper);
         if (!workClockList.isEmpty()) {//已打过卡
-            return ApiResult.failure("已打过卡",null);
+            String message = String.format("今日%s已打过卡", Objects.equals(workClock.getClockType(), "1") ? "上班":"下班");
+            return ApiResult.failure(message,null);
         }
         workClockMapper.insert(workClock);
         return ApiResult.success(workClock);