diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1b9cec78da365dcad9d593f1cb35bb3990de891e..1baf27b884c51544aca7e9d18f926c2c69661fd7 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,205 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -23,21 +221,35 @@
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -49,6 +261,7 @@
1732028253270
+
1732029242923
diff --git a/xiaocool-api/common/target/classes/domain/Constants.class b/xiaocool-api/common/target/classes/domain/Constants.class
deleted file mode 100644
index 16f6e73321ff5afee3e1e835070eb7878d68944f..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/common/target/classes/domain/Constants.class and /dev/null differ
diff --git a/xiaocool-api/common/target/classes/domain/Result$ResultBuilder.class b/xiaocool-api/common/target/classes/domain/Result$ResultBuilder.class
deleted file mode 100644
index 7456ebe0a7f6447dadd69fa6b3ec3a7aaad1123b..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/common/target/classes/domain/Result$ResultBuilder.class and /dev/null differ
diff --git a/xiaocool-api/common/target/classes/domain/Result.class b/xiaocool-api/common/target/classes/domain/Result.class
deleted file mode 100644
index ccc46ab56d06173b25c4b5a3c99a6ab4b25d658e..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/common/target/classes/domain/Result.class and /dev/null differ
diff --git a/xiaocool-api/common/target/classes/domain/SmsLengthEnum.class b/xiaocool-api/common/target/classes/domain/SmsLengthEnum.class
deleted file mode 100644
index 21113e82350c8836d7bab5cb907ab995f9cf673c..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/common/target/classes/domain/SmsLengthEnum.class and /dev/null differ
diff --git a/xiaocool-api/common/target/classes/domain/SmsResponseCodeEnum.class b/xiaocool-api/common/target/classes/domain/SmsResponseCodeEnum.class
deleted file mode 100644
index 098b2e93839f9e9179aa23e5b055e1abb245325a..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/common/target/classes/domain/SmsResponseCodeEnum.class and /dev/null differ
diff --git a/xiaocool-api/common/target/classes/domain/WebrtcMessage.class b/xiaocool-api/common/target/classes/domain/WebrtcMessage.class
deleted file mode 100644
index eeaa75132d7a659c91941518a4ad5a7a7beaeea1..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/common/target/classes/domain/WebrtcMessage.class and /dev/null differ
diff --git a/xiaocool-api/common/target/classes/dto/MeetingDto.class b/xiaocool-api/common/target/classes/dto/MeetingDto.class
deleted file mode 100644
index 452b84ca7c198ea593be45fba8096d1bc33dc912..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/common/target/classes/dto/MeetingDto.class and /dev/null differ
diff --git a/xiaocool-api/common/target/classes/dto/UserDTO.class b/xiaocool-api/common/target/classes/dto/UserDTO.class
deleted file mode 100644
index b1ea80b220ae103ad3535c5f1ac9ee78e1087881..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/common/target/classes/dto/UserDTO.class and /dev/null differ
diff --git a/xiaocool-api/common/target/classes/dto/UserPasswordDTO.class b/xiaocool-api/common/target/classes/dto/UserPasswordDTO.class
deleted file mode 100644
index 84fbc8a2339e2e7ce0f00dfa1f4d8742fc81faa4..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/common/target/classes/dto/UserPasswordDTO.class and /dev/null differ
diff --git a/xiaocool-api/common/target/classes/dto/UserRoleDTO.class b/xiaocool-api/common/target/classes/dto/UserRoleDTO.class
deleted file mode 100644
index a8aaecdd32f9978f95978e00994a49c63a99d29b..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/common/target/classes/dto/UserRoleDTO.class and /dev/null differ
diff --git a/xiaocool-api/common/target/classes/entity/Files.class b/xiaocool-api/common/target/classes/entity/Files.class
deleted file mode 100644
index 4acc89e4f02b9bc56bd82aff3e5566f56cfaef5d..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/common/target/classes/entity/Files.class and /dev/null differ
diff --git a/xiaocool-api/common/target/classes/entity/Meeting.class b/xiaocool-api/common/target/classes/entity/Meeting.class
deleted file mode 100644
index 00c01f3c21aa5cd09008631eafd0c8cf242f6177..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/common/target/classes/entity/Meeting.class and /dev/null differ
diff --git a/xiaocool-api/common/target/classes/entity/MeetingMember.class b/xiaocool-api/common/target/classes/entity/MeetingMember.class
deleted file mode 100644
index b598b5048d906cddcf17c7a913ee093096b3535d..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/common/target/classes/entity/MeetingMember.class and /dev/null differ
diff --git a/xiaocool-api/common/target/classes/entity/Menu.class b/xiaocool-api/common/target/classes/entity/Menu.class
deleted file mode 100644
index 762cc9f82ea0c7839d0113763c371711d7f6d372..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/common/target/classes/entity/Menu.class and /dev/null differ
diff --git a/xiaocool-api/common/target/classes/entity/Message.class b/xiaocool-api/common/target/classes/entity/Message.class
deleted file mode 100644
index e387e57deaaf4c0a9b6d8c69330a1be14b7eddcb..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/common/target/classes/entity/Message.class and /dev/null differ
diff --git a/xiaocool-api/common/target/classes/entity/MsgUser.class b/xiaocool-api/common/target/classes/entity/MsgUser.class
deleted file mode 100644
index f29048bf86c4b40671e6bc573e39b4bc9ed5dc91..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/common/target/classes/entity/MsgUser.class and /dev/null differ
diff --git a/xiaocool-api/common/target/classes/entity/MsgVo.class b/xiaocool-api/common/target/classes/entity/MsgVo.class
deleted file mode 100644
index f2547dd4a81c05319aa998e686dc505c32d8c77b..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/common/target/classes/entity/MsgVo.class and /dev/null differ
diff --git a/xiaocool-api/common/target/classes/entity/Oauth2.class b/xiaocool-api/common/target/classes/entity/Oauth2.class
deleted file mode 100644
index 0ff6cca154f53e757468cedd45c7fafa9d6a7604..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/common/target/classes/entity/Oauth2.class and /dev/null differ
diff --git a/xiaocool-api/common/target/classes/entity/Role.class b/xiaocool-api/common/target/classes/entity/Role.class
deleted file mode 100644
index b73d84906b75f474de003ad0dad36596ee71cb26..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/common/target/classes/entity/Role.class and /dev/null differ
diff --git a/xiaocool-api/common/target/classes/entity/User.class b/xiaocool-api/common/target/classes/entity/User.class
deleted file mode 100644
index 109f4baf9f003373639b0b0506547718a45eaf24..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/common/target/classes/entity/User.class and /dev/null differ
diff --git a/xiaocool-api/common/target/classes/entity/UserDetail.class b/xiaocool-api/common/target/classes/entity/UserDetail.class
deleted file mode 100644
index f3b647f9ba9950c7e6db0048e8e6538c4c6908fd..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/common/target/classes/entity/UserDetail.class and /dev/null differ
diff --git a/xiaocool-api/common/target/classes/entity/UserMeeting.class b/xiaocool-api/common/target/classes/entity/UserMeeting.class
deleted file mode 100644
index f0fe0a0153bbc806c629ac16322e1f654eec854a..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/common/target/classes/entity/UserMeeting.class and /dev/null differ
diff --git a/xiaocool-api/common/target/classes/entity/UserRole.class b/xiaocool-api/common/target/classes/entity/UserRole.class
deleted file mode 100644
index 203c473cce76ea807a1ed3f2d24c8a079a6cbc98..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/common/target/classes/entity/UserRole.class and /dev/null differ
diff --git a/xiaocool-api/common/target/classes/exception/BaseException.class b/xiaocool-api/common/target/classes/exception/BaseException.class
deleted file mode 100644
index 75b9f2c4125c837b487446572be66c5780854ac2..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/common/target/classes/exception/BaseException.class and /dev/null differ
diff --git a/xiaocool-api/common/target/classes/exception/GlobalExceptionHandler.class b/xiaocool-api/common/target/classes/exception/GlobalExceptionHandler.class
deleted file mode 100644
index f346718735f22729841aa19619596ceca1fac03c..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/common/target/classes/exception/GlobalExceptionHandler.class and /dev/null differ
diff --git a/xiaocool-api/common/target/common.jar b/xiaocool-api/common/target/common.jar
deleted file mode 100644
index e08bbaedcd66425fa1a2106da6b4e52da2264ecd..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/common/target/common.jar and /dev/null differ
diff --git a/xiaocool-api/common/target/maven-archiver/pom.properties b/xiaocool-api/common/target/maven-archiver/pom.properties
deleted file mode 100644
index 3b3b69e7bd50ef256f3bb056596400b39953b8ee..0000000000000000000000000000000000000000
--- a/xiaocool-api/common/target/maven-archiver/pom.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-artifactId=common
-groupId=com.example
-version=0.0.1-SNAPSHOT
diff --git a/xiaocool-api/common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/xiaocool-api/common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
deleted file mode 100644
index d5ae76a679851650265fe7fd82ef5ecc200db164..0000000000000000000000000000000000000000
--- a/xiaocool-api/common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ /dev/null
@@ -1,25 +0,0 @@
-dto\UserDTO.class
-entity\UserMeeting.class
-domain\Constants.class
-dto\MeetingDto.class
-entity\MeetingMember.class
-entity\Oauth2.class
-domain\SmsLengthEnum.class
-exception\GlobalExceptionHandler.class
-entity\Meeting.class
-entity\MsgVo.class
-domain\SmsResponseCodeEnum.class
-entity\MsgUser.class
-entity\Message.class
-entity\UserRole.class
-domain\WebrtcMessage.class
-entity\User.class
-exception\BaseException.class
-dto\UserRoleDTO.class
-entity\Menu.class
-dto\UserPasswordDTO.class
-domain\Result$ResultBuilder.class
-domain\Result.class
-entity\UserDetail.class
-entity\Files.class
-entity\Role.class
diff --git a/xiaocool-api/common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/xiaocool-api/common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
deleted file mode 100644
index 895dda4994a03b9443a838f1b1d43f6dbbc2f64c..0000000000000000000000000000000000000000
--- a/xiaocool-api/common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ /dev/null
@@ -1,24 +0,0 @@
-E:\xiaocool-api\common\src\main\java\dto\UserPasswordDTO.java
-E:\xiaocool-api\common\src\main\java\exception\BaseException.java
-E:\xiaocool-api\common\src\main\java\dto\MeetingDto.java
-E:\xiaocool-api\common\src\main\java\dto\UserDTO.java
-E:\xiaocool-api\common\src\main\java\entity\Role.java
-E:\xiaocool-api\common\src\main\java\domain\Result.java
-E:\xiaocool-api\common\src\main\java\entity\Oauth2.java
-E:\xiaocool-api\common\src\main\java\domain\SmsResponseCodeEnum.java
-E:\xiaocool-api\common\src\main\java\entity\Files.java
-E:\xiaocool-api\common\src\main\java\entity\Message.java
-E:\xiaocool-api\common\src\main\java\entity\MsgVo.java
-E:\xiaocool-api\common\src\main\java\entity\User.java
-E:\xiaocool-api\common\src\main\java\dto\UserRoleDTO.java
-E:\xiaocool-api\common\src\main\java\domain\WebrtcMessage.java
-E:\xiaocool-api\common\src\main\java\entity\UserMeeting.java
-E:\xiaocool-api\common\src\main\java\domain\Constants.java
-E:\xiaocool-api\common\src\main\java\domain\SmsLengthEnum.java
-E:\xiaocool-api\common\src\main\java\entity\UserDetail.java
-E:\xiaocool-api\common\src\main\java\exception\GlobalExceptionHandler.java
-E:\xiaocool-api\common\src\main\java\entity\Menu.java
-E:\xiaocool-api\common\src\main\java\entity\MeetingMember.java
-E:\xiaocool-api\common\src\main\java\entity\MsgUser.java
-E:\xiaocool-api\common\src\main\java\entity\Meeting.java
-E:\xiaocool-api\common\src\main\java\entity\UserRole.java
diff --git a/xiaocool-api/common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/xiaocool-api/common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/xiaocool-api/common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/xiaocool-api/common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/xiaocool-api/gateway/src/main/resources/Dockerfile b/xiaocool-api/gateway/src/main/resources/Dockerfile
index cb9e130c2f727dee27b3b990b8f1237a19663fc6..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/xiaocool-api/gateway/src/main/resources/Dockerfile
+++ b/xiaocool-api/gateway/src/main/resources/Dockerfile
@@ -1,25 +0,0 @@
-# 使用官方Java 8运行时作为基础镜像
-FROM openjdk:8-jre-slim
-
-# 维护者信息
-MAINTAINER yys(1009802251@qq.com)
-
-# 设置工作目录
-WORKDIR /app
-
-# 复制JAR文件和JKS文件到容器内
-COPY gateway.jar /app/app.jar
-COPY xiaoku.store.jks /app/xiaoku.store.jks
-
-# 设置环境变量
-ENV SPRING-CLOUD-NACOS-ADDR 124.222.32.229:8848
-ENV SPRING-CLOUD-SENTINEL-DASHBOARD 124.222.32.229:8070
-ENV SPRING-CLOUD-MYSQL-HOST 124.222.32.229:3310
-ENV SPRING-CLOUD-DB-NAME meeting
-ENV SPRING-CLOUD-REDIS-HOST 124.222.32.229
-
-# 暴露端口
-EXPOSE 9091
-
-# 运行Spring Boot应用
-ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/app/app.jar"]
diff --git a/xiaocool-api/gateway/src/main/resources/application-dev.yml b/xiaocool-api/gateway/src/main/resources/application-dev.yml
index 44a7e7c2567dca829697119d8f48ef15648c5228..0908c9caa95538c09567df1108a49f8ce69ba362 100644
--- a/xiaocool-api/gateway/src/main/resources/application-dev.yml
+++ b/xiaocool-api/gateway/src/main/resources/application-dev.yml
@@ -2,8 +2,8 @@ server:
port: 9091
ssl:
- key-store: classpath:server.p12
- key-store-password: Yys12300
+ key-store: xx.p12
+ key-store-password:
key-store-type: PKCS12
enabled: true
@@ -14,16 +14,16 @@ spring:
banner-mode: off
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://124.222.32.229:3310/meeting?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
+ url: jdbc:mysql://localhost:3306/meeting?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
username: root
- password: Yys12300
+ password: #数据库密码
cloud:
sentinel:
eager: true
transport:
port: 8719
- dashboard: 159.75.174.31:8070
+ dashboard: localhost:8070
gateway:
discovery:
@@ -78,7 +78,7 @@ sa-token:
#是否开启sa-token的启动动画
is-print: off #关闭控制台启动动画
# jwt秘钥
- jwt-secret-key: YysqwqMjlAsdaidaleiq
+ jwt-secret-key: #自己随便写一个
diff --git a/xiaocool-api/gateway/src/main/resources/application-pro.yml b/xiaocool-api/gateway/src/main/resources/application-pro.yml
index 5af10328535702032e251d59fc3749fc1b36a6b7..9188ebecaf5f2aea37e1988207cc06dad80cf361 100644
--- a/xiaocool-api/gateway/src/main/resources/application-pro.yml
+++ b/xiaocool-api/gateway/src/main/resources/application-pro.yml
@@ -1,8 +1,8 @@
server:
port: 9091
ssl:
- key-store: /app/xiaoku.store.jks # 指向容器内的JKS文件路径
- key-store-password: ketdloyv
+ key-store: /app/xx.jks # 指向容器内的JKS文件路径
+ key-store-password:
key-store-type: JKS
enabled: true
@@ -28,13 +28,13 @@ spring:
# Redis服务器连接密码(默认为空)
# password:
# 连接超时时间(毫秒)
- timeout: 5000ms
+ timeout: 1000ms
lettuce:
pool:
# 连接池最大连接数
max-active: 200
# 连接池最大阻塞等待时间(使用负值表示没有限制)
- max-wait: 5000ms
+ max-wait: -1ms
# 连接池中的最大空闲连接
max-idle: 10
# 连接池中的最小空闲连接
@@ -85,4 +85,4 @@ sa-token:
is-write-header: true
is-log: true
is-print: off
- jwt-secret-key: YysqwqMjlAsdaidaleiq
+ jwt-secret-key: #自己随便填一个
diff --git a/xiaocool-api/gateway/src/main/resources/application.yml b/xiaocool-api/gateway/src/main/resources/application.yml
index d434ed33a78e0dd5427ad5f4623e7be91347b09f..6dc33257db2ccc052976fda623f3616bb5f06ccd 100644
--- a/xiaocool-api/gateway/src/main/resources/application.yml
+++ b/xiaocool-api/gateway/src/main/resources/application.yml
@@ -1,4 +1,3 @@
spring:
profiles:
- active: dev
-# active: pro
\ No newline at end of file
+ active: pro/dev #这里如果是生产环境就是pro如果是本地测试环境就是dev,对应application-pro/dev.yaml
\ No newline at end of file
diff --git a/xiaocool-api/gateway/src/main/resources/bootstrap-dev.yml b/xiaocool-api/gateway/src/main/resources/bootstrap-dev.yml
index fa5399e60a9743feb7683d2d6cfc7ebd3c7420b8..89c7977d0735ca7ef9723f6791087202dae3660c 100644
--- a/xiaocool-api/gateway/src/main/resources/bootstrap-dev.yml
+++ b/xiaocool-api/gateway/src/main/resources/bootstrap-dev.yml
@@ -3,8 +3,12 @@ spring:
nacos:
discovery:
server-addr: localhost:8848 #Nacos服务注册中心地址
+ username: nacos
+ password: nacos
#namespace: dab22371-b924-4d2c-969f-f28e39e484b6
config:
+ username: nacos
+ password: nacos
server-addr: localhost:8848 #Nacos作为配置中心地址
file-extension: yml #指定yaml格式的配置
refresh-enabled: true #动态刷新配置
@@ -12,26 +16,10 @@ spring:
#group: ACCESS_GROUP
namespace: dev
username: nacos
- password: nacos
+ password: nacospwd
#redis相关基础配置
redis:
# Redis数据库索引(默认为0)
database: 1
- password: Yys12300
port: 6379
- host: 124.222.32.229
- timeout: 5000ms
- lettuce:
- pool:
- # 连接池最大连接数
- max-active: 200
- # 连接池最大阻塞等待时间(使用负值表示没有限制)
- max-wait: 5000ms
- # 连接池中的最大空闲连接
- max-idle: 10
- # 连接池中的最小空闲连接
- min-idle: 0
- cluster:
- refresh:
- adaptive: true
- period: 20
\ No newline at end of file
+ host: localhost
\ No newline at end of file
diff --git a/xiaocool-api/gateway/src/main/resources/bootstrap.yml b/xiaocool-api/gateway/src/main/resources/bootstrap.yml
index d434ed33a78e0dd5427ad5f4623e7be91347b09f..d886bd6db7aff11099b69e6ba83fcaf98b76d524 100644
--- a/xiaocool-api/gateway/src/main/resources/bootstrap.yml
+++ b/xiaocool-api/gateway/src/main/resources/bootstrap.yml
@@ -1,4 +1,3 @@
spring:
profiles:
- active: dev
-# active: pro
\ No newline at end of file
+ active: #这里如果是生产环境就是pro如果是本地测试环境就是dev,对应bootstrap-pro/dev.yaml
\ No newline at end of file
diff --git a/xiaocool-api/gateway/src/main/resources/server.p12 b/xiaocool-api/gateway/src/main/resources/server.p12
deleted file mode 100644
index 0888d80d43133f4cad3be3ca407c7113e6b599ae..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/gateway/src/main/resources/server.p12 and /dev/null differ
diff --git a/xiaocool-api/gateway/src/main/resources/xiaoku.store.jks b/xiaocool-api/gateway/src/main/resources/xiaoku.store.jks
deleted file mode 100644
index 130d8ab023f94df8196465e0ab4faa3723ffbce3..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/gateway/src/main/resources/xiaoku.store.jks and /dev/null differ
diff --git a/xiaocool-api/gateway/target/classes/Dockerfile b/xiaocool-api/gateway/target/classes/Dockerfile
deleted file mode 100644
index cb9e130c2f727dee27b3b990b8f1237a19663fc6..0000000000000000000000000000000000000000
--- a/xiaocool-api/gateway/target/classes/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-# 使用官方Java 8运行时作为基础镜像
-FROM openjdk:8-jre-slim
-
-# 维护者信息
-MAINTAINER yys(1009802251@qq.com)
-
-# 设置工作目录
-WORKDIR /app
-
-# 复制JAR文件和JKS文件到容器内
-COPY gateway.jar /app/app.jar
-COPY xiaoku.store.jks /app/xiaoku.store.jks
-
-# 设置环境变量
-ENV SPRING-CLOUD-NACOS-ADDR 124.222.32.229:8848
-ENV SPRING-CLOUD-SENTINEL-DASHBOARD 124.222.32.229:8070
-ENV SPRING-CLOUD-MYSQL-HOST 124.222.32.229:3310
-ENV SPRING-CLOUD-DB-NAME meeting
-ENV SPRING-CLOUD-REDIS-HOST 124.222.32.229
-
-# 暴露端口
-EXPOSE 9091
-
-# 运行Spring Boot应用
-ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/app/app.jar"]
diff --git a/xiaocool-api/gateway/target/classes/application-dev.yml b/xiaocool-api/gateway/target/classes/application-dev.yml
deleted file mode 100644
index 44a7e7c2567dca829697119d8f48ef15648c5228..0000000000000000000000000000000000000000
--- a/xiaocool-api/gateway/target/classes/application-dev.yml
+++ /dev/null
@@ -1,84 +0,0 @@
-server:
- port: 9091
-
- ssl:
- key-store: classpath:server.p12
- key-store-password: Yys12300
- key-store-type: PKCS12
- enabled: true
-
-spring:
- application:
- name: gateway-service
- main:
- banner-mode: off
- datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://124.222.32.229:3310/meeting?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
- username: root
- password: Yys12300
-
- cloud:
- sentinel:
- eager: true
- transport:
- port: 8719
- dashboard: 159.75.174.31:8070
-
- gateway:
- discovery:
- locator:
- enabled: true # gateway 可以从 nacos 发现微服务
-
- httpclient:
- ssl:
- useInsecureTrustManager: true # 仅用于测试环境,生产环境请使用可信的证书
-
- routes:
- - id: service
- uri: lb://service
- predicates:
- - Path=/service/**
- - id: uaa
- uri: lb://uaa
- predicates:
- - Path=/uaa/**
-
-
-
-management:
- endpoints:
- web:
- exposure:
- ## yml文件中存在特殊字符,必须用单引号包含,否则启动报错
- include: '*'
-
-#sa-token相关配置
-sa-token:
- # token 名称(同时也是 cookie 名称)
- token-name: token
- # token 有效期(单位:秒) 默认30天,-1 代表永久有效
- timeout: 72000
- #代表最低活跃频率,单位/秒,例如将其配置为 1800 (30分钟),代表用户如果30分钟无操作,则此Token会立即过期(被冻结,但不会删除掉)。
- active-timeout: 3600
- # 是否允许同一账号多地同时登录 (为 true 时允许一起登录, 为 false 时新登录挤掉旧登录)
- is-concurrent: true
- # 在多人登录同一账号时,是否共用一个 token (为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token)
- is-share: false
- # token 风格(默认可取值:uuid、simple-uuid、random-32、random-64、random-128、tik)
- token-style: simple-uuid
- # # 是否从cookie中读取token
- is-read-cookie: false
- # # 是否从head中读取token
- is-read-header: true
- # #能否写入到heard中
- is-write-header: true
- #是否输出操作日志
- is-log: true
- #是否开启sa-token的启动动画
- is-print: off #关闭控制台启动动画
- # jwt秘钥
- jwt-secret-key: YysqwqMjlAsdaidaleiq
-
-
-
diff --git a/xiaocool-api/gateway/target/classes/application-pro.yml b/xiaocool-api/gateway/target/classes/application-pro.yml
deleted file mode 100644
index 5af10328535702032e251d59fc3749fc1b36a6b7..0000000000000000000000000000000000000000
--- a/xiaocool-api/gateway/target/classes/application-pro.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-server:
- port: 9091
- ssl:
- key-store: /app/xiaoku.store.jks # 指向容器内的JKS文件路径
- key-store-password: ketdloyv
- key-store-type: JKS
- enabled: true
-
-spring:
- application:
- name: gateway-service
- main:
- banner-mode: off
-
- datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://${SPRING-CLOUD-MYSQL-HOST}/${SPRING-CLOUD-DB-NAME}?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
- username: root
- password: Yys12300
-
- #redis相关基础配置
- redis:
- # Redis数据库索引(默认为0)
- database: 1
- password: ${SPRING-CLOUD-REDIS-PWD}
- port: 6379
- host: ${SPRING-CLOUD-REDIS-HOST}
- # Redis服务器连接密码(默认为空)
- # password:
- # 连接超时时间(毫秒)
- timeout: 5000ms
- lettuce:
- pool:
- # 连接池最大连接数
- max-active: 200
- # 连接池最大阻塞等待时间(使用负值表示没有限制)
- max-wait: 5000ms
- # 连接池中的最大空闲连接
- max-idle: 10
- # 连接池中的最小空闲连接
- min-idle: 0
- cluster:
- refresh:
- adaptive: true
- period: 20
-
- cloud:
- sentinel:
- eager: true
- transport:
- port: 8719
- dashboard: ${SPRING-CLOUD-SENTINEL-DASHBOARD}
-
- gateway:
- discovery:
- locator:
- enabled: true
- routes:
- - id: service
- uri: lb://service
- predicates:
- - Path=/service/**
- - id: uaa
- uri: lb://uaa
- predicates:
- - Path=/uaa/**
- inetutils:
- preferred-networks:
-
-management:
- endpoints:
- web:
- exposure:
- include: '*'
-
-sa-token:
- token-name: token
- timeout: 72000
- active-timeout: 3600
- is-concurrent: true
- is-share: false
- token-style: simple-uuid
- is-read-cookie: false
- is-read-header: true
- is-write-header: true
- is-log: true
- is-print: off
- jwt-secret-key: YysqwqMjlAsdaidaleiq
diff --git a/xiaocool-api/gateway/target/classes/application.yml b/xiaocool-api/gateway/target/classes/application.yml
deleted file mode 100644
index d434ed33a78e0dd5427ad5f4623e7be91347b09f..0000000000000000000000000000000000000000
--- a/xiaocool-api/gateway/target/classes/application.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-spring:
- profiles:
- active: dev
-# active: pro
\ No newline at end of file
diff --git a/xiaocool-api/gateway/target/classes/bootstrap-dev.yml b/xiaocool-api/gateway/target/classes/bootstrap-dev.yml
deleted file mode 100644
index fa5399e60a9743feb7683d2d6cfc7ebd3c7420b8..0000000000000000000000000000000000000000
--- a/xiaocool-api/gateway/target/classes/bootstrap-dev.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-spring:
- cloud:
- nacos:
- discovery:
- server-addr: localhost:8848 #Nacos服务注册中心地址
- #namespace: dab22371-b924-4d2c-969f-f28e39e484b6
- config:
- server-addr: localhost:8848 #Nacos作为配置中心地址
- file-extension: yml #指定yaml格式的配置
- refresh-enabled: true #动态刷新配置
- #namespace: dev
- #group: ACCESS_GROUP
- namespace: dev
- username: nacos
- password: nacos
- #redis相关基础配置
- redis:
- # Redis数据库索引(默认为0)
- database: 1
- password: Yys12300
- port: 6379
- host: 124.222.32.229
- timeout: 5000ms
- lettuce:
- pool:
- # 连接池最大连接数
- max-active: 200
- # 连接池最大阻塞等待时间(使用负值表示没有限制)
- max-wait: 5000ms
- # 连接池中的最大空闲连接
- max-idle: 10
- # 连接池中的最小空闲连接
- min-idle: 0
- cluster:
- refresh:
- adaptive: true
- period: 20
\ No newline at end of file
diff --git a/xiaocool-api/gateway/target/classes/bootstrap-pro.yml b/xiaocool-api/gateway/target/classes/bootstrap-pro.yml
deleted file mode 100644
index 4363c07419f72aba2a0d28b1d277748c414ff044..0000000000000000000000000000000000000000
--- a/xiaocool-api/gateway/target/classes/bootstrap-pro.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-spring:
- cloud:
- nacos:
- username: ${NACOS-USERNAME}
- password: ${NACOS-PWD}
- discovery:
- ip: ${SPRING-CLOUD-NACOS-IP}
- server-addr: ${SPRING-CLOUD-NACOS-ADDR} #Nacos服务注册中心地址
- #namespace: dab22371-b924-4d2c-969f-f28e39e484b6
- username: ${NACOS-USERNAME}
- password: ${NACOS-PWD}
- config:
- server-addr: ${SPRING-CLOUD-NACOS-ADDR} #Nacos作为配置中心地址
- file-extension: yml #指定yaml格式的配置
- refresh-enabled: true #动态刷新配置
- #namespace: dev
- #group: ACCESS_GROUP
- username: ${NACOS-USERNAME}
- password: ${NACOS-PWD}
diff --git a/xiaocool-api/gateway/target/classes/bootstrap.yml b/xiaocool-api/gateway/target/classes/bootstrap.yml
deleted file mode 100644
index d434ed33a78e0dd5427ad5f4623e7be91347b09f..0000000000000000000000000000000000000000
--- a/xiaocool-api/gateway/target/classes/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-spring:
- profiles:
- active: dev
-# active: pro
\ No newline at end of file
diff --git a/xiaocool-api/gateway/target/classes/com/cool/gateway/GatewayApplication.class b/xiaocool-api/gateway/target/classes/com/cool/gateway/GatewayApplication.class
deleted file mode 100644
index f7fa1367a7dba6a79067a7e660f724b427f7cc86..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/gateway/target/classes/com/cool/gateway/GatewayApplication.class and /dev/null differ
diff --git a/xiaocool-api/gateway/target/classes/com/cool/gateway/config/ForwardAuthFilter.class b/xiaocool-api/gateway/target/classes/com/cool/gateway/config/ForwardAuthFilter.class
deleted file mode 100644
index c747d1da41917e2ba5c8c470ba029b8239415f4a..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/gateway/target/classes/com/cool/gateway/config/ForwardAuthFilter.class and /dev/null differ
diff --git a/xiaocool-api/gateway/target/classes/com/cool/gateway/config/GatewayConfiguration$1.class b/xiaocool-api/gateway/target/classes/com/cool/gateway/config/GatewayConfiguration$1.class
deleted file mode 100644
index e26e5fff80f8b0c6d5cb5f77949a9d31cc8931bd..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/gateway/target/classes/com/cool/gateway/config/GatewayConfiguration$1.class and /dev/null differ
diff --git a/xiaocool-api/gateway/target/classes/com/cool/gateway/config/GatewayConfiguration.class b/xiaocool-api/gateway/target/classes/com/cool/gateway/config/GatewayConfiguration.class
deleted file mode 100644
index d63cfd86c57a7a520b519e7a840581a5fd1ed940..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/gateway/target/classes/com/cool/gateway/config/GatewayConfiguration.class and /dev/null differ
diff --git a/xiaocool-api/gateway/target/classes/com/cool/gateway/config/HttpsConfig$1.class b/xiaocool-api/gateway/target/classes/com/cool/gateway/config/HttpsConfig$1.class
deleted file mode 100644
index 29240e4983faea90e37c4f578e85153c769b8dfa..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/gateway/target/classes/com/cool/gateway/config/HttpsConfig$1.class and /dev/null differ
diff --git a/xiaocool-api/gateway/target/classes/com/cool/gateway/config/HttpsConfig.class b/xiaocool-api/gateway/target/classes/com/cool/gateway/config/HttpsConfig.class
deleted file mode 100644
index 4d5392952355cd69fa0cdd6634fca1c567cd25a3..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/gateway/target/classes/com/cool/gateway/config/HttpsConfig.class and /dev/null differ
diff --git a/xiaocool-api/gateway/target/classes/com/cool/gateway/config/MyErrorWebExceptionHandler.class b/xiaocool-api/gateway/target/classes/com/cool/gateway/config/MyErrorWebExceptionHandler.class
deleted file mode 100644
index f90ed3234b05a69bb9fa851161efc263871e6349..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/gateway/target/classes/com/cool/gateway/config/MyErrorWebExceptionHandler.class and /dev/null differ
diff --git a/xiaocool-api/gateway/target/classes/com/cool/gateway/config/SaTokenConfigure.class b/xiaocool-api/gateway/target/classes/com/cool/gateway/config/SaTokenConfigure.class
deleted file mode 100644
index b1d028b92f955ffb2cd95da278ab8ecef95a78c0..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/gateway/target/classes/com/cool/gateway/config/SaTokenConfigure.class and /dev/null differ
diff --git a/xiaocool-api/gateway/target/classes/com/cool/gateway/controller/TestController.class b/xiaocool-api/gateway/target/classes/com/cool/gateway/controller/TestController.class
deleted file mode 100644
index 86a9f9d7e083db1a73b4c88a03d7a29fd3c6818c..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/gateway/target/classes/com/cool/gateway/controller/TestController.class and /dev/null differ
diff --git a/xiaocool-api/gateway/target/classes/com/cool/gateway/service/Impl/StpInterfaceImpl1.class b/xiaocool-api/gateway/target/classes/com/cool/gateway/service/Impl/StpInterfaceImpl1.class
deleted file mode 100644
index 28d1e2f2e01df7869fdd7c35c13df3939a4e0953..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/gateway/target/classes/com/cool/gateway/service/Impl/StpInterfaceImpl1.class and /dev/null differ
diff --git a/xiaocool-api/gateway/target/classes/education_deploy.sh b/xiaocool-api/gateway/target/classes/education_deploy.sh
deleted file mode 100644
index 1e499c4659c042ebcb9630ca26f69f0118b80a74..0000000000000000000000000000000000000000
--- a/xiaocool-api/gateway/target/classes/education_deploy.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-docker build -t gateway .
-docker run -p 9091:9091 -d --restart=always gateway
diff --git a/xiaocool-api/gateway/target/classes/server.p12 b/xiaocool-api/gateway/target/classes/server.p12
deleted file mode 100644
index 0888d80d43133f4cad3be3ca407c7113e6b599ae..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/gateway/target/classes/server.p12 and /dev/null differ
diff --git a/xiaocool-api/gateway/target/classes/xiaoku.store.jks b/xiaocool-api/gateway/target/classes/xiaoku.store.jks
deleted file mode 100644
index 130d8ab023f94df8196465e0ab4faa3723ffbce3..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/gateway/target/classes/xiaoku.store.jks and /dev/null differ
diff --git a/xiaocool-api/gateway/target/gateway.jar b/xiaocool-api/gateway/target/gateway.jar
deleted file mode 100644
index bba1bd7fef4656f3ed00ad52d8c53f42d101c54b..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/gateway/target/gateway.jar and /dev/null differ
diff --git a/xiaocool-api/gateway/target/gateway.jar.original b/xiaocool-api/gateway/target/gateway.jar.original
deleted file mode 100644
index cb7aee3b9f5f580202b7da502161ba8e31b35518..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/gateway/target/gateway.jar.original and /dev/null differ
diff --git a/xiaocool-api/gateway/target/maven-archiver/pom.properties b/xiaocool-api/gateway/target/maven-archiver/pom.properties
deleted file mode 100644
index 06ccb80c681a234cacb1d807f280dbf8d030976d..0000000000000000000000000000000000000000
--- a/xiaocool-api/gateway/target/maven-archiver/pom.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-artifactId=gateway
-groupId=com.example
-version=0.0.1-SNAPSHOT
diff --git a/xiaocool-api/gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/xiaocool-api/gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
deleted file mode 100644
index 5582baa8f9823eedd8a860017e69a7f579f6ceda..0000000000000000000000000000000000000000
--- a/xiaocool-api/gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ /dev/null
@@ -1,10 +0,0 @@
-com\cool\gateway\config\ForwardAuthFilter.class
-com\cool\gateway\GatewayApplication.class
-com\cool\gateway\config\GatewayConfiguration$1.class
-com\cool\gateway\config\MyErrorWebExceptionHandler.class
-com\cool\gateway\config\HttpsConfig.class
-com\cool\gateway\config\GatewayConfiguration.class
-com\cool\gateway\config\SaTokenConfigure.class
-com\cool\gateway\config\HttpsConfig$1.class
-com\cool\gateway\controller\TestController.class
-com\cool\gateway\service\Impl\StpInterfaceImpl1.class
diff --git a/xiaocool-api/gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/xiaocool-api/gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
deleted file mode 100644
index ac71329091c95bd1d8621f26c2c401f9a52d32cc..0000000000000000000000000000000000000000
--- a/xiaocool-api/gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ /dev/null
@@ -1,8 +0,0 @@
-E:\xiaocool-api\gateway\src\main\java\com\cool\gateway\controller\TestController.java
-E:\xiaocool-api\gateway\src\main\java\com\cool\gateway\config\ForwardAuthFilter.java
-E:\xiaocool-api\gateway\src\main\java\com\cool\gateway\config\GatewayConfiguration.java
-E:\xiaocool-api\gateway\src\main\java\com\cool\gateway\config\HttpsConfig.java
-E:\xiaocool-api\gateway\src\main\java\com\cool\gateway\config\MyErrorWebExceptionHandler.java
-E:\xiaocool-api\gateway\src\main\java\com\cool\gateway\service\Impl\StpInterfaceImpl1.java
-E:\xiaocool-api\gateway\src\main\java\com\cool\gateway\config\SaTokenConfigure.java
-E:\xiaocool-api\gateway\src\main\java\com\cool\gateway\GatewayApplication.java
diff --git a/xiaocool-api/gateway/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/xiaocool-api/gateway/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/xiaocool-api/gateway/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/xiaocool-api/gateway/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/xiaocool-api/pom.xml b/xiaocool-api/pom.xml
index 44da043a1ac44179a05bac83a46e86b6c5790407..3d7945ad1557d57e1d584ce5daccf439bdfda99c 100644
--- a/xiaocool-api/pom.xml
+++ b/xiaocool-api/pom.xml
@@ -44,7 +44,12 @@
import
-
+
+
+ com.xuxueli
+ xxl-job-core
+ 2.4.1
+
diff --git a/xiaocool-api/service/pom.xml b/xiaocool-api/service/pom.xml
index 33db8483cfda5e09d8d0e0c834d21cde68179357..e91b14a5028dcdbd316b3898a81b5eb06b948be3 100644
--- a/xiaocool-api/service/pom.xml
+++ b/xiaocool-api/service/pom.xml
@@ -57,6 +57,11 @@
1.38.0
+
+
+ com.xuxueli
+ xxl-job-core
+
diff --git a/xiaocool-api/service/src/main/java/com/cool/admin/controller/MeetingController.java b/xiaocool-api/service/src/main/java/com/cool/admin/controller/MeetingController.java
index a47091f759b3de04a72039309f0108c7c30e0635..5fb65a62a5b29b3f0b1d68135b768babbe545f9f 100644
--- a/xiaocool-api/service/src/main/java/com/cool/admin/controller/MeetingController.java
+++ b/xiaocool-api/service/src/main/java/com/cool/admin/controller/MeetingController.java
@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.cool.admin.service.impl.MeetingServiceImpl;
import com.cool.admin.service.impl.MsgUserServiceImpl;
import com.cool.admin.service.impl.UserForDetailServiceImpl;
+import com.xxl.job.core.handler.annotation.XxlJob;
import domain.Result;
import entity.Meeting;
import lombok.extern.slf4j.Slf4j;
@@ -54,6 +55,15 @@ public class MeetingController {
return Result.success(meetingService.saveOrUpdate(meeting));
}
+ //每日自动审核
+ @XxlJob("myXxlJobHandler")
+ public Result AuditMeeting(){
+ if (meetingService.AuditMeeting()){
+ return Result.success("审核成功");
+ }
+ return Result.error("审核失败");
+ }
+
//查询所有数据
@GetMapping
public Result findAll(){
@@ -112,7 +122,7 @@ public class MeetingController {
if (!"".equals(code)){
queryWarpper.like("code",code);
}
- queryWarpper.orderByAsc("`show`").orderByDesc("start_date");
+ queryWarpper.orderByDesc("start_date");
return Result.success(meetingService.page(page,queryWarpper));
}
diff --git a/xiaocool-api/service/src/main/java/com/cool/admin/service/impl/MeetingServiceImpl.java b/xiaocool-api/service/src/main/java/com/cool/admin/service/impl/MeetingServiceImpl.java
index 44e645cc204c98c9f9b9d46d1d09a09d82c05f3d..4382315e8023c59b1e0b5082bf9f4fca1a99ecdc 100644
--- a/xiaocool-api/service/src/main/java/com/cool/admin/service/impl/MeetingServiceImpl.java
+++ b/xiaocool-api/service/src/main/java/com/cool/admin/service/impl/MeetingServiceImpl.java
@@ -1,13 +1,13 @@
package com.cool.admin.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.cool.admin.mapper.MeetingMapper;
import com.cool.admin.service.IMeetingService;
-import com.cool.admin.service.IMsgUserService;
import entity.Meeting;
import entity.MeetingMember;
import entity.UserMeeting;
@@ -35,6 +35,8 @@ public class MeetingServiceImpl extends ServiceImpl impl
private MeetingMapper meetingMapper;
@Autowired
private StringRedisTemplate stringRedisTemplate;//操作key-value都是字符串
+ private static final String[] SENSITIVE_WORDS = {"敏感词1", "敏感词2", "敏感词3"};
+
LocalDateTime t1 =LocalDateTime.now();
String t0= t1.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
@@ -153,6 +155,27 @@ public class MeetingServiceImpl extends ServiceImpl impl
}
+ public boolean AuditMeeting() {
+ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(Meeting::getShow,0);
+ List meetings=meetingMapper.selectList(wrapper);
+ for (Meeting meeting : meetings) {
+ String meetingName=meeting.getName();
+ for (String word : SENSITIVE_WORDS) {
+ if (meetingName.contains(word)) {
+ meeting.setShow(2);
+ }
+ else {
+ meeting.setShow(1);
+ }
+ meetingMapper.updateById(meeting);
+ return true;
+ }
+ }
+ return false;
+ }
+
+
}
diff --git a/xiaocool-api/service/src/main/resources/Dockerfile b/xiaocool-api/service/src/main/resources/Dockerfile
index 357cf351f8dd4e4c8e9f62ea5418352ea56a2ca4..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/xiaocool-api/service/src/main/resources/Dockerfile
+++ b/xiaocool-api/service/src/main/resources/Dockerfile
@@ -1,18 +0,0 @@
-# 使用官方Java 8运行时作为基础镜像
-FROM openjdk:8-jre-slim
-MAINTAINER yys(1009802251@qq.com)
-VOLUME /tmp
-# 设置工作目录
-WORKDIR /app
-
-# 复制JAR文件和JKS文件到容器内
-COPY gateway.jar /app/app.jar
-COPY xiaoku.store.jks /app/xiaoku.store.jks
-
-ENV SPRING-CLOUD-NACOS-ADDR 124.222.32.229:8848
-ENV SPRING-CLOUD-MYSQL-HOST 124.222.32.229:3310
-ENV SPRING-CLOUD-DB-NAME meeting
-ENV SPRING-CLOUD-REDIS-HOST 124.222.32.229
-
-EXPOSE 8002
-ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/app/app.jar"]
diff --git a/xiaocool-api/service/src/main/resources/application-dev.yml b/xiaocool-api/service/src/main/resources/application-dev.yml
index 50bf6652ffa7c14c45ae0c0c40dbdb2ee0a80c88..bedda0345006c27ef48f7bcb4688838516da48a8 100644
--- a/xiaocool-api/service/src/main/resources/application-dev.yml
+++ b/xiaocool-api/service/src/main/resources/application-dev.yml
@@ -1,8 +1,8 @@
server:
port: 8002
ssl:
- key-store: classpath:server.p12
- key-store-password: Yys12300
+ key-store: classpath:xx.p12
+ key-store-password:
key-store-type: PKCS12
enabled: true
@@ -27,11 +27,32 @@ sa-token:
spring:
application:
name: service
+ #redis相关基础配置
+ redis:
+ # Redis数据库索引(默认为0)
+ database: 1
+ port: 6379
+ host: 127.0.0.1
+ # Redis服务器连接密码(默认为空)
+ # password:
+ # 连接超时时间(毫秒)
+ timeout: 1000ms
+ lettuce:
+ pool:
+ # 连接池最大连接数
+ max-active: 200
+ # 连接池最大阻塞等待时间(使用负值表示没有限制)
+ max-wait: -1ms
+ # 连接池中的最大空闲连接
+ max-idle: 10
+ # 连接池中的最小空闲连接
+ min-idle: 0
+
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://124.222.32.229:3310/meeting?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
+ url: jdbc:mysql://localhost:3306/meeting?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
username: root
password: Yys12300
@@ -40,11 +61,11 @@ spring:
cos:
# 腾讯云账户密钥对 secretId 和 secretKey
- secretId: AKIDrYL1TmaWIqPtEQQ5b2NbcP2TgelmKpFY
- secretKey: a2MjAZniYJsJYaNwOdeaKvJdv63sVZTI
+ secretId:
+ secretKey:
# 存储桶地区
- region: ap-guangzhou
+ region:
# 存储桶名称
- bucketName: xiaoku-1312782209
+ bucketName:
# 存储桶访问路径
- path: https://xiaoku-1312782209.cos.ap-guangzhou.myqcloud.com
\ No newline at end of file
+ path:
\ No newline at end of file
diff --git a/xiaocool-api/service/src/main/resources/application-pro.yml b/xiaocool-api/service/src/main/resources/application-pro.yml
index efebf64af0628b05ac3baa1b47376cb65c893160..58a8f9e0ee14b4bd16ac64732317f3e43aa46466 100644
--- a/xiaocool-api/service/src/main/resources/application-pro.yml
+++ b/xiaocool-api/service/src/main/resources/application-pro.yml
@@ -1,8 +1,8 @@
server:
port: 8002
ssl:
- key-store: /app/xiaoku.store.jks # 指向容器内的JKS文件路径
- key-store-password: ketdloyv
+ key-store: /app/xx.jks # 指向容器内的JKS文件路径
+ key-store-password:
key-store-type: JKS
enabled: true
@@ -65,11 +65,11 @@ spring:
cos:
# 腾讯云账户密钥对 secretId 和 secretKey
- secretId: AKIDrYL1TmaWIqPtEQQ5b2NbcP2TgelmKpFY
- secretKey: a2MjAZniYJsJYaNwOdeaKvJdv63sVZTI
+ secretId:
+ secretKey:
# 存储桶地区
- region: ap-guangzhou
+ region:
# 存储桶名称
- bucketName: xiaoku-1312782209
+ bucketName:
# 存储桶访问路径
- path: https://xiaoku-1312782209.cos.ap-guangzhou.myqcloud.com
\ No newline at end of file
+ path:
\ No newline at end of file
diff --git a/xiaocool-api/service/src/main/resources/application.yml b/xiaocool-api/service/src/main/resources/application.yml
index d304a48d598592eacdc87324d7c076f5309e5b54..71328795c06eeb7933bbc6d7464d62338a2be00c 100644
--- a/xiaocool-api/service/src/main/resources/application.yml
+++ b/xiaocool-api/service/src/main/resources/application.yml
@@ -1,4 +1,3 @@
spring:
profiles:
- active: pro
-# active: dev
\ No newline at end of file
+ active: #这里如果是生产环境就是pro如果是本地测试环境就是dev,对应application-pro/dev.yaml
\ No newline at end of file
diff --git a/xiaocool-api/service/src/main/resources/bootstrap-dev.yml b/xiaocool-api/service/src/main/resources/bootstrap-dev.yml
index 993a46a2b1a412378eb8505e5dd171af409ae71f..adf0b065efddf5431fb194ba2fb7d400ba2a897b 100644
--- a/xiaocool-api/service/src/main/resources/bootstrap-dev.yml
+++ b/xiaocool-api/service/src/main/resources/bootstrap-dev.yml
@@ -2,39 +2,26 @@ spring:
cloud:
nacos:
discovery:
- server-addr: localhost:8848 #Nacos服务注册中心地址
+ server-addr: localhost:8848
secure: true # 指示服务是通过 HTTPS 访问的
- #namespace: dab22371-b924-4d2c-969f-f28e39e484b6
- config:
- server-addr: localhost:8848 #Nacos作为配置中心地址
- file-extension: yml #指定yaml格式的配置
- refresh-enabled: true #动态刷新配置
- #namespace: dev
- #group: ACCESS_GROUP
- namespace: dev
- username: nacos
- password: nacos
-
#redis相关基础配置
redis:
# Redis数据库索引(默认为0)
database: 1
- password: Yys12300
port: 6379
- host: 124.222.32.229
- timeout: 5000ms
+ host: 127.0.0.1
+ # Redis服务器连接密码(默认为空)
+ # password:
+ # 连接超时时间(毫秒)
+ timeout: 1000ms
lettuce:
pool:
# 连接池最大连接数
max-active: 200
# 连接池最大阻塞等待时间(使用负值表示没有限制)
- max-wait: 5000ms
+ max-wait: -1ms
# 连接池中的最大空闲连接
max-idle: 10
# 连接池中的最小空闲连接
- min-idle: 0
- cluster:
- refresh:
- adaptive: true
- period: 20
\ No newline at end of file
+ min-idle: 0
\ No newline at end of file
diff --git a/xiaocool-api/service/src/main/resources/bootstrap.yml b/xiaocool-api/service/src/main/resources/bootstrap.yml
index 102b497e451abbc306dada469f336ac0453da186..71328795c06eeb7933bbc6d7464d62338a2be00c 100644
--- a/xiaocool-api/service/src/main/resources/bootstrap.yml
+++ b/xiaocool-api/service/src/main/resources/bootstrap.yml
@@ -1,4 +1,3 @@
spring:
profiles:
- active: pro
-# active: dev
\ No newline at end of file
+ active: #这里如果是生产环境就是pro如果是本地测试环境就是dev,对应application-pro/dev.yaml
\ No newline at end of file
diff --git a/xiaocool-api/service/target/classes/mapper/MeetingMapper.xml b/xiaocool-api/service/src/main/resources/mapper/MeetingMapper.xml
similarity index 100%
rename from xiaocool-api/service/target/classes/mapper/MeetingMapper.xml
rename to xiaocool-api/service/src/main/resources/mapper/MeetingMapper.xml
diff --git a/xiaocool-api/service/target/classes/mapper/MemberMapper.xml b/xiaocool-api/service/src/main/resources/mapper/MemberMapper.xml
similarity index 100%
rename from xiaocool-api/service/target/classes/mapper/MemberMapper.xml
rename to xiaocool-api/service/src/main/resources/mapper/MemberMapper.xml
diff --git a/xiaocool-api/service/target/classes/mapper/MsgUserMapper.xml b/xiaocool-api/service/src/main/resources/mapper/MsgUserMapper.xml
similarity index 100%
rename from xiaocool-api/service/target/classes/mapper/MsgUserMapper.xml
rename to xiaocool-api/service/src/main/resources/mapper/MsgUserMapper.xml
diff --git a/xiaocool-api/service/target/classes/mapper/UserDetailMapper.xml b/xiaocool-api/service/src/main/resources/mapper/UserDetailMapper.xml
similarity index 100%
rename from xiaocool-api/service/target/classes/mapper/UserDetailMapper.xml
rename to xiaocool-api/service/src/main/resources/mapper/UserDetailMapper.xml
diff --git a/xiaocool-api/service/src/main/resources/server.p12 b/xiaocool-api/service/src/main/resources/server.p12
deleted file mode 100644
index 0888d80d43133f4cad3be3ca407c7113e6b599ae..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/src/main/resources/server.p12 and /dev/null differ
diff --git a/xiaocool-api/service/src/main/resources/xiaoku.store.jks b/xiaocool-api/service/src/main/resources/xiaoku.store.jks
deleted file mode 100644
index 130d8ab023f94df8196465e0ab4faa3723ffbce3..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/src/main/resources/xiaoku.store.jks and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/Dockerfile b/xiaocool-api/service/target/classes/Dockerfile
deleted file mode 100644
index 357cf351f8dd4e4c8e9f62ea5418352ea56a2ca4..0000000000000000000000000000000000000000
--- a/xiaocool-api/service/target/classes/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# 使用官方Java 8运行时作为基础镜像
-FROM openjdk:8-jre-slim
-MAINTAINER yys(1009802251@qq.com)
-VOLUME /tmp
-# 设置工作目录
-WORKDIR /app
-
-# 复制JAR文件和JKS文件到容器内
-COPY gateway.jar /app/app.jar
-COPY xiaoku.store.jks /app/xiaoku.store.jks
-
-ENV SPRING-CLOUD-NACOS-ADDR 124.222.32.229:8848
-ENV SPRING-CLOUD-MYSQL-HOST 124.222.32.229:3310
-ENV SPRING-CLOUD-DB-NAME meeting
-ENV SPRING-CLOUD-REDIS-HOST 124.222.32.229
-
-EXPOSE 8002
-ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/app/app.jar"]
diff --git a/xiaocool-api/service/target/classes/application-dev.yml b/xiaocool-api/service/target/classes/application-dev.yml
deleted file mode 100644
index 50bf6652ffa7c14c45ae0c0c40dbdb2ee0a80c88..0000000000000000000000000000000000000000
--- a/xiaocool-api/service/target/classes/application-dev.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-server:
- port: 8002
- ssl:
- key-store: classpath:server.p12
- key-store-password: Yys12300
- key-store-type: PKCS12
- enabled: true
-
-# Sa-Token 配置
-sa-token:
- # token 名称(同时也是 cookie 名称)
- token-name: token
- # token 有效期(单位:秒) 默认30天,-1 代表永久有效
- timeout: 72000
- #代表最低活跃频率,单位/秒,例如将其配置为 1800 (30分钟),代表用户如果30分钟无操作,则此Token会立即过期(被冻结,但不会删除掉)。
- active-timeout: 3600
- # token 风格(默认可取值:uuid、simple-uuid、random-32、random-64、random-128、tik)
- token-style: simple-uuid
- # OAuth2.0 配置
- # # 是否从cookie中读取token
- is-read-cookie: false
- # # 是否从head中读取token
- is-read-header: true
- # #能否写入到heard中
- is-write-header: true
-
-spring:
- application:
- name: service
-
-
- datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://124.222.32.229:3310/meeting?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
- username: root
- password: Yys12300
-
-# autoconfigure:
-# exclude: org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration
-
-cos:
- # 腾讯云账户密钥对 secretId 和 secretKey
- secretId: AKIDrYL1TmaWIqPtEQQ5b2NbcP2TgelmKpFY
- secretKey: a2MjAZniYJsJYaNwOdeaKvJdv63sVZTI
- # 存储桶地区
- region: ap-guangzhou
- # 存储桶名称
- bucketName: xiaoku-1312782209
- # 存储桶访问路径
- path: https://xiaoku-1312782209.cos.ap-guangzhou.myqcloud.com
\ No newline at end of file
diff --git a/xiaocool-api/service/target/classes/application-pro.yml b/xiaocool-api/service/target/classes/application-pro.yml
deleted file mode 100644
index efebf64af0628b05ac3baa1b47376cb65c893160..0000000000000000000000000000000000000000
--- a/xiaocool-api/service/target/classes/application-pro.yml
+++ /dev/null
@@ -1,75 +0,0 @@
-server:
- port: 8002
- ssl:
- key-store: /app/xiaoku.store.jks # 指向容器内的JKS文件路径
- key-store-password: ketdloyv
- key-store-type: JKS
- enabled: true
-
-
-# Sa-Token 配置
-sa-token:
- # token 名称(同时也是 cookie 名称)
- token-name: token
- # token 有效期(单位:秒) 默认30天,-1 代表永久有效
- timeout: 72000
- #代表最低活跃频率,单位/秒,例如将其配置为 1800 (30分钟),代表用户如果30分钟无操作,则此Token会立即过期(被冻结,但不会删除掉)。
- active-timeout: 3600
- # token 风格(默认可取值:uuid、simple-uuid、random-32、random-64、random-128、tik)
- token-style: simple-uuid
- # OAuth2.0 配置
- # # 是否从cookie中读取token
- is-read-cookie: false
- # # 是否从head中读取token
- is-read-header: true
- # #能否写入到heard中
- is-write-header: true
-
-spring:
- application:
- name: service
-
- datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://${SPRING-CLOUD-MYSQL-HOST}/${SPRING-CLOUD-DB-NAME}?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
- username: root
- password: Yys12300
-
- #redis相关基础配置
- redis:
- # Redis数据库索引(默认为0)
- database: 1
- password: ${SPRING-CLOUD-REDIS-PWD}
- port: 6379
- host: ${SPRING-CLOUD-REDIS-HOST}
- # Redis服务器连接密码(默认为空)
- # password:
- # 连接超时时间(毫秒)
- timeout: 1000ms
- lettuce:
- pool:
- # 连接池最大连接数
- max-active: 200
- # 连接池最大阻塞等待时间(使用负值表示没有限制)
- max-wait: -1ms
- # 连接池中的最大空闲连接
- max-idle: 10
- # 连接池中的最小空闲连接
- min-idle: 0
- cluster:
- refresh:
- adaptive: true
- period: 20
-# autoconfigure:
-# exclude: org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration
-
-cos:
- # 腾讯云账户密钥对 secretId 和 secretKey
- secretId: AKIDrYL1TmaWIqPtEQQ5b2NbcP2TgelmKpFY
- secretKey: a2MjAZniYJsJYaNwOdeaKvJdv63sVZTI
- # 存储桶地区
- region: ap-guangzhou
- # 存储桶名称
- bucketName: xiaoku-1312782209
- # 存储桶访问路径
- path: https://xiaoku-1312782209.cos.ap-guangzhou.myqcloud.com
\ No newline at end of file
diff --git a/xiaocool-api/service/target/classes/application.yml b/xiaocool-api/service/target/classes/application.yml
deleted file mode 100644
index d304a48d598592eacdc87324d7c076f5309e5b54..0000000000000000000000000000000000000000
--- a/xiaocool-api/service/target/classes/application.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-spring:
- profiles:
- active: pro
-# active: dev
\ No newline at end of file
diff --git a/xiaocool-api/service/target/classes/bootstrap-dev.yml b/xiaocool-api/service/target/classes/bootstrap-dev.yml
deleted file mode 100644
index 993a46a2b1a412378eb8505e5dd171af409ae71f..0000000000000000000000000000000000000000
--- a/xiaocool-api/service/target/classes/bootstrap-dev.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-spring:
- cloud:
- nacos:
- discovery:
- server-addr: localhost:8848 #Nacos服务注册中心地址
- secure: true # 指示服务是通过 HTTPS 访问的
-
- #namespace: dab22371-b924-4d2c-969f-f28e39e484b6
- config:
- server-addr: localhost:8848 #Nacos作为配置中心地址
- file-extension: yml #指定yaml格式的配置
- refresh-enabled: true #动态刷新配置
- #namespace: dev
- #group: ACCESS_GROUP
- namespace: dev
- username: nacos
- password: nacos
-
- #redis相关基础配置
- redis:
- # Redis数据库索引(默认为0)
- database: 1
- password: Yys12300
- port: 6379
- host: 124.222.32.229
- timeout: 5000ms
- lettuce:
- pool:
- # 连接池最大连接数
- max-active: 200
- # 连接池最大阻塞等待时间(使用负值表示没有限制)
- max-wait: 5000ms
- # 连接池中的最大空闲连接
- max-idle: 10
- # 连接池中的最小空闲连接
- min-idle: 0
- cluster:
- refresh:
- adaptive: true
- period: 20
\ No newline at end of file
diff --git a/xiaocool-api/service/target/classes/bootstrap-pro.yml b/xiaocool-api/service/target/classes/bootstrap-pro.yml
deleted file mode 100644
index ac7923d7df71dedd0afdc94bb41a70cd0a60cb08..0000000000000000000000000000000000000000
--- a/xiaocool-api/service/target/classes/bootstrap-pro.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-spring:
- cloud:
- nacos:
- username: ${NACOS-USERNAME}
- password: ${NACOS-PWD}
- discovery:
- ip: ${SPRING-CLOUD-NACOS-IP}
- server-addr: ${SPRING-CLOUD-NACOS-ADDR}
- secure: true # 指示服务是通过 HTTPS 访问的
- username: ${NACOS-USERNAME}
- password: ${NACOS-PWD}
- config:
- server-addr: ${SPRING-CLOUD-NACOS-ADDR} #Nacos作为配置中心地址
- file-extension: yml #指定yaml格式的配置
- refresh-enabled: true #动态刷新配置
- username: ${NACOS-USERNAME}
- password: ${NACOS-PWD}
-
-
diff --git a/xiaocool-api/service/target/classes/bootstrap.yml b/xiaocool-api/service/target/classes/bootstrap.yml
deleted file mode 100644
index 102b497e451abbc306dada469f336ac0453da186..0000000000000000000000000000000000000000
--- a/xiaocool-api/service/target/classes/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-spring:
- profiles:
- active: pro
-# active: dev
\ No newline at end of file
diff --git a/xiaocool-api/service/target/classes/com/cool/ServiceApplication.class b/xiaocool-api/service/target/classes/com/cool/ServiceApplication.class
deleted file mode 100644
index b0ce16bb4f4c17087ab76d047e97dc2446f994d5..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/ServiceApplication.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/admin/controller/AuditUserController.class b/xiaocool-api/service/target/classes/com/cool/admin/controller/AuditUserController.class
deleted file mode 100644
index d4ca1a29aa34afeef1e844e0fb88e87414257553..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/admin/controller/AuditUserController.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/admin/controller/MeetingController.class b/xiaocool-api/service/target/classes/com/cool/admin/controller/MeetingController.class
deleted file mode 100644
index 6e5ca9f2daf3ce736edb2ea63b09763602f49729..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/admin/controller/MeetingController.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/admin/mapper/MeetingMapper.class b/xiaocool-api/service/target/classes/com/cool/admin/mapper/MeetingMapper.class
deleted file mode 100644
index b8f36585392acf77c25a904875976734e0ce2cf5..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/admin/mapper/MeetingMapper.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/admin/mapper/MessageMapper.class b/xiaocool-api/service/target/classes/com/cool/admin/mapper/MessageMapper.class
deleted file mode 100644
index 2d9efc77ca3f11cfa23bbb8a7fc3f6a5206db9c8..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/admin/mapper/MessageMapper.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/admin/mapper/MsgUserMapper.class b/xiaocool-api/service/target/classes/com/cool/admin/mapper/MsgUserMapper.class
deleted file mode 100644
index 34ea69b3e5b978467628d2066d2b0a73d32f022c..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/admin/mapper/MsgUserMapper.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/admin/mapper/UserDetailMapper.class b/xiaocool-api/service/target/classes/com/cool/admin/mapper/UserDetailMapper.class
deleted file mode 100644
index 28f06e2fb4457a1656d27f86062e6c15c3157158..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/admin/mapper/UserDetailMapper.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/admin/mapper/UserMapper.class b/xiaocool-api/service/target/classes/com/cool/admin/mapper/UserMapper.class
deleted file mode 100644
index 011a5eb4eeef5c15a5e05aa7a14c3afb0040eee3..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/admin/mapper/UserMapper.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/admin/service/IMeetingService.class b/xiaocool-api/service/target/classes/com/cool/admin/service/IMeetingService.class
deleted file mode 100644
index 3e8ef1812adb73b985452ebbe2839a79a67e78a9..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/admin/service/IMeetingService.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/admin/service/IMsgUserService.class b/xiaocool-api/service/target/classes/com/cool/admin/service/IMsgUserService.class
deleted file mode 100644
index 7c3ce26b33b17a31f8b7302602bd5694b678713b..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/admin/service/IMsgUserService.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/admin/service/IUserForDetailService.class b/xiaocool-api/service/target/classes/com/cool/admin/service/IUserForDetailService.class
deleted file mode 100644
index 906bbd1dff8cac8faabf1c0f23c46af7bdbb5fd5..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/admin/service/IUserForDetailService.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/admin/service/IUserService.class b/xiaocool-api/service/target/classes/com/cool/admin/service/IUserService.class
deleted file mode 100644
index f79527bd441c2a46756acd48a72d2338f5d87acd..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/admin/service/IUserService.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/admin/service/impl/MeetingServiceImpl.class b/xiaocool-api/service/target/classes/com/cool/admin/service/impl/MeetingServiceImpl.class
deleted file mode 100644
index 1acb47e3f9ee0e32b632470da1cee85b9a7a1f6b..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/admin/service/impl/MeetingServiceImpl.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/admin/service/impl/MsgUserServiceImpl.class b/xiaocool-api/service/target/classes/com/cool/admin/service/impl/MsgUserServiceImpl.class
deleted file mode 100644
index 5f12cd28026d83da2907fe6ac0b6e1eb0abf424c..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/admin/service/impl/MsgUserServiceImpl.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/admin/service/impl/UserForDetailServiceImpl.class b/xiaocool-api/service/target/classes/com/cool/admin/service/impl/UserForDetailServiceImpl.class
deleted file mode 100644
index 26a5ea836fd3971defb57d749bbc6b931d1e2455..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/admin/service/impl/UserForDetailServiceImpl.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/admin/service/impl/UserServiceImpl.class b/xiaocool-api/service/target/classes/com/cool/admin/service/impl/UserServiceImpl.class
deleted file mode 100644
index b41acb9e299a4bc6cf9e5e01a2048b7f33420dc3..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/admin/service/impl/UserServiceImpl.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/config/MybatisPlusConfig.class b/xiaocool-api/service/target/classes/com/cool/config/MybatisPlusConfig.class
deleted file mode 100644
index 76ae679a3bd1cb73ecce719fd5965232edc2c638..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/config/MybatisPlusConfig.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/config/SaTokenConfigure.class b/xiaocool-api/service/target/classes/com/cool/config/SaTokenConfigure.class
deleted file mode 100644
index f7fdf4631041f175434bec4698a28da2c5974f8f..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/config/SaTokenConfigure.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/config/WebSocketConfig.class b/xiaocool-api/service/target/classes/com/cool/config/WebSocketConfig.class
deleted file mode 100644
index 3231566ff15028f221467d7bacdfc2fc176021aa..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/config/WebSocketConfig.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/cos/client/CosConfig.class b/xiaocool-api/service/target/classes/com/cool/cos/client/CosConfig.class
deleted file mode 100644
index f6a98ba9af5bafdc8fa8ddc2cf7fef554f0348f1..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/cos/client/CosConfig.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/cos/controller/ICosFileController.class b/xiaocool-api/service/target/classes/com/cool/cos/controller/ICosFileController.class
deleted file mode 100644
index 4fd4bccbcbc01bc5b00d509d10a61787012c0749..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/cos/controller/ICosFileController.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/cos/service/ICosFileService.class b/xiaocool-api/service/target/classes/com/cool/cos/service/ICosFileService.class
deleted file mode 100644
index 13208b65d0d876f4a4d1bf2316aeee7905c8585b..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/cos/service/ICosFileService.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/cos/service/impl/ICosFileServiceImpl$TreeNode.class b/xiaocool-api/service/target/classes/com/cool/cos/service/impl/ICosFileServiceImpl$TreeNode.class
deleted file mode 100644
index b4652e85e77c9d799bd82f95b4d0f37ee39769b4..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/cos/service/impl/ICosFileServiceImpl$TreeNode.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/cos/service/impl/ICosFileServiceImpl.class b/xiaocool-api/service/target/classes/com/cool/cos/service/impl/ICosFileServiceImpl.class
deleted file mode 100644
index 9b90a45c90ab85962f76ce00738783e02f0c3eee..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/cos/service/impl/ICosFileServiceImpl.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/user/controller/EchartsController$1.class b/xiaocool-api/service/target/classes/com/cool/user/controller/EchartsController$1.class
deleted file mode 100644
index c2a866db8309ecd9e66be978997fab24baf779ea..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/user/controller/EchartsController$1.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/user/controller/EchartsController.class b/xiaocool-api/service/target/classes/com/cool/user/controller/EchartsController.class
deleted file mode 100644
index b37ebb0cd08523f116f500574a589c0c39731663..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/user/controller/EchartsController.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/user/controller/MsgUserController.class b/xiaocool-api/service/target/classes/com/cool/user/controller/MsgUserController.class
deleted file mode 100644
index 3ce82f9eb00479d549b29e9cfccbfa571dac7fc5..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/user/controller/MsgUserController.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/user/controller/MyMeetingController.class b/xiaocool-api/service/target/classes/com/cool/user/controller/MyMeetingController.class
deleted file mode 100644
index 0165b06b7137c4d9609e24320c39df4e307ce97b..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/user/controller/MyMeetingController.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/user/controller/UserController.class b/xiaocool-api/service/target/classes/com/cool/user/controller/UserController.class
deleted file mode 100644
index 22f54c192b091e366965361dd5ba99f8080fb450..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/user/controller/UserController.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/user/controller/WebrtcWS.class b/xiaocool-api/service/target/classes/com/cool/user/controller/WebrtcWS.class
deleted file mode 100644
index e6d06f50f5fe25581b1ebe2197208ad953a52812..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/user/controller/WebrtcWS.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/user/controller/WebrtcWsController.class b/xiaocool-api/service/target/classes/com/cool/user/controller/WebrtcWsController.class
deleted file mode 100644
index 5245fa51de8c5cd3c3b253d4a31aa2bdbf508a37..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/user/controller/WebrtcWsController.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/user/mapper/EchartsMapper.class b/xiaocool-api/service/target/classes/com/cool/user/mapper/EchartsMapper.class
deleted file mode 100644
index c2c7779af6e02fd447932493246227ff3ce15c1d..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/user/mapper/EchartsMapper.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/user/service/IEchartsService.class b/xiaocool-api/service/target/classes/com/cool/user/service/IEchartsService.class
deleted file mode 100644
index 4d804855cb30a14ac7c8c4ffa411c30bf787a73e..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/user/service/IEchartsService.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/user/service/Impl/EchartsServiceImpl.class b/xiaocool-api/service/target/classes/com/cool/user/service/Impl/EchartsServiceImpl.class
deleted file mode 100644
index debcd40957302fa402f43d08adcf53e19c2a9c5f..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/user/service/Impl/EchartsServiceImpl.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/user/service/Impl/WebrtcRoomServiceImpl.class b/xiaocool-api/service/target/classes/com/cool/user/service/Impl/WebrtcRoomServiceImpl.class
deleted file mode 100644
index dbc783392e7cecc0b090c35766fc94a01718610e..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/user/service/Impl/WebrtcRoomServiceImpl.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/com/cool/user/service/WebrtcRoomService.class b/xiaocool-api/service/target/classes/com/cool/user/service/WebrtcRoomService.class
deleted file mode 100644
index d52aa04c9483e397b2eb944f270e52948599270b..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/com/cool/user/service/WebrtcRoomService.class and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/education_deploy.sh b/xiaocool-api/service/target/classes/education_deploy.sh
deleted file mode 100644
index 04520290fc120c01e4b739e782297b2014c95b4d..0000000000000000000000000000000000000000
--- a/xiaocool-api/service/target/classes/education_deploy.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-docker build -t service .
-docker run -p 8002:8002 -d --restart=always service
\ No newline at end of file
diff --git a/xiaocool-api/service/target/classes/mapper/UserMapper.xml b/xiaocool-api/service/target/classes/mapper/UserMapper.xml
deleted file mode 100644
index 74c53315bfc1339444cd5f3d97c4192c0f658b7b..0000000000000000000000000000000000000000
--- a/xiaocool-api/service/target/classes/mapper/UserMapper.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/xiaocool-api/service/target/classes/server.p12 b/xiaocool-api/service/target/classes/server.p12
deleted file mode 100644
index 0888d80d43133f4cad3be3ca407c7113e6b599ae..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/server.p12 and /dev/null differ
diff --git a/xiaocool-api/service/target/classes/xiaoku.store.jks b/xiaocool-api/service/target/classes/xiaoku.store.jks
deleted file mode 100644
index 130d8ab023f94df8196465e0ab4faa3723ffbce3..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/classes/xiaoku.store.jks and /dev/null differ
diff --git a/xiaocool-api/service/target/maven-archiver/pom.properties b/xiaocool-api/service/target/maven-archiver/pom.properties
deleted file mode 100644
index 825be1313d4afd6c1e564b005ea37473807d7c68..0000000000000000000000000000000000000000
--- a/xiaocool-api/service/target/maven-archiver/pom.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-artifactId=service
-groupId=com.example
-version=0.0.1-SNAPSHOT
diff --git a/xiaocool-api/service/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/xiaocool-api/service/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
deleted file mode 100644
index eeb188a1808e5346fb41cc527cc08f346aa25d99..0000000000000000000000000000000000000000
--- a/xiaocool-api/service/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ /dev/null
@@ -1,36 +0,0 @@
-com\cool\admin\mapper\UserMapper.class
-com\cool\admin\service\impl\MsgUserServiceImpl.class
-com\cool\ServiceApplication.class
-com\cool\user\service\Impl\WebrtcRoomServiceImpl.class
-com\cool\user\service\WebrtcRoomService.class
-com\cool\admin\controller\AuditUserController.class
-com\cool\config\WebSocketConfig.class
-com\cool\user\service\Impl\EchartsServiceImpl.class
-com\cool\cos\service\ICosFileService.class
-com\cool\user\controller\WebrtcWsController.class
-com\cool\admin\controller\MeetingController.class
-com\cool\user\controller\EchartsController$1.class
-com\cool\user\controller\MyMeetingController.class
-com\cool\admin\service\IUserForDetailService.class
-com\cool\admin\service\IUserService.class
-com\cool\admin\mapper\MsgUserMapper.class
-com\cool\admin\service\impl\MeetingServiceImpl.class
-com\cool\user\service\IEchartsService.class
-com\cool\cos\controller\ICosFileController.class
-com\cool\config\SaTokenConfigure.class
-com\cool\cos\service\impl\ICosFileServiceImpl.class
-com\cool\cos\service\impl\ICosFileServiceImpl$TreeNode.class
-com\cool\config\MybatisPlusConfig.class
-com\cool\user\mapper\EchartsMapper.class
-com\cool\user\controller\WebrtcWS.class
-com\cool\admin\service\IMeetingService.class
-com\cool\user\controller\MsgUserController.class
-com\cool\admin\service\impl\UserServiceImpl.class
-com\cool\admin\mapper\MessageMapper.class
-com\cool\cos\client\CosConfig.class
-com\cool\user\controller\UserController.class
-com\cool\admin\service\impl\UserForDetailServiceImpl.class
-com\cool\admin\service\IMsgUserService.class
-com\cool\admin\mapper\MeetingMapper.class
-com\cool\user\controller\EchartsController.class
-com\cool\admin\mapper\UserDetailMapper.class
diff --git a/xiaocool-api/service/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/xiaocool-api/service/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
deleted file mode 100644
index 974ec55017066b0307e22985b961084af2eda0ee..0000000000000000000000000000000000000000
--- a/xiaocool-api/service/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ /dev/null
@@ -1,34 +0,0 @@
-E:\xiaocool-api\service\src\main\java\com\cool\admin\service\IUserForDetailService.java
-E:\xiaocool-api\service\src\main\java\com\cool\admin\mapper\UserDetailMapper.java
-E:\xiaocool-api\service\src\main\java\com\cool\admin\mapper\UserMapper.java
-E:\xiaocool-api\service\src\main\java\com\cool\ServiceApplication.java
-E:\xiaocool-api\service\src\main\java\com\cool\user\controller\WebrtcWsController.java
-E:\xiaocool-api\service\src\main\java\com\cool\user\service\Impl\WebrtcRoomServiceImpl.java
-E:\xiaocool-api\service\src\main\java\com\cool\user\mapper\EchartsMapper.java
-E:\xiaocool-api\service\src\main\java\com\cool\admin\mapper\MeetingMapper.java
-E:\xiaocool-api\service\src\main\java\com\cool\admin\mapper\MsgUserMapper.java
-E:\xiaocool-api\service\src\main\java\com\cool\admin\service\IUserService.java
-E:\xiaocool-api\service\src\main\java\com\cool\admin\service\impl\MsgUserServiceImpl.java
-E:\xiaocool-api\service\src\main\java\com\cool\cos\service\impl\ICosFileServiceImpl.java
-E:\xiaocool-api\service\src\main\java\com\cool\admin\controller\AuditUserController.java
-E:\xiaocool-api\service\src\main\java\com\cool\user\controller\UserController.java
-E:\xiaocool-api\service\src\main\java\com\cool\admin\service\IMsgUserService.java
-E:\xiaocool-api\service\src\main\java\com\cool\cos\service\ICosFileService.java
-E:\xiaocool-api\service\src\main\java\com\cool\user\service\WebrtcRoomService.java
-E:\xiaocool-api\service\src\main\java\com\cool\admin\service\IMeetingService.java
-E:\xiaocool-api\service\src\main\java\com\cool\admin\service\impl\UserServiceImpl.java
-E:\xiaocool-api\service\src\main\java\com\cool\config\MybatisPlusConfig.java
-E:\xiaocool-api\service\src\main\java\com\cool\user\controller\MsgUserController.java
-E:\xiaocool-api\service\src\main\java\com\cool\user\service\IEchartsService.java
-E:\xiaocool-api\service\src\main\java\com\cool\cos\client\CosConfig.java
-E:\xiaocool-api\service\src\main\java\com\cool\config\WebSocketConfig.java
-E:\xiaocool-api\service\src\main\java\com\cool\admin\service\impl\MeetingServiceImpl.java
-E:\xiaocool-api\service\src\main\java\com\cool\user\controller\EchartsController.java
-E:\xiaocool-api\service\src\main\java\com\cool\user\controller\MyMeetingController.java
-E:\xiaocool-api\service\src\main\java\com\cool\config\SaTokenConfigure.java
-E:\xiaocool-api\service\src\main\java\com\cool\cos\controller\ICosFileController.java
-E:\xiaocool-api\service\src\main\java\com\cool\admin\service\impl\UserForDetailServiceImpl.java
-E:\xiaocool-api\service\src\main\java\com\cool\user\service\Impl\EchartsServiceImpl.java
-E:\xiaocool-api\service\src\main\java\com\cool\user\controller\WebrtcWS.java
-E:\xiaocool-api\service\src\main\java\com\cool\admin\mapper\MessageMapper.java
-E:\xiaocool-api\service\src\main\java\com\cool\admin\controller\MeetingController.java
diff --git a/xiaocool-api/service/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/xiaocool-api/service/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/xiaocool-api/service/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/xiaocool-api/service/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/xiaocool-api/service/target/service.jar b/xiaocool-api/service/target/service.jar
deleted file mode 100644
index e6f33afc3a327313b6d91da288024e2428499659..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/service.jar and /dev/null differ
diff --git a/xiaocool-api/service/target/service.jar.original b/xiaocool-api/service/target/service.jar.original
deleted file mode 100644
index 8f19c15b5cffbbc2e0df3a886ffa3bc67675a2c2..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/service/target/service.jar.original and /dev/null differ
diff --git a/xiaocool-api/uaa/pom.xml b/xiaocool-api/uaa/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c1cf23e70d6ac8b66d0bd37dd23019fc3128daa0
--- /dev/null
+++ b/xiaocool-api/uaa/pom.xml
@@ -0,0 +1,140 @@
+
+
+ 4.0.0
+
+ com.example
+ xiao-cool
+ 0.0.1-SNAPSHOT
+
+
+ uaa
+
+
+
+ com.example
+ common
+ ${project.version}
+
+
+
+ mysql
+ mysql-connector-java
+
+
+
+
+ cn.dev33
+ sa-token-spring-boot-starter
+ 1.38.0
+
+
+
+ cn.dev33
+ sa-token-jwt
+ 1.38.0
+
+
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-discovery
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-config
+
+
+
+ org.springframework.cloud
+ spring-cloud-starter-bootstrap
+ 3.1.1
+
+
+
+
+
+
+ cn.dev33
+ sa-token-redis-jackson
+ 1.38.0
+
+
+
+ cn.dev33
+ sa-token-oauth2
+ 1.38.0
+
+
+
+ org.apache.commons
+ commons-pool2
+
+
+
+ org.springframework
+ spring-web
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-thymeleaf
+
+
+
+
+ com.alipay.sdk
+ alipay-sdk-java
+ 4.39.246.ALL
+
+
+
+ com.sun.mail
+ javax.mail
+ 1.6.2
+
+
+
+
+ com.tencentcloudapi
+ tencentcloud-sdk-java
+
+
+ 3.1.322
+
+
+
+
+ 8
+ 8
+ UTF-8
+
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+ repackage
+
+ repackage
+
+
+
+
+
+ uaa
+
+
+
+
\ No newline at end of file
diff --git a/xiaocool-api/uaa/src/main/java/com/cool/uaa/UaaApplication.java b/xiaocool-api/uaa/src/main/java/com/cool/uaa/UaaApplication.java
new file mode 100644
index 0000000000000000000000000000000000000000..774d3e8f0159d82b702f3b62619559295733ea7f
--- /dev/null
+++ b/xiaocool-api/uaa/src/main/java/com/cool/uaa/UaaApplication.java
@@ -0,0 +1,18 @@
+package com.cool.uaa;
+
+import cn.dev33.satoken.SaManager;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+@EnableFeignClients
+@EnableDiscoveryClient
+@SpringBootApplication
+public class UaaApplication {
+ public static void main(String[] args) {
+ SpringApplication.run(UaaApplication.class, args);
+
+ }
+}
+
diff --git a/xiaocool-api/uaa/src/main/java/com/cool/uaa/config/FeignInterceptor.java b/xiaocool-api/uaa/src/main/java/com/cool/uaa/config/FeignInterceptor.java
new file mode 100644
index 0000000000000000000000000000000000000000..7ec962ff2fcebeaaf67484d6ca2d80ddaca85e3e
--- /dev/null
+++ b/xiaocool-api/uaa/src/main/java/com/cool/uaa/config/FeignInterceptor.java
@@ -0,0 +1,21 @@
+package com.cool.uaa.config;
+
+import cn.dev33.satoken.same.SaSameUtil;
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import org.springframework.stereotype.Component;
+
+/**
+ * feign拦截器, 在feign请求发出之前,加入一些操作
+ */
+@Component
+public class FeignInterceptor implements RequestInterceptor {
+ // 为 Feign 的 RCP调用 添加请求头Same-Token
+ @Override
+ public void apply(RequestTemplate requestTemplate) {
+ requestTemplate.header(SaSameUtil.SAME_TOKEN, SaSameUtil.getToken());
+
+ // 如果希望被调用方有会话状态,此处就还需要将 satoken 添加到请求头中
+ // requestTemplate.header(StpUtil.getTokenName(), StpUtil.getTokenValue());
+ }
+}
\ No newline at end of file
diff --git a/xiaocool-api/uaa/src/main/java/com/cool/uaa/config/SaTokenConfig.java b/xiaocool-api/uaa/src/main/java/com/cool/uaa/config/SaTokenConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..efd0cf0ee47e1018b538d8c9efcd0b7e177743b2
--- /dev/null
+++ b/xiaocool-api/uaa/src/main/java/com/cool/uaa/config/SaTokenConfig.java
@@ -0,0 +1,46 @@
+package com.cool.uaa.config;
+
+
+import cn.dev33.satoken.context.SaHolder;
+import cn.dev33.satoken.filter.SaServletFilter;
+import cn.dev33.satoken.jwt.StpLogicJwtForSimple;
+import cn.dev33.satoken.same.SaSameUtil;
+import cn.dev33.satoken.stp.StpLogic;
+import cn.dev33.satoken.util.SaResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+@Slf4j
+public class SaTokenConfig implements WebMvcConfigurer {
+
+ /**
+ * jwt生成
+ * @return
+ */
+ @Bean
+ public StpLogic stpLogicJWT(){
+ return new StpLogicJwtForSimple();
+ }
+
+
+ // 注册 Sa-Token 全局过滤器
+ @Bean
+ public SaServletFilter getSaServletFilter() {
+ return new SaServletFilter()
+ .addInclude("/**")
+ .addExclude("/favicon.png","/oauth2/doLogin")
+ .setAuth(obj -> {
+ // 校验 Same-Token 身份凭证 —— 以下两句代码可简化为:SaSameUtil.checkCurrentRequestToken();
+ String token = SaHolder.getRequest().getHeader(SaSameUtil.SAME_TOKEN);
+ SaSameUtil.checkToken(token);
+
+ })
+ .setError(e -> SaResult.error(e.getMessage()))
+ ;
+ }
+
+
+}
\ No newline at end of file
diff --git a/xiaocool-api/uaa/src/main/java/com/cool/uaa/config/SaTokenOAuth2Config.java b/xiaocool-api/uaa/src/main/java/com/cool/uaa/config/SaTokenOAuth2Config.java
new file mode 100644
index 0000000000000000000000000000000000000000..34e26ba13c954fbb36f25f2ff01a0b230e63beab
--- /dev/null
+++ b/xiaocool-api/uaa/src/main/java/com/cool/uaa/config/SaTokenOAuth2Config.java
@@ -0,0 +1,63 @@
+package com.cool.uaa.config;
+
+import cn.dev33.satoken.oauth2.config.SaOAuth2Config;
+import cn.hutool.core.util.StrUtil;
+import com.cool.uaa.service.impl.UserServiceImpl;
+import domain.Result;
+import dto.UserDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.web.servlet.ModelAndView;
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+@Configuration
+public class SaTokenOAuth2Config {
+ @Resource
+ private UserServiceImpl userService;
+
+
+ @Primary
+ @Bean
+ public SaOAuth2Config getConfig() {
+ SaOAuth2Config config = new SaOAuth2Config();
+
+ config.setIsCode(true);
+ config.setIsImplicit(true);
+ config.setIsPassword(true);
+ config.setIsClient(true);
+
+ config.setDoLoginHandle((name, pwd) -> {
+ if (StrUtil.isBlank(name) || StrUtil.isBlank(pwd)) {
+ return Result.error("登录失败");
+ }
+ UserDTO userDTO = new UserDTO();
+ userDTO.setUsername(name);
+ userDTO.setPassword(pwd);
+ userDTO.setLoginType("usernameLogin");
+
+ return userService.doLogin(userDTO);
+ });
+
+ config.setNotLoginView(() -> {
+ return new ModelAndView("login.html");
+ });
+
+ config.setConfirmView((clientId, scope) -> {
+ Map map = new HashMap<>();
+ map.put("clientId", clientId);
+ map.put("scope", scope);
+ return new ModelAndView("confirm.html", map);
+ });
+
+ return config;
+ }
+
+
+
+
+}
diff --git a/xiaocool-api/uaa/src/main/java/com/cool/uaa/config/properties/EmailProperties.java b/xiaocool-api/uaa/src/main/java/com/cool/uaa/config/properties/EmailProperties.java
new file mode 100644
index 0000000000000000000000000000000000000000..661e9e59730b8ca0b053aacf4eb496083c60e4b2
--- /dev/null
+++ b/xiaocool-api/uaa/src/main/java/com/cool/uaa/config/properties/EmailProperties.java
@@ -0,0 +1,38 @@
+package com.cool.uaa.config.properties;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Component
+@ConfigurationProperties(prefix = "captcha.email")
+@Data
+public class EmailProperties {
+ /**
+ * 邮箱地址(注意:如果使用foxmail邮箱,此处user为qq号)
+ */
+ private String user;
+ /**
+ * 发件人昵称(必须正确,否则发送失败)
+ */
+ private String from;
+ /**
+ * 邮件服务器的SMTP地址
+ */
+ private String host;
+
+ /**
+ * 邮件服务器的SMTP端口
+ */
+ private Integer port;
+
+ /**
+ * 密码(授权码)
+ */
+ private String password;
+
+ /**
+ * 验证码过期时间
+ */
+ private Integer expireTime;
+}
\ No newline at end of file
diff --git a/xiaocool-api/uaa/src/main/java/com/cool/uaa/config/properties/SmsProperties.java b/xiaocool-api/uaa/src/main/java/com/cool/uaa/config/properties/SmsProperties.java
new file mode 100644
index 0000000000000000000000000000000000000000..28d2aea82febc7952e67f6ac7c083b184c717bdd
--- /dev/null
+++ b/xiaocool-api/uaa/src/main/java/com/cool/uaa/config/properties/SmsProperties.java
@@ -0,0 +1,40 @@
+package com.cool.uaa.config.properties;
+
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * description: 腾讯云短信服务,配置
+ *
+ * Date: 2020/9/16 10:53
+ **/
+@Data
+@Configuration
+@ConfigurationProperties(prefix = "sms-config")
+public class SmsProperties {
+
+ /** 腾讯云账户密钥对secretId(在访问管理中配置) */
+ private String secretId;
+
+ /** 腾讯云账户密钥对secretKey(在访问管理中配置) */
+ private String secretKey;
+
+ /** 短信应用appId */
+ private String appId;
+
+ /** 短信应用appKey */
+ private String appKey;
+
+ /** 签名 */
+ private String smsSign;
+
+ /** 过期时间 */
+ private String expireTime;
+
+ /** redis存储前缀 */
+ private String phonePrefix;
+
+}
+
diff --git a/xiaocool-api/uaa/src/main/java/com/cool/uaa/config/util/RedisUtils.java b/xiaocool-api/uaa/src/main/java/com/cool/uaa/config/util/RedisUtils.java
new file mode 100644
index 0000000000000000000000000000000000000000..617e5c5199444bca17b7e17fbcb4437d2fb31888
--- /dev/null
+++ b/xiaocool-api/uaa/src/main/java/com/cool/uaa/config/util/RedisUtils.java
@@ -0,0 +1,139 @@
+package com.cool.uaa.config.util;
+
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.RedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.TimeUnit;
+
+@Component
+@AllArgsConstructor
+public class RedisUtils {
+ private RedisTemplate