diff --git a/backend/application.yaml b/backend/application.yaml index 4ac4425..1a845b5 100644 --- a/backend/application.yaml +++ b/backend/application.yaml @@ -27,7 +27,7 @@ jetty: security: tokenName: token - timeout: 3600 + timeout: 36000 # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) # 允许同一账号并发登录,则系统参数 SessionOnlyOne 有效,亦可踢人下线并多了弹框提示功能 isConcurrent: true diff --git a/backend/src/main/resources/application.yaml b/backend/src/main/resources/application.yaml index 4ac4425..eaba89b 100644 --- a/backend/src/main/resources/application.yaml +++ b/backend/src/main/resources/application.yaml @@ -23,7 +23,7 @@ jetty: #结合ftp使用,或用nginx代理ftp路径 #staticPath: E:/project/NutzWk/upload #开发模式静态资源 - staticPathLocal: E:/project/company/hmc_gbhd/src/main/resources/static + staticPathLocal: E:/projects/hmc_gbhd/src/main/resources/static security: tokenName: token @@ -35,7 +35,7 @@ security: isShare: true redis: - host: 192.168.21.207 + host: 127.0.0.1 port: 6379 timeout: 2000 max_redir: 10 @@ -69,7 +69,7 @@ xsssql: beetl: RESOURCE: #本地路径,开发时设置本地路径,便于调试 - rootLocal: E:/project/company/hmc_gbhd/src/main/resources/views/ + rootLocal: E:/projects/hmc_gbhd/src/main/resources/views/ root: views/ DELIMITER_STATEMENT_START: '' diff --git a/frontend/vite.config.js b/frontend/vite.config.js index e57f9e6..b27bc7e 100644 --- a/frontend/vite.config.js +++ b/frontend/vite.config.js @@ -28,13 +28,13 @@ export default defineConfig({ } }, server: { - // https: { - // cert: fs.readFileSync(path.join(__dirname, 'src/ssl/localhost+2.pem')), - // key: fs.readFileSync(path.join(__dirname, 'src/ssl/localhost+2-key.pem')) - // }, + /* https: { + cert: fs.readFileSync(path.join(__dirname, 'src/ssl/localhost+2.pem')), + key: fs.readFileSync(path.join(__dirname, 'src/ssl/localhost+2-key.pem')) + },*/ proxy: { '/api': { - target: 'http://192.168.41.118:9090', + target: 'http://192.168.41.126:9090', changeOrigin: true, rewrite: (path) => path.replace(/^\/api/, '') }