marking
/
Learn.Archives.Web
19
0
Fork 0
Code Pull Requests Actions Releases Activity

Compare commits

merge into: marking:dev
Branches Tags
marking:master
marking:dev
marking:staging
...
pull from: marking:master
Branches Tags
marking:master
marking:dev
marking:staging

44 Commits
dev ... master

Author SHA1 Message Date
hy 589a28c98e Merge pull request 'dev' (#41) from dev into master 
Reviewed-on: #41
 2026-04-21 16:50:59 +08:00
hy d1504468d3 Merge pull request 'staging' (#40) from staging into master 
Reviewed-on: #40
 2025-12-09 18:28:12 +08:00
hy c4eb43769a Merge pull request 'dev' (#39) from dev into staging 
Reviewed-on: #39
 2025-12-09 18:27:56 +08:00
hy 7a0ae7886e Merge pull request 'staging' (#38) from staging into master 
Reviewed-on: #38
 2025-12-08 11:47:03 +08:00
hy 4da6835f40 Merge pull request 'dev' (#37) from dev into staging 
Reviewed-on: #37
 2025-12-08 11:46:42 +08:00
hy 29feac03a3 Merge pull request 'staging' (#36) from staging into master 
Reviewed-on: #36
 2025-11-28 10:36:37 +08:00
hy e7e5481d6b Merge pull request '修复 无法导入用户功能' (#35) from dev into staging 
Reviewed-on: #35
 2025-11-28 10:35:42 +08:00
hy ba2d248971 Merge pull request 'staging' (#34) from staging into master 
Reviewed-on: #34
 2025-11-27 17:32:57 +08:00
hy 0f158f35b4 Merge pull request 'dev' (#33) from dev into staging 
Reviewed-on: #33
 2025-11-27 17:07:46 +08:00
hy b42acd9208 Merge pull request 'staging' (#32) from staging into master 
Reviewed-on: #32
 2025-11-17 18:28:28 +08:00
hy 0b8cd890ba Merge pull request 'dev' (#31) from dev into staging 
Reviewed-on: #31
 2025-11-17 11:34:02 +08:00
hy 8ac62bef81 Merge pull request 'staging' (#30) from staging into master 
Reviewed-on: #30
 2025-11-11 17:50:02 +08:00
hy eed44c4c68 Merge pull request 'dev' (#29) from dev into staging 
Reviewed-on: #29
 2025-11-11 17:49:52 +08:00
hy 6b2aaa7aeb Merge pull request 'staging' (#27) from staging into master 
Reviewed-on: #27
 2025-10-16 10:51:15 +08:00
hy 3fd4026170 Merge pull request 'dev' (#26) from dev into staging 
Reviewed-on: #26
 2025-10-16 10:49:57 +08:00
hy a7477deb9f Merge pull request 'staging' (#25) from staging into master 
Reviewed-on: #25
 2025-10-14 15:44:51 +08:00
hy a93541cc15 Merge pull request '修复 角色页面 隐藏新增学校按钮' (#24) from dev into staging 
Reviewed-on: #24
 2025-10-14 15:44:38 +08:00
tiananlin 9f770e8487 更新 Dockerfiles/Dockerfile-production/Dockerfile 2025-10-14 11:38:50 +08:00
hy e75843bcf8 Merge pull request 'staging' (#23) from staging into master 
Reviewed-on: #23
 2025-10-14 11:13:16 +08:00
hy 67aa84d0b3 Merge pull request '新增 管理员导入功能' (#22) from dev into staging 
Reviewed-on: #22
 2025-10-14 11:08:03 +08:00
hy e2eb3b079e Merge pull request '修复 老师管理年级显示' (#21) from dev into staging 
Reviewed-on: #21
 2025-09-25 17:16:34 +08:00
hy 2df9611b90 Merge pull request 'dev' (#20) from dev into staging 
Reviewed-on: #20
 2025-09-25 17:05:32 +08:00
hy de8c416266 Merge pull request '优化 赴校任务超时时间' (#19) from dev into staging 
Reviewed-on: #19
 2025-09-25 16:41:34 +08:00
hy 7cf08fcf14 Merge pull request 'dev' (#18) from dev into staging 
Reviewed-on: #18
 2025-09-25 15:48:08 +08:00
hy fd2fcc2c1b Merge pull request '优化 班级成绩分析的 分段展示' (#17) from dev into staging 
Reviewed-on: #17
 2025-09-24 19:18:56 +08:00
hy 823a8defc8 Merge pull request 'dev' (#16) from dev into staging 
Reviewed-on: #16
 2025-09-14 15:47:28 +08:00
hy 63949500f6 Merge pull request 'dev' (#15) from dev into master 
Reviewed-on: #15
 2025-08-27 17:25:48 +08:00
hy 3ce926319b Merge pull request '新增 预览学校的功能' (#14) from dev into staging 
Reviewed-on: #14
 2025-08-27 17:19:39 +08:00
hy 5cad1c2d2b Merge pull request '修复 导入Excel时出现异常 未能获取到提示信息' (#13) from dev into staging 
Reviewed-on: #13
 2025-08-27 15:46:12 +08:00
hy f92ba97062 Merge pull request 'dev' (#12) from dev into staging 
Reviewed-on: #12
 2025-08-27 10:12:19 +08:00
hy 7aa4518673 Merge pull request '新增 edit时的学生类型' (#11) from dev into master 
Reviewed-on: #11
 2025-08-27 10:02:06 +08:00
hy f08e73a42e Merge pull request 'dev' (#10) from dev into master 
Reviewed-on: #10
 2025-08-27 09:25:08 +08:00
hy c80928a602 Merge pull request 'dev' (#9) from dev into staging 
Reviewed-on: #9
 2025-08-26 20:09:40 +08:00
hy 6ff7c1f06e Merge pull request 'dev' (#8) from dev into master 
Reviewed-on: #8
 2025-08-26 19:03:28 +08:00
hy d5d8961c8b Merge pull request 'dev' (#7) from dev into staging 
Reviewed-on: #7
 2025-08-26 18:58:58 +08:00
tiananlin bf49072325 更新 Dockerfiles/Dockerfile-production/Dockerfile 2025-08-26 15:22:12 +08:00
tiananlin 4a77cebe93 添加 Dockerfiles/Dockerfile-production/default.conf 2025-08-26 15:17:23 +08:00
tiananlin 96a74b0107 添加 Dockerfiles/Dockerfile-production/Dockerfile 2025-08-26 15:16:55 +08:00
hy 23b9f0a1d1 Merge pull request 'dev' (#6) from dev into staging 
Reviewed-on: #6
 2025-08-26 14:38:25 +08:00
hy f43d582530 Merge pull request 'dev' (#5) from dev into staging 
Reviewed-on: #5
 2025-08-26 10:23:47 +08:00
hy 832b6303f0 Merge pull request '完善 新的学生补助字段' (#4) from dev into staging 
Reviewed-on: #4
 2025-08-25 16:53:10 +08:00
tiananlin 0e7784970a Merge pull request '更新 Dockerfiles/Dockerfile-staging/default.conf' (#3) from dev into staging 
Reviewed-on: #3
 2025-08-25 15:31:30 +08:00
tiananlin 20cbc5b7b8 更新 Dockerfiles/Dockerfile-staging/default.conf 2025-08-25 15:30:48 +08:00
hy f8f6e298cd Merge pull request '删除 登录时的默认信息' (#2) from dev into staging 
Reviewed-on: #2
 2025-08-25 15:23:16 +08:00
1 changed files with 1 additions and 1 deletions
Show Stats Expand all files Collapse all files

2
Dockerfiles/Dockerfile-production/Dockerfile
View File

@ -32,7 +32,7 @@ FROM m.daocloud.io/docker.io/library/nginx:alpine
COPY --from=builder --chown=nginx:nginx /app/dist /usr/share/nginx/html COPY --from=builder --chown=nginx:nginx /app/dist /usr/share/nginx/html
# 复制 Nginx 配置 # 复制 Nginx 配置
COPY Dockerfiles/Dockerfile-staging/default.conf /etc/nginx/conf.d/default.conf COPY Dockerfiles/Dockerfile-production/default.conf /etc/nginx/conf.d/default.conf
# 暴露端口 # 暴露端口
EXPOSE 80 EXPOSE 80