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

src/后端/java/Configurer.java

@@ -18,7 +18,7 @@ public class Configurer implements WebMvcConfigurer {
                 .allowCredentials(true)
                 //放行哪些原始域
                 .allowedOriginPatterns("*")
-                .allowedMethods(new String[]{"GET", "POST", "PUT", "DELETE"})
+                .allowedMethods("GET", "POST", "PUT", "DELETE")
                 .allowedHeaders("*")
                 .exposedHeaders("*");
     }

src/后端/java/Evaluate/controller/EvaluationController.java

@@ -0,0 +1,58 @@
+package com.softegg.freetogo.Evaluate.controller;
+
+import com.softegg.freetogo.Evaluate.bean.Evaluations;
+import com.softegg.freetogo.Evaluate.service.EvaluateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @description: 对评价的操作
+ * @author: zhanglinhao
+ * @date: 2024/5/11 17:33
+ */
+@RestController
+@RequestMapping("/evaluate")
+public class EvaluationController {
+    @Autowired
+    EvaluateService evaluateService;
+
+    /**
+     * @description: 获取所有需求
+     * @param: null
+     * @return: java.util.List<com.softegg.freetogo.Evaluate.bean.Evaluations>
+     * @author: zhanglinhao
+     * @date: 2024/5/12 0:11
+     */
+    @GetMapping("findAllEvaluation")
+    public List<Evaluations> findAllEvaluation() {
+        return evaluateService.evaluationList();
+    }
+
+    /**
+     * @description: 添加评价
+     * @param: ebody
+     * @return: void
+     * @author: zhanglinhao
+     * @date: 2024/5/12 0:28
+     */
+    @PostMapping("addEvaluation")
+    public void addEvaluation(@RequestBody Map<String, Evaluations> ebody) {
+        Evaluations evaluation = ebody.get("evaluation");
+        evaluateService.addEvaluation(evaluation);
+    }
+
+    /**
+     * @description: 通过手机获取评价
+     * @param: phone
+     * @return: java.util.List<com.softegg.freetogo.Evaluate.bean.Evaluations>
+     * @author: zhanglinhao
+     * @date: 2024/5/12 0:30
+     */
+    @GetMapping("evaluationByPhone")
+    public List<Evaluations> evaluationByPhone(String phone) {
+        return evaluateService.getEListByPhone(phone);
+    }
+}

src/后端/java/Evaluate/service/evaluateService.java

@@ -11,9 +11,20 @@ import java.util.List;
  * @date:2024/5/10 8:52
  */
 @Service
