Commit Graph
120 Commits
Author SHA1 Message Date
lewis_yan 0dc5a3d730 fix: add OpenSSL and Kerberos dependencies for msodbcsql18 driver
The ODBC Driver 18 requires libssl, libcrypto, and Kerberos libraries
to function. Also set LD_LIBRARY_PATH to include the driver lib64 directory.
2026-04-01 16:07:06 +08:00
lewis_yan c146409012 fix: manually register ODBC Driver 18 by appending to odbcinst.ini
Instead of using odbcinst command (location uncertain), directly append
driver config to /etc/odbcinst.ini
2026-04-01 15:56:25 +08:00
lewis_yan f3d367db02 fix: remove unnecessary odbcinst copy, use system-installed version
The odbcinst binary is provided by unixodbc installed in the runtime
image, not copied from builder.
2026-04-01 15:50:54 +08:00
lewis_yan 8e62124695 fix: copy odbcinst binary from builder to runtime image
The odbcinst binary is installed in /usr/bin/ by unixodbc, not
/usr/local/bin/. Copy it explicitly to the runtime image.
2026-04-01 15:48:25 +08:00
lewis_yan e65bc8b8b1 fix: use libodbc2 instead of libodbc1 for Debian Trixie 2026-04-01 15:44:59 +08:00
lewis_yan 5f4d27952a fix: register ODBC Driver 18 in runtime image
The msodbcsql18 driver needs to be registered with odbcinst so that
unixODBC can find it when pyodbc connects to SQL Server.
2026-04-01 15:30:46 +08:00
lewis_yan 5f37a9391b fix: use ODBC Driver 18 for SQL Server instead of Driver 17
The settings.py is configured to use "ODBC Driver 18 for SQL Server",
so we need to install msodbcsql18 package.
2026-04-01 15:10:59 +08:00
lewis_yan 065278a15f fix: add unixodbc runtime library to Dockerfile
The runtime image needs libodbc.so.2 for pyodbc to work with SQL Server.
2026-04-01 15:06:03 +08:00
lewis_yan 8c7761ed26 fix: correct msodbcsql17 library path in Dockerfile
The msodbcsql17 package installs to /opt/microsoft/msodbcsql17/, not
/usr/lib/x86_64-linux-gnu/. Copy from the correct path in runtime image.
2026-04-01 15:02:16 +08:00
allen_xiong 670bb9c12f Merge branch 'develop' into 'develop'
新增 - 所有供应商均提交报价邮件通知采购商;供应商用户信息表及相应序列化器

See merge request pisteams/pis!33
2026-04-01 06:49:42 +00:00
nebula_chen c3ecfbfd56 实现询价操作日志查询接口;实现前端页面“询价操作日志查询” 2026-04-01 14:47:31 +08:00
lewis_yan 83fa2ea313 chore: remove Jenkins build image stage use --no-cache 2026-04-01 14:45:48 +08:00
lewis_yan 0a6e44d3de chore: update dockerfile no cache 2026-04-01 14:42:39 +08:00
lewis_yan 38d7da3762 fix: copy ODBC driver libraries to runtime image in backend Dockerfile
msodbcsql17 and its dependencies (libodbc.so.2, libodbcinst.so.2,
libmsodbcsql-17.so, libiconv.so.2, libcharset.so.1) were only installed
in the builder stage but not copied to the runtime image, causing
"libodbc.so.2: cannot open shared object file" at startup.
2026-04-01 14:40:44 +08:00
lewis_yan 08e3767d6b chore: use /api proxy in web .env.production
Switch VITE_API_URL from direct backend URL to /api proxy,
allowing nginx to handle routing to the backend container.
2026-04-01 11:47:40 +08:00
nebula_chen 0424a3e3f4 补充询价操作履历表更新逻辑;修复前端bug--报价单仅拉起10条数据;杂采报价相应表结构名更新前缀pis_misc_ 2026-04-01 11:02:35 +08:00
lewis_yan 0a541826d4 chore: remove redundant Install & Build stage (Docker handles build) 2026-04-01 10:58:51 +08:00
lewis_yan a44a0d847e fix: correct COPY paths in web Dockerfile (build context is project root) 2026-04-01 10:54:26 +08:00
lewis_yan 30ba17c91e chore: use pnpm instead of yarn in Jenkinsfile 2026-04-01 10:53:43 +08:00
lewis_yan cf22b8cfe5 chore: use pnpm instead of yarn in web Dockerfile 2026-04-01 10:51:25 +08:00
lewis_yan e0545af483 chore: restore Dockerfiles and update Jenkinsfile paths
- Add web/Dockerfile for frontend image build
- Add backend/Dockerfile for backend image build
- Update Jenkinsfile paths from docker_env/ to web/ and backend/

