update

nginx/dev-192.168.10.39/nginx.conf

@@ -1,124 +1,107 @@
-
 user root;
 worker_processes auto;
 worker_cpu_affinity auto;
 worker_rlimit_nofile 65535;
 
 events {
-	worker_connections 65535;
-	accept_mutex off;
+    worker_connections 65535;
+    accept_mutex off;
 }
 
 http {
-	include mime.types;
-	default_type application/octet-stream;
-	sendfile on;
-
-
-	# 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  logs/access.log  main;
-	access_log off;
-
-
-	underscores_in_headers on;
-	tcp_nopush on;
-	client_max_body_size 100m;
-	keepalive_timeout 3600;
-	proxy_read_timeout 3600;
-	gzip on;
-	gzip_min_length 1k;
-	gzip_comp_level 4;
-	gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
-	gzip_vary on;
-
-	# =====================================================================
-
-	upstream basic {
-		server 192.168.10.39:8000;
-	}
-
-	upstream examwork {
-		server 192.168.10.39:8001;
-	}
-
-	upstream question-for-student {
-		server 192.168.10.39:8008;
-	}
-
-	upstream question-for-admin {
-		server 192.168.10.39:8008;
-	}
-
-	upstream oe-student {
-		server 192.168.10.39:8003;
-	}
-
-	upstream oe-admin-for-admin {
-		server 192.168.10.39:8013;
-	}
-
-	upstream oe-admin-for-student {
-		server 192.168.10.39:8013;
-	}
-
-	upstream oe-task {
-		server 192.168.10.39:8002;
-	}
-
-	upstream ws {
-		server 192.168.10.39:8010;
-	}
-
-	upstream marking {
-		server 192.168.10.39:8004;
-	}
-
-	upstream logic-marking {
-		server 192.168.10.39:8005;
-	}
-
-	upstream exchange {
-		server 192.168.10.39:8007;
-	}
-
-	upstream bridge {
-		server 192.168.10.39:8030;
-	}
-
-	upstream app-api {
-		server 192.168.10.39:8090;
-	}
-
-	upstream task {
-		server 192.168.10.39:8011;
-	}
-
-	upstream print {
-		server 192.168.10.39:8009;
-	}
-
-	upstream reports {
-		server 192.168.10.39:8015;
-	}
-
-	upstream api-limiter {
-                server 192.168.10.39:18080;
-        }
-
-	# =====================================================================
-
-	include sites/http80.conf;
-	#include sites/https443.conf;
-	include sites/v3.conf;
-	include sites/http7200.conf;
-	include sites/http7700.conf;
-	include sites/http7800.conf;
-	include sites/block_ips.conf;
-	include sites/http8099.conf;
-	include sites/http8088.conf;
-	include sites/http7100.conf;
-	include sites/http7102.conf;
-}
+    include mime.types;
+    default_type application/octet-stream;
+    sendfile on;
+
+    # 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  logs/access.log  main;
+    access_log off;
+
+    underscores_in_headers on;
+    tcp_nopush on;
+    client_max_body_size 100m;
+    keepalive_timeout 3600;
+    proxy_read_timeout 3600;
+    gzip on;
+    gzip_min_length 1k;
+    gzip_comp_level 4;
+    gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
+    gzip_vary on;
+
+    # =====================================================================
+
+    upstream examcloud-core-basic {
+        server 192.168.10.39:8000;
+    }
+
+    upstream examcloud-core-examwork {
+        server 192.168.10.39:8001;
+    }
+
+    upstream examcloud-core-questions {
+        server 192.168.10.39:8008;
+    }
+
+    upstream examcloud-core-questions-branch {
+        #server 192.168.10.39:18008;
+        server 192.168.10.39:8008;
+    }
+
+    upstream examcloud-core-oe-admin {
+        server 192.168.10.39:8013;
+    }
+
+    upstream examcloud-core-oe-admin-branch {
+        #server 192.168.10.39:18013;
+        server 192.168.10.39:8013;
+    }
+
+    upstream examcloud-core-oe-student {
+        server 192.168.10.39:8003;
+    }
+
+    upstream examcloud-core-oe-task {
+        server 192.168.10.39:8002;
+    }
+
+    upstream examcloud-core-marking {
+        server 192.168.10.39:8004;
+    }
+
+    upstream examcloud-core-reports {
+        server 192.168.10.39:8015;
+    }
+
+    upstream examcloud-core-print {
+        server 192.168.10.39:8009;
+    }
+
+    upstream examcloud-exchange {
+        server 192.168.10.39:8007;
+    }
+
+    upstream examcloud-app-api {
+        server 192.168.10.39:8090;
+    }
+
+    upstream examcloud-task {
+        server 192.168.10.39:8011;
+    }
+
+    upstream examcloud-bridge {
+        server 192.168.10.39:8030;
+    }
+
+    upstream examcloud-ws {
+        server 192.168.10.39:8010;
+    }
+
+    # =====================================================================
+
+    #include sites/http80.conf;
+    #include sites/https443.conf;
+    include sites/examcloud.conf;
 
