diff --git a/README.md b/README.md
index 7c7c3de..17c1d3e 100644
--- a/README.md
+++ b/README.md
@@ -104,11 +104,11 @@
项目开发环境:Ubuntu Desktop 22.04 LTS、OpenJDK 11、MySQL 8.0.12
-| 板块 | 技术栈 | 开发工具 | 备注 |
-| ------ | --------------------------------------------------------- | ------------- | ---- |
-| 前端 | Vue 3(JavaScript框架)、Element Plus(UI组件库) | VS Code | 暂定 |
-| 后端 | Java 11(开发语言)、SpringCloud(微服务)、Redis(缓存) | Intellij IDEA | |
-| 数据库 | MySQL(数据存储) | Navicat | |
+| 板块 | 技术栈 | 开发工具 | 备注 |
+| ------ | ------------------------------------------------------------ | ------------- | ---- |
+| 前端 | Vue 3(JavaScript框架)、Element Plus(UI组件库) | VS Code | 暂定 |
+| 后端 | Java 11(开发语言)、SpringCloud(微服务)、nacos-server-2.1.2(服务注册与发现)、Redis(缓存) | Intellij IDEA | |
+| 数据库 | MySQL(数据存储) | Navicat | |
@@ -172,6 +172,24 @@
### 后端
+#### 启动nacos
+
+Nacos下载地址:https://github.com/alibaba/nacos/releases/tag/2.1.2
+
+> standalone代表着单机模式运行,非集群模式
+>
+
+```bash
+cd nacos/bin
+# Windows
+startup.cmd -m standalone
+# Linux/Unix/Mac
+# sh startup.sh -m standalone
+# bash startup.sh -m standalone
+```
+
+Nacos后台默认用户名密码都是:**nacos**
+
### 前端
@@ -265,10 +283,20 @@ Spring initializr:https://start.spring.io/
https://start.spring.io/#!type=maven-project&language=java&platformVersion=2.7.5&packaging=jar&jvmVersion=11&groupId=com.cxyxiaomo&artifactId=entrance&name=Epidemic%20prevention%20platform&description=&packageName=com.cxyxiaomo.entrance&dependencies=lombok,mysql,mybatis
+##### Gateway
+
+B站教程:https://www.bilibili.com/video/BV1JB4y1F7aL
+
#### Maven
MVN REPOSITORY:https://mvnrepository.com/
+#### Nacos
+
+Quick Start:https://nacos.io/zh-cn/docs/v2/quickstart/quick-start.html
+
+
+
### 前端
#### Element Plus
diff --git a/Solutions.md b/Solutions.md
index 8d0cb53..cdcd0a1 100644
--- a/Solutions.md
+++ b/Solutions.md
@@ -1,5 +1,13 @@
# 遇到的问题及对应的解决方案
+### 2022.11
+
+#### 2022.11.05 nacos启动报错Fail to init node, please see the logs to find the reason.
+
+Nacos启动程序路径不能有中文名
+
+
+
### 2022.10
#### 2022.10.22 CRLF换行替换为LF
diff --git a/backend/.idea/encodings.xml b/backend/.idea/encodings.xml
index eb2606c..b38c268 100644
--- a/backend/.idea/encodings.xml
+++ b/backend/.idea/encodings.xml
@@ -1,10 +1,14 @@
-
-
+
+
+
+
+
+
diff --git a/backend/.idea/runConfigurations/Gateway.xml b/backend/.idea/runConfigurations/Gateway.xml
new file mode 100644
index 0000000..e762fa3
--- /dev/null
+++ b/backend/.idea/runConfigurations/Gateway.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/backend/.idea/runConfigurations/MiniProgram.xml b/backend/.idea/runConfigurations/MiniProgram.xml
index 0355893..21c67d9 100644
--- a/backend/.idea/runConfigurations/MiniProgram.xml
+++ b/backend/.idea/runConfigurations/MiniProgram.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/backend/.idea/runConfigurations/TestProvider.xml b/backend/.idea/runConfigurations/TestProvider.xml
new file mode 100644
index 0000000..9b8a6dc
--- /dev/null
+++ b/backend/.idea/runConfigurations/TestProvider.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/backend/microservice-api/pom.xml b/backend/microservice-api/pom.xml
deleted file mode 100644
index c695770..0000000
--- a/backend/microservice-api/pom.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
-
- epp
- com.cxyxiaomo
- 0.0.1-SNAPSHOT
-
- 4.0.0
-
- microservice-api
-
-
- UTF-8
- 11
- 11
-
-
-
-
- org.projectlombok
- lombok
- true
-
-
- junit
- junit
- 4.11
- test
-
-
-
-
-
-
-
-
- maven-clean-plugin
- 3.1.0
-
-
-
- maven-resources-plugin
- 3.0.2
-
-
- maven-compiler-plugin
- 3.8.0
-
-
- maven-surefire-plugin
- 2.22.1
-
-
- maven-jar-plugin
- 3.0.2
-
-
- maven-install-plugin
- 2.5.2
-
-
- maven-deploy-plugin
- 2.8.2
-
-
-
- maven-site-plugin
- 3.7.1
-
-
- maven-project-info-reports-plugin
- 3.0.0
-
-
-
-
-
diff --git a/backend/microservice-gateway/pom.xml b/backend/microservice-gateway/pom.xml
new file mode 100644
index 0000000..66749a7
--- /dev/null
+++ b/backend/microservice-gateway/pom.xml
@@ -0,0 +1,61 @@
+
+
+
+
+ epp
+ com.cxyxiaomo
+ 0.0.1-SNAPSHOT
+
+ 4.0.0
+
+ microservice-gateway
+
+
+ UTF-8
+ 1.7
+ 1.7
+
+
+
+
+ junit
+ junit
+ test
+
+
+ org.springframework.cloud
+ spring-cloud-starter-gateway
+
+
+
+ org.springframework.cloud
+ spring-cloud-starter-loadbalancer
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-discovery
+
+
+ snakeyaml
+ org.yaml
+
+
+
+
+
+ ch.qos.logback
+ logback-core
+
+
+ org.slf4j
+ slf4j-api
+
+
+ org.slf4j
+ slf4j-simple
+
+
+
+
diff --git a/backend/microservice-gateway/src/main/java/com/cxyxiaomo/epp/Gateway.java b/backend/microservice-gateway/src/main/java/com/cxyxiaomo/epp/Gateway.java
new file mode 100644
index 0000000..61bb138
--- /dev/null
+++ b/backend/microservice-gateway/src/main/java/com/cxyxiaomo/epp/Gateway.java
@@ -0,0 +1,14 @@
+package com.cxyxiaomo.epp;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+
+@SpringBootApplication
+@EnableDiscoveryClient
+public class Gateway {
+ public static void main(String[] args) {
+ SpringApplication.run(Gateway.class, args);
+ }
+}
+
diff --git a/backend/microservice-gateway/src/main/java/com/cxyxiaomo/epp/controller/Controller.java b/backend/microservice-gateway/src/main/java/com/cxyxiaomo/epp/controller/Controller.java
new file mode 100644
index 0000000..a47e047
--- /dev/null
+++ b/backend/microservice-gateway/src/main/java/com/cxyxiaomo/epp/controller/Controller.java
@@ -0,0 +1,13 @@
+package com.cxyxiaomo.epp.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class Controller {
+
+ @RequestMapping("/error")
+ public String error() {
+ return "[ERROR] 500 Internal Server Error";
+ }
+}
diff --git a/backend/microservice-gateway/src/main/resources/application.yml b/backend/microservice-gateway/src/main/resources/application.yml
new file mode 100644
index 0000000..38d4d54
--- /dev/null
+++ b/backend/microservice-gateway/src/main/resources/application.yml
@@ -0,0 +1,41 @@
+server:
+ port: 80
+
+# Spring 配置
+spring:
+ application:
+ name: microservice-gateway
+ cloud:
+ nacos:
+ discovery:
+ server-addr: 127.0.0.1:8848
+ gateway:
+ discovery:
+ locator:
+ enabled: true
+ lower-case-service-id: true
+ routes:
+ - id: test1
+ uri: lb://microservice-provider-test
+ predicates:
+ - Path=/test/**,/test1/**
+ - Method=GET,POST
+ filters:
+ - StripPrefix=1 # 跳过第一段 /test
+
+ - id: test2
+ uri: lb://microservice-provider-test
+ predicates:
+ - Path=/test2/{routes}
+ filters:
+ - SetPath=/hi/{routes}
+
+ - id: test3
+ uri: lb://microservice-provider-test
+ predicates:
+ - Path=/test3/**
+ filters:
+ - name: RedirectTo
+ args:
+ status: 302
+ url: https://www.baidu.com/?wd=
diff --git a/backend/microservice-gateway/src/test/java/com/cxyxiaomo/epp/GatewayTest.java b/backend/microservice-gateway/src/test/java/com/cxyxiaomo/epp/GatewayTest.java
new file mode 100644
index 0000000..61aea9e
--- /dev/null
+++ b/backend/microservice-gateway/src/test/java/com/cxyxiaomo/epp/GatewayTest.java
@@ -0,0 +1,20 @@
+package com.cxyxiaomo.epp;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+/**
+ * Unit test for simple App.
+ */
+public class GatewayTest
+{
+ /**
+ * Rigorous Test :-)
+ */
+ @Test
+ public void shouldAnswerWithTrue()
+ {
+ assertTrue( true );
+ }
+}
diff --git a/backend/microservice-pojo/pom.xml b/backend/microservice-pojo/pom.xml
new file mode 100644
index 0000000..8bd40b2
--- /dev/null
+++ b/backend/microservice-pojo/pom.xml
@@ -0,0 +1,33 @@
+
+
+
+
+ epp
+ com.cxyxiaomo
+ 0.0.1-SNAPSHOT
+
+ 4.0.0
+
+ microservice-pojo
+
+
+ UTF-8
+ 11
+ 11
+
+
+
+
+ org.projectlombok
+ lombok
+ true
+
+
+ junit
+ junit
+ 4.11
+ test
+
+
+
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/pojo/Apply.java b/backend/microservice-pojo/src/main/java/com/cxyxiaomo/epp/pojo/Apply.java
similarity index 59%
rename from backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/pojo/Apply.java
rename to backend/microservice-pojo/src/main/java/com/cxyxiaomo/epp/pojo/Apply.java
index 65ed8cd..eb637f0 100644
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/pojo/Apply.java
+++ b/backend/microservice-pojo/src/main/java/com/cxyxiaomo/epp/pojo/Apply.java
@@ -1,9 +1,15 @@
-package com.cxyxiaomo.index.pojo;
+package com.cxyxiaomo.epp.pojo;
import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
@Data
-public class Apply {
+@NoArgsConstructor
+@Accessors(chain = true) // 链式写法
+public class Apply implements Serializable {
private Integer id;
diff --git a/backend/microservice-pojo/src/main/java/com/cxyxiaomo/epp/pojo/Feedback.java b/backend/microservice-pojo/src/main/java/com/cxyxiaomo/epp/pojo/Feedback.java
new file mode 100644
index 0000000..91f909e
--- /dev/null
+++ b/backend/microservice-pojo/src/main/java/com/cxyxiaomo/epp/pojo/Feedback.java
@@ -0,0 +1,23 @@
+package com.cxyxiaomo.epp.pojo;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true) // 链式写法
+public class Feedback implements Serializable {
+
+ private Integer id;
+
+ private String title;
+
+ private String content;
+
+ private String time;
+
+ private String reply;
+}
diff --git a/backend/microservice-pojo/src/main/java/com/cxyxiaomo/epp/pojo/Notice.java b/backend/microservice-pojo/src/main/java/com/cxyxiaomo/epp/pojo/Notice.java
new file mode 100644
index 0000000..3513243
--- /dev/null
+++ b/backend/microservice-pojo/src/main/java/com/cxyxiaomo/epp/pojo/Notice.java
@@ -0,0 +1,26 @@
+package com.cxyxiaomo.epp.pojo;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+// import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true) // 链式写法
+public class Notice implements Serializable {
+
+ private Integer id;
+
+ private String title;
+
+ private String content;
+
+ // @DateTimeFormat(pattern = "yyyy-MM-dd")
+ // TODO
+ private String time;
+
+}
+
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/pojo/Report.java b/backend/microservice-pojo/src/main/java/com/cxyxiaomo/epp/pojo/Report.java
similarity index 58%
rename from backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/pojo/Report.java
rename to backend/microservice-pojo/src/main/java/com/cxyxiaomo/epp/pojo/Report.java
index c3fa660..24b0253 100644
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/pojo/Report.java
+++ b/backend/microservice-pojo/src/main/java/com/cxyxiaomo/epp/pojo/Report.java
@@ -1,9 +1,15 @@
-package com.cxyxiaomo.index.pojo;
+package com.cxyxiaomo.epp.pojo;
import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
@Data
-public class Report {
+@NoArgsConstructor
+@Accessors(chain = true) // 链式写法
+public class Report implements Serializable {
private Integer id;
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/pojo/Res.java b/backend/microservice-pojo/src/main/java/com/cxyxiaomo/epp/pojo/Res.java
similarity index 94%
rename from backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/pojo/Res.java
rename to backend/microservice-pojo/src/main/java/com/cxyxiaomo/epp/pojo/Res.java
index b431900..c0f0b44 100644
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/pojo/Res.java
+++ b/backend/microservice-pojo/src/main/java/com/cxyxiaomo/epp/pojo/Res.java
@@ -1,4 +1,4 @@
-package com.cxyxiaomo.index.pojo;
+package com.cxyxiaomo.epp.pojo;
import lombok.Data;
diff --git a/backend/microservice-api/src/main/java/com/cxyxiaomo/epp/pojo/User.java b/backend/microservice-pojo/src/main/java/com/cxyxiaomo/epp/pojo/User.java
similarity index 56%
rename from backend/microservice-api/src/main/java/com/cxyxiaomo/epp/pojo/User.java
rename to backend/microservice-pojo/src/main/java/com/cxyxiaomo/epp/pojo/User.java
index e7e6046..e38012b 100644
--- a/backend/microservice-api/src/main/java/com/cxyxiaomo/epp/pojo/User.java
+++ b/backend/microservice-pojo/src/main/java/com/cxyxiaomo/epp/pojo/User.java
@@ -1,9 +1,7 @@
package com.cxyxiaomo.epp.pojo;
import lombok.Data;
-import lombok.Getter;
import lombok.NoArgsConstructor;
-import lombok.Setter;
import lombok.experimental.Accessors;
import java.io.Serializable;
@@ -11,12 +9,16 @@ import java.io.Serializable;
// 数据库关系映射
@Data
-@Getter
-@Setter
@NoArgsConstructor
@Accessors(chain = true) // 链式写法
-public class User implements Serializable { // 微服务必须要实现Serializable
- private Long id;
+// 微服务必须要实现Serializable
+public class User implements Serializable {
+ private Integer id;
private String username;
+ private String name;
private String password;
+ private String img;
+ private String stu_id;
+ private Integer role;
+ private String state;
}
diff --git a/backend/microservice-pojo/src/main/java/com/cxyxiaomo/epp/pojo/Visitor.java b/backend/microservice-pojo/src/main/java/com/cxyxiaomo/epp/pojo/Visitor.java
new file mode 100644
index 0000000..6376b79
--- /dev/null
+++ b/backend/microservice-pojo/src/main/java/com/cxyxiaomo/epp/pojo/Visitor.java
@@ -0,0 +1,28 @@
+package com.cxyxiaomo.epp.pojo;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true) // 链式写法
+public class Visitor implements Serializable {
+
+ private Integer id;
+
+ private String time;
+
+ private String phone;
+
+ private String issue;
+
+ private String meet_name;
+
+ private String create_time;
+
+ private Integer state;
+
+}
diff --git a/backend/microservice-provider-miniprogram-8080/pom.xml b/backend/microservice-provider-miniprogram-8080/pom.xml
index 89202a0..3c3fe65 100644
--- a/backend/microservice-provider-miniprogram-8080/pom.xml
+++ b/backend/microservice-provider-miniprogram-8080/pom.xml
@@ -18,6 +18,12 @@
+
+
+ com.cxyxiaomo
+ microservice-pojo
+ 0.0.1-SNAPSHOT
+
org.projectlombok
lombok
@@ -59,5 +65,10 @@
org.slf4j
slf4j-simple
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-discovery
+
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/Application.java b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/Application.java
similarity index 69%
rename from backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/Application.java
rename to backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/Application.java
index 5ba4073..6aa73fb 100644
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/Application.java
+++ b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/Application.java
@@ -1,9 +1,11 @@
-package com.cxyxiaomo;
+package com.cxyxiaomo.epp;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@SpringBootApplication
+@EnableDiscoveryClient
public class Application {
public static void main(String[] args) {
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/controller/ApplyController.java b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/controller/ApplyController.java
similarity index 89%
rename from backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/controller/ApplyController.java
rename to backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/controller/ApplyController.java
index 125e08f..49a2fea 100644
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/controller/ApplyController.java
+++ b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/controller/ApplyController.java
@@ -1,8 +1,8 @@
-package com.cxyxiaomo.index.controller;
+package com.cxyxiaomo.epp.index.controller;
-import com.cxyxiaomo.index.pojo.Apply;
-import com.cxyxiaomo.index.pojo.Res;
-import com.cxyxiaomo.index.service.ApplyService;
+import com.cxyxiaomo.epp.pojo.Apply;
+import com.cxyxiaomo.epp.pojo.Res;
+import com.cxyxiaomo.epp.index.service.ApplyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/controller/NoticeController.java b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/controller/NoticeController.java
similarity index 83%
rename from backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/controller/NoticeController.java
rename to backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/controller/NoticeController.java
index 80acc7f..7b5e6b6 100644
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/controller/NoticeController.java
+++ b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/controller/NoticeController.java
@@ -1,8 +1,8 @@
-package com.cxyxiaomo.index.controller;
+package com.cxyxiaomo.epp.index.controller;
-import com.cxyxiaomo.index.pojo.Notice;
-import com.cxyxiaomo.index.pojo.Res;
-import com.cxyxiaomo.index.service.NoticeService;
+import com.cxyxiaomo.epp.pojo.Notice;
+import com.cxyxiaomo.epp.pojo.Res;
+import com.cxyxiaomo.epp.index.service.NoticeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/controller/OtherController.java b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/controller/OtherController.java
similarity index 90%
rename from backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/controller/OtherController.java
rename to backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/controller/OtherController.java
index 1bf61e4..3973dc7 100644
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/controller/OtherController.java
+++ b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/controller/OtherController.java
@@ -1,7 +1,7 @@
-package com.cxyxiaomo.index.controller;
+package com.cxyxiaomo.epp.index.controller;
-import com.cxyxiaomo.index.pojo.Res;
-import com.cxyxiaomo.index.service.OtherService;
+import com.cxyxiaomo.epp.pojo.Res;
+import com.cxyxiaomo.epp.index.service.OtherService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/controller/ReportController.java b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/controller/ReportController.java
similarity index 81%
rename from backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/controller/ReportController.java
rename to backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/controller/ReportController.java
index b3ab100..c20c550 100644
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/controller/ReportController.java
+++ b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/controller/ReportController.java
@@ -1,8 +1,8 @@
-package com.cxyxiaomo.index.controller;
+package com.cxyxiaomo.epp.index.controller;
-import com.cxyxiaomo.index.pojo.Report;
-import com.cxyxiaomo.index.pojo.Res;
-import com.cxyxiaomo.index.service.ReportService;
+import com.cxyxiaomo.epp.pojo.Report;
+import com.cxyxiaomo.epp.pojo.Res;
+import com.cxyxiaomo.epp.index.service.ReportService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/controller/UserController.java b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/controller/UserController.java
similarity index 93%
rename from backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/controller/UserController.java
rename to backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/controller/UserController.java
index 66c51fe..32d2c88 100644
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/controller/UserController.java
+++ b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/controller/UserController.java
@@ -1,8 +1,8 @@
-package com.cxyxiaomo.index.controller;
+package com.cxyxiaomo.epp.index.controller;
-import com.cxyxiaomo.index.pojo.Res;
-import com.cxyxiaomo.index.pojo.User;
-import com.cxyxiaomo.index.service.UserService;
+import com.cxyxiaomo.epp.pojo.Res;
+import com.cxyxiaomo.epp.pojo.User;
+import com.cxyxiaomo.epp.index.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/controller/toCodeController.java b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/controller/toCodeController.java
similarity index 98%
rename from backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/controller/toCodeController.java
rename to backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/controller/toCodeController.java
index e09e593..7a7dbcd 100644
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/controller/toCodeController.java
+++ b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/controller/toCodeController.java
@@ -1,4 +1,4 @@
-package com.cxyxiaomo.index.controller;
+package com.cxyxiaomo.epp.index.controller;
import java.awt.image.BufferedImage;
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/dao/ApplyDao.java b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/dao/ApplyDao.java
similarity index 80%
rename from backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/dao/ApplyDao.java
rename to backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/dao/ApplyDao.java
index a1f4673..8103c2c 100644
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/dao/ApplyDao.java
+++ b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/dao/ApplyDao.java
@@ -1,6 +1,6 @@
-package com.cxyxiaomo.index.dao;
+package com.cxyxiaomo.epp.index.dao;
-import com.cxyxiaomo.index.pojo.Apply;
+import com.cxyxiaomo.epp.pojo.Apply;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/dao/NoticeDao.java b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/dao/NoticeDao.java
similarity index 74%
rename from backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/dao/NoticeDao.java
rename to backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/dao/NoticeDao.java
index dffebaf..3eeb37b 100644
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/dao/NoticeDao.java
+++ b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/dao/NoticeDao.java
@@ -1,6 +1,6 @@
-package com.cxyxiaomo.index.dao;
+package com.cxyxiaomo.epp.index.dao;
-import com.cxyxiaomo.index.pojo.Notice;
+import com.cxyxiaomo.epp.pojo.Notice;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/dao/OtherDao.java b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/dao/OtherDao.java
similarity index 80%
rename from backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/dao/OtherDao.java
rename to backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/dao/OtherDao.java
index 451116b..b9dd0ca 100644
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/dao/OtherDao.java
+++ b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/dao/OtherDao.java
@@ -1,6 +1,6 @@
-package com.cxyxiaomo.index.dao;
+package com.cxyxiaomo.epp.index.dao;
-import com.cxyxiaomo.index.pojo.Feedback;
+import com.cxyxiaomo.epp.pojo.Feedback;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/dao/ReportDao.java b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/dao/ReportDao.java
similarity index 71%
rename from backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/dao/ReportDao.java
rename to backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/dao/ReportDao.java
index 10ec525..c02f4b7 100644
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/dao/ReportDao.java
+++ b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/dao/ReportDao.java
@@ -1,6 +1,6 @@
-package com.cxyxiaomo.index.dao;
+package com.cxyxiaomo.epp.index.dao;
-import com.cxyxiaomo.index.pojo.Report;
+import com.cxyxiaomo.epp.pojo.Report;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/dao/UserDao.java b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/dao/UserDao.java
similarity index 86%
rename from backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/dao/UserDao.java
rename to backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/dao/UserDao.java
index 484714d..cc14d3b 100644
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/dao/UserDao.java
+++ b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/dao/UserDao.java
@@ -1,6 +1,6 @@
-package com.cxyxiaomo.index.dao;
+package com.cxyxiaomo.epp.index.dao;
-import com.cxyxiaomo.index.pojo.User;
+import com.cxyxiaomo.epp.pojo.User;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/service/ApplyService.java b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/service/ApplyService.java
similarity index 75%
rename from backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/service/ApplyService.java
rename to backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/service/ApplyService.java
index ef20c17..d71c48d 100644
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/service/ApplyService.java
+++ b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/service/ApplyService.java
@@ -1,6 +1,6 @@
-package com.cxyxiaomo.index.service;
+package com.cxyxiaomo.epp.index.service;
-import com.cxyxiaomo.index.pojo.Apply;
+import com.cxyxiaomo.epp.pojo.Apply;
import java.util.List;
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/service/ApplyServiceImpl.java b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/service/ApplyServiceImpl.java
similarity index 88%
rename from backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/service/ApplyServiceImpl.java
rename to backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/service/ApplyServiceImpl.java
index 9beef16..1b60051 100644
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/service/ApplyServiceImpl.java
+++ b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/service/ApplyServiceImpl.java
@@ -1,7 +1,7 @@
-package com.cxyxiaomo.index.service;
+package com.cxyxiaomo.epp.index.service;
-import com.cxyxiaomo.index.dao.ApplyDao;
-import com.cxyxiaomo.index.pojo.Apply;
+import com.cxyxiaomo.epp.index.dao.ApplyDao;
+import com.cxyxiaomo.epp.pojo.Apply;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/service/NoticeService.java b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/service/NoticeService.java
similarity index 68%
rename from backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/service/NoticeService.java
rename to backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/service/NoticeService.java
index 82a4e5b..498580d 100644
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/service/NoticeService.java
+++ b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/service/NoticeService.java
@@ -1,6 +1,6 @@
-package com.cxyxiaomo.index.service;
+package com.cxyxiaomo.epp.index.service;
-import com.cxyxiaomo.index.pojo.Notice;
+import com.cxyxiaomo.epp.pojo.Notice;
import java.util.List;
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/service/NoticeServiceImpl.java b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/service/NoticeServiceImpl.java
similarity index 81%
rename from backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/service/NoticeServiceImpl.java
rename to backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/service/NoticeServiceImpl.java
index 601cd91..5cdaa5f 100644
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/service/NoticeServiceImpl.java
+++ b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/service/NoticeServiceImpl.java
@@ -1,7 +1,7 @@
-package com.cxyxiaomo.index.service;
+package com.cxyxiaomo.epp.index.service;
-import com.cxyxiaomo.index.dao.NoticeDao;
-import com.cxyxiaomo.index.pojo.Notice;
+import com.cxyxiaomo.epp.index.dao.NoticeDao;
+import com.cxyxiaomo.epp.pojo.Notice;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/service/OtherService.java b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/service/OtherService.java
similarity index 77%
rename from backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/service/OtherService.java
rename to backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/service/OtherService.java
index 4657d6f..3ad2106 100644
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/service/OtherService.java
+++ b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/service/OtherService.java
@@ -1,6 +1,6 @@
-package com.cxyxiaomo.index.service;
+package com.cxyxiaomo.epp.index.service;
-import com.cxyxiaomo.index.pojo.Feedback;
+import com.cxyxiaomo.epp.pojo.Feedback;
import java.util.List;
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/service/OtherServiceImpl.java b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/service/OtherServiceImpl.java
similarity index 86%
rename from backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/service/OtherServiceImpl.java
rename to backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/service/OtherServiceImpl.java
index dcf1d7a..b31e69c 100644
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/service/OtherServiceImpl.java
+++ b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/service/OtherServiceImpl.java
@@ -1,7 +1,7 @@
-package com.cxyxiaomo.index.service;
+package com.cxyxiaomo.epp.index.service;
-import com.cxyxiaomo.index.dao.OtherDao;
-import com.cxyxiaomo.index.pojo.Feedback;
+import com.cxyxiaomo.epp.index.dao.OtherDao;
+import com.cxyxiaomo.epp.pojo.Feedback;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/service/ReportService.java b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/service/ReportService.java
similarity index 63%
rename from backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/service/ReportService.java
rename to backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/service/ReportService.java
index a91f7d8..dc33ea2 100644
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/service/ReportService.java
+++ b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/service/ReportService.java
@@ -1,6 +1,6 @@
-package com.cxyxiaomo.index.service;
+package com.cxyxiaomo.epp.index.service;
-import com.cxyxiaomo.index.pojo.Report;
+import com.cxyxiaomo.epp.pojo.Report;
import java.util.List;
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/service/ReportServiceImpl.java b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/service/ReportServiceImpl.java
similarity index 85%
rename from backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/service/ReportServiceImpl.java
rename to backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/service/ReportServiceImpl.java
index 6afd394..f62b42a 100644
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/service/ReportServiceImpl.java
+++ b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/service/ReportServiceImpl.java
@@ -1,8 +1,8 @@
-package com.cxyxiaomo.index.service;
+package com.cxyxiaomo.epp.index.service;
-import com.cxyxiaomo.index.dao.ReportDao;
-import com.cxyxiaomo.index.dao.UserDao;
-import com.cxyxiaomo.index.pojo.Report;
+import com.cxyxiaomo.epp.index.dao.ReportDao;
+import com.cxyxiaomo.epp.index.dao.UserDao;
+import com.cxyxiaomo.epp.pojo.Report;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/service/UserService.java b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/service/UserService.java
similarity index 69%
rename from backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/service/UserService.java
rename to backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/service/UserService.java
index a68bcb0..ae1d815 100644
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/service/UserService.java
+++ b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/service/UserService.java
@@ -1,13 +1,13 @@
-package com.cxyxiaomo.index.service;
+package com.cxyxiaomo.epp.index.service;
-import com.cxyxiaomo.index.pojo.User;
+import com.cxyxiaomo.epp.pojo.User;
import java.util.List;
public interface UserService {
- User getUser(String username,String role);
+ User getUser(String username, String role);
User getUserByUsername(String username);
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/service/UserServiceImpl.java b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/service/UserServiceImpl.java
similarity index 86%
rename from backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/service/UserServiceImpl.java
rename to backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/service/UserServiceImpl.java
index 45f0b7a..f03ab73 100644
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/service/UserServiceImpl.java
+++ b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/index/service/UserServiceImpl.java
@@ -1,7 +1,7 @@
-package com.cxyxiaomo.index.service;
+package com.cxyxiaomo.epp.index.service;
-import com.cxyxiaomo.index.dao.UserDao;
-import com.cxyxiaomo.index.pojo.User;
+import com.cxyxiaomo.epp.index.dao.UserDao;
+import com.cxyxiaomo.epp.pojo.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -14,7 +14,7 @@ public class UserServiceImpl implements UserService {
private UserDao userDao;
@Override
- public User getUser(String username,String role) {
+ public User getUser(String username, String role) {
return userDao.getUser(username, role);
}
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/visitor/controller/VisitorController.java b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/visitor/controller/VisitorController.java
similarity index 86%
rename from backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/visitor/controller/VisitorController.java
rename to backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/visitor/controller/VisitorController.java
index 712582f..56722fa 100644
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/visitor/controller/VisitorController.java
+++ b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/visitor/controller/VisitorController.java
@@ -1,8 +1,8 @@
-package com.cxyxiaomo.visitor.controller;
+package com.cxyxiaomo.epp.visitor.controller;
-import com.cxyxiaomo.index.pojo.Res;
-import com.cxyxiaomo.visitor.pojo.Visitor;
-import com.cxyxiaomo.visitor.service.VisitorService;
+import com.cxyxiaomo.epp.pojo.Res;
+import com.cxyxiaomo.epp.visitor.service.VisitorService;
+import com.cxyxiaomo.epp.pojo.Visitor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/visitor/dao/VisitorDao.java b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/visitor/dao/VisitorDao.java
similarity index 80%
rename from backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/visitor/dao/VisitorDao.java
rename to backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/visitor/dao/VisitorDao.java
index fcba532..1520429 100644
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/visitor/dao/VisitorDao.java
+++ b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/visitor/dao/VisitorDao.java
@@ -1,6 +1,6 @@
-package com.cxyxiaomo.visitor.dao;
+package com.cxyxiaomo.epp.visitor.dao;
-import com.cxyxiaomo.visitor.pojo.Visitor;
+import com.cxyxiaomo.epp.pojo.Visitor;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/visitor/service/VisitorService.java b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/visitor/service/VisitorService.java
similarity index 74%
rename from backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/visitor/service/VisitorService.java
rename to backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/visitor/service/VisitorService.java
index f4a8818..9405f58 100644
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/visitor/service/VisitorService.java
+++ b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/visitor/service/VisitorService.java
@@ -1,6 +1,6 @@
-package com.cxyxiaomo.visitor.service;
+package com.cxyxiaomo.epp.visitor.service;
-import com.cxyxiaomo.visitor.pojo.Visitor;
+import com.cxyxiaomo.epp.pojo.Visitor;
import java.util.List;
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/visitor/service/impl/VisitorServiceImpl.java b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/visitor/service/impl/VisitorServiceImpl.java
similarity index 86%
rename from backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/visitor/service/impl/VisitorServiceImpl.java
rename to backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/visitor/service/impl/VisitorServiceImpl.java
index 964398c..8ebc056 100644
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/visitor/service/impl/VisitorServiceImpl.java
+++ b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/epp/visitor/service/impl/VisitorServiceImpl.java
@@ -1,8 +1,8 @@
-package com.cxyxiaomo.visitor.service.impl;
+package com.cxyxiaomo.epp.visitor.service.impl;
-import com.cxyxiaomo.visitor.dao.VisitorDao;
-import com.cxyxiaomo.visitor.pojo.Visitor;
-import com.cxyxiaomo.visitor.service.VisitorService;
+import com.cxyxiaomo.epp.pojo.Visitor;
+import com.cxyxiaomo.epp.visitor.service.VisitorService;
+import com.cxyxiaomo.epp.visitor.dao.VisitorDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/pojo/Feedback.java b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/pojo/Feedback.java
deleted file mode 100644
index 0580654..0000000
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/pojo/Feedback.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.cxyxiaomo.index.pojo;
-
-import lombok.Data;
-
-@Data
-public class Feedback {
-
- private Integer id;
-
- private String title;
-
- private String content;
-
- private String time;
-
- private String reply;
-}
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/pojo/Notice.java b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/pojo/Notice.java
deleted file mode 100644
index f0d77c1..0000000
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/pojo/Notice.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.cxyxiaomo.index.pojo;
-
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-@Data
-public class Notice {
-
- private Integer id;
-
- private String title;
-
- private String content;
-
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private String time;
-
-}
-
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/pojo/User.java b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/pojo/User.java
deleted file mode 100644
index f5a59ee..0000000
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/index/pojo/User.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.cxyxiaomo.index.pojo;
-
-import lombok.Data;
-
-@Data
-public class User {
- private Integer id;
- private String username;
- private String name;
- private String password;
- private String img;
- private String stu_id;
- private Integer role;
- private String state;
-}
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/visitor/pojo/Visitor.java b/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/visitor/pojo/Visitor.java
deleted file mode 100644
index ddce0de..0000000
--- a/backend/microservice-provider-miniprogram-8080/src/main/java/com/cxyxiaomo/visitor/pojo/Visitor.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.cxyxiaomo.visitor.pojo;
-
-import lombok.Data;
-
-@Data
-public class Visitor {
-
- private Integer id;
-
- private String time;
-
- private String phone;
-
- private String issue;
-
- private String meet_name;
-
- private String create_time;
-
- private Integer state;
-
-}
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/resources/application.yml b/backend/microservice-provider-miniprogram-8080/src/main/resources/application.yml
index 008e797..41077a0 100644
--- a/backend/microservice-provider-miniprogram-8080/src/main/resources/application.yml
+++ b/backend/microservice-provider-miniprogram-8080/src/main/resources/application.yml
@@ -3,9 +3,15 @@ server:
max-http-header-size: 102400
spring:
+ application:
+ name: microservice-provider-miniprogram
+ cloud:
+ nacos:
+ discovery:
+ server-addr: 127.0.0.1:8848
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/school?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&serverTimezone=UTC
+ url: jdbc:mysql://127.0.0.1:3306/epp?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&serverTimezone=UTC
username: root
password: root
diff --git a/backend/microservice-provider-miniprogram-8080/src/main/resources/mapper/ApplyMapper.xml b/backend/microservice-provider-miniprogram-8080/src/main/resources/mapper/ApplyMapper.xml
index 1c8e22f..726ebe2 100644
--- a/backend/microservice-provider-miniprogram-8080/src/main/resources/mapper/ApplyMapper.xml
+++ b/backend/microservice-provider-miniprogram-8080/src/main/resources/mapper/ApplyMapper.xml
@@ -1,7 +1,7 @@
-
+
insert into apply
@@ -15,12 +15,12 @@
-