diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java index 63fa66692..4029211bd 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java @@ -129,6 +129,26 @@ public class MemberController extends BaseController { return response; } + /** + * 支付寶一键登录 + * http://localhost:8080/uniapp/member/wechatLogin + */ + @PostMapping("/alipayLogin") + public RestApiResponse> alipayLogin(HttpServletRequest request, @RequestBody WechatLoginDTO dto) { + RestApiResponse> response = null; + try { + // 获取小程序appid + String appId = request.getHeader("appId"); + dto.setAppId(appId); + String memberToken = memberService.wechatLogin(dto); + response = new RestApiResponse<>(ImmutableMap.of("memberToken", memberToken)); + } catch (Exception e) { + logger.error("微信登录异常 param:{}", JSON.toJSONString(dto), e); + response = new RestApiResponse<>(ReturnCodeEnum.CODE_WECHAT_LOGIN_ERROR); + } + return response; + } + /** * 接收并处理前端用户信息 *
diff --git a/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java b/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java index e3ec6dee6..ee0a0903e 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java +++ b/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java @@ -58,9 +58,11 @@ public class Constants { public static final byte[] updateServerPort = new byte[]{port}; + // FTP用户名 public static final String updateServerUserName = "ftptest"; - public static final String updateServerPassword = "js160829"; + // FTP密码 + public static final String updateServerPassword = "aEYU^q=8t"; public static final String filePath = "/update.bin"; @@ -70,9 +72,9 @@ public class Constants { public static final String JSOWELL_OPERATORID = "MA1JLFUU8"; public static final String OPERATORID_LIANLIAN = "MA1JLFUU8"; - public static final String OPERATORID_JIANG_SU = "MA1X78KH5"; + public static final String OPERATORID_XI_XIAO = "MAC13L2Q9"; public static final String OPERATORID_YUAN_DA = "599777560";