From ec24992ba50793d7917fd5c1ebe0b064ea2f0c88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E6=89=BF?= <guocheng@xinyingpower.com>
Date: Fri, 14 Feb 2025 13:40:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jkpg/centos7/setup.sh  |  8 ++++++++
 jkpg/package/jkpg.conf | 28 +++++++++++++---------------
 jkpg/setup.ini         |  2 +-
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/jkpg/centos7/setup.sh b/jkpg/centos7/setup.sh
index ae10023..523a3fe 100644
--- a/jkpg/centos7/setup.sh
+++ b/jkpg/centos7/setup.sh
@@ -167,7 +167,15 @@ installNewJKPG(){
     unzip -q package/static.zip -d ${JKPG_HOME}/
     unzip -q package/filestore.zip -d ${JKPG_HOME}/
 
+    groupadd sftpuser
+    useradd -d /home/sftpuser -g sftpuser sftpuser
+    echo "sftpuser:123456" | chpasswd
+    ln -s ${JKPG_HOME}/filestore /home/sftpuser/filestore
+    chown -R sftpuser:sftpuser /home/sftpuser/filestore
+    chown -R sftpuser:sftpuser ${JKPG_HOME}/filestore
+
     cp package/jkpg.conf ${BASE_DIR}/conf
+	sed -i 's#/home/xydl#'${BASE_DIR}'#g' ${BASE_DIR}/conf/jkpg.conf
     cp package/application.properties ${JKPG_HOME}/
     cp package/jdbc.properties ${JKPG_HOME}/
     cp package/redis.properties ${JKPG_HOME}/
diff --git a/jkpg/package/jkpg.conf b/jkpg/package/jkpg.conf
index d4fba8a..dde9ffc 100644
--- a/jkpg/package/jkpg.conf
+++ b/jkpg/package/jkpg.conf
@@ -1,28 +1,26 @@
 server {
-	listen       90;
+	listen       80;
 	server_name  localhost;
 	add_header 'Access-Control-Allow-Origin' '*';
 	add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+	proxy_set_header Upgrade $http_upgrade;
+	proxy_set_header Connection "upgrade";
 
 	location / {
-		root  /home/xydl/jkpg/static;
+	    root  /home/xydl/jkpg/static;
 		index index.html;
 	}
 
 	location /jkpg-api/ {
-	   proxy_pass http://127.0.0.1:8080/;
+		proxy_pass http://127.0.0.1:8080/;
 	}
-
-	location /data/sftp/picbak {
-		root   /;
-		index  index.html index.htm;
-	}
-
-	location /api/sysLoginRemoteController/login {
-		proxy_pass http://192.168.50.200:8080/sysLoginRemoteController/login;
-	}
-
-	location /api/modelFile/ {
-			proxy_pass http://192.168.50.200:8022/;
+	
+	
+	location /filestore {
+		alias  /home/xydl/jkpg/filestore;
+		autoindex on;
 	}
+	
+	
+	
 }
diff --git a/jkpg/setup.ini b/jkpg/setup.ini
index 60125f0..8f2d7db 100644
--- a/jkpg/setup.ini
+++ b/jkpg/setup.ini
@@ -35,4 +35,4 @@ NGINX_INS=1
 ### 是否安装自带的Redis ###
 REDIS_INS=1
 ### Redis的密码 ###
-REDIS_PASS=123456
+REDIS_PASS=
\ No newline at end of file