diff --git a/.env.dev b/.env.dev index 232f1c6b7..9d097189d 100644 --- a/.env.dev +++ b/.env.dev @@ -4,12 +4,12 @@ NODE_ENV=production VITE_DEV=true # 请求路径 -VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn' +VITE_BASE_URL='http://saas.yibeidl.cn' # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持S3服务 VITE_UPLOAD_TYPE=server # 上传路径 -VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload' +VITE_UPLOAD_URL='http://saas.yibeidl.cn/admin-api/infra/file/upload' # 接口地址 VITE_API_URL=/admin-api diff --git a/.env.local b/.env.local index 005d2f0d6..2364b0831 100644 --- a/.env.local +++ b/.env.local @@ -4,7 +4,7 @@ NODE_ENV=development VITE_DEV=true # 请求路径 -VITE_BASE_URL='http://localhost:48080' +VITE_BASE_URL='http://192.168.10.68:48081/' # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持 S3 服务 VITE_UPLOAD_TYPE=server diff --git a/.env.test b/.env.test index 7bf1b4175..9ce667508 100644 --- a/.env.test +++ b/.env.test @@ -4,7 +4,7 @@ NODE_ENV=production VITE_DEV=false # 请求路径 -VITE_BASE_URL='http://localhost:48080' +VITE_BASE_URL='http://sasa.jh-web.cn' # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持S3服务 VITE_UPLOAD_TYPE=server @@ -27,7 +27,7 @@ VITE_SOURCEMAP=false VITE_BASE_PATH=/admin-ui-vue3/ # 输出路径 -VITE_OUT_DIR=dist-test +VITE_OUT_DIR=dist # 商城H5会员端域名 VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn' diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..d2860c2dc --- /dev/null +++ b/Dockerfile @@ -0,0 +1,16 @@ +FROM nginx:latest + +ENV TZ=Asia/Shanghai + +#创建app目录 +WORKDIR /app + +COPY ./dist/ /app + +#COPY ./ssl/* /etc/nginx + +ADD ./nginx.conf /etc/nginx/nginx.conf + +EXPOSE 80 + +CMD ["nginx", "-g", "daemon off;"] diff --git a/nginx.conf b/nginx.conf new file mode 100644 index 000000000..3e583db0a --- /dev/null +++ b/nginx.conf @@ -0,0 +1,46 @@ +user nginx; +worker_processes 1; +error_log /var/log/nginx/error.log warn; +pid /var/run/nginx.pid; +events { + worker_connections 1024; +} +http { + include /etc/nginx/mime.types; + client_max_body_size 0; + default_type application/octet-stream; + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + access_log /var/log/nginx/access.log main; + sendfile on; + keepalive_timeout 65; + + server { + listen 80; + server_name saas.yibeidl.cn; ## 重要!!!修改成你的外网 IP/域名 + + location / { ## 前端项目 + root /app; + index index.html index.htm; + try_files $uri $uri/ /index.html; + } + + location /admin-api/ { ## 后端项目 - 管理后台 + proxy_pass http://specialty:48080/admin-api/; ## 重要!!!proxy_pass 需要设置为后端项目所在服务器的 IP + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header REMOTE-HOST $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } + + location /app-api/ { ## 后端项目 - 用户 App + proxy_pass http://specialty:48080/app-api/; ## 重要!!!proxy_pass 需要设置为后端项目所在服务器的 IP + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header REMOTE-HOST $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } + + } +} \ No newline at end of file diff --git a/src/views/Login/SocialLogin.vue b/src/views/Login/SocialLogin.vue index eff59ba64..82bad646c 100644 --- a/src/views/Login/SocialLogin.vue +++ b/src/views/Login/SocialLogin.vue @@ -196,9 +196,9 @@ const loginData = reactive({ captchaEnable: import.meta.env.VITE_APP_CAPTCHA_ENABLE !== 'false', tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE !== 'false', loginForm: { - tenantName: '芋道源码', - username: 'admin', - password: 'admin123', + tenantName: '', + username: '', + password: '', captchaVerification: '', rememberMe: false }