调整授权代码
parent
2869c2d253
commit
3aa5f0b117
|
|
@ -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))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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}"
|
||||
|
|
|
|||
Loading…
Reference in New Issue