Labels Milestones

后端代码新增 #14

Open

p4hc6qtoi wants to merge 59 commits from wuyifan_branch into master

pull from: wuyifan_branch

merge into: mwxbgi697:master

mwxbgi697:master

mwxbgi697:曾晨曦_branch

mwxbgi697:develop

mwxbgi697:fangxiaoting_branch

mwxbgi697:zhanglinhao_branch

Conversation 0 Commits 59 Files Changed 182

p4hc6qtoi commented 1 year ago

Collaborator

后端合并

后端合并

p4hc6qtoi added 58 commits 1 year ago

36717942eb 用例图

31f1339042 Merge branch 'develop' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch

26f7946e45 1

bfb34b10a2 需求规格说明书

1de1cccf80 对需求规格说明书第二大点进行修改

616cd32933 修改模板

cb9e75bb11 需求构思补了部署图，规格说明书写了第二大点

7d61ee5b91 修改

c63bc3bc5b 用户注册、登录的顺序图

309f6806a3 将用户注册和登录作了是否区分游客与导游两种情况

5502fbfc11 Merge branch 'master' of https://bdgit.educoder.net/mwxbgi697/softegg into wuyifan_branch ...

# Conflicts:
#	doc/文档模板-软件需求构思及描述模板.docx

83ecb0ff15 Merge branch 'develop' of https://bdgit.educoder.net/mwxbgi697/softegg into wuyifan_branch ...

# Conflicts:
#	doc/~$由同行”软件需求规格说明书.docx
#	doc/“自由同行”软件需求规格说明书.docx
#	doc/自由同行-软件需求构思及描述.docx

e5d3488734 更新

c6568564ce 1

167bb2d273 前端代码初始版

5e48c1f463 Merge branch '曾晨曦_branch' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch ...

# Conflicts:
#	doc/“自由同行”软件需求规格说明书.docx

7b44e8a348 1

ff3952859f Merge branch 'develop' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch ...

# Conflicts:
#	doc/自由同行-软件需求构思及描述.docx

548cc49c7d 聊天界面初始版

f6fc54bb2a Squashed commit of the following: ...

commit 548cc49c7d
Author: zcx <1078327420@qq.com>
Date:   Fri May 10 10:20:18 2024 +0800

    聊天界面初始版

commit ff3952859f
Merge: 7b44e8a c656856
Author: zcx <1078327420@qq.com>
Date:   Fri May 10 10:15:56 2024 +0800

    Merge branch 'develop' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch

    # Conflicts:
    #	doc/自由同行-软件需求构思及描述.docx

commit 7b44e8a348
Author: zcx <1078327420@qq.com>
Date:   Fri May 10 10:12:14 2024 +0800

    1

commit 5e48c1f463
Merge: 167bb2d bfb34b1
Author: zcx <1078327420@qq.com>
Date:   Fri May 10 10:10:13 2024 +0800

    Merge branch '曾晨曦_branch' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch

    # Conflicts:
    #	doc/“自由同行”软件需求规格说明书.docx

commit 167bb2d273
Author: zcx <1078327420@qq.com>
Date:   Fri May 10 10:09:46 2024 +0800

    前端代码初始版

commit e5d3488734
Author: zcx <1078327420@qq.com>
Date:   Sun Mar 31 11:48:46 2024 +0800

    更新

commit bfb34b10a2
Author: zcx <1078327420@qq.com>
Date:   Tue Mar 26 11:15:48 2024 +0800

    需求规格说明书

commit 26f7946e45
Author: zcx <1078327420@qq.com>
Date:   Tue Mar 26 11:08:14 2024 +0800

    1

commit 31f1339042
Merge: 3671794 9d34b69
Author: zcx <1078327420@qq.com>
Date:   Tue Mar 26 11:07:41 2024 +0800

    Merge branch 'develop' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch

commit 36717942eb
Author: zcx <1078327420@qq.com>
Date:   Thu Mar 21 15:50:06 2024 +0800

    用例图

977b40cd4f 新的页面代码

f0eb9cae7e Squashed commit of the following: ...

commit 977b40cd4f
Author: zcx <1078327420@qq.com>
Date:   Fri May 10 10:44:28 2024 +0800

    新的页面代码

commit 548cc49c7d
Author: zcx <1078327420@qq.com>
Date:   Fri May 10 10:20:18 2024 +0800

    聊天界面初始版

commit ff3952859f
Merge: 7b44e8a c656856
Author: zcx <1078327420@qq.com>
Date:   Fri May 10 10:15:56 2024 +0800

    Merge branch 'develop' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch

    # Conflicts:
    #	doc/自由同行-软件需求构思及描述.docx

