Merge remote-tracking branch 'origin/branch-nt-1.0.1' into branch-nt-1.0.1

eladmin-system/src/main/java/me/zhengjie/application/bank/controller/vo/BankLoginVO.java

@@ -30,6 +30,7 @@ public class BankLoginVO {
 
 	private String token;
  
+	private String appUpdateVersion;
 
 	public String getSdkAppId() {
 	//	this.sdkappid = String.valueOf(AppConfigInfo.TENCENT_SDK_APP_ID);

eladmin-system/src/main/java/me/zhengjie/application/bank/service/impl/BankLoginServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.corundumstudio.socketio.SocketIOClient;
 
 import lombok.RequiredArgsConstructor;
+import me.zhengjie.application.admin.service.DictDetailService;
 import me.zhengjie.application.bank.controller.vo.BankLoginVO;
 import me.zhengjie.application.bank.service.BankLoginService;
 import me.zhengjie.application.bank.service.SysUserService;
@@ -44,6 +45,8 @@ public class BankLoginServiceImpl implements BankLoginService {
 	private final ContractOrderMapper order;
 
 	private final AppPcBindSocketIo appPcBindSocketIo;
+	
+	private final DictDetailService dictDetailService;
 
 	@Override
 	public ResponseDTO<BankLoginVO> login(BankLoginVO loginVo) {
@@ -76,11 +79,13 @@ public class BankLoginServiceImpl implements BankLoginService {
 					});
 				}
 			}
+			String appUpdateVersion=dictDetailService.getLabelValue("region_app_version", "app_update_version");
 			String token = tokenProvider.appToken(loginVo.getPhone());
 			tokenProvider.setTokenTime(token, JSONObject.toJSONString(sysUser));
 			BankLoginVO bankLoginVO = new BankLoginVO();
 			bankLoginVO.setNickName(sysUser.getNickName());
 			bankLoginVO.setToken(token);
+			bankLoginVO.setAppUpdateVersion(appUpdateVersion);
 			return ResponseDTO.success(bankLoginVO);
 		}
 		return ResponseDTO.error(ResultCode.USER_LOGIN_ERROR);