Note: docker_env directory was removed; Dockerfiles now placed in respective app directories.
2026-04-01 10:50:06 +08:00
lewis_yan 56aca2107b chore: add pnpm-lock.yaml for faster builds 2026-04-01 10:39:57 +08:00
lewis_yan 9ee8a04714 chore: remove docker_env directory
部署配置已迁移到独立仓库
2026-04-01 10:35:43 +08:00
lewis_yan f50c55408d fix: push latest tag after build 2026-04-01 10:28:10 +08:00
lewis_yan dfe5284ba1 fix: push latest tag after build 2026-04-01 10:28:00 +08:00
lewis_yan ea17214803 chore: remove docker-compose files
Docker compose is no longer used for deployment.
2026-04-01 10:27:59 +08:00
nebula_chen 90103f6126 新增 - 所有供应商均提交报价邮件通知采购商;供应商用户信息表及相应序列化器 2026-04-01 09:43:44 +08:00
allen_xiong bf531c13fa Merge branch 'develop' into 'develop'
报价单详情窗口、询价单详情窗口、比价窗口转为对应路由页面;

See merge request pisteams/pis!32
2026-04-01 01:12:05 +00:00
nebula_chen fb308ca691 报价单详情窗口、询价单详情窗口、比价窗口转为对应路由页面; 2026-03-31 19:37:45 +08:00
lewis_yan a5e7230fd7 docs: add CLAUDE.md for Claude Code guidance
Add project documentation for future Claude Code sessions covering
backend/frontend commands, architecture, and configuration.
2026-03-31 19:35:25 +08:00
lewis_yan 37027bf068 chore: remove deploy stage, only build and push to Harbor 2026-03-31 19:23:42 +08:00
lewis_yan 66c7721ced fix: use usernamePassword instead of sshUserPrivateKey for deploy 2026-03-31 19:22:14 +08:00
lewis_yan 05d6932cbe chore: rename image names to pis-backend and pis-web 2026-03-31 17:38:01 +08:00
lewis_yan 1b98690567 chore: update SERVER_HOST to actual deployment server IP 2026-03-31 17:37:12 +08:00
lewis_yan 6a17de2231 chore: update HARBOR_URL to actual Harbor address 2026-03-31 17:36:33 +08:00
lewis_yan 10563ef779 perf: optimize docker build with layer consolidation and caching 2026-03-31 17:34:29 +08:00
lewis_yan e918235b4f fix: use correct pip mirror (tsinghua) instead of docker mirror 2026-03-31 17:31:38 +08:00
lewis_yan 4837d79992 perf: use docker.1ms.run mirror to speed up builds 2026-03-31 17:30:58 +08:00
lewis_yan 85503ad233 Merge branch 'develop' of http://192.168.80.90:8086/pisteams/pis into develop 2026-03-31 17:26:52 +08:00
lewis_yan c228095c8f fix(jenkins): install Node.js and yarn if not present 2026-03-31 17:25:18 +08:00
lewis_yan 530fde4a28 chore: disable GitLab CI, use Jenkins instead 2026-03-31 16:58:29 +08:00
lewis_yan 853223aa8b chore: disable GitLab CI, use Jenkins instead 2026-03-31 16:52:19 +08:00
lewis_yan e7f5e6e8fa feat(jenkins): add frontend CI/CD pipeline 2026-03-31 16:50:40 +08:00
lewis_yan a034a4dc27 feat(jenkins): add backend CI/CD pipeline 2026-03-31 16:49:32 +08:00
lewis_yan 1ec7253d36 docs: add Jenkins CI/CD implementation plan 2026-03-31 16:46:47 +08:00
lewis_yan 8004cb4b50 docs: add Jenkins CI/CD design spec 2026-03-31 16:44:31 +08:00
allen_xiong 29a5d55852 Merge branch 'develop' into 'develop'
重写制程最低价计算与取值逻辑;调整部分前端逻辑

See merge request pisteams/pis!31
2026-03-30 09:43:21 +00:00
nebula_chen 2fd8788e5f 重写制程最低价计算与取值逻辑;调整部分前端逻辑 2026-03-30 17:40:53 +08:00
allen_xiong 91ee7467c5 Merge branch 'develop' into 'develop'
调整比议价程式相关前端效果;修改制程最低价记录后端逻辑

See merge request pisteams/pis!30
2026-03-30 05:44:20 +00:00
nebula_chen e41983eb5a 调整比议价程式相关前端效果;修改制程最低价记录后端逻辑 2026-03-30 12:34:00 +08:00