commit 7b44e8a348
Author: zcx <1078327420@qq.com>
Date:   Fri May 10 10:12:14 2024 +0800

    1

commit 5e48c1f463
Merge: 167bb2d bfb34b1
Author: zcx <1078327420@qq.com>
Date:   Fri May 10 10:10:13 2024 +0800

    Merge branch '曾晨曦_branch' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch

    # Conflicts:
    #	doc/“自由同行”软件需求规格说明书.docx

commit 167bb2d273
Author: zcx <1078327420@qq.com>
Date:   Fri May 10 10:09:46 2024 +0800

    前端代码初始版

commit e5d3488734
Author: zcx <1078327420@qq.com>
Date:   Sun Mar 31 11:48:46 2024 +0800

    更新

commit bfb34b10a2
Author: zcx <1078327420@qq.com>
Date:   Tue Mar 26 11:15:48 2024 +0800

    需求规格说明书

commit 26f7946e45
Author: zcx <1078327420@qq.com>
Date:   Tue Mar 26 11:08:14 2024 +0800

    1

commit 31f1339042
Merge: 3671794 9d34b69
Author: zcx <1078327420@qq.com>
Date:   Tue Mar 26 11:07:41 2024 +0800

    Merge branch 'develop' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch

commit 36717942eb
Author: zcx <1078327420@qq.com>
Date:   Thu Mar 21 15:50:06 2024 +0800

    用例图

1e9c7ee52d 删除多余文件

d83686a012 新界面

1767a27da7 Squashed commit of the following: ...

commit d83686a012
Author: zcx <1078327420@qq.com>
Date:   Fri May 10 11:06:40 2024 +0800

    新界面

commit 977b40cd4f
Author: zcx <1078327420@qq.com>
Date:   Fri May 10 10:44:28 2024 +0800

    新的页面代码

commit 548cc49c7d
Author: zcx <1078327420@qq.com>
Date:   Fri May 10 10:20:18 2024 +0800

    聊天界面初始版

commit ff3952859f
Merge: 7b44e8a c656856
Author: zcx <1078327420@qq.com>
Date:   Fri May 10 10:15:56 2024 +0800

    Merge branch 'develop' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch

    # Conflicts:
    #	doc/自由同行-软件需求构思及描述.docx

commit 7b44e8a348
Author: zcx <1078327420@qq.com>
Date:   Fri May 10 10:12:14 2024 +0800

    1

commit 5e48c1f463
Merge: 167bb2d bfb34b1
Author: zcx <1078327420@qq.com>
Date:   Fri May 10 10:10:13 2024 +0800

    Merge branch '曾晨曦_branch' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch

    # Conflicts:
    #	doc/“自由同行”软件需求规格说明书.docx

commit 167bb2d273
Author: zcx <1078327420@qq.com>
Date:   Fri May 10 10:09:46 2024 +0800

    前端代码初始版

commit e5d3488734
Author: zcx <1078327420@qq.com>
Date:   Sun Mar 31 11:48:46 2024 +0800

    更新

commit bfb34b10a2
Author: zcx <1078327420@qq.com>
Date:   Tue Mar 26 11:15:48 2024 +0800

    需求规格说明书

commit 26f7946e45
Author: zcx <1078327420@qq.com>
Date:   Tue Mar 26 11:08:14 2024 +0800

    1

commit 31f1339042
Merge: 3671794 9d34b69
Author: zcx <1078327420@qq.com>
Date:   Tue Mar 26 11:07:41 2024 +0800

    Merge branch 'develop' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch

commit 36717942eb
Author: zcx <1078327420@qq.com>
Date:   Thu Mar 21 15:50:06 2024 +0800

    用例图

# Conflicts:
#	src/前端/walktofree/src/components/SecurityVerification.vue

3e2ec298a3 优化仓库结构

f710dc84ed 优化仓库储存结构

b89bbc7124 格式化仓库

7f854cff83 Merge branch 'develop' of bdgit.educoder.net:mwxbgi697/softegg into zhanglinhao_branch ...

