fix license problem

robinhood-jim · robinhood-jim · commit 3f4bbf524edb · 2025-07-07T20:53:37.000+08:00
diff --git a/common/src/main/java/com/robin/comm/util/config/YamlUtils.java b/common/src/main/java/com/robin/comm/util/config/YamlUtils.java
@@ -3,9 +3,7 @@
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
 
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
+import java.io.*;
 import java.util.Map;
 
 
@@ -16,7 +14,10 @@ public static Map<String,Object> parseYamlFileWithClasspath(String classPathFile
         Map<String,Object> map= yaml.load(clazz.getClassLoader().getResourceAsStream(classPathFile));
         return map;
     }
-    public static Map<String,Object> parseYamlFileWithStream(InputStream in){
+    public static Map<String,Object> parseYamlFromFile(String filePath) throws IOException {
+        return parseYamlFromStream(new FileInputStream(filePath));
+    }
+    public static Map<String,Object> parseYamlFromStream(InputStream in){
         Map<String,Object> map= yaml.load(in);
         return map;
     }
@@ -31,5 +32,8 @@ public static <T> T loadFromStream(InputStream inputStream,Class<T> clazz){
         Yaml tyaml=new Yaml(new Constructor(clazz.getClass()));
         return tyaml.load(inputStream);
     }
+    public static <T> T loadFromClassPath(String classPath,Class<T> clazz){
+        return loadFromStream(clazz.getClassLoader().getResourceAsStream(classPath),clazz);
+    }
 
 }
diff --git a/common/src/main/java/com/robin/comm/util/xls/ExcelSheetProp.java b/common/src/main/java/com/robin/comm/util/xls/ExcelSheetProp.java
@@ -15,6 +15,8 @@
  */
 package com.robin.comm.util.xls;
 
+import com.robin.core.fileaccess.meta.DataCollectionMeta;
+import com.robin.core.fileaccess.meta.DataSetColumnMeta;
 import lombok.Data;
 
 import java.util.*;
