~

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/api/comm/DicController.java

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 
@@ -34,7 +33,7 @@ public class DicController extends MyValidController {
     @ApiOperation(value = "2-4.字典项目获取所有")
     @PostMapping(value = "/itemGetAll")
     public ApiResponse<Map<String, List<DictItemModel>>> itemGetAll(@RequestBody CommRequestDTO req) throws ManagerException {
-        Map<String, List<DictItemModel>> response = dictManager.getAllDictItem(req);
+        Map<String, List<DictItemModel>> response = dictManager.getAllDictItem();
         return ApiResponse.of(response);
     }
 }

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/api/comm/PortalConfigController.java

@@ -32,7 +32,7 @@ public class PortalConfigController extends MyValidController {
 
     @ApiOperation(value = "根据登录来源方获取门户配置")
     @PostMapping(value = "/getPortalConfig")
-    public ApiResponse<GetPortalConfigResDTO> getPortalConfig(@Valid @RequestBody CommRequestDTO reqDto) throws ManagerException {
+    public ApiResponse<GetPortalConfigResDTO> getPortalConfig(@RequestBody CommRequestDTO reqDto) throws ManagerException {
         GetPortalConfigResDTO res = portalConfigManage.getPortalConfig(reqDto);
         return ApiResponse.of(res).setMessage("操作成功");
     }

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/comm/DictManager.java

@@ -1,15 +1,17 @@
 package cn.com.taiji.iaw.manager.comm;
 
 import cn.com.taiji.common.manager.ManagerException;
+import cn.com.taiji.common.model.BaseModel;
+import cn.com.taiji.common.valid.BaseValidDTO;
 import cn.com.taiji.core.entity.basic.DictItem;
 import cn.com.taiji.core.entity.basic.DictType;
 import cn.com.taiji.core.repo.jpa.basic.DictItemRepo;
 import cn.com.taiji.core.repo.jpa.basic.DictTypeRepo;
-import cn.com.taiji.iaw.dto.CommRequestDTO;
 import cn.com.taiji.iaw.dto.comm.DictItemModel;
 import com.google.common.collect.Maps;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -28,7 +30,7 @@ public class DictManager {
     @Autowired
     private DictTypeRepo dictTypeRepo;
 
-    public Map<String, List<DictItemModel>> getAllDictItem(CommRequestDTO req) throws ManagerException {
+    public Map<String, List<DictItemModel>> getAllDictItem() throws ManagerException {
         Map<String, List<DictItemModel>> dictTypeModels = Maps.newHashMap();
         List<DictType> dictTypes = dictTypeRepo.findAll();
         for (DictType dictType : dictTypes) {

zhywpt-app-ifmw/src/main/java/cn/com/taiji/ifmw/manager/sourceidentification/SourceIdentificationManagerImpl.java

@@ -68,7 +68,7 @@ public class SourceIdentificationManagerImpl implements SourceIdentificationMana
         ImcSourceIdentSecret secret= secretRepo.getBySourceIdentId(byId.getSourceIdentId());
         SourceIdentificationModel model = new SourceIdentificationModel();
         BeanUtil.copyProperties(byId, model);
-        model.setSecretKey(secret.getSm4PubKey());
+        model.setSecretKey(secret.getSm4PubKey().substring(0, 16));
         model.setSignKey(secret.getSm3Key());
 
         SourceIdentificationByIdResponse res = new SourceIdentificationByIdResponse();