yly
/
NewGaoKaoApi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整授权代码

develop
old易 2024-10-08 16:34:14 +08:00
parent 2869c2d253
commit 3aa5f0b117
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
New_College.Api/Controllers/OAuthController.cs
View File

@ -63,7 +63,7 @@ namespace New_College.Controllers
Encoding.UTF8, "application/json"));// Encoding.UTF8, "application/json"));//
if (userinfo != null && userinfo.code == 200 && userinfo.type == "success") if (userinfo != null && userinfo.code == 200 && userinfo.type == "success")
{ {
var user = (await _CustomerInfoServices.Query(q => q.UUID == userinfo.result.UnionId)).FirstOrDefault(); var user = (await _CustomerInfoServices.Query(q => q.GZOpenId == userinfo.result.OpenId)).FirstOrDefault();
if (user == null) if (user == null)
{ {
//没有用户则注册一个新用户 //没有用户则注册一个新用户
@ -87,7 +87,7 @@ namespace New_College.Controllers
} }
else else
{ {
user.GZOpenId = userinfo.result.OpenId; user.UUID = userinfo.result.UnionId;
user.ModifyTime = DateTime.UtcNow; user.ModifyTime = DateTime.UtcNow;
if (!string.IsNullOrEmpty(userinfo.result.Mobile)&&string.IsNullOrEmpty(user.Phone)) if (!string.IsNullOrEmpty(userinfo.result.Mobile)&&string.IsNullOrEmpty(user.Phone))
{ {

2
New_College.Api/Dockerfile
View File

@ -18,7 +18,7 @@ RUN git init
RUN git remote add origin http://$GIT_USERNAME:$GIT_PERSONAL_ACCESS_TOKEN@nas.jinzejk.com:3000/yly/NewGaoKaoApi.git RUN git remote add origin http://$GIT_USERNAME:$GIT_PERSONAL_ACCESS_TOKEN@nas.jinzejk.com:3000/yly/NewGaoKaoApi.git
# 启用稀疏检出并指定要拉取的目录 # 启用稀疏检出并指定要拉取的目录
RUN echo "Admin.NET" >> .git/info/sparse-checkout #RUN echo "Admin.NET" >> .git/info/sparse-checkout
RUN git pull --depth 1 origin develop RUN git pull --depth 1 origin develop
RUN git checkout develop RUN git checkout develop

2
New_College.Api/start.sh
View File

@ -4,7 +4,7 @@ echo "Cleaning up unused Docker resources..."
yes | docker system prune -f yes | docker system prune -f
# 定义 Docker 镜像名称、Tag 前缀和当前时间戳 # 定义 Docker 镜像名称、Tag 前缀和当前时间戳
REPO_NAME="newgaokao" REPO_NAME="newgaokaov2"
TAG_PREFIX="build_" TAG_PREFIX="build_"
TIMESTAMP=$(date +%Y%m%d%H%M%S) TIMESTAMP=$(date +%Y%m%d%H%M%S)
TAG="${REPO_NAME}:${TAG_PREFIX}${TIMESTAMP}" TAG="${REPO_NAME}:${TAG_PREFIX}${TIMESTAMP}"