vue back modify

Author: robinhood-jim

core/src/main/java/com/robin/core/base/service/AbstractMybatisService.java

@@ -80,7 +80,7 @@ public BaseAnnotationJdbcService(){
 		if(type!=null){
 			entityContent= AnnotationRetriever.getMappingTableByCache(type);
 		}
-		//LicenseUtils.getInstance();
+		LicenseUtils.getInstance();
 	}
 
 	@Override

core/src/main/java/com/robin/core/base/service/BaseAnnotationJdbcService.java

@@ -19,7 +19,6 @@
 
 public interface IMybatisBaseService<T extends Serializable,P extends Serializable> extends IService<T> {
     boolean deleteByIds(String ids);
-    T get(P id);
     IPage<T> getPage(Map<String, Object> params, String defaultOrderField, boolean isAsc);
     IPage<T> getPage(PageDTO pageDTO);
 
@@ -42,7 +41,7 @@ public interface IMybatisBaseService<T extends Serializable,P extends Serializab
     List<T> selectBetweenByField(String columnName, Object fromValue, Object toValue);
     List<T> queryWithRequest(Object queryObject);
     IPage<T> queryPageWithRequest(Object queryObject, String orderField, boolean isAsc) throws ServiceException;
-    QueryWrapper wrapWithEntity(Object queryObject) throws Exception;
+
     List<T> queryValid(QueryWrapper<T> queryWrapper);
     List<T> queryValid(LambdaQueryWrapper<T> queryWrapper, SFunction<T,?> function);
     /**
@@ -54,7 +53,6 @@ public interface IMybatisBaseService<T extends Serializable,P extends Serializab
     List<P> parseId(String ids) throws ServiceException;
     boolean deleteByIds(List<P> ids);
     boolean deleteByField(SFunction<T,?> queryField,Const.OPERATOR oper,Object... value);
-    boolean saveEntity(T entity);
     boolean updateModelById(T entity);
     void queryBySelectId(PageQuery<Map<String,Object>> query) throws ServiceException;
     List<Map<String, Object>> queryBySql(String sqlstr, Object... objects) throws ServiceException;

core/src/main/java/com/robin/core/base/service/IMybatisBaseService.java

@@ -12,6 +12,7 @@
 import java.util.concurrent.CompletableFuture;
 
 
+import cn.hutool.core.util.StrUtil;
 import org.apache.commons.lang3.tuple.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -73,8 +74,6 @@ public String executeCmd(List<String> cmd) throws Exception{
 			CompletableFuture<Pair<Boolean,String>> future=CompletableFuture.supplyAsync(()->readOutput(process,0));
 			int runCode=process.waitFor();
 			Pair<Boolean,String> pair=future.get();
-			logger.info("return code={}",runCode);
-			logger.info("execute tag= {}",pair.getKey());
 			if(runCode!=0 || !pair.getKey()){
 				runOk=false;
 			}
@@ -96,8 +95,7 @@ public String executeCmdReturnAfterRow(List<String> cmd,int afterRow) throws Exc
 			CompletableFuture<Pair<Boolean,String>> future=CompletableFuture.supplyAsync(()->readOutput(process,afterRow));
 			int runCode=process.waitFor();
 			Pair<Boolean,String> pair=future.get();
-			logger.info("return code={}",runCode);
-			logger.info("execute tag= {}",pair.getKey());
+
 			if(runCode!=0 || !pair.getKey()){
 				runOk=false;
 			}
@@ -119,8 +117,6 @@ public String executeCmdReturnSpecifyKey(List<String> cmd,String key) throws Exc
 			CompletableFuture<Pair<Boolean,String>> future=CompletableFuture.supplyAsync(()->readOutputWithSpecifyKey(process,key));
 			int runCode=process.waitFor();
 			Pair<Boolean,String> pair=future.get();
-			logger.info("return code={}",runCode);
-			logger.info("execute tag= {}",pair.getKey());
 			if(runCode!=0 || !pair.getKey()){
 				runOk=false;
 			}
@@ -383,7 +379,9 @@ private Pair<Boolean,String> readOutput(Process process,int afterrow){
 		int pos=0;
 		try(BufferedReader reader=new BufferedReader(new InputStreamReader(process.getInputStream()))){
 			while((line=reader.readLine())!=null){
-				pos++;
+				if(!StrUtil.isBlank(line) || !StrUtil.isBlank(line.trim())) {
+					pos++;
+				}
 				if(logger.isDebugEnabled()) {
 					logger.debug("message={}",line);
 				}

core/src/main/java/com/robin/core/base/service/MybatisUtils.java

@@ -123,7 +123,9 @@ public String retKeyword(Integer key) {
     }
 
     public static void main(String[] args) {
-        generateFromProperties("f:/keyword.dat","configparam");
+        //generateFromProperties("f:/keyword.dat","configparam");
         //System.out.println(CharUtils.getInstance().retKeyword(118));
+        CharUtils.getInstance();
+        System.out.println(keywordMap);
     }
 }