Commit Graph

48 Commits

Author SHA1 Message Date
28810ecff3 添加了前端frontend代码 2025-11-21 13:06:11 +08:00
0f50e2ccd1 Merge remote-tracking branch 'origin/main-framework' into develop-business-css 2025-11-21 11:31:39 +08:00
aec6f41b25 Merge pull request 'develop-framework' (#8) from develop-framework into main-framework
Reviewed-on: #8
2025-11-21 10:29:51 +08:00
30642e95c0 修改了忽略文件 2025-11-21 10:24:05 +08:00
4b94be1b4a chore: stop tracking generated assets per .gitignore (static/ and business-css/target) 2025-11-21 10:18:55 +08:00
e8f1f576bf Merge framework directory from develop-business-css into develop-framework 2025-11-21 10:07:17 +08:00
507cc6a6d2 整理和前后端端代码及框架 2025-11-21 10:04:00 +08:00
f2e6cc67f3 测试提交 2025-11-20 16:42:09 +08:00
6fba87f156 Merge remote-tracking branch 'origin/main-framework' into develop-business-css 2025-11-12 18:15:45 +08:00
4bae2b7c03 修改了一个告警错误 2025-11-12 18:14:38 +08:00
3ae1e7b1f9 Merge pull request 'develop-framework' (#7) from develop-framework into main-framework
Reviewed-on: #7
2025-11-12 17:41:02 +08:00
3a8b721d7c fix:初始化代码 2025-11-10 11:41:42 +08:00
a79f0bd0d3 fix:修改sass运行警告问题 2025-11-10 10:59:46 +08:00
63d41e11a6 增加了分析模拟系统模块框架 2025-11-09 22:55:49 +08:00
48bca56d15 Merge remote-tracking branch 'origin/main-framework' into develop-business-css 2025-11-09 22:06:32 +08:00
0f23ed2024 Merge pull request 'develop-framework' (#6) from develop-framework into main-framework
Reviewed-on: #6
2025-11-09 22:05:32 +08:00
a80ddcd2eb Merge branch 'main-framework' into develop-framework 2025-11-09 22:00:34 +08:00
d962eadafc 更新了数据库连接frameworkdb2023 2025-11-09 21:57:40 +08:00
fc4d5fc2cd 增加了从main-framework分支同步脚本 2025-11-09 21:48:30 +08:00
16549de421 Merge branch 'main-framework' into develop-business-css 2025-11-09 21:43:52 +08:00
d790992125 Merge pull request '增加了数据库初始化脚本处理' (#4) from develop-framework into main-framework
Reviewed-on: #4
2025-11-09 20:43:08 +08:00
9397ba32b6 增加了数据库初始化脚本处理 2025-11-09 20:41:38 +08:00
a14bdfd804 Merge pull request 'docs:测试从开发分支合并到主分支' (#3) from develop-framework into main-framework
Reviewed-on: #3
2025-11-09 18:59:12 +08:00
64929f620c docs:测试提交 2025-11-09 18:51:58 +08:00
3079ca2a44 Merge pull request 'develop-framework' (#2) from develop-framework into main-framework
Reviewed-on: #2
2025-11-09 18:38:11 +08:00
6dee0c43e8 Merge branch 'main-framework' into develop-framework 2025-11-09 18:29:31 +08:00
1d93c13d62 Merge branch 'develop-framework' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into develop-framework 2025-11-09 16:34:18 +08:00
ProjectFrameWork2025
353324515a docs:修改了develop-framework 分支 Git 操作指南 2025-11-09 16:28:59 +08:00
ProjectFrameWork2025
b8a2635707 docs:添加了开发分支GIT操作指南 2025-11-09 16:25:49 +08:00
ProjectFrameWork2025
96d29aff64 更新了git忽略文件 2025-11-09 16:13:16 +08:00
ProjectFrameWork2025
745a270db1 更新了框架开发,并进行了文档整合 2025-11-09 16:11:35 +08:00
ProjectFrameWork2025
4a16886686 清理了develop-framework 2025-11-09 15:42:55 +08:00
ProjectFrameWork2025
478b5deaba 清理main-framework项目 2025-11-09 15:39:10 +08:00
ProjectFrameWork2025
dbc4804610 提交main分支 2025-11-09 15:33:38 +08:00
ProjectFrameWork2025
4dadab0990 chore(main-framework): remove non-framework dirs and keep aggregator for framework 2025-11-09 15:31:59 +08:00
ProjectFrameWork2025
afdfcf29a1 重新整合了项目结构 2025-11-09 14:54:47 +08:00
ProjectFrameWork2025
93bd427608 merge: resolve root pom conflict by adopting aggregator parent 2025-11-09 14:48:33 +08:00
ProjectFrameWork2025
ca90144a53 chore(repo): initialize monorepo (framework + business-css + docs) 2025-11-09 14:47:10 +08:00
localuser
e5031ed8bb 修正路径错误 2025-11-08 21:46:55 +08:00
localuser
38b171657c Merge branch 'main' of http://121.37.111.42:3000/ThbTech/ProjectFrameWork2025 2025-11-08 21:04:23 +08:00
localuser
abf51a7c96 修改了前后端的代码,集成打包配置。 2025-11-08 21:04:11 +08:00
d89b94bb0c 更新前端 2025-11-08 13:31:33 +08:00
54c279d20c 合并冲突 2025-11-08 11:37:30 +08:00
20625f7e9a 添加前端 2025-11-08 11:32:46 +08:00
localuser
33e88eabd6 添加了前端代码 2025-11-08 11:21:31 +08:00
localuser
8cae29f3b2 Initialize app-only repo 2025-11-08 10:26:37 +08:00
03729926c8 前端目录 2025-11-07 22:35:45 +08:00
7de982d150 refactor: replace @Value(file-space.system) with @ConfigurationProperties
feat: add Actuator/Micrometer Prometheus and Springdoc defaults

build(app): fix MyBatis dependency convergence; relax enforcer for Maven 3.6.3

chore: add quartz.properties example and Dockerfile; remove duplicate websocket dep
2025-11-07 22:30:59 +08:00