Skip to content

Commit

Permalink
review code.
Browse files Browse the repository at this point in the history
  • Loading branch information
lijiahangmax committed Jun 1, 2022
1 parent a855280 commit 1642f77
Show file tree
Hide file tree
Showing 12 changed files with 203 additions and 69 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ orion-all | 全部模块聚合 包含了上述所有模块的引用

### 如何使用
``` pom.xml
# 当前最新版本 1.0.1
# 当前最新版本 1.0.2
<dependency>
<groupId>io.github.lijiahangmax</groupId>
<artifactId>模块名称</artifactId>
Expand All @@ -61,7 +61,7 @@ orion-all | 全部模块聚合 包含了上述所有模块的引用
<dependency>
<groupId>io.github.lijiahangmax</groupId>
<artifactId>orion-all</artifactId>
<version>1.0.1</version>
<version>1.0.2</version>
</dependency>
```

Expand Down
42 changes: 26 additions & 16 deletions orion-lang/src/main/java/com/orion/constant/Const.java
Original file line number Diff line number Diff line change
Expand Up @@ -168,37 +168,45 @@ public abstract class Const {

// -------------------- num --------------------

public static final int N_N_1 = -1;
public static final Integer N_N_1 = -1;

public static final int N_0 = 0;
public static final Integer N_0 = 0;

public static final int N_1 = 1;
public static final Integer N_1 = 1;

public static final int N_2 = 2;
public static final Integer N_2 = 2;

public static final int N_3 = 3;
public static final Integer N_3 = 3;

public static final int N_4 = 4;
public static final Integer N_4 = 4;

public static final int N_5 = 5;
public static final Integer N_5 = 5;

public static final int N_6 = 6;
public static final Integer N_6 = 6;

public static final int N_7 = 7;
public static final Integer N_7 = 7;

public static final int N_8 = 8;
public static final Integer N_8 = 8;

public static final int N_9 = 9;
public static final Integer N_9 = 9;

public static final int N_10 = 10;
public static final Integer N_10 = 10;

public static final int N_100 = 100;
public static final Integer N_100 = 100;

public static final int N_1000 = 1000;
public static final Integer N_1000 = 1000;

public static final int N_10000 = 10000;
public static final Integer N_10000 = 10000;

public static final int N_100000 = 100000;
public static final Integer N_100000 = 100000;

public static final Long L_N_1 = -1L;

public static final Long L_0 = 0L;

public static final Long L_1 = 1L;

public static final Double D_0 = 0D;

// -------------------- suffix --------------------

Expand Down Expand Up @@ -272,6 +280,8 @@ public abstract class Const {

// -------------------- sql --------------------

public static final String LIMIT = "LIMIT";

public static final String LIMIT_1 = "LIMIT 1";

public static final String ENTITY = "entity";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,20 @@ public abstract class StandardHttpHeader {

public static final String ACCEPT = "Accept";

public static final String AUTHORIZATION = "Authorization";

public static final String ACCEPT_ENCODING = "Accept-Encoding";

public static final String ACCEPT_LANGUAGE = "Accept-Language";

public static final String TRANSFER_ENCODING = "Transfer-Encoding";

public static final String SEC_CH_UA = "sec-ch-ua";

public static final String SEC_CH_UA_MOBILE = "sec-ch-ua-mobile";

public static final String SEC_CH_UA_PLATFORM = "sec-ch-ua-platform";

public static final String SEC_FETCH_SITE = "Sec-Fetch-Site";

public static final String SEC_FETCH_MODE = "Sec-Fetch-Mode";
Expand All @@ -61,6 +69,10 @@ public abstract class StandardHttpHeader {

public static final String ACCESS_CONTROL_MAX_AGE = "Access-Control-Max-Age";

public static final String ACCESS_CONTROL_REQUEST_HEADERS = "Access-Control-Request-Headers";

public static final String ACCESS_CONTROL_EXPOSE_HEADERS = "Access-Control-Expose-Headers";

public static final String X_REQUESTED_WITH = "X-Requested-With";

public static final String X_FORWARDED_FOR = "X-Forwarded-For";
Expand All @@ -71,4 +83,30 @@ public abstract class StandardHttpHeader {

public static final String X_REAL_IP = "X-Real-IP";

public static final String X_POWERED_BY = "X-Powered-By";

public static final String E_TAG = "ETag";

public static final String PRAGMA = "Pragma";

public static final String PURPOSE = "Purpose";

public static final String KEEP_ALIVE = "Keep-Alive";

public static final String VARY = "Vary";

public static final String LAST_MODIFIED = "Last-Modified";

public static final String UPGRADE_INSECURE_REQUESTS = "upgrade-insecure-requests";

public static final String X_CACHE_LOOKUP = "x-cache-lookup";

public static final String X_REQ_ID = "x-req-id";

public static final String Expires = "expires";

public static final String ACCEPT_RANGES = "accept-ranges";

public static final String AGE = "age";

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package com.orion.exception;

/**
* 禁用异常
*
* @author Jiahang Li
* @version 1.0.0
* @since 2022/5/23 17:03
*/
public class DisabledException extends RuntimeException {

public DisabledException() {
}

public DisabledException(String message) {
super(message);
}

public DisabledException(String message, Throwable cause) {
super(message, cause);
}

public DisabledException(Throwable cause) {
super(cause);
}

}
27 changes: 27 additions & 0 deletions orion-lang/src/main/java/com/orion/exception/EnabledException.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package com.orion.exception;

/**
* 启用异常
*
* @author Jiahang Li
* @version 1.0.0
* @since 2022/5/23 17:03
*/
public class EnabledException extends RuntimeException {

public EnabledException() {
}

public EnabledException(String message) {
super(message);
}

public EnabledException(String message, Throwable cause) {
super(message, cause);
}

public EnabledException(Throwable cause) {
super(cause);
}

}
32 changes: 32 additions & 0 deletions orion-lang/src/main/java/com/orion/utils/Exceptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -775,6 +775,38 @@ public static LogException log(String s, Throwable t) {
return new LogException(s, t);
}

public static EnabledException enabled() {
return new EnabledException();
}

public static EnabledException enabled(Throwable t) {
return new EnabledException(t);
}

public static EnabledException enabled(String s) {
return new EnabledException(s);
}

public static EnabledException enabled(String s, Throwable t) {
return new EnabledException(s, t);
}

public static DisabledException disabled() {
return new DisabledException();
}

public static DisabledException disabled(Throwable t) {
return new DisabledException(t);
}

public static DisabledException disabled(String s) {
return new DisabledException(s);
}

public static DisabledException disabled(String s, Throwable t) {
return new DisabledException(s, t);
}

public static Error error() {
return new Error();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public interface ICommandExecutor {
* @return 返回码是否为 0
*/
default boolean isSuccessExit() {
return ExitCode.SUCCESS.getCode().equals(this.getExitCode());
return ExitCode.isSuccess(this.getExitCode());
}

/**
Expand Down
17 changes: 17 additions & 0 deletions orion-net/src/main/java/com/orion/net/remote/CommandExecutors.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;

/**
* 命令执行器工具
Expand Down Expand Up @@ -91,4 +92,20 @@ public static byte[] getCommandOutputResult(BaseCommandExecutor executor) throws
}
}

/**
* 异步执行命令获取命令输出
*
* @param executor executor
* @throws IOException IOException
*/
public static void syncExecCommand(BaseCommandExecutor executor, OutputStream transfer) throws IOException {
executor.inherit();
executor.sync();
executor.transfer(transfer);
if (executor instanceof ChannelConnector) {
((ChannelConnector) executor).connect();
}
executor.exec();
}

}
10 changes: 10 additions & 0 deletions orion-net/src/main/java/com/orion/net/remote/ExitCode.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,14 @@ public Integer getCode() {
return code;
}

/**
* 判断是否成功执行
*
* @param exitCode exitCode
* @return isSuccess
*/
public static boolean isSuccess(Integer exitCode) {
return SUCCESS.code.equals(exitCode);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@ protected ExportInitializer(Workbook workbook, Sheet sheet, Class<T> targetClass
* 预初始化
*/
private void setup() {
// 解析sheet
SheetAnalysis sheetAnalysis = new SheetAnalysis(targetClass, sheetConfig);
sheetAnalysis.analysis();
// 解析列
SheetColumnAnalysis sheetColumnAnalysis = new SheetColumnAnalysis(targetClass, sheetConfig);
sheetColumnAnalysis.analysis();
// 初始化sheet
if (sheet == null) {
if (sheetConfig.sheetOption.getName() != null) {
Expand All @@ -62,12 +68,6 @@ private void setup() {
// 改名
workbook.setSheetName(workbook.getSheetIndex(sheet), sheetConfig.sheetOption.getName());
}
// 解析sheet
SheetAnalysis sheetAnalysis = new SheetAnalysis(targetClass, sheetConfig);
sheetAnalysis.analysis();
// 解析列
SheetColumnAnalysis sheetColumnAnalysis = new SheetColumnAnalysis(targetClass, sheetConfig);
sheetColumnAnalysis.analysis();
// 样式
this.addColumnStyle();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public void analysis() {
Annotations.getAnnotation(method, ExportIgnore.class),
method, null);
}
// 如果将index作为排序字段则需要重新设置 fieldOptions的index 和 columnMaxIndex
// 如果将 index 作为排序字段则需要重新设置 fieldOptions 的 index 和 columnMaxIndex
this.indexToSort();
}

Expand Down
Loading

0 comments on commit 1642f77

Please sign in to comment.