Skip to content

Commit 7c99ed8

Browse files
xlornexlorne
committed
fix columnLabelMap toUpperCase
1 parent 7485f85 commit 7c99ed8

File tree

4 files changed

+311
-117
lines changed

4 files changed

+311
-117
lines changed

‎springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/handler/ColumnHandler.java‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
import java.io.InputStream;
66
import java.io.Reader;
77
import java.math.BigDecimal;
8-
import java.sql.Date;
9-
import java.sql.Time;
10-
import java.sql.Timestamp;
8+
import java.net.URL;
9+
import java.sql.*;
1110

1211
/**
1312
* 列表拦截器
@@ -50,4 +49,26 @@ public interface ColumnHandler {
5049

5150
Reader getCharacterStream(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, Reader value);
5251

52+
Ref getRef(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, Ref value);
53+
54+
Blob getBlob(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, Blob value);
55+
56+
Clob getClob(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, Clob value);
57+
58+
Array getArray(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, Array value);
59+
60+
URL getURL(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, URL value);
61+
62+
NClob getNClob(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, NClob value);
63+
64+
SQLXML getSQLXML(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, SQLXML value);
65+
66+
String getNString(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, String value);
67+
68+
Reader getNCharacterStream(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, Reader value);
69+
70+
RowId getRowId(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, RowId value);
71+
72+
<T> T getObject(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, T value, Class<T> type);
73+
5374
}

‎springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/handler/ColumnHandlerContext.java‎

Lines changed: 64 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77
import java.io.InputStream;
88
import java.io.Reader;
99
import java.math.BigDecimal;
10-
import java.sql.Date;
11-
import java.sql.Time;
12-
import java.sql.Timestamp;
10+
import java.net.URL;
11+
import java.sql.*;
1312

1413
/**
1514
* ResultSet 拦截器
@@ -28,74 +27,118 @@ private ColumnHandlerContext() {
2827

2928

3029
public String getString(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, String value) {
31-
return columnHandler.getString(interceptState,columnIndex, tableName, columnName, value);
30+
return columnHandler.getString(interceptState, columnIndex, tableName, columnName, value);
3231
}
3332

3433
public short getShort(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, short value) {
35-
return columnHandler.getShort(interceptState,columnIndex, tableName, columnName, value);
34+
return columnHandler.getShort(interceptState, columnIndex, tableName, columnName, value);
3635
}
3736

3837
public boolean getBoolean(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, boolean value) {
39-
return columnHandler.getBoolean(interceptState,columnIndex, tableName, columnName, value);
38+
return columnHandler.getBoolean(interceptState, columnIndex, tableName, columnName, value);
4039
}
4140

4241
public byte getByte(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, byte value) {
43-
return columnHandler.getByte(interceptState,columnIndex, tableName, columnName, value);
42+
return columnHandler.getByte(interceptState, columnIndex, tableName, columnName, value);
4443
}
4544

4645
public int getInt(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, int value) {
47-
return columnHandler.getInt(interceptState,columnIndex, tableName, columnName, value);
46+
return columnHandler.getInt(interceptState, columnIndex, tableName, columnName, value);
4847
}
4948

5049
public long getLong(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, long value) {
51-
return columnHandler.getLong(interceptState,columnIndex, tableName, columnName, value);
50+
return columnHandler.getLong(interceptState, columnIndex, tableName, columnName, value);
5251
}
5352

5453
public float getFloat(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, float value) {
55-
return columnHandler.getFloat(interceptState,columnIndex, tableName, columnName, value);
54+
return columnHandler.getFloat(interceptState, columnIndex, tableName, columnName, value);
5655
}
5756

5857
public double getDouble(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, double value) {
59-
return columnHandler.getDouble(interceptState,columnIndex, tableName, columnName, value);
58+
return columnHandler.getDouble(interceptState, columnIndex, tableName, columnName, value);
6059
}
6160

6261
public BigDecimal getBigDecimal(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, BigDecimal value) {
63-
return columnHandler.getBigDecimal(interceptState,columnIndex, tableName, columnName, value);
62+
return columnHandler.getBigDecimal(interceptState, columnIndex, tableName, columnName, value);
6463
}
6564

6665
public byte[] getBytes(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, byte[] value) {
67-
return columnHandler.getBytes(interceptState,columnIndex, tableName, columnName, value);
66+
return columnHandler.getBytes(interceptState, columnIndex, tableName, columnName, value);
6867
}
6968

7069
public Timestamp getTimestamp(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, Timestamp value) {
71-
return columnHandler.getTimestamp(interceptState,columnIndex, tableName, columnName, value);
70+
return columnHandler.getTimestamp(interceptState, columnIndex, tableName, columnName, value);
7271
}
7372

7473
public Time getTime(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, Time value) {
75-
return columnHandler.getTime(interceptState,columnIndex, tableName, columnName, value);
74+
return columnHandler.getTime(interceptState, columnIndex, tableName, columnName, value);
7675
}
7776

7877
public Date getDate(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, Date value) {
79-
return columnHandler.getDate(interceptState,columnIndex, tableName, columnName, value);
78+
return columnHandler.getDate(interceptState, columnIndex, tableName, columnName, value);
8079
}
8180

8281
public InputStream getAsciiStream(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, InputStream value) {
83-
return columnHandler.getAsciiStream(interceptState,columnIndex, tableName, columnName, value);
82+
return columnHandler.getAsciiStream(interceptState, columnIndex, tableName, columnName, value);
8483
}
8584

8685
public InputStream getUnicodeStream(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, InputStream value) {
87-
return columnHandler.getUnicodeStream(interceptState,columnIndex, tableName, columnName, value);
86+
return columnHandler.getUnicodeStream(interceptState, columnIndex, tableName, columnName, value);
8887
}
8988

9089
public InputStream getBinaryStream(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, InputStream value) {
91-
return columnHandler.getBinaryStream(interceptState,columnIndex, tableName, columnName, value);
90+
return columnHandler.getBinaryStream(interceptState, columnIndex, tableName, columnName, value);
9291
}
9392

9493
public Object getObject(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, Object value) {
95-
return columnHandler.getObject(interceptState,columnIndex, tableName, columnName, value);
94+
return columnHandler.getObject(interceptState, columnIndex, tableName, columnName, value);
9695
}
9796

9897
public Reader getCharacterStream(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, Reader value) {
99-
return columnHandler.getCharacterStream(interceptState,columnIndex, tableName, columnName, value);
98+
return columnHandler.getCharacterStream(interceptState, columnIndex, tableName, columnName, value);
99+
}
100+
101+
public Ref getRef(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, Ref value) {
102+
return columnHandler.getRef(interceptState, columnIndex, tableName, columnName, value);
103+
}
104+
105+
public Blob getBlob(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, Blob value) {
106+
return columnHandler.getBlob(interceptState, columnIndex, tableName, columnName, value);
107+
}
108+
109+
public Clob getClob(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, Clob value) {
110+
return columnHandler.getClob(interceptState, columnIndex, tableName, columnName, value);
111+
}
112+
113+
public Array getArray(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, Array value) {
114+
return columnHandler.getArray(interceptState, columnIndex, tableName, columnName, value);
115+
}
116+
117+
public URL getURL(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, URL value) {
118+
return columnHandler.getURL(interceptState, columnIndex, tableName, columnName, value);
119+
}
120+
121+
public NClob getNClob(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, NClob value) {
122+
return columnHandler.getNClob(interceptState, columnIndex, tableName, columnName, value);
123+
}
124+
125+
public SQLXML getSQLXML(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, SQLXML value) {
126+
return columnHandler.getSQLXML(interceptState, columnIndex, tableName, columnName, value);
127+
}
128+
129+
public String getNString(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, String value) {
130+
return columnHandler.getNString(interceptState, columnIndex, tableName, columnName, value);
131+
}
132+
133+
public Reader getNCharacterStream(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, Reader value) {
134+
return columnHandler.getNCharacterStream(interceptState, columnIndex, tableName, columnName, value);
135+
}
136+
137+
public RowId getRowId(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, RowId value) {
138+
return columnHandler.getRowId(interceptState, columnIndex, tableName, columnName, value);
139+
}
140+
141+
public <T> T getObject(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, T value, Class<T> type) {
142+
return columnHandler.getObject(interceptState, columnIndex, tableName, columnName, value, type);
100143
}
101144
}

‎springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/handler/DefaultColumnHandler.java‎

Lines changed: 57 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66
import java.io.InputStream;
77
import java.io.Reader;
88
import java.math.BigDecimal;
9-
import java.sql.Date;
10-
import java.sql.Time;
11-
import java.sql.Timestamp;
9+
import java.net.URL;
10+
import java.sql.*;
1211

1312
/**
1413
* 默认ResultSet 拦截器
@@ -104,4 +103,59 @@ public Object getObject(SQLInterceptState interceptState, int columnIndex, Strin
104103
public Reader getCharacterStream(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, Reader value) {
105104
return DataAuthorizationContext.getInstance().columnAuthorization(interceptState,tableName, columnName, value);
106105
}
106+
107+
@Override
108+
public Ref getRef(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, Ref value) {
109+
return DataAuthorizationContext.getInstance().columnAuthorization(interceptState,tableName, columnName, value);
110+
}
111+
112+
@Override
113+
public Blob getBlob(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, Blob value) {
114+
return DataAuthorizationContext.getInstance().columnAuthorization(interceptState,tableName, columnName, value);
115+
}
116+
117+
@Override
118+
public Clob getClob(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, Clob value) {
119+
return DataAuthorizationContext.getInstance().columnAuthorization(interceptState,tableName, columnName, value);
120+
}
121+
122+
@Override
123+
public Array getArray(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, Array value) {
124+
return DataAuthorizationContext.getInstance().columnAuthorization(interceptState,tableName, columnName, value);
125+
}
126+
127+
@Override
128+
public URL getURL(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, URL value) {
129+
return DataAuthorizationContext.getInstance().columnAuthorization(interceptState,tableName, columnName, value);
130+
}
131+
132+
@Override
133+
public NClob getNClob(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, NClob value) {
134+
return DataAuthorizationContext.getInstance().columnAuthorization(interceptState,tableName, columnName, value);
135+
}
136+
137+
@Override
138+
public SQLXML getSQLXML(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, SQLXML value) {
139+
return DataAuthorizationContext.getInstance().columnAuthorization(interceptState,tableName, columnName, value);
140+
}
141+
142+
@Override
143+
public String getNString(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, String value) {
144+
return DataAuthorizationContext.getInstance().columnAuthorization(interceptState,tableName, columnName, value);
145+
}
146+
147+
@Override
148+
public Reader getNCharacterStream(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, Reader value) {
149+
return DataAuthorizationContext.getInstance().columnAuthorization(interceptState,tableName, columnName, value);
150+
}
151+
152+
@Override
153+
public RowId getRowId(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, RowId value) {
154+
return DataAuthorizationContext.getInstance().columnAuthorization(interceptState,tableName, columnName, value);
155+
}
156+
157+
@Override
158+
public <T> T getObject(SQLInterceptState interceptState, int columnIndex, String tableName, String columnName, T value, Class<T> type) {
159+
return DataAuthorizationContext.getInstance().columnAuthorization(interceptState,tableName, columnName, value);
160+
}
107161
}

0 commit comments

Comments
 (0)