Dockerfile添加时区设置

修改前端指向SAE的後端地址
修復api重複
2026-04-15 16:09:05 +08:00 · 2026-04-14 14:40:01 +08:00 · 2026-04-14 13:04:10 +08:00 · 2026-04-14 11:56:26 +08:00 · 2026-04-14 10:51:38 +08:00 · 2026-04-14 09:39:40 +08:00
79 changed files with 84 additions and 82 deletions
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -8,6 +8,10 @@ COPY package*.json ./

 # 安装所有依赖 (包括开发依赖)
 RUN npm ci
+# 设置时区
+RUN apk add --no-cache tzdata \
+ && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+ && echo "Asia/Shanghai" > /etc/timezone

 # 复制源代码
 COPY . .
--- a/backend/src/tmpclaude-46a5-cwd
+++ b/backend/src/tmpclaude-46a5-cwd
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system/backend/src
--- a/backend/src/tmpclaude-b0af-cwd
+++ b/backend/src/tmpclaude-b0af-cwd
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system/backend/src
--- a/backend/src/tmpclaude-d3fd-cwd
+++ b/backend/src/tmpclaude-d3fd-cwd
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system/backend/src
--- a/backend/tmpclaude-02c4-cwd
+++ b/backend/tmpclaude-02c4-cwd
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system/backend
--- a/backend/tmpclaude-043a-cwd
+++ b/backend/tmpclaude-043a-cwd
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system/backend
--- a/backend/tmpclaude-0599-cwd
+++ b/backend/tmpclaude-0599-cwd
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system/backend
--- a/backend/tmpclaude-0fee-cwd
+++ b/backend/tmpclaude-0fee-cwd
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system/backend
--- a/backend/tmpclaude-1aba-cwd
+++ b/backend/tmpclaude-1aba-cwd
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system/backend
--- a/backend/tmpclaude-2026-cwd
+++ b/backend/tmpclaude-2026-cwd
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system/backend
--- a/backend/tmpclaude-21bf-cwd
+++ b/backend/tmpclaude-21bf-cwd
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system/backend
--- a/backend/tmpclaude-3341-cwd
+++ b/backend/tmpclaude-3341-cwd
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system/backend
--- a/backend/tmpclaude-3d35-cwd
+++ b/backend/tmpclaude-3d35-cwd
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system/backend
--- a/backend/tmpclaude-4785-cwd
+++ b/backend/tmpclaude-4785-cwd
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system/backend
--- a/backend/tmpclaude-47ab-cwd
+++ b/backend/tmpclaude-47ab-cwd
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system/backend
--- a/backend/tmpclaude-4cd8-cwd
+++ b/backend/tmpclaude-4cd8-cwd
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system/backend
--- a/backend/tmpclaude-53c5-cwd
+++ b/backend/tmpclaude-53c5-cwd
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system/backend
--- a/backend/tmpclaude-694c-cwd
+++ b/backend/tmpclaude-694c-cwd
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system/backend
--- a/backend/tmpclaude-7448-cwd
+++ b/backend/tmpclaude-7448-cwd
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system/backend
--- a/backend/tmpclaude-83c4-cwd
+++ b/backend/tmpclaude-83c4-cwd
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system/backend
--- a/backend/tmpclaude-8dfc-cwd
+++ b/backend/tmpclaude-8dfc-cwd
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system/backend
--- a/backend/tmpclaude-9f46-cwd
+++ b/backend/tmpclaude-9f46-cwd
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system/backend
--- a/backend/tmpclaude-a119-cwd
+++ b/backend/tmpclaude-a119-cwd
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system/backend
--- a/backend/tmpclaude-b1f0-cwd
+++ b/backend/tmpclaude-b1f0-cwd
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system/backend
--- a/backend/tmpclaude-c361-cwd
+++ b/backend/tmpclaude-c361-cwd
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system/backend
--- a/backend/tmpclaude-ca77-cwd
+++ b/backend/tmpclaude-ca77-cwd
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system/backend
--- a/backend/tmpclaude-d5fe-cwd
+++ b/backend/tmpclaude-d5fe-cwd
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system/backend
--- a/backend/tmpclaude-dc44-cwd
+++ b/backend/tmpclaude-dc44-cwd
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system/backend
--- a/backend/tmpclaude-e63d-cwd
+++ b/backend/tmpclaude-e63d-cwd
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system/backend
--- a/backend/tmpclaude-e6a4-cwd
+++ b/backend/tmpclaude-e6a4-cwd
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system/backend
--- a/backend/tmpclaude-fe0a-cwd
+++ b/backend/tmpclaude-fe0a-cwd
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system/backend
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -75,7 +75,7 @@ services:
    depends_on:
      - backend
    environment:
-      VITE_API_BASE_URL: http://47.238.126.111:33001
+      VITE_API_BASE_URL: ''
      VITE_API_URL: http://backend:3001
    ports:
      - "2000:3000"
@@ -91,6 +91,27 @@ services:
      retries: 3
      start_period: 30s

+  # Nginx反向代理服务
+  nginx:
+    image: nginx:alpine
+    container_name: performance-nginx
+    restart: unless-stopped
+    depends_on:
+      - frontend
+      - backend
+    ports:
+      - "80:80"
+    volumes:
+      - ./nginx.conf:/etc/nginx/nginx.conf:ro
+    networks:
+      - app-network
+    healthcheck:
+      test: ["CMD", "nginx", "-t"]
+      interval: 30s
+      timeout: 5s
+      retries: 3
+      start_period: 10s
+
 # 定义网络
 networks:
  app-network:
