From 823d625c8c3cfd44925880038d06bc011d68a328 Mon Sep 17 00:00:00 2001
From: fangyuan <527392886@qq.com>
Date: 星期四, 16 二月 2023 09:19:48 +0800
Subject: [PATCH] 配置修改
---
ycl-common/src/main/java/com/ycl/config/WebConfig.java | 6
ycl-common/src/main/java/com/ycl/api/BaseEntity.java | 50 ++---
/dev/null | 24 ---
ycl-common/src/main/java/com/ycl/entity/auth/AuthInfo.java | 24 +-
ycl-common/src/main/java/com/ycl/enums/common/ResultCode.java | 103 ++++++------
ycl-common/src/main/java/com/ycl/config/WebSecurityCorsFilter.java | 54 +++---
ycl-common/src/main/java/com/ycl/enums/common/DelType.java | 91 +++++------
ycl-common/src/main/java/com/ycl/api/BasePageDTO.java | 40 ++--
ycl-common/src/main/java/com/ycl/constant/SysConst.java | 29 +--
9 files changed, 181 insertions(+), 240 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/api/BaseEntity.java b/ycl-common/src/main/java/com/ycl/api/BaseEntity.java
index 1b27653..bd1d195 100644
--- a/ycl-common/src/main/java/com/ycl/api/BaseEntity.java
+++ b/ycl-common/src/main/java/com/ycl/api/BaseEntity.java
@@ -1,27 +1,23 @@
-package com.ycl.api;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author Lyq
- * @version 1.0
- * @date 2022/9/7
- */
-@Data
-public class BaseEntity {
- @ApiModelProperty("鍒涘缓鏃堕棿")
- @TableField(fill = FieldFill.INSERT)
- private Date createTime;
- /**
- * 涓婁竴娆′慨鏀规椂闂�
- */
- @ApiModelProperty("淇敼鏃堕棿")
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private Date updateTime;
-
-}
+package com.ycl.api;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+
+@Data
+public class BaseEntity {
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ private Date createTime;
+ /**
+ * 涓婁竴娆′慨鏀规椂闂�
+ */
+ @ApiModelProperty("淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateTime;
+
+}
diff --git a/ycl-common/src/main/java/com/ycl/api/BasePageDTO.java b/ycl-common/src/main/java/com/ycl/api/BasePageDTO.java
index 0b67830..541ccd3 100644
--- a/ycl-common/src/main/java/com/ycl/api/BasePageDTO.java
+++ b/ycl-common/src/main/java/com/ycl/api/BasePageDTO.java
@@ -1,22 +1,18 @@
-package com.ycl.api;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Lyq
- * @version 1.0
- * @date 2022/9/9
- */
-@ApiModel
-@Data
-public class BasePageDTO<T> {
- @ApiModelProperty("鎬绘暟")
- private long total;
- @ApiModelProperty("鍒楄〃")
- private List<T> records = new ArrayList<>();
-}
+package com.ycl.api;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+@ApiModel
+@Data
+public class BasePageDTO<T> {
+ @ApiModelProperty("鎬绘暟")
+ private long total;
+ @ApiModelProperty("鍒楄〃")
+ private List<T> records = new ArrayList<>();
+}
diff --git a/ycl-common/src/main/java/com/ycl/aspect/LogAspect.java b/ycl-common/src/main/java/com/ycl/aspect/LogAspect.java
deleted file mode 100644
index af83dae..0000000
--- a/ycl-common/src/main/java/com/ycl/aspect/LogAspect.java
+++ /dev/null
@@ -1,69 +0,0 @@
-//package com.ycl.aspect;
-//
-//import com.ycl.annotation.LogSave;
-//import com.ycl.bo.AdminUserDetails;
-//import com.ycl.entity.user.UmsAdminLoginLog;
-//import com.ycl.mapper.user.UmsAdminLoginLogMapper;
-//import org.aspectj.lang.JoinPoint;
-//import org.aspectj.lang.annotation.Aspect;
-//import org.aspectj.lang.annotation.Before;
-//import org.aspectj.lang.annotation.Pointcut;
-//import org.aspectj.lang.reflect.MethodSignature;
-//import org.springframework.security.core.context.SecurityContextHolder;
-//import org.springframework.stereotype.Component;
-//import org.springframework.web.context.request.RequestContextHolder;
-//import org.springframework.web.context.request.ServletRequestAttributes;
-//
-//import javax.annotation.Resource;
-//import javax.servlet.http.HttpServletRequest;
-//import java.lang.reflect.Method;
-//import java.util.Date;
-//
-//@Component
-//@Aspect
-//public class LogAspect {
-//
-// @Resource
-// UmsAdminLoginLogMapper umsAdminLoginLogMapper;
-//
-// @Pointcut("@annotation(com.ycl.annotation.LogSave)")
-// public void pointCut() {
-// }
-//
-// @Before("pointCut()")
-// public void handle(JoinPoint joinPoint) {
-// MethodSignature signature = (MethodSignature) joinPoint.getSignature();
-// Method method = signature.getMethod();
-// LogSave annotation = method.getAnnotation(LogSave.class);
-// AdminUserDetails adminUserDetails = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
-// UmsAdminLoginLog loginLog = new UmsAdminLoginLog();
-// loginLog.setAdminId(adminUserDetails.getUserId());
-// loginLog.setCreateTime(new Date());
-// ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-// HttpServletRequest request = attributes.getRequest();
-// loginLog.setIp(request.getRemoteAddr());
-// String header = request.getHeader("user-agent");
-// if (header.contains("Windows NT")) {
-// loginLog.setUserAgent("Web绔�");
-// }
-// else if(header.contains("Android")) {
-// loginLog.setUserAgent("Android绔�");
-// }
-// else if(header.contains("iPhone")) {
-// loginLog.setUserAgent("ios绔�");
-// }
-// else if(header.contains("iPad")) {
-// loginLog.setUserAgent("iPad绔�");
-// }else {
-// loginLog.setUserAgent("Web绔�");
-// }
-// if (annotation.operationType().equals("")){
-// loginLog.setOperationType("鍏朵粬鎿嶄綔");
-// }else {
-// loginLog.setOperationType(annotation.operationType());
-// }
-// loginLog.setContain(annotation.contain());
-// umsAdminLoginLogMapper.insert(loginLog);
-// }
-//
-//}
diff --git a/ycl-common/src/main/java/com/ycl/config/MybatisPlusConfig.java b/ycl-common/src/main/java/com/ycl/config/MybatisPlusConfig.java
deleted file mode 100644
index f52183d..0000000
--- a/ycl-common/src/main/java/com/ycl/config/MybatisPlusConfig.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.ycl.config;
-
-import com.baomidou.mybatisplus.annotation.DbType;
-
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-//@MapperScan("com.ycl.*")
-public class MybatisPlusConfig {
-
- /**
- * 鍒嗛〉閰嶇疆
- * @return
- */
-// @Bean
-// public MybatisPlusInterceptor mybatisPlusInterceptor() {
-// MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
-// interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
-// return interceptor;
-// }
-
-}
diff --git a/ycl-common/src/main/java/com/ycl/config/WebConfig.java b/ycl-common/src/main/java/com/ycl/config/WebConfig.java
index e2f3a65..253af80 100644
--- a/ycl-common/src/main/java/com/ycl/config/WebConfig.java
+++ b/ycl-common/src/main/java/com/ycl/config/WebConfig.java
@@ -6,11 +6,7 @@
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.web.filter.CorsFilter;
-/**
- * @author Lyq
- * @version 1.0
- * @date 2022/9/10 11:09
- */
+
@Configuration
@Order(Ordered.HIGHEST_PRECEDENCE)
public class WebConfig {
diff --git a/ycl-common/src/main/java/com/ycl/config/WebSecurityCorsFilter.java b/ycl-common/src/main/java/com/ycl/config/WebSecurityCorsFilter.java
index 77eb666..ff6fcfe 100644
--- a/ycl-common/src/main/java/com/ycl/config/WebSecurityCorsFilter.java
+++ b/ycl-common/src/main/java/com/ycl/config/WebSecurityCorsFilter.java
@@ -1,29 +1,25 @@
-package com.ycl.config;
-
-
-import javax.servlet.*;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * @author Lyq
- * @version 1.0
- * @date 2022/9/11 10:04
- */
-public class WebSecurityCorsFilter implements Filter {
- @Override
- public void init(FilterConfig filterConfig) throws ServletException {
- }
- @Override
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
- HttpServletResponse res = (HttpServletResponse) response;
- res.setHeader("Access-Control-Allow-Origin", "*");
- res.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE, PUT");
- res.setHeader("Access-Control-Max-Age", "3600");
- res.setHeader("Access-Control-Allow-Headers", "Authorization, Content-Type, Accept, x-requested-with, Cache-Control");
- chain.doFilter(request, res);
- }
- @Override
- public void destroy() {
- }
-}
+package com.ycl.config;
+
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+
+public class WebSecurityCorsFilter implements Filter {
+ @Override
+ public void init(FilterConfig filterConfig) throws ServletException {
+ }
+ @Override
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+ HttpServletResponse res = (HttpServletResponse) response;
+ res.setHeader("Access-Control-Allow-Origin", "*");
+ res.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE, PUT");
+ res.setHeader("Access-Control-Max-Age", "3600");
+ res.setHeader("Access-Control-Allow-Headers", "Authorization, Content-Type, Accept, x-requested-with, Cache-Control");
+ chain.doFilter(request, res);
+ }
+ @Override
+ public void destroy() {
+ }
+}
diff --git a/ycl-common/src/main/java/com/ycl/constant/SysConst.java b/ycl-common/src/main/java/com/ycl/constant/SysConst.java
index 3bf4301..2f132a7 100644
--- a/ycl-common/src/main/java/com/ycl/constant/SysConst.java
+++ b/ycl-common/src/main/java/com/ycl/constant/SysConst.java
@@ -1,17 +1,12 @@
-package com.ycl.constant;
-
-/**
- * 鍏ㄥ眬甯搁噺
- * @author Lyq
- * @version 1.0
- * @date 2022/9/7
- */
-public class SysConst {
- /**椤甸潰涓嬫媺妗嗕紶 0琛ㄧず 鏌ヨ鏉′欢涓哄叏閮�*/
- public static final Integer COMBOBOX_ALL = 0;
-
- /**
- * 鎺ㄨ崘hashMap鐨勫垵濮嬮暱搴�
- */
- public static final Integer REF_MAP_LENGTH = 20;
-}
+package com.ycl.constant;
+
+
+public class SysConst {
+ /**椤甸潰涓嬫媺妗嗕紶 0琛ㄧず 鏌ヨ鏉′欢涓哄叏閮�*/
+ public static final Integer COMBOBOX_ALL = 0;
+
+ /**
+ * 鎺ㄨ崘hashMap鐨勫垵濮嬮暱搴�
+ */
+ public static final Integer REF_MAP_LENGTH = 20;
+}
diff --git a/ycl-common/src/main/java/com/ycl/entity/auth/AuthInfo.java b/ycl-common/src/main/java/com/ycl/entity/auth/AuthInfo.java
index 882e388..d6eb8e2 100644
--- a/ycl-common/src/main/java/com/ycl/entity/auth/AuthInfo.java
+++ b/ycl-common/src/main/java/com/ycl/entity/auth/AuthInfo.java
@@ -1,14 +1,10 @@
-package com.ycl.entity.auth;
-
-import lombok.Data;
-
-/**
- * @author Lyq
- * @version 1.0
- * @date 2022/9/9
- */
-@Data
-public class AuthInfo {
- private Long userId;
- private String username;
-}
+package com.ycl.entity.auth;
+
+import lombok.Data;
+
+
+@Data
+public class AuthInfo {
+ private Long userId;
+ private String username;
+}
diff --git a/ycl-common/src/main/java/com/ycl/enums/common/DelType.java b/ycl-common/src/main/java/com/ycl/enums/common/DelType.java
index f591c72..0664c77 100644
--- a/ycl-common/src/main/java/com/ycl/enums/common/DelType.java
+++ b/ycl-common/src/main/java/com/ycl/enums/common/DelType.java
@@ -1,48 +1,43 @@
-package com.ycl.enums.common;
-
-/**
- * 浼垹闄�
- * @author lyq
- * @since 2022-09-07
- * @Description
- */
-public enum DelType {
-
- /***/
- NORMAL((byte) 0, "姝ｅ父鐘舵��"),
-
- IS_DEL((byte) 1, "浼垹闄ょ姸鎬�");
-
- private byte code;
- private String name;
-
- DelType(byte code, String name) {
- this.code = code;
- this.name = name;
- }
-
- public static String getName(byte code) {
- for (DelType del : DelType.values()) {
- if (del.code == code) {
- return del.name;
- }
- }
- return null;
- }
-
- public byte getCode() {
- return code;
- }
-
- public void setCode(byte code) {
- this.code = code;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-}
+package com.ycl.enums.common;
+
+
+public enum DelType {
+
+ /***/
+ NORMAL((byte) 0, "姝ｅ父鐘舵��"),
+
+ IS_DEL((byte) 1, "浼垹闄ょ姸鎬�");
+
+ private byte code;
+ private String name;
+
+ DelType(byte code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public static String getName(byte code) {
+ for (DelType del : DelType.values()) {
+ if (del.code == code) {
+ return del.name;
+ }
+ }
+ return null;
+ }
+
+ public byte getCode() {
+ return code;
+ }
+
+ public void setCode(byte code) {
+ this.code = code;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
diff --git a/ycl-common/src/main/java/com/ycl/enums/common/ResultCode.java b/ycl-common/src/main/java/com/ycl/enums/common/ResultCode.java
index 80087d0..28d794a 100644
--- a/ycl-common/src/main/java/com/ycl/enums/common/ResultCode.java
+++ b/ycl-common/src/main/java/com/ycl/enums/common/ResultCode.java
@@ -1,54 +1,49 @@
-package com.ycl.enums.common;
-
-import com.ycl.api.IErrorCode;
-
-/**
- * 鏋氫妇浜嗕竴浜涘父鐢ˋPI鎿嶄綔鐮�
- *
- * @author lyq
- * @since 2022-09-06
- */
-public enum ResultCode implements IErrorCode {
- API_SUCCESS(0, "鎿嶄綔鎴愬姛"),
- SUCCESS(200, "鎿嶄綔鎴愬姛"),
- FAILED(500, "鎿嶄綔澶辫触"),
- VALIDATE_FAILED(404, "鍙傛暟妫�楠屽け璐�"),
- UNAUTHORIZED(401, "鏆傛湭鐧诲綍鎴杢oken宸茬粡杩囨湡"),
- FORBIDDEN(403, "娌℃湁鐩稿叧鏉冮檺"),
-
- NULL_PARAMETER(-3, "绌哄弬"),
-
- RECORD_ALREADY_EXISTS(2001, "璁板綍宸插瓨鍦�"),
- RECORD_SAVE_FAIL(2002, "璁板綍淇濆瓨澶辫触"),
- RECORD_UPDATE_FAIL(2003, "璁板綍鏇存柊澶辫触"),
- RECORD_DELETE_FAIL(2004, "璁板綍鍒犻櫎澶辫触"),
- RECORD_NOT_EXISTS(2005, "璁板綍涓嶅瓨鍦�"),
- FILE_NOT_FOUND(2006, "鏂囦欢涓嶅瓨鍦�"),
- FILE_TYPE_FAIL(2007, "鏂囦欢鏍煎紡閿欒"),
-
- CAR_NUMBER_REPETITION(2008, "杞︾墝鍙烽噸澶�"),
- NOT_LOGGED(2015, "鏈櫥褰�,璇风櫥褰曞悗鎿嶄綔"),
-
- LOGIN_TIMEOUT(2016, "鐧诲綍瓒呮椂,璇烽噸鏂扮櫥褰�"),
-
- OPERATOR_TYPE_FETCH_FAIL(3001, "鑾峰彇鎿嶄綔鍛樺け璐�"),
- APPID_ERROR(3002, "appId閿欒"),
- APPKEY_ERROR(3003, "appKey閿欒"),
- SIGN_ERROR(3004,"sign閿欒");
-
- private long code;
- private String message;
-
- private ResultCode(long code, String message) {
- this.code = code;
- this.message = message;
- }
-
- public long getCode() {
- return code;
- }
-
- public String getMessage() {
- return message;
- }
-}
+package com.ycl.enums.common;
+
+import com.ycl.api.IErrorCode;
+
+
+public enum ResultCode implements IErrorCode {
+ API_SUCCESS(0, "鎿嶄綔鎴愬姛"),
+ SUCCESS(200, "鎿嶄綔鎴愬姛"),
+ FAILED(500, "鎿嶄綔澶辫触"),
+ VALIDATE_FAILED(404, "鍙傛暟妫�楠屽け璐�"),
+ UNAUTHORIZED(401, "鏆傛湭鐧诲綍鎴杢oken宸茬粡杩囨湡"),
+ FORBIDDEN(403, "娌℃湁鐩稿叧鏉冮檺"),
+
+ NULL_PARAMETER(-3, "绌哄弬"),
+
+ RECORD_ALREADY_EXISTS(2001, "璁板綍宸插瓨鍦�"),
+ RECORD_SAVE_FAIL(2002, "璁板綍淇濆瓨澶辫触"),
+ RECORD_UPDATE_FAIL(2003, "璁板綍鏇存柊澶辫触"),
+ RECORD_DELETE_FAIL(2004, "璁板綍鍒犻櫎澶辫触"),
+ RECORD_NOT_EXISTS(2005, "璁板綍涓嶅瓨鍦�"),
+ FILE_NOT_FOUND(2006, "鏂囦欢涓嶅瓨鍦�"),
+ FILE_TYPE_FAIL(2007, "鏂囦欢鏍煎紡閿欒"),
+
+ CAR_NUMBER_REPETITION(2008, "杞︾墝鍙烽噸澶�"),
+ NOT_LOGGED(2015, "鏈櫥褰�,璇风櫥褰曞悗鎿嶄綔"),
+
+ LOGIN_TIMEOUT(2016, "鐧诲綍瓒呮椂,璇烽噸鏂扮櫥褰�"),
+
+ OPERATOR_TYPE_FETCH_FAIL(3001, "鑾峰彇鎿嶄綔鍛樺け璐�"),
+ APPID_ERROR(3002, "appId閿欒"),
+ APPKEY_ERROR(3003, "appKey閿欒"),
+ SIGN_ERROR(3004,"sign閿欒");
+
+ private long code;
+ private String message;
+
+ private ResultCode(long code, String message) {
+ this.code = code;
+ this.message = message;
+ }
+
+ public long getCode() {
+ return code;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+}
--
Gitblit v1.8.0