diff --git a/.idea/misc.xml b/.idea/misc.xml index 9bb6421..2f30dbf 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,13 @@ + + + + diff --git a/mini_program.iml b/mini_program.iml index c90834f..a80f8af 100644 --- a/mini_program.iml +++ b/mini_program.iml @@ -1,11 +1,8 @@ - - - + + - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 9f003c5..57a2271 100644 --- a/pom.xml +++ b/pom.xml @@ -49,6 +49,13 @@ mybatis-spring-boot-starter 2.2.2 + + + + org.json + json + 20231013 + diff --git a/src/main/java/com/example/mini_program/MiniProgramApplication.java b/src/main/java/com/example/mini_program/MiniProgramApplication.java index 44425b8..dd1b09e 100644 --- a/src/main/java/com/example/mini_program/MiniProgramApplication.java +++ b/src/main/java/com/example/mini_program/MiniProgramApplication.java @@ -2,10 +2,14 @@ package com.example.mini_program; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.scheduling.annotation.EnableAsync; @SpringBootApplication +@EnableAsync public class MiniProgramApplication { + public static void main(String[] args) { SpringApplication.run(MiniProgramApplication.class, args); } + } diff --git a/src/main/java/com/example/mini_program/controller/demo/mini/WxMiniAppConfig.java b/src/main/java/com/example/mini_program/config/WxMiniAppConfig.java similarity index 89% rename from src/main/java/com/example/mini_program/controller/demo/mini/WxMiniAppConfig.java rename to src/main/java/com/example/mini_program/config/WxMiniAppConfig.java index f67c1d6..1c12774 100644 --- a/src/main/java/com/example/mini_program/controller/demo/mini/WxMiniAppConfig.java +++ b/src/main/java/com/example/mini_program/config/WxMiniAppConfig.java @@ -1,4 +1,4 @@ -package main.java.com.example.mini_program.controller.demo.mini; +package com.example.mini_program.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/example/mini_program/controller/HelloController.java b/src/main/java/com/example/mini_program/controller/HelloController.java deleted file mode 100644 index 1addbab..0000000 --- a/src/main/java/com/example/mini_program/controller/HelloController.java +++ /dev/null @@ -1,13 +0,0 @@ -package main.java.com.example.mini_program.controller; - -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -public class HelloController { - - @GetMapping("/hello") - public String hello() { - return "Hello, Spring Boot!"; - } -} diff --git a/src/main/java/com/example/mini_program/controller/demo/mini/WxLoginController.java b/src/main/java/com/example/mini_program/controller/WxLoginController.java similarity index 85% rename from src/main/java/com/example/mini_program/controller/demo/mini/WxLoginController.java rename to src/main/java/com/example/mini_program/controller/WxLoginController.java index bb60575..e73bcd9 100644 --- a/src/main/java/com/example/mini_program/controller/demo/mini/WxLoginController.java +++ b/src/main/java/com/example/mini_program/controller/WxLoginController.java @@ -1,6 +1,8 @@ -package main.java.com.example.mini_program.controller.demo.mini; +package com.example.mini_program.controller; -import com.example.demo.mini.entity.VisitApplication; +import com.example.mini_program.entity.VisitApplication; +import com.example.mini_program.service.AppointmentService; +import com.example.mini_program.service.WxLoginService; import org.springframework.web.bind.annotation.*; @RestController @@ -23,14 +25,14 @@ public class WxLoginController { * @return openid等信息 */ @GetMapping("/login") - public Result login(@RequestParam String code) { + public Result login(@RequestParam String code) { if (code == null || code.trim().isEmpty()) { return Result.error("code不能为空"); } - WxLoginResult result = wxLoginService.code2Session(code); + WxLoginService.WxLoginResult result = wxLoginService.code2Session(code); - if ("0".equals(result.getErrcode())|| "".equals(result.getErrcode())) { + if ("0".equals(result.getErrcode()) || "".equals(result.getErrcode())) { return Result.success(result); } else { return Result.error(result.getErrcode(), result.getErrmsg()); diff --git a/src/main/java/com/example/mini_program/controller/demo/Demo3Application.java b/src/main/java/com/example/mini_program/controller/demo/Demo3Application.java deleted file mode 100644 index 0759561..0000000 --- a/src/main/java/com/example/mini_program/controller/demo/Demo3Application.java +++ /dev/null @@ -1,15 +0,0 @@ -package main.java.com.example.mini_program.controller.demo; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.scheduling.annotation.EnableAsync; - -@SpringBootApplication -@EnableAsync -public class Demo3Application { - - public static void main(String[] args) { - SpringApplication.run(Demo3Application.class, args); - } - -} diff --git a/src/main/java/com/example/mini_program/controller/demo/mini/WxLoginResult.java b/src/main/java/com/example/mini_program/controller/demo/mini/WxLoginResult.java deleted file mode 100644 index 5f8fb86..0000000 --- a/src/main/java/com/example/mini_program/controller/demo/mini/WxLoginResult.java +++ /dev/null @@ -1,50 +0,0 @@ -package main.java.com.example.mini_program.controller.demo.mini; - -public class WxLoginResult { - - private String session_key; - private String unionid; - private String openid; - private String errcode; - private String errmsg; - - public String getSession_key() { - return session_key; - } - - public void setSession_key(String session_key) { - this.session_key = session_key; - } - - public String getUnionid() { - return unionid; - } - - public void setUnionid(String unionid) { - this.unionid = unionid; - } - - public String getOpenid() { - return openid; - } - - public void setOpenid(String openid) { - this.openid = openid; - } - - public String getErrcode() { - return errcode; - } - - public void setErrcode(String errcode) { - this.errcode = errcode; - } - - public String getErrmsg() { - return errmsg; - } - - public void setErrmsg(String errmsg) { - this.errmsg = errmsg; - } -} diff --git a/src/main/java/com/example/mini_program/controller/demo/mini/data.sql b/src/main/java/com/example/mini_program/controller/demo/mini/data.sql deleted file mode 100644 index 98920dc..0000000 --- a/src/main/java/com/example/mini_program/controller/demo/mini/data.sql +++ /dev/null @@ -1,54 +0,0 @@ --- -------------------------------------------------------- --- 主机: txy.588580.xyz --- 服务器版本: 5.7.44 - MySQL Community Server (GPL) --- 服务器操作系统: Linux --- HeidiSQL 版本: 12.17.0.7270 --- -------------------------------------------------------- - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET NAMES utf8 */; -/*!50503 SET NAMES utf8mb4 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - - --- 导出 mini 的数据库结构 -CREATE DATABASE IF NOT EXISTS `mini` /*!40100 DEFAULT CHARACTER SET utf8 */; -USE `mini`; - --- 导出 表 mini.visit_application 结构 -CREATE TABLE IF NOT EXISTS `visit_application` ( - `id` varchar(32) NOT NULL COMMENT '主键ID', - `name` varchar(50) NOT NULL COMMENT '访客姓名', - `phone` varchar(20) NOT NULL COMMENT '联系电话', - `company` varchar(100) DEFAULT NULL COMMENT '公司名称', - `reason` varchar(500) DEFAULT NULL COMMENT '来访原因', - `visit_date` date NOT NULL COMMENT '来访日期', - `visit_time` time DEFAULT '00:00:00' COMMENT '来访时间', - `host_name` varchar(50) DEFAULT NULL COMMENT '接待人姓名', - `area` varchar(50) DEFAULT NULL COMMENT '访问区域', - `status` varchar(20) NOT NULL DEFAULT 'pending' COMMENT '状态', - `status_text` varchar(50) DEFAULT NULL COMMENT '状态文本描述', - `openid` varchar(64) DEFAULT NULL COMMENT '微信用户openid', - `create_time` datetime DEFAULT NULL COMMENT '创建时间', - PRIMARY KEY (`id`), - KEY `idx_status` (`status`), - KEY `idx_visit_date` (`visit_date`), - KEY `idx_openid` (`openid`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='访问申请记录表'; - --- 正在导出表 mini.visit_application 的数据:~4 rows (大约) -INSERT INTO `visit_application` (`id`, `name`, `phone`, `company`, `reason`, `visit_date`, `visit_time`, `host_name`, `area`, `status`, `status_text`, `openid`, `create_time`) VALUES - ('16a235b169e3405200194dd91bc3e36f', '吴松', '12311111111', 'hj', 'jkk', '2026-04-18', '00:00:00', 'clj', 'B区-办公楼', 'cancelled', '已取消', 'ogzdF3d3Z494n28mxsUUHvASiePE', '2026-04-18 08:26:58'), - ('5f19df4769e3444d001856492c09fb78', 'k', '12224446798', 'j', '你说的这个是同步svn上的所有文件,还是某一个文件夹下的文件q', '2026-04-18', '00:00:00', 'lj', 'A区-生产车间', 'pending', '待审核', 'ogzdF3d3Z494n28mxsUUHvASiePE', '2026-04-18 08:43:57'), - ('6cd8d0ff69e5f0f9004d447951241305', '陈良', '15056476763', '安影', '测试', '2026-04-20', '10:00:00', '虞欢溢', 'A区-生产车间', 'pending', '待审核', 'ogzdF3a-l23Vfpq14b7QEp1VEukg', '2026-04-20 09:25:13'), - ('8b925adc69e5d944004a593558e0a944', '程利娟', '19805853215', '哈哈科技有限公司', '参观', '2026-04-21', '13:00:00', '生产部长', 'A区-生产车间', 'pending', '待审核', 'ogzdF3Vv42nydiUnY6lEW0ufK4Q0', '2026-04-20 07:44:04'); - -/*!40103 SET TIME_ZONE=IFNULL(@OLD_TIME_ZONE, 'system') */; -/*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */; -/*!40014 SET FOREIGN_KEY_CHECKS=IFNULL(@OLD_FOREIGN_KEY_CHECKS, 1) */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40111 SET SQL_NOTES=IFNULL(@OLD_SQL_NOTES, 1) */; diff --git a/src/main/java/com/example/mini_program/controller/demo/mini/database_export-3wUktapIrwxg.json b/src/main/java/com/example/mini_program/controller/demo/mini/database_export-3wUktapIrwxg.json deleted file mode 100644 index 045c5eb..0000000 --- a/src/main/java/com/example/mini_program/controller/demo/mini/database_export-3wUktapIrwxg.json +++ /dev/null @@ -1,4 +0,0 @@ -{"_id":"16a235b169e3405200194dd91bc3e36f","name":"吴松","phone":"12311111111","company":"hj","reason":"jkk","time":"00:00","hostName":"clj","area":"B区-办公楼","statusText":"已取消","date":"2026-04-18","status":"cancelled","createTime":{"$date":"2026-04-18T08:26:58.102Z"},"_openid":"ogzdF3d3Z494n28mxsUUHvASiePE"} -{"_id":"5f19df4769e3444d001856492c09fb78","statusText":"待审核","createTime":{"$date":"2026-04-18T08:43:57.985Z"},"_openid":"ogzdF3d3Z494n28mxsUUHvASiePE","phone":"12224446798","company":"j","reason":"你说的这个是同步svn上的所有文件,还是某一个文件夹下的文件q","date":"2026-04-18","time":"00:00","hostName":"lj","status":"pending","name":"k","area":"A区-生产车间"} -{"_id":"8b925adc69e5d944004a593558e0a944","_openid":"ogzdF3Vv42nydiUnY6lEW0ufK4Q0","name":"程利娟","company":"哈哈科技有限公司","reason":"参观","date":"2026-04-21","hostName":"生产部长","area":"A区-生产车间","status":"pending","createTime":{"$date":"2026-04-20T07:44:04.124Z"},"phone":"19805853215","time":"13:00","statusText":"待审核"} -{"_id":"6cd8d0ff69e5f0f9004d447951241305","name":"陈良","phone":"15056476763","reason":"测试","hostName":"虞欢溢","statusText":"待审核","createTime":{"$date":"2026-04-20T09:25:13.364Z"},"_openid":"ogzdF3a-l23Vfpq14b7QEp1VEukg","company":"安影","date":"2026-04-20","time":"10:00","area":"A区-生产车间","status":"pending"} diff --git a/src/main/java/com/example/mini_program/controller/demo/mini/database_export-STEP_NEQozdm.json b/src/main/java/com/example/mini_program/controller/demo/mini/database_export-STEP_NEQozdm.json deleted file mode 100644 index 484691d..0000000 --- a/src/main/java/com/example/mini_program/controller/demo/mini/database_export-STEP_NEQozdm.json +++ /dev/null @@ -1,3 +0,0 @@ -{"_id":"775c8c1769e34030001852fa5df8d835","_openid":"ogzdF3d3Z494n28mxsUUHvASiePE","avatarUrl":"wxfile://tmp_087ba7d96bc1da49c25cf77a6c2b6a90f03fffddcc59aecf.png","nickName":"i","createTime":{"$date":"2026-04-18T08:26:24.337Z"},"lastLoginTime":{"$date":"2026-04-20T09:47:25.222Z"}} -{"_id":"5065eed869e341aa0019a9352a21b8e4","_openid":"ogzdF3Vv42nydiUnY6lEW0ufK4Q0","avatarUrl":"http://tmp/q2RwR6L5kT1v2b4bd91956654d901dfa7b6cd59aa006.jpeg","nickName":"23","createTime":{"$date":"2026-04-18T08:32:42.356Z"},"lastLoginTime":{"$date":"2026-04-20T07:42:43.764Z"}} -{"_id":"775c8c1769e5f0cd00499e73707f0bb9","_openid":"ogzdF3a-l23Vfpq14b7QEp1VEukg","createTime":{"$date":"2026-04-20T09:24:29.069Z"},"lastLoginTime":{"$date":"2026-04-20T09:24:29.069Z"}} diff --git a/src/main/java/com/example/mini_program/controller/demo/mini/entity/VisitApplication.java b/src/main/java/com/example/mini_program/entity/VisitApplication.java similarity index 96% rename from src/main/java/com/example/mini_program/controller/demo/mini/entity/VisitApplication.java rename to src/main/java/com/example/mini_program/entity/VisitApplication.java index ef5c806..24bbc61 100644 --- a/src/main/java/com/example/mini_program/controller/demo/mini/entity/VisitApplication.java +++ b/src/main/java/com/example/mini_program/entity/VisitApplication.java @@ -1,4 +1,4 @@ -package main.java.com.example.mini_program.controller.demo.mini.entity; +package com.example.mini_program.entity; public class VisitApplication { diff --git a/src/main/java/com/example/mini_program/controller/demo/mini/mapper/VisitApplicationMapper.java b/src/main/java/com/example/mini_program/mapper/VisitApplicationMapper.java similarity index 75% rename from src/main/java/com/example/mini_program/controller/demo/mini/mapper/VisitApplicationMapper.java rename to src/main/java/com/example/mini_program/mapper/VisitApplicationMapper.java index 3db8f33..fe41ed9 100644 --- a/src/main/java/com/example/mini_program/controller/demo/mini/mapper/VisitApplicationMapper.java +++ b/src/main/java/com/example/mini_program/mapper/VisitApplicationMapper.java @@ -1,6 +1,6 @@ -package main.java.com.example.mini_program.controller.demo.mini.mapper; +package com.example.mini_program.mapper; -import com.example.demo.mini.entity.VisitApplication; +import com.example.mini_program.entity.VisitApplication; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/example/mini_program/controller/demo/mini/AppointmentService.java b/src/main/java/com/example/mini_program/service/AppointmentService.java similarity index 85% rename from src/main/java/com/example/mini_program/controller/demo/mini/AppointmentService.java rename to src/main/java/com/example/mini_program/service/AppointmentService.java index a47c32e..25f074c 100644 --- a/src/main/java/com/example/mini_program/controller/demo/mini/AppointmentService.java +++ b/src/main/java/com/example/mini_program/service/AppointmentService.java @@ -1,7 +1,7 @@ -package main.java.com.example.mini_program.controller.demo.mini; +package com.example.mini_program.service; -import com.example.demo.mini.entity.VisitApplication; -import com.example.demo.mini.mapper.VisitApplicationMapper; +import com.example.mini_program.entity.VisitApplication; +import com.example.mini_program.mapper.VisitApplicationMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/example/mini_program/controller/demo/mini/WxLoginService.java b/src/main/java/com/example/mini_program/service/WxLoginService.java similarity index 66% rename from src/main/java/com/example/mini_program/controller/demo/mini/WxLoginService.java rename to src/main/java/com/example/mini_program/service/WxLoginService.java index 660a833..969c0b4 100644 --- a/src/main/java/com/example/mini_program/controller/demo/mini/WxLoginService.java +++ b/src/main/java/com/example/mini_program/service/WxLoginService.java @@ -1,5 +1,6 @@ -package main.java.com.example.mini_program.controller.demo.mini; +package com.example.mini_program.service; +import com.example.mini_program.config.WxMiniAppConfig; import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -58,4 +59,53 @@ public class WxLoginService { return errorResult; } } + + public static class WxLoginResult { + + private String session_key; + private String unionid; + private String openid; + private String errcode; + private String errmsg; + + public String getSession_key() { + return session_key; + } + + public void setSession_key(String session_key) { + this.session_key = session_key; + } + + public String getUnionid() { + return unionid; + } + + public void setUnionid(String unionid) { + this.unionid = unionid; + } + + public String getOpenid() { + return openid; + } + + public void setOpenid(String openid) { + this.openid = openid; + } + + public String getErrcode() { + return errcode; + } + + public void setErrcode(String errcode) { + this.errcode = errcode; + } + + public String getErrmsg() { + return errmsg; + } + + public void setErrmsg(String errmsg) { + this.errmsg = errmsg; + } + } } diff --git a/src/main/resources/data/data.sql b/src/main/resources/data/data.sql new file mode 100644 index 0000000..eabe116 Binary files /dev/null and b/src/main/resources/data/data.sql differ diff --git a/src/main/resources/data/database_export-3wUktapIrwxg.json b/src/main/resources/data/database_export-3wUktapIrwxg.json new file mode 100644 index 0000000..8651d31 Binary files /dev/null and b/src/main/resources/data/database_export-3wUktapIrwxg.json differ diff --git a/src/main/resources/data/database_export-STEP_NEQozdm.json b/src/main/resources/data/database_export-STEP_NEQozdm.json new file mode 100644 index 0000000..c318e3c Binary files /dev/null and b/src/main/resources/data/database_export-STEP_NEQozdm.json differ