yucheng 3 лет назад
Родитель
Сommit
71aa0b781a

+ 1 - 0
.gitignore

@@ -31,6 +31,7 @@ mvnw
 
 ### JRebel ###
 rebel.xml
+rebel-remote.xml
 
 ### Sonar ###
 .scannerwork

+ 2 - 2
dc-cloud/dc-file/src/main/java/com/persagy/dc/file/service/impl/FileServiceImpl.java

@@ -87,8 +87,8 @@ public class FileServiceImpl extends ServiceImpl<FileMapper, FileInfo> implement
         if(StrUtil.isNotBlank(vo.getId())) {
             queryWrapper.ne(FileInfo::getId, vo.getId());
         }
-        List<FileInfo> dbVOs = list(queryWrapper);
-        if(CollUtil.isEmpty(dbVOs)) {
+        List<FileInfo> dbVos = list(queryWrapper);
+        if(CollUtil.isEmpty(dbVos)) {
             return;
         }
         // 存在同名 - 重新命名 +随机数

+ 6 - 43
dc-common/src/main/java/com/persagy/dc/common/constant/ResponseCode.java

@@ -6,82 +6,45 @@ package com.persagy.dc.common.constant;
  * @since 2020年8月26日:	下午5:17:08
  */
 public enum ResponseCode {
-
+    /** 通用返回值 */
 	A00000("00000", "success"),
-	
-	A10000("10000", "failure"),
-    
-	A0001("A0001", "用户端错误"),
-	
-	A0100("A0100", "用户注册错误"),
-   
+    A10000("10000", "failure"),
+    A0001("A0001", "用户端错误"),
+    A0100("A0100", "用户注册错误"),
     A0135("A0135", "Method Not Allowed"),
-    
     A0136("A0136", "Unsupported Media Type"),
-    
     A0137("A0137", "Not Acceptable"),
-	
-	A0151("A0151", "手机格式校验失败"),
-
+    A0151("A0151", "手机格式校验失败"),
 	A0152("A0152", "地址格式校验失败"),
-    
 	A0153("A0153", "邮箱格式校验失败"),
-
     A0154("A0154", "账号名称重复"),
-
     A0155("A0155", "员工编号重复"),
-
     A0156("A0156", "手机号重复"),
-
     A0157("A0157", "邮箱重复"),
-    
     A0201("A0201", "用户账户不存在"),
-    
     A0202("A0202", "用户账户被冻结"),
-    
     A0203("A0203", "用户账户已作废"),
-    
     A0210("A0210", "用户名/密码错误"),
-    
 	A0220("A0220", "用户身份校验失败"),
-	
 	A0301("A0301", "访问未授权"),
-	
 	A0302("A0302", "正在授权中"),
-	
 	A0303("A0303", "拒绝授权申请"),
-	
 	A0311("A0311", "授权已过期"),
-	
 	A0324("A0324", "网关访问受限"),
-	
 	A0340("A0340", "签名异常"),
-	
 	A0400("A0400", "用户请求参数错误"),
-	
 	A0402("A0402", "无效的用户输入"),
-	
 	A0422("A0422", "地址不在服务范围"),
-	
 	A0427("A0427", "请求JSON 解析失败"),
-	
     B0001("B0001", "系统执行出错"),
-    
     B0300("B0300", "系统资源异常"),
-	
     C0001("C0001", "调用第三方服务出错"),
-    
     C0100("C0100", "中间件服务出错"),
-    
     C0110("C0110", "RPC服务出错"),
-    
     C0134("C0134", "不支持的数据格式"),
-    
     C0320("C0320", "数据不存在"),
-    
     C0341("C0341", "主键冲突"),
-	
-	Z9999("Z9999", "系统繁忙");	// 未知异常
+	Z9999("Z9999", "系统繁忙");
 	
     private String code;
     

+ 1 - 0
dc-common/src/main/java/com/persagy/dc/common/constant/ValidEnum.java

@@ -8,6 +8,7 @@ package com.persagy.dc.common.constant;
  * @version: V1.0
  */
 public enum ValidEnum {
+    /** 有效标识 */
     FALSE(0, false),
     TRUE(1, true);
 

+ 6 - 4
dc-common/src/main/java/com/persagy/dc/common/exception/BusinessException.java

@@ -10,11 +10,13 @@ import com.persagy.dc.common.constant.ResponseCode;
  */
 public class BusinessException extends RuntimeException {
 	private static final long serialVersionUID = -3325873096967595156L;
-	
+
+	/** 异常编码 */
 	private String errorCode;
-    private String errorDesc;		// 给前端看
-    
-	private Object respJson; 		// 响应content中的数据,可加可不加
+    /** 异常描述 */
+    private String errorDesc;
+    /** 响应content中的数据,可加可不加 */
+    private Object respJson;
 
     public BusinessException() {
         super();

+ 3 - 3
dc-common/src/main/java/com/persagy/dc/common/lang/PsDate.java

@@ -290,7 +290,7 @@ public class PsDate implements Serializable, Comparable<PsDate>, Cloneable {
      * 取得日期对象中的日串
      * @return 天数串(两位)
      */
-    public String getDAY() {
+    public String getDayStr() {
         return formatNumber(getDay());
     }
 
@@ -306,7 +306,7 @@ public class PsDate implements Serializable, Comparable<PsDate>, Cloneable {
      * 取得日期对象的月份串(两位)
      * @return 月份串(两位)
      */
-    public String getMONTH() {
+    public String getMonthStr() {
         return formatNumber(getMonth() + 1);
     }
 
@@ -357,7 +357,7 @@ public class PsDate implements Serializable, Comparable<PsDate>, Cloneable {
      * 取得年字符串
      * @return 年字符串
      */
-    public String getYEAR() {
+    public String getYearStr() {
         return Integer.toString(getYear());
     }
 

+ 6 - 6
dc-common/src/main/java/com/persagy/dc/common/lang/PsDateTime.java

@@ -140,7 +140,7 @@ public class PsDateTime extends PsDate implements Comparable<PsDate> {
      * 取得自定义日期时间对象中的自定义日期对象
      * @return 自定义日期对象
      */
-    public PsDate getDDate() {
+    public PsDate getPsDate() {
         return new PsDate(getMillis());
     }
 
@@ -148,7 +148,7 @@ public class PsDateTime extends PsDate implements Comparable<PsDate> {
      * 取得自定义日期时间对象中的自定义时间对象
      * @return 自定义时间对象
      */
-    public PsTime getDTime() {
+    public PsTime getPsTime() {
         return new PsTime(getMillis());
     }
 
@@ -232,7 +232,7 @@ public class PsDateTime extends PsDate implements Comparable<PsDate> {
      * 取得小时数字符串
      * @return 小时数字符串
      */
-    public String getHOUR() {
+    public String getHourStr() {
         return formatNumber(getHour());
     }
 
@@ -248,7 +248,7 @@ public class PsDateTime extends PsDate implements Comparable<PsDate> {
      * 取得分钟数字符串
      * @return 分钟数字符串
      */
-    public String getMINUTE() {
+    public String getMinuteStr() {
         return formatNumber(getMinute());
     }
 
@@ -264,7 +264,7 @@ public class PsDateTime extends PsDate implements Comparable<PsDate> {
      * 取得秒数字符串
      * @return 秒数字符串
      */
-    public String getSECOND() {
+    public String getSecondStr() {
         return formatNumber(getSecond());
     }
 
@@ -280,7 +280,7 @@ public class PsDateTime extends PsDate implements Comparable<PsDate> {
      * 取得毫秒数串
      * @return 毫秒数串
      */
-    public String getMILLISECOND() {
+    public String getMilliStr() {
         int ms = getMilliSecond();
         return Integer.toString(ms + 1000).substring(1);
     }

+ 4 - 2
dc-common/src/main/java/com/persagy/dc/common/model/entity/IBaseEntity.java

@@ -1,6 +1,8 @@
 package com.persagy.dc.common.model.entity;
 
 
+import com.persagy.dc.common.lang.PsDateTime;
+
 import java.util.Date;
 
 /**
@@ -26,13 +28,13 @@ public interface IBaseEntity extends Comparable<IBaseEntity>{
 	 * 取得时间戳
 	 * @return 时间戳
 	 */
-	Date getTs();
+	PsDateTime getTs();
 
 	/**
 	 * 设置时间戳
 	 * @param ts 时间戳
 	 */
-	void setTs(Date ts);
+	void setTs(PsDateTime ts);
 
 	/**
 	 * 取得实体状态

+ 2 - 2
dc-comp/dc-mybatis/src/main/java/com/persagy/dc/mybatis/handler/DynamicDataSourceHandler.java

@@ -41,8 +41,8 @@ public class DynamicDataSourceHandler extends HandlerInterceptorAdapter {
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        String requestURI = request.getRequestURI();
-        if (StrUtil.containsAny(requestURI, IGNORE_URL)) {
+        String requestUri = request.getRequestURI();
+        if (StrUtil.containsAny(requestUri, IGNORE_URL)) {
             return true;
         }
         resetDataSource();