From 8546b3d285af4235a0ef615a0c6e89486ae2c806 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 17 十月 2024 21:01:37 +0800
Subject: [PATCH] 达梦不支持value改为values
---
src/main/java/com/ycl/jxkg/controller/wx/student/AuthController.java | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/wx/student/AuthController.java b/src/main/java/com/ycl/jxkg/controller/wx/student/AuthController.java
index 9c963eb..b2975cd 100644
--- a/src/main/java/com/ycl/jxkg/controller/wx/student/AuthController.java
+++ b/src/main/java/com/ycl/jxkg/controller/wx/student/AuthController.java
@@ -1,16 +1,16 @@
package com.ycl.jxkg.controller.wx.student;
-import com.ycl.jxkg.base.RestResponse;
-import com.ycl.jxkg.configuration.property.SystemConfig;
+import com.ycl.jxkg.base.Result;
+import com.ycl.jxkg.config.property.SystemConfig;
import com.ycl.jxkg.controller.wx.BaseWXApiController;
-import com.ycl.jxkg.domain.UserToken;
-import com.ycl.jxkg.domain.enums.UserStatusEnum;
+import com.ycl.jxkg.domain.entity.UserToken;
+import com.ycl.jxkg.enums.UserStatusEnum;
import com.ycl.jxkg.service.AuthenticationService;
import com.ycl.jxkg.service.UserService;
import com.ycl.jxkg.service.UserTokenService;
-import com.ycl.jxkg.utility.WxUtil;
-import com.ycl.jxkg.viewmodel.wx.student.user.BindInfo;
-import com.ycl.jxkg.domain.User;
+import com.ycl.jxkg.utils.WxUtil;
+import com.ycl.jxkg.domain.vo.wx.student.user.BindInfo;
+import com.ycl.jxkg.domain.entity.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
@@ -38,48 +38,48 @@
}
@RequestMapping(value = "/bind", method = RequestMethod.POST)
- public RestResponse bind(@Valid BindInfo model) {
+ public Result bind(@Valid BindInfo model) {
User user = userService.getUserByUserName(model.getUserName());
if (user == null) {
- return RestResponse.fail(2, "鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒");
+ return Result.fail(2, "鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒");
}
boolean result = authenticationService.authUser(user, model.getUserName(), model.getPassword());
if (!result) {
- return RestResponse.fail(2, "鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒");
+ return Result.fail(2, "鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒");
}
UserStatusEnum userStatusEnum = UserStatusEnum.fromCode(user.getStatus());
if (UserStatusEnum.Disable == userStatusEnum) {
- return RestResponse.fail(3, "鐢ㄦ埛琚鐢�");
+ return Result.fail(3, "鐢ㄦ埛琚鐢�");
}
String code = model.getCode();
String openid = WxUtil.getOpenId(systemConfig.getWx().getAppid(), systemConfig.getWx().getSecret(), code);
if (null == openid) {
- return RestResponse.fail(4, "鑾峰彇寰俊OpenId澶辫触");
+ return Result.fail(4, "鑾峰彇寰俊OpenId澶辫触");
}
user.setWxOpenId(openid);
UserToken userToken = userTokenService.bind(user);
- return RestResponse.ok(userToken.getToken());
+ return Result.ok(userToken.getToken());
}
@RequestMapping(value = "/checkBind", method = RequestMethod.POST)
- public RestResponse checkBind(@Valid @NotBlank String code) {
+ public Result checkBind(@Valid @NotBlank String code) {
String openid = WxUtil.getOpenId(systemConfig.getWx().getAppid(), systemConfig.getWx().getSecret(), code);
if (null == openid) {
- return RestResponse.fail(3, "鑾峰彇寰俊OpenId澶辫触");
+ return Result.fail(3, "鑾峰彇寰俊OpenId澶辫触");
}
UserToken userToken = userTokenService.checkBind(openid);
if (null != userToken) {
- return RestResponse.ok(userToken.getToken());
+ return Result.ok(userToken.getToken());
}
- return RestResponse.fail(2, "鐢ㄦ埛鏈粦瀹�");
+ return Result.fail(2, "鐢ㄦ埛鏈粦瀹�");
}
@RequestMapping(value = "/unBind", method = RequestMethod.POST)
- public RestResponse unBind() {
+ public Result unBind() {
UserToken userToken = getUserToken();
userTokenService.unBind(userToken);
- return RestResponse.ok();
+ return Result.ok();
}
}
--
Gitblit v1.8.0