+}

nginx/dev-192.168.10.39/sites/examcloud.conf

@@ -0,0 +1,175 @@
+server {
+    listen 80;
+    #listen 443 ssl;
+    #server_name *.dev39.qmth.com.cn dev39.qmth.com.cn;
+
+    ssl_certificate ssl/dev39.qmth.com.cn/fullchain.cer;
+    ssl_certificate_key ssl/dev39.qmth.com.cn/dev39.qmth.com.cn.key;
+
+    ssl_session_cache shared:SSL:1m;
+    ssl_session_timeout	5m;
+    ssl_ciphers	HIGH:!aNULL:!MD5;
+    ssl_prefer_server_ciphers on;
+    charset utf-8;
+    error_page 404 /40x.html;
+
+    location = / {
+        rewrite / /admin/ last;
+    }
+
+    location = /admin {
+        rewrite /admin /admin/ last;
+    }
+
+    location ^~ /admin/ {
+        alias /home/qmth/project/examcloud/static-new/admin/dist/;
+        try_files $uri $uri/ /admin/index.html;
+    }
+
+    location ^~ /admin/js/ {
+        alias /home/qmth/project/examcloud/static-new/admin/dist/js/;
+        try_files $uri $uri/ =404;
+    }
+
+    location = /oe-web {
+        rewrite /oe-web /oe-web/ last;
+    }
+
+    location ^~ /oe-web/ {
+        alias /home/qmth/project/examcloud/static-new/oe-web-v3/dist/;
+        try_files $uri $uri/ /oe-web/index.html;
+    }
+
+    location ^~ /oe-web/assets/ {
+        alias /home/qmth/project/examcloud/static-new/oe-web-v3/dist/assets/;
+        try_files $uri $uri/ =404;
+    }
+
+    location ^~ /models/ {
+        alias /home/qmth/project/examcloud/static-new/oe-web-v3/dist/models/;
+        try_files $uri $uri/ =404;
+    }
+
+    location ^~ /oe/facepp_api {
+        proxy_pass https://api-cn.faceplusplus.com/facepp/v3;
+    }
+
+    location ^~ /api/ecs_core/ {
+        proxy_pass http://examcloud-core-basic;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    }
+
+    location ^~ /api/ecs_exam_work/ {
+        proxy_pass http://examcloud-core-examwork;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    }
+
+    location ^~ /api/ecs_ques/ {
+        proxy_pass http://examcloud-core-questions;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    }
+
+    location /api/branch_ecs_ques/ {
+        proxy_pass http://examcloud-core-questions-branch/api/ecs_ques/;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    }
+
+    location ^~ /api/ecs_oe_admin/ {
+        proxy_pass http://examcloud-core-oe-admin;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    }
+
+    location /api/branch_ecs_oe_admin/ {
+        proxy_pass http://examcloud-core-oe-admin-branch/api/ecs_oe_admin/;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    }
+
+    location ^~ /api/ecs_oe_student/ {
+        proxy_pass http://examcloud-core-oe-student;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    }
+
+    location ^~ /api/ecs_oe_student_face/ {
+        proxy_pass http://examcloud-core-oe-task;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    }
+
+    location ^~ /api/ecs_marking/ {
+        proxy_pass http://examcloud-core-marking;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    }
+
+    location ^~ /api/ecs_reports/ {
+        proxy_pass http://examcloud-core-reports;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    }
+
+    location ^~ /api/exchange/ {
+        proxy_pass http://examcloud-exchange/;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    }
+
+    location ^~ /api/exchange/outer/ {
+        proxy_pass http://examcloud-exchange;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    }
+
+    location ^~ /api/exchange/inner/ {
+        proxy_pass http://examcloud-exchange;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    }
+
+    location ^~ /api/ecs_outlet/ {
+        proxy_pass http://examcloud-exchange;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    }
+
+    location ^~ /api/app-api/ {
+        proxy_pass http://examcloud-app-api;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    }
+
+    location ^~ /api/ctr/task/ {
+        proxy_pass http://examcloud-task;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    }
+
+    location ^~ /api/ecs_prt/ {
+        proxy_pass http://examcloud-core-print;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    }
+
+    location ^~ /cmcClient/ {
+        proxy_pass http://examcloud-bridge;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    }
+
+    location ^~ /api/ws/ {
+        proxy_pass http://examcloud-ws;
+        proxy_http_version 1.1;
+        proxy_connect_timeout 60s;
+        proxy_read_timeout 3600s;
+        proxy_send_timeout 12s;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+    }
+
+}

upgrade-202411/20241126至现在-待升级内容.txt

@@ -22,7 +22,8 @@ Redis部分
 ***** ***** ***** ***** ***** ***** *****
 三、配置文件变更
 ***** ***** ***** ***** ***** ***** *****
-暂无
+新增配置项：
+$report.mq-topic=examcloud_report_topic_prod
 
 ***** ***** ***** ***** ***** ***** *****
 四、菜单项变更
@@ -32,4 +33,4 @@ Redis部分
 ***** ***** ***** ***** ***** ***** *****
 五、其它变更（如：系统参数、环境、脚本。。。）
 ***** ***** ***** ***** ***** ***** *****
-暂无
+系统管理->参数配置->参数名:config4Edit1 添加值:OVERWRITE_PHOTO

upgrades/upgrade-202503/20250328至现在-待升级内容.txt

@@ -1,39 +0,0 @@
-
-release_v5.0.6
-
-***** ***** ***** ***** ***** ***** *****
-一、数据库变更（!!!任何!!!表或字段的变化罗列此处）
-***** ***** ***** ***** ***** ***** *****
-
-MySql部分
-暂无
-
-MongoDB部分
-暂无
-
-Redis部分
-暂无
-
-***** ***** ***** ***** ***** ***** *****
-二、数据割接部分
-***** ***** ***** ***** ***** ***** *****
-修复错误底照路径规则：
-暂无
-
-***** ***** ***** ***** ***** ***** *****
-三、配置文件变更
-***** ***** ***** ***** ***** ***** *****
-移除配置项：
-
-新增配置项：
-
-***** ***** ***** ***** ***** ***** *****
-四、菜单项变更
-***** ***** ***** ***** ***** ***** *****
-
-***** ***** ***** ***** ***** ***** *****
-五、其它变更（如：系统参数、环境、脚本。。。）
-***** ***** ***** ***** ***** ***** *****
-系统管理->参数配置->参数名:config4Edit1 添加值:OVERWRITE_PHOTO
-
-人脸抓拍比对任务调度参数支持：