diff --git a/.idea/xin-launcher.iml b/.idea/xin-launcher.iml
index 797d18d..ec0b9e4 100644
--- a/.idea/xin-launcher.iml
+++ b/.idea/xin-launcher.iml
@@ -6,6 +6,5 @@
-
\ No newline at end of file
diff --git a/ReadMe.md b/ReadMe.md
index 2d8248c..8a0558d 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -1,4 +1,8 @@
2023-02-06
Xin-Laucher包更新后,下载的框架内容初始化登录账号密码已修改
旧账号密码: admin/111111
- 新账号密码: admin/CRTECH@2023laucher
+ 新账号密码: admin/CRTECH@2023laucher
+
+2023-10-09
+ Xin-laucher包更新后,需要在配置文件 xin-launcher > conf > XinLauncher.ini 中加上配置 product_version=2.0
+ 以上配置实时更新,下载此包时需要查看
diff --git a/xin-launcher.zip b/xin-launcher.zip
index 3eccb32..fe20bc5 100644
Binary files a/xin-launcher.zip and b/xin-launcher.zip differ
diff --git a/xin-launcher/apps/xinadmin/WEB-INF/lib/xin-admin.jar b/xin-launcher/apps/xinadmin/WEB-INF/lib/xin-admin.jar
index f921ed6..54724d7 100644
Binary files a/xin-launcher/apps/xinadmin/WEB-INF/lib/xin-admin.jar and b/xin-launcher/apps/xinadmin/WEB-INF/lib/xin-admin.jar differ
diff --git a/xin-launcher/apps/xinadmin/themes/css/main.css b/xin-launcher/apps/xinadmin/themes/css/main.css
index 37de1db..8349ed3 100644
--- a/xin-launcher/apps/xinadmin/themes/css/main.css
+++ b/xin-launcher/apps/xinadmin/themes/css/main.css
@@ -86,7 +86,7 @@ body {
.company-det {
padding: 10px;
- margin: 10px 20px 0px 20px;
+ margin: 10px 20px 0 20px;
}
.company-logo {
@@ -155,7 +155,7 @@ body {
}
.app-name {
- font-family: "微软雅黑";
+ font-family: "微软雅黑", serif;
font-size: 12pt;
color: #666666;
text-decoration: none;
@@ -164,14 +164,14 @@ body {
}
.app-des {
- font-family: "微软雅黑";
+ font-family: "微软雅黑", serif;
font-size: 14px;
line-height: 22px;
color: #999999;
}
.app-license {
- font-family: "微软雅黑";
+ font-family: "微软雅黑", serif;
font-size: 14px;
line-height: 28px;
color: #084aaf;
@@ -216,7 +216,7 @@ body {
}
.main {
- margin: 10px 0px auto;
+ margin: 10px 0 auto;
padding: 10px;
}
diff --git a/xin-launcher/conf/Dev-Hosts.xml b/xin-launcher/conf/Dev-Hosts.xml
new file mode 100644
index 0000000..baf72d7
--- /dev/null
+++ b/xin-launcher/conf/Dev-Hosts.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/xin-launcher/conf/XinLauncher.data b/xin-launcher/conf/XinLauncher.data
deleted file mode 100644
index a6be071..0000000
--- a/xin-launcher/conf/XinLauncher.data
+++ /dev/null
@@ -1 +0,0 @@
-cNSGlMwZy8GxLDTo3QxuAYdVS847cZkzMhg/elJWYfigvUT6qRoxruOwstcfHkMHh18o7e6t/8KVUTycWJ5YJbpmYIAQBDOnCLD3//z+RFFPKj56UGZl9gyii4poNjj6phEnQWQ0wSf0DAAiL59m4y26ZzadKfSIqxMQlVPlj4T9tuhaLtqFKPIVPPllhJd8/okdKBcFK0m9GyKu9RyjWFuaBbpnyYE4/h/PuBY8hv6+e9bZPbz0i7SdX9EFBqDE
\ No newline at end of file
diff --git a/xin-launcher/conf/XinLauncher.ini b/xin-launcher/conf/XinLauncher.ini
index f6bc509..3d94b2a 100644
--- a/xin-launcher/conf/XinLauncher.ini
+++ b/xin-launcher/conf/XinLauncher.ini
@@ -6,6 +6,7 @@ port=8080
charset=UTF-8
connectiontimeout=60000
login.edit=0
-login.pass=96e79218965eb72c92a549dd5a330112
-is_check=1
+login.pass=aeb6a04dfe285d98298f5666f02d2503
+is_dev=1
maxconnections=10000
+product_version=2.0
diff --git a/xin-launcher/lib/xin-launcher.jar b/xin-launcher/lib/xin-launcher.jar
index 52a1769..508dc71 100644
Binary files a/xin-launcher/lib/xin-launcher.jar and b/xin-launcher/lib/xin-launcher.jar differ
diff --git a/xin-launcher/xin-launcher.zip b/xin-launcher/xin-launcher.zip
deleted file mode 100644
index 583c6b4..0000000
Binary files a/xin-launcher/xin-launcher.zip and /dev/null differ