-public interface evaluateService {
+public interface EvaluateService {
     List<Evaluations> evaluationList();//获取所有评论
+<<<<<<< HEAD
     List<Evaluations> getEListByPhone(String phone);//根据电话筛选评价
     void addEvaluation(Evaluations evaluation);//添加评论
 
+=======
+
+    List<Evaluations> getEListByPhone(String phone);//根据电话筛选评价
+
+    void addEvaluation(Evaluations evaluation);//添加评论
+
+    void editEvaluation(int eid, String ebody);//编辑评论
+
+    void deleteEvaluation(int eid);//删除评论
+>>>>>>> zhanglinhao_branch
 }

src/后端/java/Evaluate/service/evaluateServiceImpl.java

@@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @description:
@@ -13,7 +14,7 @@ import java.util.List;
  * @date:2024/5/10 9:25
  */
 @Component
-public class evaluateServiceImpl implements evaluateService {
+public class EvaluateServiceImpl implements EvaluateService {
 
     @Autowired
     EvaluateRepository evaluateRepository;
@@ -43,6 +44,19 @@ public class evaluateServiceImpl implements evaluateService {
         return evaluateRepository.findByEditorPhone(phone);
     }
 
+    /**
+     * @description: 根据电话筛选评价
+     * @param: phone
+     * @return: java.util.List<com.softegg.freetogo.Evaluate.bean.Evaluations>
+     * @author: zhanglinhao
+     * @date: 2024/5/11 16:28
+     */
+    @Override
+    public List<Evaluations> getEListByPhone(String phone) {
+        System.out.println("查询" + phone + "的评论");
+        return evaluateRepository.findByEditorPhone(phone);
+    }
+
     /**
      * @description: 添加评论
      * @param: evaluation
@@ -56,5 +70,40 @@ public class evaluateServiceImpl implements evaluateService {
         System.out.println("添加评论" + evaluation.getEbody());
     }
 
+<<<<<<< HEAD
+=======
+    /**
+     * @description: 编辑评论
+     * @param: eid
+     * @return: void
+     * @author: zhanglinhao
+     * @date: 2024/5/11 17:10
+     */
+    @Override
+    public void editEvaluation(int eid, String ebody) {
+        System.out.println("编辑评论:" + eid);
+        Optional<Evaluations> opt = evaluateRepository.findById(eid);
+        if (opt.isPresent()) {
+            Evaluations evaluation = opt.get();
+            evaluation.setEbody(ebody);
+            evaluateRepository.save(evaluation);
+            System.out.println("编辑成功:" + eid);
+        }
+    }
+
+    /**
+     * @description: 删除评论
+     * @param: eid
+     * @return: void
+     * @author: zhanglinhao
+     * @date: 2024/5/11 17:28
+     */
+    @Override
+    public void deleteEvaluation(int eid) {
+        evaluateRepository.deleteById(eid);
+        System.out.println("删除评论:" + eid);
+    }
+
+>>>>>>> zhanglinhao_branch
 
 }

src/后端/java/FreeToGoApplication.java

@@ -1,9 +1,7 @@
 package com.softegg.freetogo;
 
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
 
 @SpringBootApplication
 public class FreeToGoApplication {

src/后端/java/Login/controller/LoginController.java

@@ -32,10 +32,17 @@ public class LoginController {
     @PostMapping("login")
     public int Login(@RequestBody Map<String, Object> map) {
         System.out.println(map);
+<<<<<<< HEAD
         System.out.println("phone:"+map.get("phone").toString());
         System.out.println("password"+map.get("password").toString());
         int tag = loginService.loginAccount(map.get("name").toString(), map.get("password").toString());
         System.out.println("LoginTag:"+tag);
+=======
+        System.out.println("phone:" + map.get("phone").toString());
+        System.out.println("password" + map.get("password").toString());
+        int tag = loginService.loginAccount(map.get("name").toString(), map.get("password").toString());
+        System.out.println("LoginTag:" + tag);
+>>>>>>> zhanglinhao_branch
         return switch (tag) {
             case 1000 -> 1;//登陆成功
             case 1001 -> 2;//密码或账号错误
@@ -58,8 +65,13 @@ public class LoginController {
     @PostMapping("register")
     public int Register(@RequestBody Map<String, Object> map) {
         System.out.println(map);
+<<<<<<< HEAD
+        int tag = loginService.registerAccount((String)map.get("name"), (String)map.get("password"),(String)map.get("phone"),(String)map.get("nickname"),(String)map.get("IDCard"));
+        System.out.println("RegisterTag:"+tag);
+=======
         int tag = loginService.registerAccount((String) map.get("name"), (String) map.get("password"), (String) map.get("phone"), (String) map.get("nickname"), (String) map.get("IDCard"));
         System.out.println("RegisterTag:" + tag);
+>>>>>>> zhanglinhao_branch
         return switch (tag) {
             case 1003 -> 4;//该账户已经注册
             case 1004 -> 5;//注册成功

src/后端/java/Login/service/LoginServiceImpl.java

@@ -6,7 +6,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
+<<<<<<< HEAD
 import java.util.Objects;
+=======
+>>>>>>> zhanglinhao_branch
 
 /**
  * @description:登录服务实现类
@@ -62,26 +65,44 @@ public class LoginServiceImpl implements LoginService {
                                String IDCard) {
         if (usersService.isRegister(phone))
             return 1003;//该账户已经注册
+<<<<<<< HEAD
         else if(IDCard.length()!=18)
             return 1008;//身份证输入错误
         else {
             LocalDateTime currentTime = LocalDateTime.now();
             System.out.println("注册信息:姓名:"+name+"密码:"+password+"电话:"+phone+"昵称:"+nickname+"身份证:"+IDCard);
+=======
+        else if (IDCard.length() != 18)
+            return 1008;//身份证输入错误
+        else {
+            LocalDateTime currentTime = LocalDateTime.now();
+            System.out.println("注册信息:姓名:" + name + "密码:" + password + "电话:" + phone + "昵称:" + nickname + "身份证:" + IDCard);
+>>>>>>> zhanglinhao_branch
             Users user = new Users();
             user.setPhone(phone);
             user.setPassword(password);
             user.setNickname(nickname);
             user.setIDCard(IDCard);
             user.setName(name);
+<<<<<<< HEAD
             user.setCreatetime((currentTime.getYear()+"-"+currentTime.getMonthValue()+"-"+currentTime.getDayOfMonth()));
+=======
+            user.setCreatetime((currentTime.getYear() + "-" + currentTime.getMonthValue() + "-" + currentTime.getDayOfMonth()));
+>>>>>>> zhanglinhao_branch
             user.setGender(isMale(IDCard));
             usersService.add(user);
             return 1004;//注册成功
         }
     }
 
+<<<<<<< HEAD
+    boolean isMale(String IDCard){
+        System.out.println("根据身份证判断性别:"+IDCard+" 第17位:"+IDCard.charAt(16));
+        return (int)IDCard.charAt(16) % 2 != 0;
+=======
     boolean isMale(String IDCard) {
         System.out.println("根据身份证判断性别:" + IDCard + " 第17位:" + IDCard.charAt(16));
         return (int) IDCard.charAt(16) % 2 != 0;
+>>>>>>> zhanglinhao_branch
     }
 }

src/后端/java/User/controller/UsersController.java

@@ -15,7 +15,7 @@ import java.util.Map;
  */
 @RestController
 //@CrossOrigin(origins = "*")
-@RequestMapping("/users")
+@RequestMapping("/Users")
 public class UsersController {
     @Autowired
     private UsersService usersService;
@@ -149,6 +149,16 @@ public class UsersController {
         return true;
     }
 
+    @PostMapping("Pupdate")
+    public boolean Pupdate(@RequestBody Map<String, Users> user) {
+        Users ubody = user.get("user");
+        System.out.println(ubody);
+//        System.out.println(ubody.get("uid"));
+        Users User = new Users(ubody.getUid(), ubody.getName(), ubody.getEmail(), ubody.getPassword(), ubody.getCreatetime(), ubody.getIDCard(), ubody.getReputation(), ubody.isGender(), ubody.isMembertype(), ubody.getPhone(), ubody.getNickname(), ubody.getStatus());
+        usersService.update(User);
+        return true;
+    }
+
     /**
      * @description: 通过手机号获取用户信息
      * @param: phone