Skip to content

Commit 06a99f5

Browse files
Time-wTime-w
committed
Merge remote-tracking branch 'origin/dev' into dev
2 parents 385a9f0 + 16da470 commit 06a99f5

File tree

10 files changed

+26
-29
lines changed

10 files changed

+26
-29
lines changed

‎continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/aop/CrudApiAnnotationInterceptor.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,10 @@ public Object invoke(MethodInvocation invocation) throws Throwable {
5050
// 获取处理器
5151
CrudApiHandler<?> crudApiHandler = CrudApiStrategy.INSTANCE.handlerMap.get(targetClass);
5252
if (crudApiHandler != null) {
53-
crudApiHandler.preHandle(crudApi, targetMethod, targetClass);
53+
crudApiHandler.preHandle(crudApi, invocation.getArguments(), targetMethod, targetClass);
5454
} else {
55-
CrudApiStrategy.INSTANCE.handlerMap.get(BaseController.class).preHandle(crudApi, targetMethod, targetClass);
55+
CrudApiStrategy.INSTANCE.handlerMap.get(BaseController.class)
56+
.preHandle(crudApi, invocation.getArguments(), targetMethod, targetClass);
5657
}
5758
return invocation.proceed();
5859
}

‎continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/controller/BaseController.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import top.continew.starter.extension.crud.model.resp.BaseIdResp;
3434
import top.continew.starter.extension.crud.model.resp.BasePageResp;
3535
import top.continew.starter.extension.crud.service.BaseService;
36-
import top.continew.starter.extension.crud.util.ValidateGroup;
36+
import top.continew.starter.extension.crud.validation.CrudValidateGroup;
3737

3838
import java.util.List;
3939

