diff --git a/.idea/xin-launcher.iml b/.idea/xin-launcher.iml index ec0b9e4..95afa5f 100644 --- a/.idea/xin-launcher.iml +++ b/.idea/xin-launcher.iml @@ -6,5 +6,6 @@ + \ No newline at end of file diff --git a/ReadMe.md b/ReadMe.md index 8746d8e..57614ba 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -21,3 +21,13 @@ - 优化记录日志信息 - 优化返回授权码授权异常信息提示 - 建议使用管理员身份启动,避免由于权限原因导致信息写入注册表失败 + +2024-09-03 + + 运行命令更新 + +2024-11-20 + + XinLauncher.ini文件新增配置项 + - is_client 该配置为 1 时 标识不加载对应鉴权数据模块 为空或其他值时进行校验 + - product_group_code 产品分组标识 为空时不进行校验 存在值时将进行产品分组数据信息校验 不一致时鉴权不通过 diff --git a/xin-launcher.zip b/xin-launcher.zip index 851698b..6a0a438 100644 Binary files a/xin-launcher.zip and b/xin-launcher.zip differ diff --git a/xin-launcher/conf/XinLauncher.ini b/xin-launcher/conf/XinLauncher.ini index 3d94b2a..dab83e8 100644 --- a/xin-launcher/conf/XinLauncher.ini +++ b/xin-launcher/conf/XinLauncher.ini @@ -10,3 +10,7 @@ login.pass=aeb6a04dfe285d98298f5666f02d2503 is_dev=1 maxconnections=10000 product_version=2.0 +# 产品分组标识 为空时不进行校验 存在值时将进行产品分组数据信息校验 不一致时鉴权不通过 +product_group_code= +# 该配置为 1 时 标识不加载对应鉴权数据模块 为空或其他值时进行校验 +is_client= diff --git a/xin-launcher/lib/xin-launcher.jar b/xin-launcher/lib/xin-launcher.jar index f3f874c..684182b 100644 Binary files a/xin-launcher/lib/xin-launcher.jar and b/xin-launcher/lib/xin-launcher.jar differ diff --git a/xin-launcher/register.bat b/xin-launcher/register.bat new file mode 100644 index 0000000..4ac4b8b --- /dev/null +++ b/xin-launcher/register.bat @@ -0,0 +1,6 @@ +@echo off +setlocal EnableDelayedExpansion +@rem set "LinkName=C:\ProgramData\Microsoft\Windows\Start Menu\Programs\StartUp\XinLauncher.lnk" +mshta VBScript:Execute("Set Shell=CreateObject(""WScript.Shell""):Set Link=Shell.CreateShortcut(Shell.SpecialFolders(""Startup"") & ""\XinLauncher.lnk""):Link.TargetPath=""%~dp0\run.bat"":Link.WorkingDirectory=""%~dp0\"":Link.Save:close") +pause +exit diff --git a/xin-launcher/run.bat b/xin-launcher/run.bat index 90be13c..39d2531 100644 --- a/xin-launcher/run.bat +++ b/xin-launcher/run.bat @@ -1,6 +1,27 @@ @echo off title Xin-launcher启动器(请勿关闭) -set CURRENT_DIR="%cd%" -set JAVA_HOME="%CURRENT_DIR%\..\..\..\DevelopTools\jdk1.8.0_51" +SETLOCAL +set "CURRENT_DIR=%cd%" + +set "CATALINA_HOME=%CURRENT_DIR%" + +set MAINPATH=%cd%\lib\xin-launcher.jar + +set JAVA_HOME="C:\project\test_environment\jdk1.8.0_191" + +echo CURRENT_DIR=%CURRENT_DIR% +echo JAVA_HOME=%JAVA_HOME% +echo MAINPATH=%MAINPATH% + +@rem 设置Java虚拟机参数 +set JAVA_VM=-hotspot +@rem 设置Java虚拟机所使用的内存 +set MEM_ARGS=-Xms128m -Xmx128m -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -XX:MaxDirectMemorySize=128m -Xss1024K +@rem start /b +taskkill /f /t /im javaw.exe CHCP 65001 -%JAVA_HOME%\bin\java -Xms1024m -Xmx1024m -Dfile.encoding=utf-8 -jar lib\xin-launcher.jar \ No newline at end of file +@rem 如果此行命令运行失败 使用下方命令 +start /b %JAVA_HOME%\bin\javaw %MEM_ARGS% -Dfile.encoding=UTF-8 -jar %MAINPATH% +@rem start /b %JAVA_HOME%\bin\javaw %MEM_ARGS% %MAINPATH% +:end +ENDLOCAL \ No newline at end of file