Merge remote-tracking branch 'origin/dev/mix20191225_security' into dev/mix20191225_security

knowledgeman-service/src/main/java/com/diagbot/dto/SimilarLibraryDTO.java

@@ -1,5 +1,6 @@
 package com.diagbot.dto;
 
+import com.diagbot.annotation.CryptField;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -12,6 +13,7 @@ import lombok.Setter;
 @Setter
 public class SimilarLibraryDTO {
     private Long conceptId;
+    @CryptField
     private String name;
     private Long typeId;
     private String libType;

knowledgeman-service/src/main/java/com/diagbot/facade/ConceptFacade.java

@@ -1511,7 +1511,7 @@ public class ConceptFacade extends ConceptServiceImpl {
         if (ListUtil.isNotEmpty(list)) {
             Date now = DateUtil.now();
             for (LibraryInfo libraryInfo : list) {
-                libraryInfo.setSpell(CryptUtil.encrypt_char(Cn2SpellUtil.converterToFirstSpell(libraryInfo.getName())));
+                libraryInfo.setSpell(CryptUtil.encrypt_char(Cn2SpellUtil.converterToFirstSpell(CryptUtil.decrypt_char(libraryInfo.getName()))));
                 libraryInfo.setGmtModified(now);
             }
             List<List<LibraryInfo>> listList = SqlExecuteUtil.divideList(list, 200);

knowledgeman-service/src/main/java/com/diagbot/facade/SimilarFacade.java

@@ -2,11 +2,13 @@ package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.client.NLPServiceClient;
+import com.diagbot.config.CryptConfiguer;
 import com.diagbot.dto.SimilarLibraryDTO;
 import com.diagbot.entity.LibraryInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.LexiconTypeEnum;
 import com.diagbot.util.BeanUtil;
+import com.diagbot.util.CryptUtil;
 import com.diagbot.util.ListUtil;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,11 +27,16 @@ public class SimilarFacade {
     NLPServiceClient nlpServiceClient;
     @Autowired
     LibraryInfoFacade libraryInfoFacade;
+    @Autowired
+    private CryptConfiguer cryptConfiguer;
 
     public List<SimilarLibraryDTO> getSimilarList(String inputWord) {
         List<String> libraryNameList = nlpServiceClient.getSimilarList(inputWord);
         List<SimilarLibraryDTO> libraryList = Lists.newLinkedList();
         if (ListUtil.isNotEmpty(libraryNameList)) {
+            if (cryptConfiguer.cryptFlag){
+                CryptUtil.encryptList(libraryNameList);
+            }
             QueryWrapper<LibraryInfo> libraryInfoQueryWrapper = new QueryWrapper<>();
             libraryInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                     .in("name", libraryNameList)