diff --git a/New_College.Api/Controllers/OAuthController.cs b/New_College.Api/Controllers/OAuthController.cs index 9f6dafd..6d5f919 100644 --- a/New_College.Api/Controllers/OAuthController.cs +++ b/New_College.Api/Controllers/OAuthController.cs @@ -63,7 +63,7 @@ namespace New_College.Controllers Encoding.UTF8, "application/json"));// 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) { //没有用户则注册一个新用户 @@ -87,7 +87,7 @@ namespace New_College.Controllers } else { - user.GZOpenId = userinfo.result.OpenId; + user.UUID = userinfo.result.UnionId; user.ModifyTime = DateTime.UtcNow; if (!string.IsNullOrEmpty(userinfo.result.Mobile)&&string.IsNullOrEmpty(user.Phone)) { diff --git a/New_College.Api/Dockerfile b/New_College.Api/Dockerfile index a5a24cc..a5a56ca 100644 --- a/New_College.Api/Dockerfile +++ b/New_College.Api/Dockerfile @@ -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 echo "Admin.NET" >> .git/info/sparse-checkout +#RUN echo "Admin.NET" >> .git/info/sparse-checkout RUN git pull --depth 1 origin develop RUN git checkout develop diff --git a/New_College.Api/start.sh b/New_College.Api/start.sh index 80c4fa2..aa90b07 100644 --- a/New_College.Api/start.sh +++ b/New_College.Api/start.sh @@ -4,7 +4,7 @@ echo "Cleaning up unused Docker resources..." yes | docker system prune -f # ¶¨Òå Docker ¾µÏñÃû³Æ¡¢Tag ǰ׺ºÍµ±Ç°Ê±¼ä´Á -REPO_NAME="newgaokao" +REPO_NAME="newgaokaov2" TAG_PREFIX="build_" TIMESTAMP=$(date +%Y%m%d%H%M%S) TAG="${REPO_NAME}:${TAG_PREFIX}${TIMESTAMP}"