From b40924a789f7ab38636a9347145f323c7ec21c2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E4=BF=8A=E5=9F=8E?= Date: Tue, 25 Feb 2025 11:04:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=98=E6=9B=B4sh=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E8=A1=8C=E5=B0=BE=E4=B8=BALF=EF=BC=8C=E8=A7=A3=E5=86=B3bash?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jshERP-boot/.gitattributes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jshERP-boot/.gitattributes b/jshERP-boot/.gitattributes index fe566d71e..7c7f32654 100644 --- a/jshERP-boot/.gitattributes +++ b/jshERP-boot/.gitattributes @@ -1,3 +1,4 @@ *.js linguist-language=Java *.css linguist-language=Java -*.html linguist-language=Java \ No newline at end of file +*.html linguist-language=Java +*.sh text eol=lf \ No newline at end of file From 5c1d9ee27d874bb415a96ec7df44568f6074ddff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E4=BF=8A=E5=9F=8E?= Date: Tue, 25 Feb 2025 11:37:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8C=87=E5=AE=9ABash=E8=A7=A3=E9=87=8A?= =?UTF-8?q?=E5=99=A8=EF=BC=8C=E9=81=BF=E5=85=8D=E5=9B=A0=E8=A7=A3=E9=87=8A?= =?UTF-8?q?=E5=99=A8=E4=B8=8D=E5=90=8C=E5=87=BA=E7=8E=B0=E4=B8=8D=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E7=9A=84=E5=87=BD=E6=95=B0=E8=AF=AD=E6=B3=95=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jshERP-boot/src/main/assembly/assembly.xml | 5 ++--- jshERP-boot/src/main/bin/run-manage.sh | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/jshERP-boot/src/main/assembly/assembly.xml b/jshERP-boot/src/main/assembly/assembly.xml index 4b3818dbf..298a4fa7d 100644 --- a/jshERP-boot/src/main/assembly/assembly.xml +++ b/jshERP-boot/src/main/assembly/assembly.xml @@ -3,8 +3,7 @@ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 - http://maven.apache.org/xsd/assembly-1.1.0.xsd -http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 "> + http://maven.apache.org/xsd/assembly-1.1.0.xsd "> bin @@ -38,7 +37,7 @@ http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 "> run-manage.sh - unix + lf ${project.basedir}/src/main/bin/ diff --git a/jshERP-boot/src/main/bin/run-manage.sh b/jshERP-boot/src/main/bin/run-manage.sh index 45d493de0..a349a383a 100644 --- a/jshERP-boot/src/main/bin/run-manage.sh +++ b/jshERP-boot/src/main/bin/run-manage.sh @@ -1,3 +1,5 @@ +#!/bin/bash + SERVER_NAME=jshERP readonly APP_HOME=${FILE_PATH:-$(dirname $(cd `dirname $0`; pwd))} #readonly JAVA_HOME=""