# Conflicts:
#	model/顺序图/导游方竞价顺序图.png
#	src/后端/java/Configurer.java
#	src/后端/java/FreeToGoApplication.java
#	src/后端/java/Login/LoginController.java
#	src/后端/java/Login/LoginService.java
#	src/后端/java/Login/LoginServiceImpl.java
#	src/后端/java/Login/controller/LoginController.java
#	src/后端/java/Login/service/LoginService.java
#	src/后端/java/Login/service/LoginServiceImpl.java
#	src/后端/java/User/Dao/UsersRepository.java
#	src/后端/java/User/bean/Users.java
#	src/后端/java/User/controller/UsersController.java
#	src/后端/java/User/service/UserServiceImpl.java
#	src/后端/java/User/service/UsersService.java
#	src/后端/java/UserServiceImpl.java
#	src/后端/java/Users.java
#	src/后端/java/UsersController.java
#	src/后端/java/UsersRepository.java
#	src/后端/java/UsersService.java
#	src/后端/java/helloController.java
#	src/后端/resources/application.properties
#	src/后端/resources/application.yml

2e1475fb0a 更新后端代码

6e9bf8e012 Merge pull request '更新后端代码' (#8) from zhanglinhao_branch into develop

682f31b015 Merge branch 'develop' of https://bdgit.educoder.net/mwxbgi697/softegg into develop ...

# Conflicts:
#	doc/自由同行-软件需求构思及描述.docx
#	model/顺序图/通信系统顺序图.png
#	src/前端/src/components/Communication.vue
#	src/前端/src/components/Demand.vue
#	src/前端/src/components/Evaluation.vue
#	src/前端/src/components/Pay.vue

c82f1efc8c 修改文件位置

f745de4fef Merge branch 'develop' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch

55dbf59cb1 修改文件

ecd56eeb36 Merge branch 'develop' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch

3f241a6a46 1

d73c814619 Squashed commit of the following: ...

commit 3f241a6a46
Author: zcx <1078327420@qq.com>
Date:   Sat May 11 16:03:53 2024 +0800

    1

commit ecd56eeb36
Merge: f745de4 55dbf59
Author: zcx <1078327420@qq.com>
Date:   Sat May 11 16:03:36 2024 +0800

    Merge branch 'develop' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch

commit f745de4fef
Merge: d83686a c82f1ef
Author: zcx <1078327420@qq.com>
Date:   Sat May 11 15:51:39 2024 +0800

    Merge branch 'develop' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch

commit d83686a012
Author: zcx <1078327420@qq.com>
Date:   Fri May 10 11:06:40 2024 +0800

    新界面

commit 977b40cd4f
Author: zcx <1078327420@qq.com>
Date:   Fri May 10 10:44:28 2024 +0800

    新的页面代码

commit 548cc49c7d
Author: zcx <1078327420@qq.com>
Date:   Fri May 10 10:20:18 2024 +0800

    聊天界面初始版

commit ff3952859f
Merge: 7b44e8a c656856
Author: zcx <1078327420@qq.com>
Date:   Fri May 10 10:15:56 2024 +0800

    Merge branch 'develop' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch

    # Conflicts:
    #	doc/自由同行-软件需求构思及描述.docx

commit 7b44e8a348
Author: zcx <1078327420@qq.com>
Date:   Fri May 10 10:12:14 2024 +0800

    1

commit 5e48c1f463
Merge: 167bb2d bfb34b1
Author: zcx <1078327420@qq.com>
Date:   Fri May 10 10:10:13 2024 +0800

    Merge branch '曾晨曦_branch' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch

    # Conflicts:
    #	doc/“自由同行”软件需求规格说明书.docx

commit 167bb2d273
Author: zcx <1078327420@qq.com>
Date:   Fri May 10 10:09:46 2024 +0800

    前端代码初始版

commit e5d3488734
Author: zcx <1078327420@qq.com>
Date:   Sun Mar 31 11:48:46 2024 +0800

    更新

commit bfb34b10a2
Author: zcx <1078327420@qq.com>
Date:   Tue Mar 26 11:15:48 2024 +0800

    需求规格说明书

commit 26f7946e45
Author: zcx <1078327420@qq.com>
Date:   Tue Mar 26 11:08:14 2024 +0800

    1

commit 31f1339042
Merge: 3671794 9d34b69
Author: zcx <1078327420@qq.com>
Date:   Tue Mar 26 11:07:41 2024 +0800

    Merge branch 'develop' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch

commit 36717942eb
Author: zcx <1078327420@qq.com>
Date:   Thu Mar 21 15:50:06 2024 +0800

    用例图

aa91faa3df 优化后端代码存储结构

63b04cda77 Squashed commit of the following: ...

commit d6932b75e1
Author: zhanglinhao <1260788704@qq.com>
Date:   Sat May 11 16:44:13 2024 +0800

    更新后端代码

commit ded46a1389
Author: zhanglinhao <1260788704@qq.com>
Date:   Sat May 11 16:43:27 2024 +0800

    优化后端仓库存储结构

417422d127 Merge branch 'develop' of https://bdgit.educoder.net/mwxbgi697/softegg into wuyifan_branch ...

# Conflicts:
#	doc/“自由同行”软件需求规格说明书.docx
#	doc/自由同行-软件需求构思及描述.docx

ef00c925dd 新增后端代码

1676bb1968 Merge pull request '后端代码新增' (#9) from wuyifan_branch into develop

07afa9091a 修改

0d739d8a5a Merge pull request '发送需求' (#10) from wuyifan_branch into develop

e14c3ccc0c Squashed commit of the following: ...

commit 5e37650982
Author: zhanglinhao <1260788704@qq.com>
Date:   Sun May 12 00:39:53 2024 +0800

    新增评价控制类

commit d6932b75e1
Author: zhanglinhao <1260788704@qq.com>
Date:   Sat May 11 16:44:13 2024 +0800

    更新后端代码

commit ded46a1389
Author: zhanglinhao <1260788704@qq.com>
Date:   Sat May 11 16:43:27 2024 +0800

    优化后端仓库存储结构

# Conflicts:
#	src/后端/java/Evaluate/service/evaluateService.java
#	src/后端/java/Evaluate/service/evaluateServiceImpl.java
#	src/后端/java/Login/controller/LoginController.java
#	src/后端/java/Login/service/LoginServiceImpl.java

a8191418b4 Squashed commit of the following: ...

commit 2991a0288e
Author: zcx <1078327420@qq.com>
Date:   Sun May 12 19:24:16 2024 +0800

    1

commit f0a01dc52a
Author: zcx <1078327420@qq.com>
Date:   Sun May 12 19:14:07 2024 +0800

    1

commit 103b91481d
Merge: 3f241a6 d73c814
Author: zcx <1078327420@qq.com>
Date:   Sat May 11 16:10:15 2024 +0800

    Merge branch 'develop' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch

commit d73c814619
Author: zcx <1078327420@qq.com>
Date:   Sat May 11 16:04:16 2024 +0800

    Squashed commit of the following:

    commit 3f241a6a46
    Author: zcx <1078327420@qq.com>
    Date:   Sat May 11 16:03:53 2024 +0800

        1

    commit ecd56eeb36
    Merge: f745de4 55dbf59
    Author: zcx <1078327420@qq.com>
    Date:   Sat May 11 16:03:36 2024 +0800

        Merge branch 'develop' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch

    commit f745de4fef
    Merge: d83686a c82f1ef
    Author: zcx <1078327420@qq.com>
    Date:   Sat May 11 15:51:39 2024 +0800

        Merge branch 'develop' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch

    commit d83686a012
    Author: zcx <1078327420@qq.com>
    Date:   Fri May 10 11:06:40 2024 +0800

        新界面

    commit 977b40cd4f
    Author: zcx <1078327420@qq.com>
    Date:   Fri May 10 10:44:28 2024 +0800

        新的页面代码

    commit 548cc49c7d
    Author: zcx <1078327420@qq.com>
    Date:   Fri May 10 10:20:18 2024 +0800

        聊天界面初始版

    commit ff3952859f
    Merge: 7b44e8a c656856
    Author: zcx <1078327420@qq.com>
    Date:   Fri May 10 10:15:56 2024 +0800

        Merge branch 'develop' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch

        # Conflicts:
        #	doc/自由同行-软件需求构思及描述.docx

    commit 7b44e8a348
    Author: zcx <1078327420@qq.com>
    Date:   Fri May 10 10:12:14 2024 +0800

        1

    commit 5e48c1f463
    Merge: 167bb2d bfb34b1
    Author: zcx <1078327420@qq.com>
    Date:   Fri May 10 10:10:13 2024 +0800

        Merge branch '曾晨曦_branch' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch

        # Conflicts:
        #	doc/“自由同行”软件需求规格说明书.docx

    commit 167bb2d273
    Author: zcx <1078327420@qq.com>
    Date:   Fri May 10 10:09:46 2024 +0800

        前端代码初始版

    commit e5d3488734
    Author: zcx <1078327420@qq.com>
    Date:   Sun Mar 31 11:48:46 2024 +0800

        更新

    commit bfb34b10a2
    Author: zcx <1078327420@qq.com>
    Date:   Tue Mar 26 11:15:48 2024 +0800

        需求规格说明书

    commit 26f7946e45
    Author: zcx <1078327420@qq.com>
    Date:   Tue Mar 26 11:08:14 2024 +0800

        1

    commit 31f1339042
    Merge: 3671794 9d34b69
    Author: zcx <1078327420@qq.com>
    Date:   Tue Mar 26 11:07:41 2024 +0800

        Merge branch 'develop' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch

    commit 36717942eb
    Author: zcx <1078327420@qq.com>
    Date:   Thu Mar 21 15:50:06 2024 +0800

        用例图

5770cc6dd5 Merge branch 'develop' of https://bdgit.educoder.net/mwxbgi697/softegg into develop

093ac28300 Squashed commit of the following: ...

commit dece352494
Author: zcx <1078327420@qq.com>
Date:   Sun May 12 19:47:44 2024 +0800

    1

commit c4de9ccc45
Author: zcx <1078327420@qq.com>
Date:   Sun May 12 19:36:07 2024 +0800

    1

commit 05aefb2d55
Author: zcx <1078327420@qq.com>
Date:   Sun May 12 19:28:09 2024 +0800

    1

commit 2991a0288e
Author: zcx <1078327420@qq.com>
Date:   Sun May 12 19:24:16 2024 +0800

    1

commit f0a01dc52a
Author: zcx <1078327420@qq.com>
Date:   Sun May 12 19:14:07 2024 +0800

    1

commit 103b91481d
Merge: 3f241a6 d73c814
Author: zcx <1078327420@qq.com>
Date:   Sat May 11 16:10:15 2024 +0800

    Merge branch 'develop' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch

# Conflicts:
#	src/前端/walktofree/src/components/DemandList.vue
#	src/前端/walktofree/src/router/index.js

aed55f5ff8 修改文件结构

ba80d18ee0 Squashed commit of the following: ...

commit 4ca319060a
Author: zcx <1078327420@qq.com>
Date:   Sun May 12 21:41:25 2024 +0800

    1

commit 420c9925aa
Author: zcx <1078327420@qq.com>
Date:   Sun May 12 21:00:08 2024 +0800

    修改文件结构

commit dece352494
Author: zcx <1078327420@qq.com>
Date:   Sun May 12 19:47:44 2024 +0800

    1

commit c4de9ccc45
Author: zcx <1078327420@qq.com>
Date:   Sun May 12 19:36:07 2024 +0800

    1

commit 05aefb2d55
Author: zcx <1078327420@qq.com>
Date:   Sun May 12 19:28:09 2024 +0800

    1

commit 2991a0288e
Author: zcx <1078327420@qq.com>
Date:   Sun May 12 19:24:16 2024 +0800

    1

commit f0a01dc52a
Author: zcx <1078327420@qq.com>
Date:   Sun May 12 19:14:07 2024 +0800

    1

commit 103b91481d
Merge: 3f241a6 d73c814
Author: zcx <1078327420@qq.com>
Date:   Sat May 11 16:10:15 2024 +0800

    Merge branch 'develop' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch

# Conflicts:
#	src/前端/walktofree/src/App.vue
#	src/前端/walktofree/src/api/auth.js
#	src/前端/walktofree/src/components/new_file.vue
#	src/前端/walktofree/src/main.js
#	src/前端/walktofree/src/pages/Communication.vue
#	src/前端/walktofree/src/pages/Evaluation.vue
#	src/前端/walktofree/src/pages/HomePage.vue
#	src/前端/walktofree/src/pages/Login.vue
#	src/前端/walktofree/src/pages/Pay.vue
#	src/前端/walktofree/src/pages/Register.vue
#	src/前端/walktofree/src/pages/SecurityVerification.vue
#	src/前端/walktofree/src/pages/mine.vue
#	src/前端/walktofree/src/pages/searchPage.vue
#	src/前端/walktofree/src/router/index.js

06ae856043 合并分支

325958e5f6 修改

3d84564315 修改

74038d062a 导游服务

4bd9229d2c 修改

980cfee63e 后端代码更新

321772afa7 后端代码提交

p4hc6qtoi added 1 commit 1 year ago

847fa31515 代码上传

This pull request has changes conflicting with the target branch.

model/用户注册（导游与游客分开）.png

model/自由同行分析类图.png

doc/自由同行-软件需求构思及描述.docx

model/用户注册(不区分导游与游客）.png

model/用例图.png

model/登录(导游与游客分开）.png

model/登录（导游与游客不区分）.png

model/部署图.png

doc/“自由同行”软件需求规格说明书.docx

doc/文档模板：软件设计规格说明书(2).docx

Sign in to join this conversation.

Reviewers

Request review

No reviewers

Labels

Apply labels

Clear labels

No items

No Label

Milestone

Set milestone

Clear milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Assign users

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: mwxbgi697/softegg#14

Write Preview

Loading…

Cancel

Save

There is no content yet.