Skip to content

Commit 570ffd2

Browse files
author
Evan Hu
committed
指定版本为java8
1 parent c8a1307 commit 570ffd2

File tree

5 files changed

+80
-78
lines changed

5 files changed

+80
-78
lines changed

‎.github/workflows/maven-publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
- uses: actions/checkout@v2
1010
- uses: actions/setup-java@v1
1111
with:
12-
java-version: 15
12+
java-version: 1.8
1313
- name: Publish package
1414
run: mvn --batch-mode deploy
1515
env:

‎.github/workflows/maven.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616

1717
steps:
1818
- uses: actions/checkout@v2
19-
- name: Set up JDK 15
19+
- name: Set up JDK 1.8
2020
uses: actions/setup-java@v1
2121
with:
22-
java-version: 15
22+
java-version: 1.8
2323
- name: Build with Maven
2424
run: mvn -B package --file pom.xml

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<version>3.2.3</version>
1010

1111
<properties>
12-
<maven.compiler.source>15</maven.compiler.source>
13-
<maven.compiler.target>15</maven.compiler.target>
12+
<maven.compiler.source>1.8</maven.compiler.source>
13+
<maven.compiler.target>1.8</maven.compiler.target>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1515
</properties>
1616

‎src/main/java/info/xiaomo/gengine/config/util/ReflectUtils.java‎