@@ -39,6 +41,8 @@ public class ExcelSheetProp {
 	private String templateFile;
 	private boolean useOffHeap=false;
 	private String fontName;
+	private int maxRows;
+	private int maxSheetSize;
 	private ExcelSheetProp(){
 
 	}
@@ -61,6 +65,15 @@ public void addColumnProp(ExcelColumnProp prop){
 	public List<ExcelColumnProp> getColumnPropList() {
 		return columnPropList;
 	}
+
+	public static ExcelSheetProp fromDataCollectionMeta(DataCollectionMeta colmeta){
+		ExcelSheetProp.Builder builder=ExcelSheetProp.Builder.newBuilder();
+		for(DataSetColumnMeta setColumnMeta:colmeta.getColumnList()){
+			builder.addColumnProp(setColumnMeta.getColumnName(), setColumnMeta.getColumnName(), setColumnMeta.getColumnType());
+		}
+		builder.setStartRow(2);
+		return builder.build();
+	}
 	public static class Builder{
 		private ExcelSheetProp prop=new ExcelSheetProp();
 		private Builder(){
@@ -130,6 +143,14 @@ public Builder dumpUseTempFile(){
 			prop.setUseOffHeap(false);
 			return this;
 		}
+		public Builder maxRows(int maxRows){
+			prop.setMaxRows(maxRows);
+			return this;
+		}
+		public Builder maxSheetSize(int maxSheetSize){
+			prop.setMaxSheetSize(maxSheetSize);
+			return this;
+		}
 		public ExcelSheetProp build(){
 			return prop;
 		}
diff --git a/common/src/main/java/com/robin/core/fileaccess/util/ByteBufferInputStream.java b/common/src/main/java/com/robin/core/fileaccess/util/ByteBufferInputStream.java
@@ -22,6 +22,16 @@ public ByteBufferInputStream(ByteBuffer buffer,byte[] bytes){
         buffer.put(bytes);
         this.count=bytes.length;
     }
+    public ByteBufferInputStream(ByteBuffer buffer,InputStream inputStream) throws IOException{
+        this.byteBuffer=buffer;
+        byteBuffer.position(0);
+        byte[] readBytes=new byte[8192];
+        int count;
+        while ((count=inputStream.read(readBytes))>0){
+            byteBuffer.put(readBytes,0,count);
+        }
+        this.count=byteBuffer.position();
+    }
     @Override
     public int read() throws IOException {
         if (byteBuffer.position()>count || byteBuffer.remaining() == 0) {
diff --git a/common/src/main/java/com/robin/core/fileaccess/util/ByteBufferOutputStream.java b/common/src/main/java/com/robin/core/fileaccess/util/ByteBufferOutputStream.java
@@ -44,6 +44,7 @@ public void writeLong(long value) throws IOException{
     }
     public void writeGap() throws IOException{
         write(0);
+        count++;
     }
     public void writeNullTag() throws IOException{
         //overwrite 0x00 with 0xff
diff --git a/core/src/main/java/com/robin/core/base/dao/IjdbcDao.java b/core/src/main/java/com/robin/core/base/dao/IjdbcDao.java
@@ -240,4 +240,5 @@ public interface IjdbcDao {
     <T extends BaseObject,P extends Serializable> int deleteByLogic(Class<T> clazz,List<P> pkObjs,String statusColumn,String statusValue) throws DAOException;
     <T extends BaseObject> List<T> queryByVO(Class<T> type, BaseObject vo, String orderByStr);
     List<Map<String, Object>> queryByNamedParam(String executeSql, Map<String, List<Object>> parmaMap) throws DAOException;
+    long executeSqlWithReturn(final String sql, Object[] object);
 }
diff --git a/core/src/main/java/com/robin/core/base/dao/JdbcDao.java b/core/src/main/java/com/robin/core/base/dao/JdbcDao.java
@@ -811,6 +811,12 @@ public <T extends BaseObject,P extends Serializable> T getEntity(Class<T> clazz,
             throw wrapException(ex);
         }
     }
+    public long executeSqlWithReturn(final String sql, Object[] object)
+            throws DAOException {
+        KeyHolder keyHolder = new GeneratedKeyHolder();
+        getJdbcTemplate().update(new SimplePrepareStatement(sql, object, lobHandler), keyHolder);
+        return keyHolder.getKey().longValue();
+    }
 
 
     public void setSqlGen(BaseSqlGen sqlGen) {
diff --git a/core/src/main/java/com/robin/core/base/dao/util/SimplePrepareStatement.java b/core/src/main/java/com/robin/core/base/dao/util/SimplePrepareStatement.java
@@ -1,13 +1,11 @@
 package com.robin.core.base.dao.util;
 
-import com.robin.core.base.model.BaseObject;
 import org.springframework.jdbc.core.PreparedStatementCreator;
 import org.springframework.jdbc.support.lob.LobHandler;
+import org.springframework.util.ObjectUtils;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Statement;
+import java.io.ByteArrayInputStream;
+import java.sql.*;
 
 
 public class SimplePrepareStatement implements PreparedStatementCreator {
@@ -24,7 +22,23 @@ public SimplePrepareStatement(String sql,Object[] objects,LobHandler lobHandler)
     public PreparedStatement createPreparedStatement(Connection conn) throws SQLException {
         try(PreparedStatement ps = conn.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) {
             for (int i = 0; i < objects.length; i++) {
-                ps.setObject(i + 1, objects[i]);
+                if(!ObjectUtils.isEmpty(objects[i])) {
+                    if (byte[].class.isAssignableFrom(objects[i].getClass())) {
+                        byte[] bytes = (byte[]) objects[i];
+                        lobHandler.getLobCreator().setBlobAsBinaryStream(ps, i + 1, new ByteArrayInputStream(bytes), bytes.length);
+                    }
+                    if (String.class.isAssignableFrom(objects[i].getClass())) {
+                        if(objects[i].toString().length()>512){
+                            lobHandler.getLobCreator().setClobAsString(ps,i+1,objects[i].toString());
+                        }else{
+                            ps.setString(i+1,objects[i].toString());
+                        }
+                    } else {
+                        ps.setObject(i + 1, objects[i]);
+                    }
+                }else{
+                    ps.setNull(i+1, Types.VARCHAR);
+                }
             }
             return ps;
         }
diff --git a/core/src/main/java/com/robin/core/base/util/FileUtils.java b/core/src/main/java/com/robin/core/base/util/FileUtils.java
@@ -7,7 +7,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileExistsException;
 import org.springframework.util.Assert;
-import org.springframework.util.MimeTypeUtils;
 import org.springframework.util.ObjectUtils;
 
 import java.io.File;
@@ -20,7 +19,6 @@
 import java.nio.file.attribute.PosixFilePermission;
 import java.nio.file.attribute.UserPrincipalLookupService;
 import java.util.*;
-import java.util.stream.Collectors;
 
 @Slf4j
 public class FileUtils {
@@ -200,7 +198,7 @@ public static class FileContent{
         private Const.CompressType compressType= Const.CompressType.COMPRESS_TYPE_NONE;
     }
     public static void main(String[] args){
-        String path="file:///e:/tmp/test/test1.avro.cs.lz4";
+        String path="tmp/1234.xlsx";
         System.out.println(parseFile(path));
     }
 }
diff --git a/core/src/main/java/com/robin/core/base/util/LicenseUtils.java b/core/src/main/java/com/robin/core/base/util/LicenseUtils.java
@@ -39,6 +39,7 @@ public class LicenseUtils {
     private static final LicenseUtils utils = new LicenseUtils();
     private static RunThread thread = null;
     private static LocalDateTime lastCheckTs;
+    private static final Long startTs=System.currentTimeMillis();
 
     private static final Logger logger= LoggerFactory.getLogger(CharUtils.class);
     private static LocalDateTime lastCredentianlTs=null;
@@ -48,8 +49,9 @@ public class LicenseUtils {
     private LicenseUtils() {
         if (thread == null) {
             thread = new RunThread();
+            thread.setDaemon(true);
             thread.start();
-            Runtime.getRuntime().addShutdownHook(new Thread(() ->thread.stopRun()));
+            //Runtime.getRuntime().addShutdownHook(new Thread(() ->thread.stopRun()));
         }
     }
 
@@ -101,6 +103,7 @@ private static PublicKey getPublicKey(String userPath) {
                 File rsaPath = new File(userPath + File.separator + ".ssh" + File.separator + "id_rsa.pub");
                 if (rsaPath.exists()) {
                     publicKey = CipherUtil.readPublicKeyByPem(new FileInputStream(userPath + File.separator + ".ssh" + File.separator + "id_rsa.pub"));
+                    valid=true;
                 }
             }
         } catch (Exception ex1) {
@@ -160,6 +163,10 @@ private static boolean validate(PublicKey publicKey,String machineId) {
                 logger.error("license locked");
                 System.exit(1);
             }
+            if(CharUtils.getInstance().retKeyword(121).equals(CharUtils.getInstance().retKeyword(119)) && System.currentTimeMillis()-startTs>24*3600*1000L) {
+                logger.error("server run more than one day,Stopped!");
+                System.exit(1);
+            }
             length=inputStream.readInt();
             byte[] signbytes=new byte[length];
             inputStream.read(signbytes);
diff --git a/core/src/main/java/com/robin/core/convert/util/ConvertUtil.java b/core/src/main/java/com/robin/core/convert/util/ConvertUtil.java
@@ -179,7 +179,7 @@ public static void mapToObject(Object target, Map<String, Object> src, String...
     }
 
 
-    private static String wordCase(String value) {
+    private static String camelCase(String value) {
         return value.substring(0, 1).toUpperCase() + value.substring(1);
     }
 
diff --git a/core/src/main/java/com/robin/core/fileaccess/meta/DataCollectionMeta.java b/core/src/main/java/com/robin/core/fileaccess/meta/DataCollectionMeta.java
@@ -70,19 +70,26 @@ public void setAvroSchema(Class<?> clazz){
 		valueClassName=fullClassName.substring(pos+1);
 	}
 
-	public void addColumnMeta(String columnName,String columnType,String defaultNullValue){
+	public void addColumnMeta(String columnName,String columnType,Object defaultNullValue){
 		this.columnList.add(new DataSetColumnMeta(columnName, columnType, defaultNullValue));
 		columnNameMap.put(columnName,1);
 	}
 	public void addColumnMeta(String columnName,String columnType,boolean flushOut){
 		this.columnList.add(new DataSetColumnMeta(columnName, columnType, flushOut));
 		columnNameMap.put(columnName,1);
 	}
-	public void addColumnMeta(String columnName,String columnType,String defaultNullValue,boolean required){
+
+	public void addColumnMeta(String columnName,String columnType,Object defaultNullValue,boolean required){
 		this.columnList.add(new DataSetColumnMeta(columnName, columnType, defaultNullValue,required));
 		columnNameMap.put(columnName,null);
 	}
-	public void addColumnMeta(String columnName,String columnType,String defaultNullValue,boolean required,String dateFormat){
+	public void addColumnMeta(String columnName,String columnCode,String columnType,Object defaultNullValue,boolean required){
+		DataSetColumnMeta setColumnMeta=new DataSetColumnMeta(columnName,columnCode, columnType, defaultNullValue);
+		setColumnMeta.setRequired(required);
+		this.columnList.add(setColumnMeta);
+		columnNameMap.put(columnName,null);
+	}
+	public void addColumnMeta(String columnName,String columnType,Object defaultNullValue,boolean required,String dateFormat){
 		this.columnList.add(new DataSetColumnMeta(columnName, columnType, defaultNullValue,required,dateFormat));
 		columnNameMap.put(columnName,null);
 	}
diff --git a/core/src/main/java/com/robin/core/fileaccess/meta/DataSetColumnMeta.java b/core/src/main/java/com/robin/core/fileaccess/meta/DataSetColumnMeta.java
@@ -11,6 +11,7 @@
 @Data
 public class DataSetColumnMeta implements Serializable {
     private String columnName;
+    private String columnCode;
     private String columnType;
     private Object defaultNullValue;
     private String dateFormat;
@@ -24,17 +25,24 @@ public class DataSetColumnMeta implements Serializable {
     private Integer length;
     private List<String> nominalValues;
     private boolean flushOut=true;
+    public DataSetColumnMeta(){
 
+    }
 
     public DataSetColumnMeta(String columnName,String columnType,Object defaultNullValue){
         this.columnName=columnName;
+        this.columnCode=columnName;
         this.columnType=columnType;
         if(defaultNullValue!=null){
             this.defaultNullValue=defaultNullValue;
         }else{
             this.defaultNullValue="";
         }
     }
+    public DataSetColumnMeta(String columnName,String columnCode,String columnType,Object defaultNullValue){
+        this(columnName,columnType,defaultNullValue);
+        this.columnCode=columnCode;
+    }
     public DataSetColumnMeta(String columnName,String columnType){
         this(columnName,columnType,null);
     }
@@ -48,24 +56,12 @@ public DataSetColumnMeta(String columnName,String columnType,boolean flushOut){
         this.flushOut=flushOut;
     }
     public DataSetColumnMeta(String columnName,String columnType,Object defaultNullValue,boolean required,String dateFormat){
-        this.columnName=columnName;
-        this.columnType=columnType;
-        if(defaultNullValue!=null){
-            this.defaultNullValue=defaultNullValue;
-        }else{
-            this.defaultNullValue="";
-        }
+        this(columnName,columnType,defaultNullValue);
         this.required=required;
         this.dateFormat=dateFormat;
     }
     public DataSetColumnMeta(String columnName,String columnType,Object defaultNullValue,boolean required){
-        this.columnName=columnName;
-        this.columnType=columnType;
-        if(defaultNullValue!=null){
-            this.defaultNullValue=defaultNullValue;
-        }else{
-            this.defaultNullValue="";
-        }
+        this(columnName,columnType,defaultNullValue);
         this.required=required;
     }
     public DataBaseColumnMeta toDataBaseColumnMeta(){
diff --git a/core/src/main/java/com/robin/core/hardware/MachineIdUtils.java b/core/src/main/java/com/robin/core/hardware/MachineIdUtils.java
@@ -149,10 +149,21 @@ public static String getHardDiskSerial() throws RuntimeException{
         BufferedReader reader=null;
         try{
             if(isWindows()){
-                serial=CommandLineExecutor.getInstance().executeCmdReturnAfterRow(Arrays.asList("powershell.exe","Get-WmiObject","-Class","Win32_DiskDrive","|","Select-Object","SerialNumber"),2);
+                serial=CommandLineExecutor.getInstance().executeCmdReturnAfterRow(Arrays.asList("powershell.exe","Get-WmiObject","-Class","Win32_DiskDrive","|","Select-Object","SerialNumber,DeviceId"),2);
                 if(serial.contains("\n") || serial.contains("\r\n")){
                     reader=new BufferedReader(new StringReader(serial));
-                    serial=reader.readLine();
+                    String tmpStr;
+                    String selSerial=null;
+                    int deviceId=10000;
+                    while((tmpStr=reader.readLine())!=null){
+                        String[] arr=tmpStr.split(" ");
+                        int currentdevice=Integer.parseInt(arr[1].substring(arr[1].length()-1));
+                        if(currentdevice<deviceId){
+                            selSerial=arr[0].trim();
+                            deviceId=currentdevice;
+                        }
+                    }
+                    serial=selSerial;
                 }
             }else if(isLinux()){
                 serial=CommandLineExecutor.getInstance().executeCmdReturnAfterRow(Arrays.asList("bash","-c","sudo lsblk -o SERIAL"),1);
diff --git a/core/src/main/resources/keyword.dat b/core/src/main/resources/keyword.dat

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ public void writeLong(long value) throws IOException{`
`44`	`44`	`}`
`45`	`45`	`public void writeGap() throws IOException{`
`46`	`46`	`write(0);`
	`47`	`+ count++;`
`47`	`48`	`}`
`48`	`49`	`public void writeNullTag() throws IOException{`
`49`	`50`	`//overwrite 0x00 with 0xff`
Original file line number	Diff line number	Diff line change
`@@ -240,4 +240,5 @@ public interface IjdbcDao {`
`240`	`240`	`<T extends BaseObject,P extends Serializable> int deleteByLogic(Class<T> clazz,List<P> pkObjs,String statusColumn,String statusValue) throws DAOException;`
`241`	`241`	`<T extends BaseObject> List<T> queryByVO(Class<T> type, BaseObject vo, String orderByStr);`
`242`	`242`	`List<Map<String, Object>> queryByNamedParam(String executeSql, Map<String, List<Object>> parmaMap) throws DAOException;`
	`243`	`+ long executeSqlWithReturn(final String sql, Object[] object);`
`243`	`244`	`}`
Original file line number	Diff line number	Diff line change
`@@ -811,6 +811,12 @@ public <T extends BaseObject,P extends Serializable> T getEntity(Class<T> clazz,`
`811`	`811`	`throw wrapException(ex);`
`812`	`812`	`}`
`813`	`813`	`}`
	`814`	`+ public long executeSqlWithReturn(final String sql, Object[] object)`
	`815`	`+ throws DAOException {`
	`816`	`+ KeyHolder keyHolder = new GeneratedKeyHolder();`
	`817`	`+ getJdbcTemplate().update(new SimplePrepareStatement(sql, object, lobHandler), keyHolder);`
	`818`	`+ return keyHolder.getKey().longValue();`
	`819`	`+ }`
`814`	`820`
`815`	`821`
`816`	`822`	`public void setSqlGen(BaseSqlGen sqlGen) {`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ public static void mapToObject(Object target, Map<String, Object> src, String...`
`179`	`179`	`}`
`180`	`180`
`181`	`181`
`182`		`- private static String wordCase(String value) {`
	`182`	`+ private static String camelCase(String value) {`
`183`	`183`	`return value.substring(0, 1).toUpperCase() + value.substring(1);`
`184`	`184`	`}`
`185`	`185`