diff --git a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/Assert/AssertUtils.java b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/Assert/AssertUtils.java index c471c748b..875d3ce84 100644 --- a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/Assert/AssertUtils.java +++ b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/Assert/AssertUtils.java @@ -52,4 +52,11 @@ public class AssertUtils { } } + + public static void notEmpty(List array, ErrorCode errorCode,Object object) { + if (ObjectUtils.isEmpty(array)) { + throw exception(errorCode,object); + } + } + } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java index d7ace9ff4..7c5d47f82 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java @@ -399,11 +399,13 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { List goodsIds = respVO.getGoodsId(); List goodsNo = respVO.getGoodsNo(); Integer cutedType = respVO.getCutedType(); + Long planConfigId = respVO.getPlanConfigId(); if(goodsIds.isEmpty() || goodsNo.isEmpty()){ return; } + AssertUtils.notEmpty(planConfigId,PLAN_PLATE_OPTIMIZE_DATA_ERROR); PlanDO planDO = validatePlanExists(planId); @@ -415,7 +417,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { // 查询优化信息 - List optimizeBoardModelDOS = esUtils.getEsDocument(FIELD_PLAN_CONFIG_ID,FIELD_PLAN_ID,respVO.getPlanConfigId(), planId, ORDER_OPTIMIZE_PLATE_MODEL, OptimizeBoardModelDO.class); + List optimizeBoardModelDOS = esUtils.getEsDocument(FIELD_PLAN_CONFIG_ID,FIELD_PLAN_ID,planConfigId, planId, ORDER_OPTIMIZE_PLATE_MODEL, OptimizeBoardModelDO.class); AssertUtils.notEmpty(optimizeBoardModelDOS,ORDER_PLAN_OPTIMIZE_ERROR); @@ -822,7 +824,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { esUtils.saveEsDocument(PLAN_PROCESS_SCHEME_OPTIMIZE_MODEL,schemeModelDOS); - +// esUtils.refresh(PLAN_PROCESS_SCHEME_OPTIMIZE_MODEL); } @@ -860,6 +862,8 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { @Override public PlanProcessSchemeList getProcessSchemeConfig(Long processId,Long planId) { + esUtils.refresh(PLAN_PROCESS_SCHEME_OPTIMIZE_MODEL); + PlanProcessSchemeList planProcessSchemeList = new PlanProcessSchemeList(); List schemeDTOList = systemConfigApi.getProcessById(processId).getCheckedData(); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java index dec9e63d6..877299da3 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java @@ -39,9 +39,7 @@ import com.cf.imes.module.executor.dal.dataobject.orderGroup.OrderGroupDO; import com.cf.imes.module.executor.dal.dataobject.orderItem.OrderItemDO; import com.cf.imes.module.executor.dal.dataobject.orderParts.OrderPartsDO; import com.cf.imes.module.executor.dal.dataobject.orderParts.PartsDO; -import com.cf.imes.module.executor.dal.dataobject.ordermodel.OrderModelCompressDO; import com.cf.imes.module.executor.dal.dataobject.ordermodel.OrderModelDO; -import com.cf.imes.module.executor.dal.dataobject.ordermodel.OrderPlateList; import com.cf.imes.module.executor.dal.dataobject.plan.PlanDO; import com.cf.imes.module.executor.dal.dataobject.plate.PlateDO; import com.cf.imes.module.executor.dal.dataobject.plate.PlateGoodDO; @@ -63,11 +61,11 @@ import com.cf.imes.module.executor.enums.CategoryEnum; import com.cf.imes.module.executor.enums.OrderDeletedEnum; import com.cf.imes.module.executor.enums.OrderStatusEnum; import com.cf.imes.module.executor.service.customplateno.CustomPlateNoGenerateService; -import com.cf.imes.module.executor.util.deviseData.structure.FieldConstants; -import com.cf.imes.module.executor.util.deviseData.structure.PlateDetail; import com.cf.imes.module.executor.service.orderImport.OrderImportHandler; import com.cf.imes.module.executor.service.orderImport.factory.OrderImportHandlerFactory; import com.cf.imes.module.executor.service.plan.PlanService; +import com.cf.imes.module.executor.util.deviseData.structure.FieldConstants; +import com.cf.imes.module.executor.util.deviseData.structure.PlateDetail; import com.cf.imes.module.executor.util.fileConversion.admin.api.webcad.ApiDataTypeVo; import org.springframework.aop.framework.AopContext; import org.springframework.beans.factory.annotation.Autowired; @@ -93,8 +91,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.cf.imes.framework.common.util.json.JsonUtils.toJsonString; -import static com.cf.imes.framework.common.util.json.JsonUtils.zipString; import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId; import static com.cf.imes.module.executor.enums.ErrorCodeConstants.*; import static com.cf.imes.module.infra.enums.ErrorCodeConstants.FILE_NOT_EXISTS; @@ -464,16 +460,17 @@ public class OrderServiceImpl implements OrderService { List orderModelDOs = BeanUtils.toBean(plateDetail, OrderModelDO.class); if (orderModelDOs != null && !orderModelDOs.isEmpty()) { - // 将生产单板材的造型信息进行压缩并保存 - OrderModelCompressDO orderModelCompressDO = new OrderModelCompressDO(); - orderModelCompressDO.setOrderId(order.getId()); +// // 将生产单板材的造型信息进行压缩并保存 +// OrderModelCompressDO orderModelCompressDO = new OrderModelCompressDO(); +// orderModelCompressDO.setOrderId(order.getId()); orderModelDOs.forEach(orderModelDO -> orderModelDO.setOrderId(order.getId())); // 保存大板的分类和实际ID和未优化 - saveOrderPlateModel(plateDO,goodsDO,orderModelDOs,orderModelCompressDO); + saveOrderPlateModel(plateDO,goodsDO,orderModelDOs); orderInputProcessor.batchSaveModel(orderModelDOs); + // 保存压缩的数据 - orderInputProcessor.batchSaveCompressModel(Collections.singletonList(orderModelCompressDO)); +// orderInputProcessor.batchSaveCompressModel(Collections.singletonList(orderModelCompressDO)); } if (!partsRemark.isEmpty()) { orderInputProcessor.batchSaveOrderPartsModel(partsRemark); @@ -547,14 +544,15 @@ public class OrderServiceImpl implements OrderService { List orderModelDOs = BeanUtils.toBean(plateDetail, OrderModelDO.class); // orderInputProcessor.batchSaveModel(orderModelDOs); - // 将生产单板材的造型信息进行压缩并保存 - OrderModelCompressDO orderModelCompressDO = new OrderModelCompressDO(); - orderModelCompressDO.setOrderId(orderDO.getId()); +// // 将生产单板材的造型信息进行压缩并保存 +// OrderModelCompressDO orderModelCompressDO = new OrderModelCompressDO(); +// orderModelCompressDO.setOrderId(orderDO.getId()); - saveOrderPlateModel(plateDO,goodsDO,orderModelDOs,orderModelCompressDO); + saveOrderPlateModel(plateDO,goodsDO,orderModelDOs); orderInputProcessor.batchSaveModel(orderModelDOs); + // 保存压缩的数据 - orderInputProcessor.batchSaveCompressModel(Collections.singletonList(orderModelCompressDO)); +// orderInputProcessor.batchSaveCompressModel(Collections.singletonList(orderModelCompressDO)); // } } @@ -1363,19 +1361,19 @@ public class OrderServiceImpl implements OrderService { - private void saveOrderPlateModel(List plateDO, List goodsDO, List orderModelDOs,OrderModelCompressDO orderModelCompressDO) { + private void saveOrderPlateModel(List plateDO, List goodsDO, List orderModelDOs) { - // 将生产单板材的造型信息进行压缩并保存 - String orderPlateModeList = toJsonString(BeanUtils.toBean(orderModelDOs, OrderPlateList.class)); - orderModelCompressDO.setOrderModelZip(zipString(orderPlateModeList)); +// // 将生产单板材的造型信息进行压缩并保存 +// String orderPlateModeList = toJsonString(BeanUtils.toBean(orderModelDOs, OrderPlateList.class)); +// orderModelCompressDO.setOrderModelZip(zipString(orderPlateModeList)); // 板材造型数据添加 大板分类ID，实际ID List orderGoodsPlateIds = BeanUtils.toBean(plateDO, OrderGoodsPlateIds.class); - List finalGoodsDO = goodsDO; orderGoodsPlateIds.forEach(f-> - f.setActualGoodsId(finalGoodsDO.stream().filter(g->g.getId().equals(f.getGoodsId())).map(GoodsDO::getGoodsId).toList().get(0)) + f.setActualGoodsId(goodsDO.stream().filter(g->g.getId().equals(f.getGoodsId())).map(GoodsDO::getGoodsId).toList().get(0)) ); orderModelDOs.forEach(f->{ + f.setId(f.getPlateId().toString()); f.setGoodsId(orderGoodsPlateIds.stream().filter(fo->fo.getId().equals(f.getPlateId())).map(OrderGoodsPlateIds::getActualGoodsId).toList().get(0)); f.setPlateGoodsId(orderGoodsPlateIds.stream().filter(fo->fo.getId().equals(f.getPlateId())).map(OrderGoodsPlateIds::getGoodsId).toList().get(0)); diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java index a109b3ddb..1d95bc2d7 100644 --- a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java +++ b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java @@ -392,4 +392,13 @@ public class ErrorCodeConstants { public static final ErrorCode TOKEN_DATA_IS_NULL = new ErrorCode(1_002_041_007, "当前token的配置为空，无需删除"); public static final ErrorCode TOKEN_EXPIRES_TIME_IS_NULL = new ErrorCode(1_002_041_008, "当前未选择有效时间，请选择再进行新增"); public static final ErrorCode TOKEN_EXPIRES_TIME_DATA_ERROR = new ErrorCode(1_002_041_009, "当前选择的有效时间已过期，请增加有效时间"); + public static final ErrorCode INSERT_TOKEN_DATA_ERROR = new ErrorCode(1_002_041_010, "token新增失败，请重新尝试"); + + + + //=========== 资金管理 1-002-042-000 ============ + public static final ErrorCode ORGAN_AMOUNT_NO_EXIST = new ErrorCode(1_002_042_001, "当前组织无资金管理"); + + + } diff --git a/cf-module-system/cf-module-system-biz/pom.xml b/cf-module-system/cf-module-system-biz/pom.xml index 62ca48d86..57ae5b75f 100644 --- a/cf-module-system/cf-module-system-biz/pom.xml +++ b/cf-module-system/cf-module-system-biz/pom.xml @@ -202,6 +202,31 @@ compile + + + + + io.jsonwebtoken + jjwt-api + 0.11.5 + + + io.jsonwebtoken + jjwt-impl + 0.11.5 + runtime + + + io.jsonwebtoken + jjwt-jackson + 0.11.5 + runtime + + + + + + diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/tokenconfig/TokenConfigController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/tokenconfig/TokenConfigController.java new file mode 100644 index 000000000..bd652b6f1 --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/tokenconfig/TokenConfigController.java @@ -0,0 +1,132 @@ +package com.cf.imes.module.system.controller.admin.tokenconfig; + + +import com.cf.imes.framework.common.pojo.CommonResult; +import com.cf.imes.framework.common.pojo.PageParam; +import com.cf.imes.framework.common.pojo.PageResult; +import com.cf.imes.framework.common.util.object.BeanUtils; +import com.cf.imes.framework.excel.core.util.ExcelUtils; +import com.cf.imes.framework.operatelog.core.annotations.OperateLog; +import com.cf.imes.module.system.controller.admin.tokenconfig.vo.TokenConfigPageReqVO; +import com.cf.imes.module.system.controller.admin.tokenconfig.vo.TokenConfigRespVO; +import com.cf.imes.module.system.controller.admin.tokenconfig.vo.TokenConfigSaveReqVO; +import com.cf.imes.module.system.dal.dataobject.tokenconfig.TokenConfigDO; +import com.cf.imes.module.system.service.tokenconfig.TokenConfigService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.List; + +import static com.cf.imes.framework.common.pojo.CommonResult.success; +import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; + + +/** + * @author token配置管理 + */ +@Tag(name = "管理后台 - Token管理") +@RestController +@RequestMapping("/system/token") +@Validated +public class TokenConfigController { + + @Resource + private TokenConfigService tokenConfigService; + + + @GetMapping() + @Operation(summary = "获得token配置的分页列表") +// @PreAuthorize("@ss.hasAnyPermissions('system:token:query')") + public CommonResult> getTokenConfigPage(@Valid TokenConfigPageReqVO pageReqVO) { + PageResult pageResult = tokenConfigService.getTokenConfigPage(pageReqVO); + + return success(pageResult); + + } + + + + @GetMapping("/{id}") + @Operation(summary = "根据ID获取对应的token配置信息") +// @PreAuthorize("@ss.hasAnyPermissions('system:token:query')") + public CommonResult getTokenConConfig(@PathVariable("id") Long id) { + TokenConfigDO tokenConConfig = tokenConfigService.getTokenConConfig(id); + return success(BeanUtils.toBean(tokenConConfig, TokenConfigRespVO.class)); + } + + + + @PostMapping() + @Operation(summary = "token配置新增") +// @PreAuthorize("@ss.hasAnyPermissions('system:token:create')") + public CommonResult insertTokenConfig(@Valid @RequestBody TokenConfigSaveReqVO reqVO) { + tokenConfigService.insertTokenConfig(reqVO); + return success(true); + } + + + + @PutMapping() + @Operation(summary = "token配置修改") +// @PreAuthorize("@ss.hasAnyPermissions('system:token:update')") + public CommonResult updateTokenConfig(@Valid @RequestBody TokenConfigSaveReqVO reqVO) { + tokenConfigService.updateTokenConfig(reqVO); + return success(true); + } + + + + @DeleteMapping("/{id}") + @Operation(summary = "token配置删除") +// @PreAuthorize("@ss.hasPermission('system:token:delete')") + public CommonResult deleteTokenConfig(@PathVariable("id") Long id) { + tokenConfigService.deleteTokenConfig(id); + return success(true); + } + + + + + @GetMapping("/check") + @Operation(summary = "token校验") +// @PreAuthorize("@ss.hasAnyPermissions('system:base-setting:query','unplannedOrders:query','placeorder:query')") + public CommonResult checkTokenConfig(@RequestParam("token") String token) { + + return success(tokenConfigService.checkTokenConfig(token)); + } + + + + @GetMapping("/copy") + @Operation(summary = "token复制") +// @PreAuthorize("@ss.hasAnyPermissions('system:base-setting:query','unplannedOrders:query','placeorder:query')") + public CommonResult tokenConfigCopy(@RequestParam("id") Long id) { + + return success(tokenConfigService.tokenConfigCopy(id)); + } + + + + + @GetMapping("/export") + @Operation(summary = "导出配置信息") +// @PreAuthorize("@ss.hasAnyPermissions('system:token:export')") + @OperateLog(type = EXPORT) + public void exportPlateExcel(@Valid TokenConfigPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = tokenConfigService.getTokenConfigPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "token配置信息表.xls", "数据", TokenConfigRespVO.class, + BeanUtils.toBean(list, TokenConfigRespVO.class)); + } + + + +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/tokenconfig/vo/JwtConfig.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/tokenconfig/vo/JwtConfig.java new file mode 100644 index 000000000..f1b1215ae --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/tokenconfig/vo/JwtConfig.java @@ -0,0 +1,17 @@ +package com.cf.imes.module.system.controller.admin.tokenconfig.vo; + +import lombok.Data; +import lombok.Getter; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +@Component +@Getter +@Data +public class JwtConfig{ + + @Value("${jwt.secret}") + private String secret; + + +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/tokenconfig/vo/TokenConfigPageReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/tokenconfig/vo/TokenConfigPageReqVO.java new file mode 100644 index 000000000..d9f0f787f --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/tokenconfig/vo/TokenConfigPageReqVO.java @@ -0,0 +1,35 @@ +package com.cf.imes.module.system.controller.admin.tokenconfig.vo; + +import com.cf.imes.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDate; + +import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; + + +@Schema(description = "管理后台 - token 配置分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@Builder +public class TokenConfigPageReqVO extends PageParam { + + + @Schema(description = "应用名称") + private String appName; + + + @Schema(description = "token值") + private String appToken; + + + @Schema(description = "时间范围", example = "[2022-07-01 ,2022-07-01]") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) + private LocalDate[] expiresTime; + + +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/tokenconfig/vo/TokenConfigRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/tokenconfig/vo/TokenConfigRespVO.java new file mode 100644 index 000000000..183738509 --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/tokenconfig/vo/TokenConfigRespVO.java @@ -0,0 +1,65 @@ +package com.cf.imes.module.system.controller.admin.tokenconfig.vo; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * @author token配置 + */ +@Schema(description = "管理后台 - token配置 Response VO") +@Data +@ExcelIgnoreUnannotated +public class TokenConfigRespVO { + + + @Schema(description = "配置编号") + @ExcelProperty("配置编号") + private Long id; + + + @Schema(description = "应用类型") + @ExcelProperty("应用类型") + private Integer appType; + + + @Schema(description = "用户名称") + @ExcelProperty("用户名称") + private String appName; + + + @Schema(description = "组织名称") + @ExcelProperty("组织名称") + private String organName; + + + @Schema(description = "应用token") + @ExcelProperty("应用token") + private String appToken; + + + @Schema(description = "过期时间") + @ExcelProperty("过期时间") + private LocalDateTime expiresTime; + + + @Schema(description = "备注") + @ExcelProperty("备注") + private String remark; + + + @Schema(description = "组织ID") + @ExcelProperty("组织ID") + private Long organId; + + + @Schema(description = "创建时间") + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/tokenconfig/vo/TokenConfigSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/tokenconfig/vo/TokenConfigSaveReqVO.java new file mode 100644 index 000000000..809229715 --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/tokenconfig/vo/TokenConfigSaveReqVO.java @@ -0,0 +1,41 @@ +package com.cf.imes.module.system.controller.admin.tokenconfig.vo; + + +import com.cf.imes.module.system.validation.token.TokenConfigAppTypeEnumValid; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + + +/** + * @author token配置创建/修改 + */ + +@Schema(description = "管理后台 - Token配置创建/修改 Request VO") +@Data +public class TokenConfigSaveReqVO { + + + @Schema(description = "token配置ID") + private Long id; + + + + @Schema(description = "应用类型", requiredMode = Schema.RequiredMode.REQUIRED) + @TokenConfigAppTypeEnumValid + private Integer appType; + + + @Schema(description = "自定义时间") + private String customizeTime; + + + @Schema(description = "有效时间类型") + private String expiresTimeType; + + + @Schema(description = "备注") + private String remark; + + +} + diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/tokenconfig/TokenConfigDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/tokenconfig/TokenConfigDO.java new file mode 100644 index 000000000..b40ea1950 --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/tokenconfig/TokenConfigDO.java @@ -0,0 +1,62 @@ +package com.cf.imes.module.system.dal.dataobject.tokenconfig; + + +import com.baomidou.mybatisplus.annotation.*; +import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; +import lombok.*; + +import java.time.LocalDateTime; + +/** + * @author token 配置管理 + */ + +@TableName(value = "system_config_token", autoResultMap = true) +@KeySequence("system_config_token_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class TokenConfigDO extends BaseDO { + + + /** + * 主键 + */ + @TableId + private Long id; + + /** + * 应用类型，1 WebCAD + */ + private Integer appType; + + /** + * 用户名称 + */ + private String appName; + + /** + * 应用token + */ + private String appToken; + + /** + * 过期时间 + */ + private LocalDateTime expiresTime; + + /** + * 备注 + */ + private String remark; + + /** + * 组织id + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Long organId; + +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/organ/OrganMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/organ/OrganMapper.java index bf889bf48..3a1cbbb67 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/organ/OrganMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/organ/OrganMapper.java @@ -122,13 +122,4 @@ public interface OrganMapper extends BaseMapperX { } - - default OrganizationDO selectByOrganIdAndMobile(Long organId,String mobile) { - return selectOne(new LambdaQueryWrapperX() - .eqIfPresent(OrganizationDO::getDeleted,false) - .eq(OrganizationDO::getId,organId) - .eq(OrganizationDO::getContactMobile,mobile)); - } - - } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/tokenconfig/TokenConfigMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/tokenconfig/TokenConfigMapper.java new file mode 100644 index 000000000..f9d1492f4 --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/tokenconfig/TokenConfigMapper.java @@ -0,0 +1,53 @@ +package com.cf.imes.module.system.dal.mysql.tokenconfig; + + +import com.cf.imes.framework.common.pojo.PageResult; +import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; +import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.cf.imes.module.system.controller.admin.tokenconfig.vo.TokenConfigPageReqVO; +import com.cf.imes.module.system.dal.dataobject.tokenconfig.TokenConfigDO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId; + + + +/** + * @author token 配置管理mapper + */ + +@Mapper +public interface TokenConfigMapper extends BaseMapperX { + + + default PageResult selectConfigPage(TokenConfigPageReqVO pageReqVO) { + return selectPage(pageReqVO, new LambdaQueryWrapperX() + .eq(TokenConfigDO::getOrganId,getUserOrganId()) + .eq(TokenConfigDO::getDeleted,false) + .likeIfPresent(TokenConfigDO::getAppToken,pageReqVO.getAppToken()) + .likeIfPresent(TokenConfigDO::getAppName,pageReqVO.getAppName()) + .betweenIfPresent(TokenConfigDO::getExpiresTime,pageReqVO.getExpiresTime()) + .orderByDesc(TokenConfigDO::getId)); + } + + + List selectAppTypeByOrganId(@Param("organId") Long organId); + + + default List selectConfigByOrganId(Long organId) { + return selectList(new LambdaQueryWrapperX() + .eq(TokenConfigDO::getOrganId,organId) + .eq(TokenConfigDO::getDeleted,false)); + } + + + default TokenConfigDO selectByToken(String token) { + return selectOne(new LambdaQueryWrapperX() + .eq(TokenConfigDO::getAppToken,token)); + } + + void deleteTokenConfig(@Param("id") Long id); +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/enums/token/TokenConfigAppTypeEnum.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/enums/token/TokenConfigAppTypeEnum.java new file mode 100644 index 000000000..0ddf71b05 --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/enums/token/TokenConfigAppTypeEnum.java @@ -0,0 +1,46 @@ +package com.cf.imes.module.system.enums.token; + + +import cn.hutool.core.util.ObjectUtil; +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @author token配置应用类型枚举 + */ + +@Getter +@AllArgsConstructor +public enum TokenConfigAppTypeEnum { + + + /** + * WebCAD + */ + WEBCAD(1, "WebCAD"); + + + + /** + * 类型 + */ + private final Integer type; + + /** + * 应用名称 + */ + private final String name; + + + public static TokenConfigAppTypeEnum fromType(Integer type) { + if (type == null) { + return null; + } + for (TokenConfigAppTypeEnum value : values()) { + if (ObjectUtil.equal(value.getType(), type)) { + return value; + } + } + return null; + } +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/enums/token/TokenExpiresTimeTypeEnum.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/enums/token/TokenExpiresTimeTypeEnum.java new file mode 100644 index 000000000..41d52dd31 --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/enums/token/TokenExpiresTimeTypeEnum.java @@ -0,0 +1,114 @@ +package com.cf.imes.module.system.enums.token; + + +import cn.hutool.core.util.ObjectUtil; +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.time.LocalDateTime; +import java.time.temporal.ChronoUnit; + +import static java.time.temporal.ChronoUnit.*; + +/** + * @author token有效时间的类型枚举 + */ + +@Getter +@AllArgsConstructor +public enum TokenExpiresTimeTypeEnum { + + PERMANENT("permanent",99,FOREVER,"永久"), + + + ONEHOURS("1_hour",1, HOURS,"1小时"), + + + EIGHTHOURS("8_hour",8, HOURS,"8小时"), + + + TWELVEHOURS("12_hour",12, HOURS,"12小时"), + + + ONEDAYS("1_day",1, DAYS,"1天"), + + + SEVENDAYS("7_day",7, DAYS,"7天"), + + + FIFTEENDAYS("15_day",15, DAYS,"15天"), + + + ONEMONTHS("1_month",1, MONTHS,"1个月"), + + + THREEMONTHS("3_month",3, MONTHS,"3个月"), + + + SIXMONTHS("6_month",6, MONTHS,"6个月"); + + + /** + * 字段类型名称 + */ + private final String type; + + + /** + * 时长 + */ + private final Integer value; + + + /** + * 类型 + */ + private final ChronoUnit timeType; + + + /** + * 总和 + */ + private final String name; + + + + + public static LocalDateTime adjustTime(String type, LocalDateTime dateTime) { + + TokenExpiresTimeTypeEnum typeEnum = null; + + for (TokenExpiresTimeTypeEnum value : values()) { + if (ObjectUtil.equal(value.getType(), type)) { + typeEnum = value; + break; + } + } + + + if(typeEnum == null){ + return null; + } + + ChronoUnit typeEnumType = typeEnum.getTimeType(); + + return switch (typeEnumType) { + case FOREVER -> LocalDateTime.of(2999, 1,1, 0, 0, 0); + case YEARS -> dateTime.plusMinutes(typeEnum.getValue()); + case HOURS -> dateTime.plusHours(typeEnum.getValue()); + case DAYS -> dateTime.plusDays(typeEnum.getValue()); + case MONTHS -> dateTime.plusMonths(typeEnum.getValue()); + default -> null; + }; + + + } + + + + + + + + +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/notify/NotifyMessageServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/notify/NotifyMessageServiceImpl.java index 73d014fc4..fef115684 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/notify/NotifyMessageServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/notify/NotifyMessageServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; import com.cf.imes.framework.common.pojo.PageResult; +import com.cf.imes.framework.common.util.date.LocalDateTimeUtils; import com.cf.imes.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO; import com.cf.imes.module.system.dal.dataobject.notify.NotifyMessageDO; import com.cf.imes.module.system.dal.dataobject.notify.NotifyMessageReadInfoDO; @@ -15,7 +16,9 @@ import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; -import java.util.*; +import java.util.Collection; +import java.util.List; +import java.util.Map; /** * 站内信 Service 实现类 @@ -47,6 +50,7 @@ public class NotifyMessageServiceImpl implements NotifyMessageService { @Override public PageResult getMyMyNotifyMessagePage(NotifyMessagePageReqVO pageReqVO) { PageDTO page = new PageDTO(pageReqVO.getPageNo(), pageReqVO.getPageSize()); + pageReqVO.setCreateTime(LocalDateTimeUtils.generateTimeSection(pageReqVO.getCreateTime())); IPage myMyNotifyMessage = notifyMessageMapper.getMyMyNotifyMessage(page, pageReqVO); return new PageResult<>(myMyNotifyMessage.getRecords(), myMyNotifyMessage.getTotal()); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java index 748d02ee4..6b96f37cc 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.dynamic.datasource.annotation.DSTransactional; import com.cf.imes.framework.common.enums.CommonStatusEnum; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.util.collection.CollectionUtils; @@ -20,30 +21,32 @@ import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils; import com.cf.imes.module.system.api.organ.dto.OrgStatisticsIsLapseRespDTO; import com.cf.imes.module.system.api.organ.dto.OrgStatisticsReqDTO; import com.cf.imes.module.system.constants.permission.InternalRoleConstants; +import com.cf.imes.module.system.controller.admin.organ.vo.organ.OrganPageReqVO; import com.cf.imes.module.system.controller.admin.organ.vo.organ.OrganRespVO; +import com.cf.imes.module.system.controller.admin.organ.vo.organ.OrganSaveReqVO; import com.cf.imes.module.system.controller.admin.organ.vo.organ.OrganSimpleRespVO; import com.cf.imes.module.system.controller.admin.permission.vo.role.RoleSaveReqVO; -import com.cf.imes.module.system.controller.admin.organ.vo.organ.OrganPageReqVO; -import com.cf.imes.module.system.controller.admin.organ.vo.organ.OrganSaveReqVO; +import com.cf.imes.module.system.controller.admin.tokenconfig.vo.JwtConfig; import com.cf.imes.module.system.controller.admin.user.vo.user.UserSaveReqVO; import com.cf.imes.module.system.convert.organ.OrganConvert; import com.cf.imes.module.system.dal.dataobject.machine.MachineLimitDO; import com.cf.imes.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; -import com.cf.imes.module.system.dal.dataobject.permission.MenuDO; -import com.cf.imes.module.system.dal.dataobject.permission.RoleDO; import com.cf.imes.module.system.dal.dataobject.organ.OrganizationDO; import com.cf.imes.module.system.dal.dataobject.organ.TenantPackageDO; +import com.cf.imes.module.system.dal.dataobject.permission.MenuDO; +import com.cf.imes.module.system.dal.dataobject.permission.RoleDO; +import com.cf.imes.module.system.dal.dataobject.tokenconfig.TokenConfigDO; import com.cf.imes.module.system.dal.mysql.machine.MachineLimitMapper; import com.cf.imes.module.system.dal.mysql.organ.OrganMapper; +import com.cf.imes.module.system.dal.mysql.tokenconfig.TokenConfigMapper; import com.cf.imes.module.system.enums.permission.RoleCodeEnum; import com.cf.imes.module.system.enums.permission.RoleTypeEnum; +import com.cf.imes.module.system.service.organ.handler.OrganInfoHandler; +import com.cf.imes.module.system.service.organ.handler.OrganMenuHandler; import com.cf.imes.module.system.service.permission.MenuService; import com.cf.imes.module.system.service.permission.PermissionService; import com.cf.imes.module.system.service.permission.RoleService; -import com.cf.imes.module.system.service.organ.handler.OrganInfoHandler; -import com.cf.imes.module.system.service.organ.handler.OrganMenuHandler; import com.cf.imes.module.system.service.user.AdminUserService; -import com.baomidou.dynamic.datasource.annotation.DSTransactional; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -62,6 +65,7 @@ import java.util.*; import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.cf.imes.module.system.dal.redis.RedisKeyConstants.OAUTH2_ACCESS_TOKEN; import static com.cf.imes.module.system.enums.ErrorCodeConstants.*; +import static com.cf.imes.module.system.service.tokenconfig.TokenConfigServiceImpl.generateBaseToken; import static java.util.Collections.singleton; /** @@ -99,6 +103,13 @@ public class OrganServiceImpl implements OrganService { @Resource private MachineLimitMapper machineLimitMapper; + @Resource + private TokenConfigMapper tokenConfigMapper; + + + @Resource + private JwtConfig jwtConfig; + @Resource private StringRedisTemplate stringRedisTemplate; @@ -234,7 +245,22 @@ public class OrganServiceImpl implements OrganService { } tenant.setPinyinFull(pinyinFull); tenant.setPinyinInitial(PinYinUtils.convertFirstChar(tenant.getName())); + } + + + // 如果手机号更新，需要同步更新 token 管理的 token + if(!Objects.equals(tenant.getContactMobile(), updateReqVO.getContactMobile())){ + + List tokenConfigDOS = tokenConfigMapper.selectConfigByOrganId(organId); + if(CollUtil.isNotEmpty(tokenConfigDOS)) { + tokenConfigDOS.forEach(f -> { + f.setAppToken(generateBaseToken(organId, updateReqVO.getContactMobile(), f.getAppType(), jwtConfig.getSecret())); + }); + tokenConfigMapper.updateBatch(tokenConfigDOS); + } + } + // 更新组织 OrganizationDO updateObj = BeanUtils.toBean(updateReqVO, OrganizationDO.class); organMapper.updateById(updateObj); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/tokenconfig/TokenConfigService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/tokenconfig/TokenConfigService.java new file mode 100644 index 000000000..dd8eb3c57 --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/tokenconfig/TokenConfigService.java @@ -0,0 +1,33 @@ +package com.cf.imes.module.system.service.tokenconfig; + + +import com.cf.imes.framework.common.pojo.PageResult; +import com.cf.imes.module.system.controller.admin.tokenconfig.vo.TokenConfigPageReqVO; +import com.cf.imes.module.system.controller.admin.tokenconfig.vo.TokenConfigRespVO; +import com.cf.imes.module.system.controller.admin.tokenconfig.vo.TokenConfigSaveReqVO; +import com.cf.imes.module.system.dal.dataobject.tokenconfig.TokenConfigDO; + +/** + * @author token 配置管理接口 + */ +public interface TokenConfigService { + + PageResult getTokenConfigPage(TokenConfigPageReqVO pageReqVO); + + + TokenConfigDO getTokenConConfig(Long id); + + + void insertTokenConfig(TokenConfigSaveReqVO reqVO); + + + void updateTokenConfig(TokenConfigSaveReqVO reqVO); + + + void deleteTokenConfig(Long id); + + + Long checkTokenConfig(String token); + + String tokenConfigCopy(Long id); +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/tokenconfig/TokenConfigServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/tokenconfig/TokenConfigServiceImpl.java new file mode 100644 index 000000000..b259cb64c --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/tokenconfig/TokenConfigServiceImpl.java @@ -0,0 +1,313 @@ +package com.cf.imes.module.system.service.tokenconfig; + + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; +import com.cf.imes.framework.common.enums.CommonStatusEnum; +import com.cf.imes.framework.common.pojo.PageResult; +import com.cf.imes.framework.common.util.Assert.AssertUtils; +import com.cf.imes.framework.common.util.date.DateUtils; +import com.cf.imes.framework.common.util.object.BeanUtils; +import com.cf.imes.module.system.controller.admin.tokenconfig.vo.JwtConfig; +import com.cf.imes.module.system.controller.admin.tokenconfig.vo.TokenConfigPageReqVO; +import com.cf.imes.module.system.controller.admin.tokenconfig.vo.TokenConfigRespVO; +import com.cf.imes.module.system.controller.admin.tokenconfig.vo.TokenConfigSaveReqVO; +import com.cf.imes.module.system.dal.dataobject.organ.OrganizationDO; +import com.cf.imes.module.system.dal.dataobject.tokenconfig.TokenConfigDO; +import com.cf.imes.module.system.dal.mysql.organ.OrganMapper; +import com.cf.imes.module.system.dal.mysql.tokenconfig.TokenConfigMapper; +import com.cf.imes.module.system.enums.token.TokenConfigAppTypeEnum; +import com.cf.imes.module.system.enums.token.TokenExpiresTimeTypeEnum; +import com.cf.imes.module.system.service.organ.OrganService; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.SignatureAlgorithm; +import io.jsonwebtoken.security.Keys; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import javax.crypto.SecretKey; +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.Base64; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId; +import static com.cf.imes.module.system.enums.ErrorCodeConstants.*; + +/** + * @author 配置管理接口 实现类 + */ +@Slf4j +@Service +public class TokenConfigServiceImpl implements TokenConfigService{ + + @Resource + private TokenConfigMapper tokenConfigMapper; + + @Resource + private OrganMapper organMapper; + + @Resource + private OrganService organService; + + + @Resource + private JwtConfig jwtConfig; + + + + @Override + public PageResult getTokenConfigPage(TokenConfigPageReqVO pageReqVO) { + + PageResult pageResult = tokenConfigMapper.selectConfigPage(pageReqVO); + if(CollUtil.isEmpty(pageResult.getList())) { + return new PageResult<>(); + } + + OrganizationDO organizationDO = organService.validOrgan(getUserOrganId()); + + PageResult result = BeanUtils.toBean(pageResult, TokenConfigRespVO.class); + + result.getList().forEach(f->{ + f.setOrganName(organizationDO.getName()); + f.setAppToken(maskString(f.getAppToken())); + + }); + + return result; + + + } + + + + @Override + public TokenConfigDO getTokenConConfig(Long id) { + + TokenConfigDO tokenConfigDO = validateTokenConfigExists(id); + + tokenConfigDO.setAppToken(maskString(tokenConfigDO.getAppToken())); + + return tokenConfigDO; + + } + + + + + @Override + public void insertTokenConfig(TokenConfigSaveReqVO reqVO) { + + Long organId = getUserOrganId(); + + OrganizationDO organizationDO = organService.validOrgan(organId); + + List appTypes = tokenConfigMapper.selectAppTypeByOrganId(organId); + + if(appTypes.contains(reqVO.getAppType())){ + throw exception(TOKEN_APP_TYPE_EXIST); + } + + String token = generateBaseToken(organId, organizationDO.getContactMobile(), reqVO.getAppType(), jwtConfig.getSecret()); + + LocalDateTime adjustedTime; + + if (reqVO.getCustomizeTime() != null){ + LocalDateTime localDateTime = LocalDate.parse(reqVO.getCustomizeTime()).atStartOfDay(); + adjustedTime = localDateTime.withHour(23).withMinute(59).withSecond(59); + }else { + AssertUtils.notEmpty(reqVO.getExpiresTimeType(),TOKEN_EXPIRES_TIME_IS_NULL); + adjustedTime = TokenExpiresTimeTypeEnum.adjustTime(reqVO.getExpiresTimeType(), LocalDateTime.now()); + } + + + tokenConfigMapper.insert(TokenConfigDO.builder() + .appName(TokenConfigAppTypeEnum.fromType(reqVO.getAppType()).getName()) + .appToken(token) + .appType(reqVO.getAppType()) + .organId(organId) + .expiresTime(adjustedTime) + .remark(reqVO.getRemark()) + .build()); + + + } + + + + @Override + public void updateTokenConfig(TokenConfigSaveReqVO reqVO) { + + TokenConfigDO tokenConfigDO = validateTokenConfigExists(reqVO.getId()); + + if(!tokenConfigDO.getAppType().equals(reqVO.getAppType())){ + throw exception(TOKEN_APP_TYPE_NO_UPDATE); + } + + LocalDateTime adjustedTime = null; + + if (reqVO.getCustomizeTime() != null){ + LocalDateTime localDateTime = LocalDate.parse(reqVO.getCustomizeTime()).atStartOfDay(); + adjustedTime = localDateTime.withHour(23).withMinute(59).withSecond(59); + }else if(reqVO.getExpiresTimeType() != null){ + adjustedTime = TokenExpiresTimeTypeEnum.adjustTime(reqVO.getExpiresTimeType(), tokenConfigDO.getCreateTime()); + } + + if(adjustedTime != null){ + + if(DateUtils.isExpired(adjustedTime)){ + throw exception(TOKEN_EXPIRES_TIME_DATA_ERROR); + } + + tokenConfigDO.setExpiresTime(adjustedTime); + } + + tokenConfigDO.setRemark(reqVO.getRemark() == null ? tokenConfigDO.getRemark() : reqVO.getRemark()); + + tokenConfigMapper.updateById(tokenConfigDO); + + + } + + + + @Override + public void deleteTokenConfig(Long id) { + + TokenConfigDO tokenConfigDO = tokenConfigMapper.selectById(id); + + if(ObjectUtil.isNull(tokenConfigDO)){ + throw exception(TOKEN_DATA_IS_NULL); + } + + tokenConfigMapper.deleteTokenConfig(id); + + } + + + + + @Override + public Long checkTokenConfig(String token) { + + TokenConfigDO tokenConfigDO = tokenConfigMapper.selectByToken(token); + + if(tokenConfigDO == null){ + throw exception(TOKEN_CONFIG_NOT_EXISTS); + } + + if (DateUtils.isExpired(tokenConfigDO.getExpiresTime())) { + throw exception(TOKEN_TIME_IS_EXPIRES); + } + + Long organId = tokenConfigDO.getOrganId(); + + OrganizationDO organizationDO = organMapper.selectById(organId); + + if (organizationDO == null) { + throw exception(ORGAN_NOT_EXISTS); + } + + if (organizationDO.getStatus().equals(CommonStatusEnum.DISABLE.getStatus())) { + throw exception(ORGAN_DISABLE, organizationDO.getName()); + } + + if (DateUtils.isExpired(organizationDO.getExpireTime())) { + throw exception(ORGAN_EXPIRE, organizationDO.getName()); + } + + return organId; + + } + + @Override + public String tokenConfigCopy(Long id) { + + TokenConfigDO tokenConfigDO = validateTokenConfigExists(id); + + return tokenConfigDO.getAppToken(); + } + + + + + + + private TokenConfigDO validateTokenConfigExists(Long id) { + + TokenConfigDO tokenConfigDO = tokenConfigMapper.selectById(id); + + if (ObjectUtil.isNull(tokenConfigDO)) { + throw exception(TOKEN_CONFIG_NOT_EXISTS); + } + + return tokenConfigDO; + } + + + + + + // token生成 + public static String generateToken(Map claims, String base64SecretKey) { + SecretKey secretKey = Keys.hmacShaKeyFor(base64SecretKey.getBytes(StandardCharsets.UTF_8)); + + return Jwts.builder() + .addClaims(claims) + .signWith(secretKey, SignatureAlgorithm.HS256) + .compact(); + } + + + + + // 生成token的信息 + public static String generateBaseToken(Long organId, String mobile,Integer appType, String base64SecretKey) { + Map claims = new HashMap<>(); + claims.put("organId", organId); + claims.put("mobile", mobile); + claims.put("appType",appType); + String token = generateToken(claims, base64SecretKey); + + try { + + MessageDigest digest = MessageDigest.getInstance("SHA-256"); + byte[] hash = digest.digest(token.getBytes()); + + token = Base64.getEncoder().encodeToString(hash); + + }catch (NoSuchAlgorithmException e){ + + log.error("token二次处理失败"+e.getMessage()); + + throw exception(INSERT_TOKEN_DATA_ERROR); + + } + + return token; + } + + + + public static String maskString(String input) { + int length = input.length(); + return input.substring(0, 4) + "*".repeat(length - 8) + input.substring(length - 4); + } + + + +// // 安全密钥生成 +// public static String generateSecureSecretKey() { +// SecretKey key = Keys.secretKeyFor(SignatureAlgorithm.HS256); +// return Base64.getEncoder().encodeToString(key.getEncoded()); +// } + + +} \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/token/TokenConfigAppTypeEnumValid.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/token/TokenConfigAppTypeEnumValid.java new file mode 100644 index 000000000..580680b2e --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/token/TokenConfigAppTypeEnumValid.java @@ -0,0 +1,28 @@ +package com.cf.imes.module.system.validation.token; + + +import javax.validation.Constraint; +import javax.validation.Payload; +import java.lang.annotation.*; + +/** + * @author token配置管理应用类型注解 + */ +@Target({ + ElementType.FIELD, + ElementType.PARAMETER, +}) +@Retention(RetentionPolicy.RUNTIME) +@Documented +@Constraint( + validatedBy = {TokenConfigAppTypeEnumValidator.class} +) +public @interface TokenConfigAppTypeEnumValid { + + String message() default "应用类型错误，请检查"; + + Class[] groups() default {}; + + Class[] payload() default {}; + +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/token/TokenConfigAppTypeEnumValidator.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/token/TokenConfigAppTypeEnumValidator.java new file mode 100644 index 000000000..3bcd89618 --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/token/TokenConfigAppTypeEnumValidator.java @@ -0,0 +1,31 @@ +package com.cf.imes.module.system.validation.token; + + +import cn.hutool.core.util.ObjectUtil; +import com.cf.imes.module.system.enums.token.TokenConfigAppTypeEnum; + +import javax.validation.ConstraintValidator; +import javax.validation.ConstraintValidatorContext; + +/** + * @author token配置管理应用类型校验器 + */ +public class TokenConfigAppTypeEnumValidator implements ConstraintValidator { + + @Override + public void initialize(TokenConfigAppTypeEnumValid constraintAnnotation) { + ConstraintValidator.super.initialize(constraintAnnotation); + } + + @Override + public boolean isValid(Integer value, ConstraintValidatorContext context) { + if (ObjectUtil.isNull(value)) { + return true; + } + TokenConfigAppTypeEnum configTypeEnum = TokenConfigAppTypeEnum.fromType(value); + if (ObjectUtil.isNotNull(configTypeEnum)) { + return true; + } + return false; + } +} diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/application.yaml b/cf-module-system/cf-module-system-biz/src/main/resources/application.yaml index afe5d2f15..1a14aaa17 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/application.yaml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/application.yaml @@ -43,6 +43,12 @@ knife4j: setting: language: zh_cn + +# JWT 密钥配置 +jwt: + secret: BjEM0tnL3W5zYLQ6pllol49uYVXe+f66pHyOM/tkGWg= + + # MyBatis Plus 的配置项 mybatis-plus: configuration: diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/tokenconfig/TokenConfigMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/tokenconfig/TokenConfigMapper.xml new file mode 100644 index 000000000..68be63847 --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/tokenconfig/TokenConfigMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + delete from system_config_token where id = #{id}; + + + + + + \ No newline at end of file