diff --git a/src/account/Login.tsx b/src/account/Login.tsx index cd32e77..b25777f 100644 --- a/src/account/Login.tsx +++ b/src/account/Login.tsx @@ -2,9 +2,10 @@ import React from "react"; import {Button, Form} from 'react-bootstrap' import {Input} from "../ui/InputGroup"; import {LoginProps, LoginState} from "../entity"; -import {API, Method, request} from "../interface"; +import {Method, request} from "../interface"; import {LoginRes, LoginResMessage, LoginTransform} from "../result"; import {MyDialog} from "../ui/MyDialog"; +import {Api} from "../api"; /** * 登陆表单组件 @@ -26,7 +27,7 @@ export class Login extends React.Component{ login(){ let that=this - request(API.account.login,Method.POST,{ + request(Api.account.login,Method.POST,{ userId:this.state.userId, password:this.state.password },new LoginTransform(),function (res:LoginRes) { diff --git a/src/account/Register.tsx b/src/account/Register.tsx index 115b658..0738b65 100644 --- a/src/account/Register.tsx +++ b/src/account/Register.tsx @@ -4,9 +4,10 @@ import {Button, Form} from 'react-bootstrap' import {RegisterProps, RegisterState, UserType} from "../entity"; import {UploadImg} from "../ui/UploadImg"; import {Address} from "../ui/Address"; -import {API, JSONResponse, Method, request} from "../interface" +import {JSONResponse, Method, request} from "../interface" import {RegisterMessage, RegisterTransform} from "../result"; import {MyDialog} from "../ui/MyDialog"; +import {Api} from "../api"; /** * 图片尺寸限制 @@ -49,7 +50,7 @@ export class Register extends React.Component{ //注册 register(){ let that=this - request(API.account.register,Method.PUT, { + request(Api.account.register,Method.PUT, { userId:this.state.userId, password:this.state.password, name:this.state.name, diff --git a/src/api.ts b/src/api.ts new file mode 100644 index 0000000..6511c9b --- /dev/null +++ b/src/api.ts @@ -0,0 +1,57 @@ +//服务端地址 +export const server = "http://localhost:8080" +//接口地址前缀 +export const prefix = { + user: "/api/user", + activity: "/api/activity", + image: "/image/" +} +//接口地址 +export const Api = { + account: { + //注册 + register: prefix.user + "/register", + //登录 + login: prefix.user + "/login", + //查找用户 + find: prefix.user + "/find", + //更新 + update: prefix.user + "/update", + //更新密码 + updatePwd: prefix.user + "/updatePwd", + //查看留言 + leaveWord: prefix.user + "/find/leaveWord", + //发送好友邀请 + friend: prefix.user + "/friend", + //拒绝好友邀请 + refuse: prefix.user + "/refuse", + //同意好友邀请 + agree: prefix.user + "/agree", + //我的好友 + myFriend: prefix.user + "/friend/list", + //刷新聊天室状态 + refreshChat: prefix.user + "/chat/status", + //查找用户 + findUser: prefix.user + "/find/name", + //查找本人信息 + findOwn: prefix.user + "/find/own" + }, + main: { + activity: { + //发布求助信息 + help: prefix.activity + "/sendHelp", + //查找活动列表 + find: prefix.activity + "/find", + //报名活动 + apply: prefix.activity + "/apply", + //求助信息统计 + seekHelp: prefix.activity + "/seekHelp", + //求助信息志愿者 + seekHelpUser: prefix.activity + "/seekHelpUser", + //帮助信息 + myHelp: prefix.activity + "/help", + //活动评价 + score: prefix.activity + '/score' + } + } +} diff --git a/src/interface.ts b/src/interface.ts index 73acdfa..ba4f8e6 100644 --- a/src/interface.ts +++ b/src/interface.ts @@ -1,62 +1,7 @@ //服务端地址 -const server="http://localhost:8080" - -export const prefix={ - user:"/api/user", - activity:"/api/activity", - image:"/image/" -} -//服务器接口地址 -export const API={ - account:{ - //注册 - register:prefix.user+"/register", - //登录 - login:prefix.user+"/login", - //查找用户 - find:prefix.user+"/find", - //更新 - update:prefix.user+"/update", - //更新密码 - updatePwd:prefix.user+"/updatePwd", - //查看留言 - leaveWord:prefix.user+"/find/leaveWord", - //发送好友邀请 - friend:prefix.user+"/friend", - //拒绝好友邀请 - refuse:prefix.user+"/refuse", - //同意好友邀请 - agree:prefix.user+"/agree", - //我的好友 - myFriend:prefix.user+"/friend/list", - //刷新聊天室状态 - refreshChat:prefix.user+"/chat/status", - //查找用户 - findUser:prefix.user+"/find/name", - //查找本人信息 - findOwn:prefix.user+"/find/own" - }, - main:{ - activity: { - //发布求助信息 - help: prefix.activity + "/sendHelp", - //查找活动列表 - find: prefix.activity + "/find", - //报名活动 - apply:prefix.activity+ "/apply", - //求助信息统计 - seekHelp:prefix.activity+"/seekHelp", - //求助信息志愿者 - seekHelpUser:prefix.activity+"/seekHelpUser", - //帮助信息 - myHelp:prefix.activity+"/help", - //活动评价 - score:prefix.activity+'/score' - } - } -} +import {server} from "./api"; export enum Method { PUT="PUT", diff --git a/src/my/MyFriend.tsx b/src/my/MyFriend.tsx index 577935c..94708f5 100644 --- a/src/my/MyFriend.tsx +++ b/src/my/MyFriend.tsx @@ -6,9 +6,10 @@ import moment from "moment"; import {MyInfo} from "./MyInfo"; import {MyDialog} from "../ui/MyDialog"; import {userObj} from "../ui/TestData"; -import {API, JSONResponse, Method, request} from "../interface"; +import {JSONResponse, Method, request} from "../interface"; import {EmptyBodyTransform, PageDataMessage, SimpleMessage, UserRes, UserTransform} from "../result"; import {loadMyFriend} from "../public"; +import {Api} from "../api"; const maxLength=150 /** @@ -83,7 +84,7 @@ export class MyFriend extends React.Component< */ refreshStatus(chatStatus:boolean){ let that=this - request(API.account.refreshChat,Method.POST, {chatStatus:String(chatStatus)},new EmptyBodyTransform(),function (res:JSONResponse) { + request(Api.account.refreshChat,Method.POST, {chatStatus:String(chatStatus)},new EmptyBodyTransform(),function (res:JSONResponse) { switch (res.customResult) { case SimpleMessage.fail: that.setState({ @@ -113,7 +114,7 @@ export class MyFriend extends React.Component< }else { let that = this - request(API.account.findUser + "?name=" + name, Method.GET, {}, new UserTransform(), function (res: UserRes) { + request(Api.account.findUser + "?name=" + name, Method.GET, {}, new UserTransform(), function (res: UserRes) { switch (res.customResult) { case PageDataMessage.ok: that.setState({ diff --git a/src/my/MyHelp.tsx b/src/my/MyHelp.tsx index 0cd7b00..525b1e9 100644 --- a/src/my/MyHelp.tsx +++ b/src/my/MyHelp.tsx @@ -2,13 +2,14 @@ import React from "react"; import {Button, Col, Container, Image, Row} from "react-bootstrap"; import {ActivityStatus, HelpEntity, PageProps} from "../entity"; import moment from "moment"; -import {API, JSONResponse, Method, prefix, request} from "../interface"; +import {JSONResponse, Method, request} from "../interface"; import {EmptyBodyTransform, HelpRes, HelpTransform, PageDataMessage, SimpleMessage} from "../result"; import {MyDialog} from "../ui/MyDialog"; import {changeActivity} from "../public"; import {Input} from "../ui/InputGroup"; import {Cookies} from "react-cookie"; import {time_score} from "../account/PropCookie"; +import {Api, prefix} from "../api"; const classList="border-info border d-flex justify-content-center align-items-center" @@ -49,7 +50,7 @@ export class MyHelp extends React.Component<{ score(){ let that=this - request(API.main.activity.score,Method.POST ,{ + request(Api.main.activity.score,Method.POST ,{ score:this.state.activeScore+"", historyId:this.state.historyId+"" },new EmptyBodyTransform(),function (res:JSONResponse) { @@ -128,7 +129,7 @@ export class MyHelp extends React.Component<{ loadMyHelp(page:number){ let that=this - request(API.main.activity.myHelp+"?currentPage="+page,Method.GET,{},new HelpTransform(),function (res:HelpRes) { + request(Api.main.activity.myHelp+"?currentPage="+page,Method.GET,{},new HelpTransform(),function (res:HelpRes) { switch (res.customResult) { case PageDataMessage.ok: that.setState({ diff --git a/src/my/MyInfo.tsx b/src/my/MyInfo.tsx index 021ef74..93abbb1 100644 --- a/src/my/MyInfo.tsx +++ b/src/my/MyInfo.tsx @@ -2,7 +2,7 @@ import React from "react"; import {Button, Col, Container, Form, FormControl, Image, Row} from "react-bootstrap"; import {User, UserEdit, UserType} from "../entity"; import {Input} from "../ui/InputGroup"; -import {API, JSONResponse, Method, prefix, request} from "../interface"; +import {JSONResponse, Method, request} from "../interface"; import { EmptyBodyTransform, FindUserInfo, @@ -15,6 +15,7 @@ import {MyDialog} from "../ui/MyDialog"; import {Address} from "../ui/Address"; import {Cookies} from "react-cookie"; import {user_type_cookie} from "../account/PropCookie"; +import {Api, prefix} from "../api"; /** * 个人信息 @@ -70,7 +71,7 @@ export class MyInfo extends React.Component< } let that=this - request(API.account.find+"/"+this.props.userId,Method.GET, {},new FindUserInfoTransform(),function(res:FindUserInfo){ + request(Api.account.find+"/"+this.props.userId,Method.GET, {},new FindUserInfoTransform(),function(res:FindUserInfo){ switch (res.customResult) { case SimpleMessage.fail: that.setState({ @@ -136,7 +137,7 @@ export class MyInfo extends React.Component< let that=this - request(API.account.updatePwd,Method.POST, { + request(Api.account.updatePwd,Method.POST, { newPassword:this.state.userEdit.newPassword, oldPassword:this.state.userEdit.oldPassword },new ModifyPwdTransform(),function (res:JSONResponse) { @@ -170,7 +171,7 @@ export class MyInfo extends React.Component< // if(isUpdateUserType&&this.props.cookies){ // this.props.cookies.set(user_type_cookie,this.state.userEdit.userType) // } - request(API.account.update,Method.POST, { + request(Api.account.update,Method.POST, { headImg:this.state.userEdit.headImg||"", name:this.state.userEdit.name||"", age:this.state.userEdit.age+""||"", @@ -207,7 +208,7 @@ export class MyInfo extends React.Component< */ addFriend(){ let that=this - request(API.account.friend,Method.POST, {targetUserId:this.props.userId},new EmptyBodyTransform(),function (res:JSONResponse) { + request(Api.account.friend,Method.POST, {targetUserId:this.props.userId},new EmptyBodyTransform(),function (res:JSONResponse) { switch (res.customResult) { case SimpleMessage.ok: that.setState({ diff --git a/src/my/MyLeaveWord.tsx b/src/my/MyLeaveWord.tsx index c255ffb..3aa75ed 100644 --- a/src/my/MyLeaveWord.tsx +++ b/src/my/MyLeaveWord.tsx @@ -5,10 +5,11 @@ import {Tooltip} from "@material-ui/core"; import {MyDialog} from "../ui/MyDialog"; import {MyInfo} from "./MyInfo"; import {Activity} from "../ui/Activity"; -import {API, JSONResponse, Method, prefix, request} from "../interface"; +import {JSONResponse, Method, request} from "../interface"; import {EmptyBodyTransform, LeaveWordRes, LeaveWordTransform, PageDataMessage, SimpleMessage} from "../result"; import {changeActivity} from "../public"; import {Cookies} from "react-cookie"; +import {Api, prefix} from "../api"; /** * 我的留言 @@ -54,7 +55,7 @@ export class MyLeaveWord extends React.Component< let that=this - request(API.account.leaveWord+"?currentPage="+page,Method.GET,{},new LeaveWordTransform(),function (res:LeaveWordRes) { + request(Api.account.leaveWord+"?currentPage="+page,Method.GET,{},new LeaveWordTransform(),function (res:LeaveWordRes) { switch (res.customResult) { case PageDataMessage.ok: that.setState({ @@ -89,7 +90,7 @@ export class MyLeaveWord extends React.Component< */ doRefuse(id:number){ let that=this - request(API.account.refuse+"/"+id,Method.POST, {},new EmptyBodyTransform(),function (res:JSONResponse) { + request(Api.account.refuse+"/"+id,Method.POST, {},new EmptyBodyTransform(),function (res:JSONResponse) { switch (res.customResult) { case SimpleMessage.ok: that.setState({ @@ -112,7 +113,7 @@ export class MyLeaveWord extends React.Component< */ doAgree(data:LeaveWord){ let that=this - request(API.account.agree,Method.POST, { + request(Api.account.agree,Method.POST, { leaveWordId:data.leaveWordId+"", sourceUserId:data.userId },new EmptyBodyTransform(),function (res:JSONResponse) { diff --git a/src/my/SeekHelp.tsx b/src/my/SeekHelp.tsx index 5779fba..e2253e6 100644 --- a/src/my/SeekHelp.tsx +++ b/src/my/SeekHelp.tsx @@ -8,9 +8,10 @@ import {Paper, Tooltip} from "@material-ui/core"; import Draggable from "react-draggable"; import {MyDialog} from "../ui/MyDialog"; import {MyInfo} from "./MyInfo"; -import {API, Method, prefix, request} from "../interface"; +import {Method, request} from "../interface"; import {SeekHelpInfoRes, SeekHelpInfoTransform, SeekHelpUser, SeekHelpUserTransform, SimpleMessage} from "../result"; import {getStatus} from "../public"; +import {Api, prefix} from "../api"; const titleId="seek-help-dialog" @@ -56,7 +57,7 @@ export class SeekHelp extends React.Component<{ user:string }, */ loadHelp(){ let that=this - request(API.main.activity.seekHelp,Method.GET, {},new SeekHelpInfoTransform(),function (res:SeekHelpInfoRes) { + request(Api.main.activity.seekHelp,Method.GET, {},new SeekHelpInfoTransform(),function (res:SeekHelpInfoRes) { switch (res.customResult) { case SimpleMessage.fail: that.setState({ @@ -76,7 +77,7 @@ export class SeekHelp extends React.Component<{ user:string }, //打开志愿者列表 openVolunteerList(activityId:number,status:ActivityStatus){ let that=this - request(API.main.activity.seekHelpUser+"?activityId="+activityId+"&activityStatus="+status,Method.GET,{}, + request(Api.main.activity.seekHelpUser+"?activityId="+activityId+"&activityStatus="+status,Method.GET,{}, new SeekHelpUserTransform(),function (res:SeekHelpUser) { switch (res.customResult) { case SimpleMessage.fail: diff --git a/src/public.tsx b/src/public.tsx index 3ffd61d..4f011cb 100644 --- a/src/public.tsx +++ b/src/public.tsx @@ -1,5 +1,5 @@ // 一些组件公用函数 -import {API, Method, request} from "./interface"; +import {Method, request} from "./interface"; import {ActivityDetail, ActivityStatus, UserType} from "./entity"; import { ChangeActivityRes, @@ -12,6 +12,7 @@ import { import React from "react"; import {user_cookie, user_type_cookie} from "./account/PropCookie"; import {Cookies} from "react-cookie"; +import {Api} from "./api"; /** * 更新活动状态 @@ -22,7 +23,7 @@ import {Cookies} from "react-cookie"; */ export function changeActivity(activityId:number,activityStatus:ActivityStatus,that:React.Component,callback:Function){ - request(API.main.activity.apply,Method.POST,{ + request(Api.main.activity.apply,Method.POST,{ activityId:activityId+"", activityStatus:activityStatus.toString() },new ChangeActivityTransform(),function (res:ChangeActivityRes) { @@ -54,7 +55,7 @@ export function getStatus(status:ActivityStatus){ //查找我的好友 export function loadMyFriend(name:string,that:React.Component){ - request(API.account.myFriend+"?currentPage=1&name="+name,Method.GET, {},new UserTransform(),function (res:UserRes) { + request(Api.account.myFriend+"?currentPage=1&name="+name,Method.GET, {},new UserTransform(),function (res:UserRes) { switch (res.customResult) { case PageDataMessage.ok: that.setState({ diff --git a/src/sub/IndexMenu.tsx b/src/sub/IndexMenu.tsx index 54c6d9e..df2f93e 100644 --- a/src/sub/IndexMenu.tsx +++ b/src/sub/IndexMenu.tsx @@ -6,10 +6,11 @@ import {ActivityDetail, ActivityStatus, PageProps} from "../entity"; import {MyDialog} from "../ui/MyDialog"; import {Activity} from "../ui/Activity"; import {Input} from "../ui/InputGroup"; -import {API, Method, prefix, request} from "../interface"; +import {Method, request} from "../interface"; import {FindActivityRes, FindActivityTransform, PageDataMessage} from "../result"; import {Cookies} from "react-cookie"; import {changeActivity, showActivityTip} from "../public"; +import {Api, prefix} from "../api"; /** * 首页 @@ -54,7 +55,7 @@ export class IndexMenu extends React.Component<{ cookies:Cookies }, loadActivity(page:number){ console.debug("检索活动关键字:"+this.state.title) let that=this - request(API.main.activity.find+'?title='+this.state.title+"¤tPage="+page,Method.GET, {},new FindActivityTransform(),function (res:FindActivityRes) { + request(Api.main.activity.find+'?title='+this.state.title+"¤tPage="+page,Method.GET, {},new FindActivityTransform(),function (res:FindActivityRes) { switch(res.customResult){ diff --git a/src/sub/SendHelp.tsx b/src/sub/SendHelp.tsx index a98b1aa..01c5823 100644 --- a/src/sub/SendHelp.tsx +++ b/src/sub/SendHelp.tsx @@ -7,10 +7,11 @@ import "react-datetime/css/react-datetime.css"; import moment from 'moment'; import {Address} from "../ui/Address"; import {UploadImg} from "../ui/UploadImg"; -import {API, JSONResponse, Method, request} from "../interface" +import {JSONResponse, Method, request} from "../interface" import {EmptyBodyTransform, SimpleMessage} from "../result"; import {MyDialog} from "../ui/MyDialog"; import {loadMyFriend} from "../public"; +import {Api} from "../api"; /** * 活动内容限长字符数 @@ -59,7 +60,7 @@ export class SendHelp extends React.Component<{ onSendActivityOK:Function }, Sen //发布求助信息 sendHelp(){ let that=this - request(API.main.activity.help,Method.PUT, { + request(Api.main.activity.help,Method.PUT, { title:this.state.title, content:this.state.content, activityStartTime:this.state.activityStartTime, diff --git a/src/sub/Volunteer.tsx b/src/sub/Volunteer.tsx index edc1a3b..01cf8b3 100644 --- a/src/sub/Volunteer.tsx +++ b/src/sub/Volunteer.tsx @@ -4,9 +4,10 @@ import {Input} from "../ui/InputGroup"; import {PageProps, User} from "../entity"; import {Page} from "../ui/Page"; import {Address} from "../ui/Address"; -import {API, Method, request} from "../interface" +import {Method, request} from "../interface" import {FindUserRes, FindUserTransform, PageDataMessage} from "../result"; import {MyDialog} from "../ui/MyDialog"; +import {Api} from "../api"; /** * 志愿者信息 @@ -45,7 +46,7 @@ export class Volunteer extends React.Component<{ undefined?:undefined }, loadVolunteerList(page:number){ let that=this - request(API.account.find+'?info='+this.state.form.keyword+'&serviceAddress='+this.state.form.serviceAddress + request(Api.account.find+'?info='+this.state.form.keyword+'&serviceAddress='+this.state.form.serviceAddress +'¤tPage='+page+'&userTypes=help',Method.GET,{},new FindUserTransform(),function(res:FindUserRes){ switch (res.customResult) { case PageDataMessage.ok: diff --git a/src/ui/Activity.tsx b/src/ui/Activity.tsx index 00a6fba..34d726d 100644 --- a/src/ui/Activity.tsx +++ b/src/ui/Activity.tsx @@ -2,10 +2,11 @@ import React from "react"; import {Button, Image} from "react-bootstrap"; import {ActivityDetail} from "../entity"; import moment from "moment"; -import {API, Method, prefix, request} from "../interface"; +import {Method, request} from "../interface"; import {ActivityDetailRes, ActivityDetailTransform, SimpleMessage} from "../result"; import {showActivityTip} from "../public"; import {Cookies} from "react-cookie"; +import {Api, prefix} from "../api"; /** * 活动信息 @@ -49,7 +50,7 @@ export class Activity extends React.Component< loadActivityWithId(){ let that=this - request(API.main.activity.find+"/"+this.props.activityId,Method.GET,{},new ActivityDetailTransform(),function(res:ActivityDetailRes){ + request(Api.main.activity.find+"/"+this.props.activityId,Method.GET,{},new ActivityDetailTransform(),function(res:ActivityDetailRes){ switch (res.customResult) { case SimpleMessage.fail: that.setState({