Lines changed: 74 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -18,87 +18,89 @@
1818
* @author YangQiang
1919
*/
2020
public class ReflectUtils {
21-
private static final Logger LOGGER = LoggerFactory.getLogger(ReflectUtils.class);
21+
private static final Logger LOGGER = LoggerFactory.getLogger(ReflectUtils.class);
2222

23-
/**
24-
* 获取指定类的表描述信息
25-
*
26-
* @param clz
27-
* @return
28-
* @throws Exception
29-
*/
30-
public static TableDesc<IConfig> getTableDesc(Class<?> clz) throws Exception {
31-
TableDesc<IConfig> tableDesc = new TableDesc(clz);
23+
/**
24+
* 获取指定类的表描述信息
25+
*
26+
* @param clz
27+
* @return
28+
* @throws Exception
29+
*/
30+
public static TableDesc<IConfig> getTableDesc(Class<?> clz) throws Exception {
31+
TableDesc<IConfig> tableDesc = new TableDesc(clz);
3232

33-
tableDesc.setName(clz.getSimpleName());
33+
tableDesc.setName(clz.getSimpleName());
3434

35-
Table table = clz.getAnnotation(Table.class);
36-
if (table != null) {
37-
String tableName = table.name();
38-
if (!tableName.trim().isEmpty()) {
39-
tableDesc.setName(tableName);
40-
}
35+
Table table = clz.getAnnotation(Table.class);
36+
if (table != null) {
37+
String tableName = table.name();
38+
if (!tableName.trim().isEmpty()) {
39+
tableDesc.setName(tableName);
40+
}
4141

42-
String[] primaryKeys = table.primaryKey();
43-
if (primaryKeys.length > 0) {
44-
tableDesc.setPrimaryKeys(primaryKeys);
45-
}
42+
String[] primaryKeys = table.primaryKey();
43+
if (primaryKeys.length > 0) {
44+
tableDesc.setPrimaryKeys(primaryKeys);
45+
}
4646

47-
tableDesc.setHeader(table.header());
48-
tableDesc.setIgnoreRow(table.ignoreRow());
49-
}
47+
tableDesc.setHeader(table.header());
48+
tableDesc.setIgnoreRow(table.ignoreRow());
49+
}
5050

51-
Map<String, ColumnDesc> columns = new HashMap<>(10);
52-
Field[] declaredFields = clz.getDeclaredFields();
53-
for (Field field : declaredFields) {
54-
ColumnDesc columnDesc = getColumnDesc(field);
55-
columns.put(columnDesc.getName(), columnDesc);
56-
}
57-
tableDesc.setColumns(columns);
58-
return tableDesc;
59-
}
51+
Map<String, ColumnDesc> columns = new HashMap<>(10);
52+
Field[] declaredFields = clz.getDeclaredFields();
53+
for (Field field : declaredFields) {
54+
ColumnDesc columnDesc = getColumnDesc(field);
55+
columns.put(columnDesc.getName(), columnDesc);
56+
}
57+
tableDesc.setColumns(columns);
58+
return tableDesc;
59+
}
6060

61+
/**
62+
* 获取指定属性的列描述信息
63+
*
64+
* @param field
65+
* @return
66+
* @throws Exception
67+
*/
68+
public static ColumnDesc getColumnDesc(Field field) throws Exception {
69+
String fieldName = field.getName();
6170

62-
/**
63-
* 获取指定属性的列描述信息
64-
*
65-
* @param field
66-
* @return
67-
* @throws Exception
68-
*/
69-
public static ColumnDesc getColumnDesc(Field field) throws Exception {
70-
String fieldName = field.getName();
71+
ColumnDesc columnDesc = new ColumnDesc();
72+
columnDesc.setName(fieldName);
73+
columnDesc.setField(field);
7174

72-
ColumnDesc columnDesc = new ColumnDesc();
73-
columnDesc.setName(fieldName);
74-
columnDesc.setField(field);
75+
try {
76+
Column column = field.getAnnotation(Column.class);
77+
if (column != null) {
78+
String columnName = column.name();
79+
// 有单独设置列名
80+
if (!columnName.trim().isEmpty()) {
81+
columnDesc.setName(columnName);
82+
}
83+
// 字段不为null
84+
columnDesc.setNotNull(column.notNull());
7585

76-
try {
77-
Column column = field.getAnnotation(Column.class);
78-
if (column != null) {
79-
String columnName = column.name();
80-
// 有单独设置列名
81-
if (!columnName.trim().isEmpty()) {
82-
columnDesc.setName(columnName);
83-
}
84-
// 字段不为null
85-
columnDesc.setNotNull(column.notNull());
86+
// 将多个转换器转为一个
87+
Class<? extends IConverter>[] converters = column.value();
88+
if (converters.length > 0) {
89+
IConverter converter = converters[0].getConstructor().newInstance();
90+
for (int i = 1; i < converters.length; i++) {
91+
converter = converter.andThen(converters[i].getConstructor().newInstance());
92+
}
93+
columnDesc.setConverter(converter);
94+
}
95+
}
96+
} catch (Exception e) {
97+
LOGGER.error(
98+
String.format(
99+
"解析【%s】中的【%s】属性错误", field.getDeclaringClass().getName(), fieldName),
100+
e);
101+
throw e;
102+
}
86103

87-
// 将多个转换器转为一个
88-
Class<? extends IConverter>[] converters = column.value();
89-
if (converters.length > 0) {
90-
IConverter converter = converters[0].getConstructor().newInstance();
91-
for (int i = 1; i < converters.length; i++) {
92-
converter = converter.andThen(converters[i].getConstructor().newInstance());
93-
}
94-
columnDesc.setConverter(converter);
95-
}
96-
}
97-
} catch (Exception e) {
98-
LOGGER.error(String.format("解析【%s】中的【%s】属性错误", field.getDeclaringClass().getName(), fieldName), e);
99-
throw e;
100-
}
101-
102-
return columnDesc;
103-
}
104+
return columnDesc;
105+
}
104106
}

‎src/main/java/info/xiaomo/gengine/utils/ClassUtil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ public boolean accept(File dir, String name) {
178178
// 从URLClassLoader类中获取类所在文件夹的方法
179179
// 对于jar文件，可以理解为一个存放class文件的文件夹
180180
Method method = URLClassLoader.class.getDeclaredMethod("addURL", URL.class);
181-
boolean accessible = method.canAccess(method); // 获取方法的访问权限
181+
boolean accessible = method.isAccessible(); // 获取方法的访问权限
182182
try {
183183
if (!accessible) {
184184
method.setAccessible(true); // 设置方法的访问权限

0 commit comments

Comments
 (0)