submit

run-prod.sh

@@ -30,44 +30,4 @@ docker run -p 5055:5055 --name ${app_name} \
 -v /data/logs/prod_api:/logs \
 -v /mydata/app/${app_name}/logs:/var/logs \
 -d ${group_name}/${app_name}:${app_version}
-echo '----start container----'
-
-echo "开始等待20秒..."
-# 1-10秒内随机
-sleep 5
-echo "等待后继续"
-
-#!/usr/bin/env bash
-# 定义应用组名
-group_admin_name='zhichen'
-# 定义应用名称
-app_admin_name='zhichen-saas-admin'
-# 定义应用版本
-app_admin_version='1.0-SNAPSHOT'
-# 定义应用环境
-profile_active='prod'
-echo '----copy jar admin----'
-docker stop ${app_admin_name}
-echo '----stop container admin----'
-docker rm ${app_admin_name}
-echo '----rm container admin----'
-docker rmi ${group_admin_name}/${app_admin_name}:${app_admin_version}
-echo '----rm image admin----'
-# 打包编译docker镜像
-docker build -f /mydata/maven/build/Dockerfile-admi -t ${group_admin_name}/${app_admin_name}:${app_admin_version} .
-echo '----build image admin----'
-docker run \
--p 5030:5030 \
---name ${app_admin_name} \
---restart=always \
---log-opt max-size=50m \
---log-opt max-file=3 \
--e 'spring.profiles.active'=${profile_active} \
--e TZ="Asia/Shanghai" \
--v /etc/localtime:/etc/localtime \
--v /usr/share/fonts:/usr/share/fonts \
--v /data/logs/prod_admin:/logs \
--v /mydata/app/${app_admin_name}/logs:/var/logs \
--v /data/nginx/conf.d:/data/nginx/conf.d \
--d ${group_admin_name}/${app_admin_name}:${app_admin_version}
-echo '----start container admin----'
+echo '----start container----'

zhichen-framework/src/main/java/com/zhichen/framework/web/service/WeChatSignatureService.java

@@ -138,6 +138,4 @@ public class WeChatSignatureService {
             throw new RuntimeException("SHA1加密失败", e);
         }
     }
-
-
 }

zhichen-framework/src/main/java/com/zhichen/framework/web/service/WxLoginService.java

@@ -1367,6 +1367,9 @@ public class WxLoginService implements IWxLoginService {
         String resultString = HttpUtils.sendGet(gzh_wxAuthUrl, param);
         //解析json
         JSONObject jsonObject = (JSONObject) JSONObject.parse(resultString);
+        if (ObjectUtils.isNotNull(jsonObject.get("errcode"))){
+            throw new CustomException(resultString+"【"+loginBody.getCode()+"】");
+        }
         String openId = String.valueOf(jsonObject.get("openid"));
         String url = "https://api.weixin.qq.com/cgi-bin/user/info";
         String param2 = String.format(