--- a/frontend/.env.production
+++ b/frontend/.env.production
@@ -0,0 +1,7 @@
+# 前端生产环境配置
+# 构建时使用的环境变量
+
+# API 基础 URL - 使用阿里云NLB负载均衡器
+VITE_API_BASE_URL=http://nlb-y7wvnvbyb726t5m4bz.cn-hongkong.nlb.aliyuncsslbintl.com:3001
+
+# 其他环境变量可根据需要添加
--- a/frontend/src/api/http.ts
+++ b/frontend/src/api/http.ts
@@ -3,7 +3,8 @@ import axios from 'axios';
 const TOKEN_KEY = 'auth_token';

 const http = axios.create({
-  baseURL: import.meta.env.VITE_API_BASE_URL || 'http://localhost:33001',
+  // 🔥 核心修改
+  baseURL: import.meta.env.VITE_API_BASE_URL || '',
  timeout: 15000,
 });

@@ -25,7 +26,6 @@ http.interceptors.response.use(
  (error) => {
    const status = error?.response?.status;
    if (status === 401 || status === 403) {
-      // Clear stored credentials and redirect to login
      localStorage.removeItem(TOKEN_KEY);
      localStorage.removeItem('auth_user');
      window.location.href = '/login';
--- a/frontend/src/pages/manager/PerformanceReview.tsx
+++ b/frontend/src/pages/manager/PerformanceReview.tsx
@@ -24,7 +24,7 @@ import {
  ArrowLeftOutlined,
 } from '@ant-design/icons';
 import { useParams, useNavigate } from 'react-router-dom';
-import { PerformanceRecord } from '../../api/performance';
+import { PerformanceRecord, PerformanceItemDetail } from '../../api/performance';
 import http from '../../api/http';
 import { useIsMobile } from '../../hooks/useBreakpoint';
 import dayjs from 'dayjs';
@@ -85,7 +85,7 @@ const PerformanceReview: React.FC = () => {

      // Initialize form with existing manager scores if available
      const itemScores: Record<string, ItemScoreForm> = {};
-      data.performanceItems?.forEach((item) => {
+      data.performanceItems?.forEach((item: PerformanceItemDetail) => {
        itemScores[item.itemName] = {
          managerScore: item.managerScore ?? item.aiScore ?? item.selfScore ?? 0,
          scoreExplanation: item.managerExplanation ?? '',
--- a/frontend/src/pages/manager/SubordinateList.tsx
+++ b/frontend/src/pages/manager/SubordinateList.tsx
@@ -42,12 +42,12 @@ interface SubordinateRecord extends PerformanceRecord {
  userPosition?: string;
 }

-interface PageResult<T> {
-  list: T[];
-  total: number;
-  page: number;
-  pageSize: number;
-}
+// interface PageResult<T> {
+//   list: T[];
+//   total: number;
+//   page: number;
+//   pageSize: number;
+// }

 const SubordinateList: React.FC = () => {
  const navigate = useNavigate();
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -4,12 +4,19 @@ import react from '@vitejs/plugin-react';
 export default defineConfig({
  plugins: [react()],
  server: {
+    host: '0.0.0.0', // 监听所有网络接口
    port: 3000,
+    allowedHosts: 'all',
    proxy: {
      '/api': {
        target: process.env.VITE_API_URL || 'http://localhost:33001',
        changeOrigin: true,
      },
    },
+    hmr: {
+      host: 'performance-appraisal.excn.top',
+      protocol: 'wss',
+      clientPort: 443,
+    },
  },
 });
--- a/nginx.conf
+++ b/nginx.conf
@@ -0,0 +1,34 @@
+server {
+    listen 80;
+    server_name performance-appraisal.excn.top;
+
+    if ($http_x_forwarded_proto = "http") {
+        return 301 https://$server_name$request_uri;
+    }
+
+    # 🔥 API（必须放前面 + ^~）
+    location ^~ /api/ {
+
+        rewrite ^/api/api/(.*)$ /api/$1 break;
+
+        proxy_pass http://backend:3001/;
+
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;
+
+        add_header X-Debug-API "hit-api";
+    }
+
+    # 前端
+    location / {
+        proxy_pass http://frontend:3000;
+
+        proxy_set_header Host $host;
+
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+    }
+}
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/c/Users/99095/Desktop/优一科技/performance-evaluation-system
Author	SHA1	Message	Date
zhuyu	80a88dfd58	Dockerfile添加时区设置	2026-04-15 16:09:05 +08:00
zhuyu	3a9b552681	修改前端指向SAE的後端地址	2026-04-14 14:40:01 +08:00
zhuyu	c48e8716ae	修復api重複	2026-04-14 13:04:10 +08:00
zhuyu	c4a8232226	update frontend api and nginx config	2026-04-14 11:56:26 +08:00
zhuyu	cf708dde75	修改vite配置	2026-04-14 10:51:38 +08:00
zhuyu	d4ab6db42e	增加nginx代理，https域名	2026-04-14 09:39:40 +08:00
zhuyu	c7ee52a1a1	正式环境代码	2026-04-13 14:40:45 +08:00
				`@@ -1 +0,0 @@`
				`/c/Users/99095/Desktop/优一科技/performance-evaluation-system/backend/src`