From 3aa5f0b117bfcb028a4986eb69fc5a8ae765d623 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?old=E6=98=93?= <156663459@qq.com>
Date: Tue, 8 Oct 2024 16:34:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=88=E6=9D=83=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 New_College.Api/Controllers/OAuthController.cs | 4 ++--
 New_College.Api/Dockerfile                     | 2 +-
 New_College.Api/start.sh                       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

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}"