@@ -44,7 +44,7 @@
4444
* @param <L> 列表类型
4545
* @param <D> 详情类型
4646
* @param <Q> 查询条件
47-
* @param <C> 创建或修改类型
47+
* @param <C> 创建或修改参数类型
4848
* @author Charles7c
4949
* @since 1.0.0
5050
*/
@@ -123,7 +123,7 @@ public D detail(@PathVariable("id") Long id) {
123123
@Operation(summary = "新增数据", description = "新增数据")
124124
@ResponseBody
125125
@PostMapping
126-
public BaseIdResp<Long> add(@Validated(ValidateGroup.Crud.Add.class) @RequestBody C req) {
126+
public BaseIdResp<Long> add(@Validated(CrudValidateGroup.Add.class) @RequestBody C req) {
127127
return new BaseIdResp<>(baseService.add(req));
128128
}
129129

@@ -138,7 +138,7 @@ public BaseIdResp<Long> add(@Validated(ValidateGroup.Crud.Add.class) @RequestBod
138138
@Parameter(name = "id", description = "ID", example = "1", in = ParameterIn.PATH)
139139
@ResponseBody
140140
@PutMapping("/{id}")
141-
public void update(@Validated(ValidateGroup.Crud.Update.class) @RequestBody C req, @PathVariable("id") Long id) {
141+
public void update(@Validated(CrudValidateGroup.Update.class) @RequestBody C req, @PathVariable("id") Long id) {
142142
baseService.update(req, id);
143143
}
144144

‎continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/handler/CrudApiHandler.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,10 @@ public interface CrudApiHandler<T extends BaseController> {
4040
* 前置处理
4141
*
4242
* @param crudApi CRUD API 注解
43+
* @param args 方法参数
4344
* @param targetMethod 目标方法
4445
* @param targetClass 目标类
4546
* @throws Exception 处理异常
4647
*/
47-
void preHandle(CrudApi crudApi, Method targetMethod, Class<?> targetClass) throws Exception;
48+
void preHandle(CrudApi crudApi, Object[] args, Method targetMethod, Class<?> targetClass) throws Exception;
4849
}

‎continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/handler/CrudApiStrategy.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ public void registerHandler(CrudApiHandler<?> handler) {
6060
}
6161

6262
/**
63-
* 移除一个注解处理器
63+
* 移除一个处理器
6464
*
6565
* @param controllerClass 控制器类
6666
*/
67-
public void removeAnnotationHandler(Class<?> controllerClass) {
67+
public void removeHandler(Class<?> controllerClass) {
6868
handlerMap.remove(controllerClass);
6969
}
7070
}

‎continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/handler/DefaultCrudApiHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public Class getHandlerControllerClass() {
3535
}
3636

3737
@Override
38-
public void preHandle(CrudApi crudApi, Method targetMethod, Class<?> targetClass) {
38+
public void preHandle(CrudApi crudApi, Object[] args, Method targetMethod, Class<?> targetClass) {
3939
// do nothing
4040
}
4141
}

‎continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/service/BaseService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* @param <L> 列表类型
3232
* @param <D> 详情类型
3333
* @param <Q> 查询条件
34-
* @param <C> 创建或修改类型
34+
* @param <C> 创建或修改参数类型
3535
* @author Charles7c
3636
* @since 1.0.0
3737
*/

‎continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/util/ValidateGroup.java‎ renamed to ‎continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/validation/CrudValidateGroup.java‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,25 @@
1414
* limitations under the License.
1515
*/
1616

17-
package top.continew.starter.extension.crud.util;
17+
package top.continew.starter.extension.crud.validation;
1818

1919
import jakarta.validation.groups.Default;
2020

2121
/**
22-
* 分组校验
22+
* CRUD 分组校验
2323
*
2424
* @author Charles7c
2525
* @since 1.0.0
2626
*/
27-
public interface ValidateGroup extends Default {
27+
public interface CrudValidateGroup extends Default {
2828

2929
/**
30-
* 分组校验-增删改查
30+
* CRUD 分组校验-新增
3131
*/
32-
interface Crud extends ValidateGroup {
33-
/**
34-
* 分组校验-创建
35-
*/
36-
interface Add extends Crud {}
32+
interface Add extends CrudValidateGroup {}
3733

38-
/**
39-
* 分组校验-修改
40-
*/
41-
interface Update extends Crud {}
42-
}
34+
/**
35+
* CRUD 分组校验-修改
36+
*/
37+
interface Update extends CrudValidateGroup {}
4338
}

‎continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/BaseServiceImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
* @param <L> 列表类型
6060
* @param <D> 详情类型
6161
* @param <Q> 查询条件
62-
* @param <C> 创建或修改类型
62+
* @param <C> 创建或修改参数类型
6363
* @author Charles7c
6464
* @since 1.0.0
6565
*/

‎continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/BaseServiceImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
* @param <L> 列表类型
6565
* @param <D> 详情类型
6666
* @param <Q> 查询条件
67-
* @param <C> 创建或修改类型
67+
* @param <C> 创建或修改参数类型
6868
* @author Charles7c
6969
* @since 1.0.0
7070
*/

‎continew-starter-file/continew-starter-file-excel/src/main/java/top/continew/starter/file/excel/converter/ExcelListConverter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package top.continew.starter.file.excel.converter;
1818

1919
import cn.hutool.core.collection.CollUtil;
20-
import cn.hutool.core.util.StrUtil;
20+
import cn.hutool.core.text.CharSequenceUtil;
2121
import com.alibaba.excel.converters.Converter;
2222
import com.alibaba.excel.enums.CellDataTypeEnum;
2323
import com.alibaba.excel.metadata.GlobalConfiguration;
@@ -57,7 +57,7 @@ public List convertToJavaData(ReadCellData<?> cellData,
5757
ExcelContentProperty contentProperty,
5858
GlobalConfiguration globalConfiguration) {
5959
String stringValue = cellData.getStringValue();
60-
return StrUtil.split(stringValue, StringConstants.COMMA);
60+
return CharSequenceUtil.split(stringValue, StringConstants.COMMA);
6161
}
6262

6363
@Override

0 commit comments

Comments
 (0)