Merge branch 'main' of http://47.100.54.81:3000/huojin/hefeihvac_java
# Conflicts: # youchain-system/src/main/java/com/youchain/AppRun.java # youchain-system/src/main/java/com/youchain/modules/license/LicenseValidate.javamain
							parent
							
								
									e0585fad31
								
							
						
					
					
						commit
						c9e6d8627a
					
				| 
						 | 
					@ -23,7 +23,7 @@ public class LicenseValidate {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public static void validate()  throws Exception{
 | 
					    public static void validate()  throws Exception{
 | 
				
			||||||
        //读取本地文件
 | 
					        //读取本地文件
 | 
				
			||||||
        /*FileProperties properties= SpringContextHolder.getBean(FileProperties.class);
 | 
					        FileProperties properties= SpringContextHolder.getBean(FileProperties.class);
 | 
				
			||||||
        log.info(properties.getPath().getPath());
 | 
					        log.info(properties.getPath().getPath());
 | 
				
			||||||
        String result="";
 | 
					        String result="";
 | 
				
			||||||
        try{
 | 
					        try{
 | 
				
			||||||
| 
						 | 
					@ -31,7 +31,7 @@ public class LicenseValidate {
 | 
				
			||||||
            result = fileReader.readString();
 | 
					            result = fileReader.readString();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        }catch (Exception e){
 | 
					        }catch (Exception e){
 | 
				
			||||||
            throw new BadRequestException("License不存在,请上传License");
 | 
					//            throw new BadRequestException("License不存在,请上传License");
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        log.error(result);
 | 
					        log.error(result);
 | 
				
			||||||
| 
						 | 
					@ -67,7 +67,7 @@ public class LicenseValidate {
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }catch (Exception e){
 | 
					        }catch (Exception e){
 | 
				
			||||||
            throw new BadRequestException("无效的License,请重新生成");
 | 
					            throw new BadRequestException("无效的License,请重新生成");
 | 
				
			||||||
        }*/
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue