merge into main #36

Merged
sangge merged 45 commits from fix-update into main 2024-10-24 23:35:44 +08:00
4 changed files with 41 additions and 34 deletions
Showing only changes of commit ca253dbb77 - Show all commits

View File

@ -30,9 +30,9 @@
- Windows (需要自行安装gmssl的共享库)
该项目依赖以下软件:
python 3.11
gmssl
gmssl-python
python 3.12
gmssl v3.1.1
gmssl-python 2.2.2
### Docker 版本安装
@ -46,9 +46,9 @@ chmod +x install_docker.sh
docker 版本:
- 版本: 24.0.5
- API 版本: 1.43
- Go 版本: go1.20.6
- 版本: 24.0.5
- API 版本: 1.43
- Go 版本: go1.20.6
## 安装步骤
@ -56,6 +56,14 @@ docker 版本:
本项目依赖gmssl所以请提前安装好。访问 [GmSSL](https://github.com/guanzhi/GmSSL) 可以看到如何安装。
本项目也提供了submodule的方式可以直接使用
```bash
git clone --recurse-submodules https://git.mamahaha.work/sangge/tpre-python.git
chmod +x install_gmssl.sh
./install_docker.sh
```
然后安装必要的python库
```bash

View File

@ -30,9 +30,9 @@ System requirements:
The project relies on the following software:
- Python 3.11
- gmssl
- gmssl-python
- Python 3.12
- gmssl v3.1.1
- gmssl-python 2.2.2
### Docker installer
@ -46,9 +46,9 @@ chmod +x install_docker.sh
docker version:
- Version: 24.0.5
- API version: 1.43
- Go version: go1.20.6
- Version: 24.0.5
- API version: 1.43
- Go version: go1.20.6
## Installation Steps

View File

@ -6,7 +6,6 @@ mkdir include
cp gmssl/include include
mkdir gmssl/build
cd gmssl/build
cd gmssl/build || exit
cmake ..
make
cp bin/lib* ../../lib
sudo make install

View File

@ -1,4 +1,4 @@
gmssl-python
gmssl-python>=2.2.2,<3.0.0
fastapi
uvicorn
requests