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 redisTemplate;
+
+
+ //指定用redis的序列化方式进行序列化
+ @Autowired(required = false)
+ public void setRedisTemplate(RedisTemplate redisTemplate) {
+ RedisSerializer stringSerializer = new StringRedisSerializer();//序列化为String
+ //不能反序列化
+ //Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class);//序列化为Json
+ GenericJackson2JsonRedisSerializer serializer = new GenericJackson2JsonRedisSerializer();
+ redisTemplate.setKeySerializer(stringSerializer);
+ redisTemplate.setValueSerializer(serializer);
+ redisTemplate.setHashKeySerializer(stringSerializer);
+ redisTemplate.setHashValueSerializer(serializer);
+ this.redisTemplate = redisTemplate;
+ }
+
+
+ /**
+ * 普通获取键对应值
+ *
+ * @param key 键
+ * @return 值
+ */
+ public Object get(String key) {
+ return key == null ? null : redisTemplate.opsForValue().get(key);
+ }
+
+ /**
+ * 普通设置键值
+ *
+ * @param key 键
+ * @param value 值
+ * @return true成功 false失败
+ */
+ public boolean set(String key, Object value) {
+ try {
+ redisTemplate.opsForValue().set(key, value);
+ return true;
+ } catch (Exception e) {
+ return false;
+ }
+ }
+
+ /**
+ * 普通设置键值并设置过期时间
+ *
+ * @param key 键
+ * @param value 值
+ * @param time 时间(秒) time要大于0 如果time小于等于0 将设置无限期
+ * @return true成功 false 失败
+ */
+ public boolean set(String key, Object value, long time) {
+ try {
+ if (time > 0) {
+ redisTemplate.opsForValue().set(key, value, time, TimeUnit.SECONDS);
+
+ } else {
+ set(key, value);
+ }
+ return true;
+ } catch (Exception e) {
+ return false;
+ }
+ }
+
+ /**
+ * 删除缓存
+ *
+ * @param key 键
+ * @return 是否成功
+ */
+ public boolean del(String key) {
+ return Boolean.TRUE.equals(redisTemplate.delete(key));
+ }
+
+ /**
+ * 指定缓存的失效时间
+ *
+ * @param key 键值
+ * @param time 时间(秒)
+ */
+ public boolean expire(String key, long time) {
+ try {
+ if (time > 0) {
+ redisTemplate.expire(key, time, TimeUnit.SECONDS);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ return false;
+ }
+ return true;
+ }
+
+
+ /**
+ * 判断key是否存在
+ * @param key 键
+ * @return true 存在 false不存在
+ */
+ public boolean hasKey(String key) {
+ try {
+ return Boolean.TRUE.equals(redisTemplate.hasKey(key));
+ } catch (Exception e) {
+ e.printStackTrace();
+ return false;
+ }
+ }
+
+ public boolean set(String key, String value, long time ,TimeUnit timeType) {
+
+ try {
+ if (time > 0) {
+ redisTemplate.opsForValue().set(key, value, time, timeType);
+ } else {
+ set(key, value);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ return false;
+ }
+ return true;
+ }
+}
diff --git a/xiaocool-api/uaa/src/main/java/com/cool/uaa/config/util/SmsCodeUtil.java b/xiaocool-api/uaa/src/main/java/com/cool/uaa/config/util/SmsCodeUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..6ea74be0054bf66593c7f65063dd97b4c360ec69
--- /dev/null
+++ b/xiaocool-api/uaa/src/main/java/com/cool/uaa/config/util/SmsCodeUtil.java
@@ -0,0 +1,42 @@
+package com.cool.uaa.config.util;
+
+import cn.hutool.core.util.RandomUtil;
+import domain.SmsLengthEnum;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * description: 腾讯云短信服务工具类
+ *
+ * Date: 2020/9/16 10:53
+ **/
+@Configuration
+public class SmsCodeUtil {
+
+ /**
+ * 随机生成指定长度的短信的验证码
+ *
+ * @param smsLengthEnum 短信验证码长度枚举
+ * @return 随机验证码
+ * @author RenShiWei
+ * Date: 2020/9/16 10:53
+ */
+ public static String createSmsRandomCode(SmsLengthEnum smsLengthEnum) {
+ return RandomUtil.randomNumbers(smsLengthEnum.getLength());
+ }
+
+ /**
+ * 创建短信验证码，缓存键策略
+ * 策略：前缀_业务名_手机号
+ *
+ * @param phone 手机号
+ * @param businessStr 业务名
+ * @return 短信验证码，缓存键策略
+ * @author RenShiWei
+ * Date: 2020/9/16 10:53
+ */
+ public static String createSmsCacheKey(String phone, String businessStr) {
+ return "SmsCaptcha:" + businessStr + phone;
+ }
+
+}
+
diff --git a/xiaocool-api/uaa/src/main/java/com/cool/uaa/config/util/SmsUtil.java b/xiaocool-api/uaa/src/main/java/com/cool/uaa/config/util/SmsUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..5575beb63a6384cd2009ad194188079624b41479
--- /dev/null
+++ b/xiaocool-api/uaa/src/main/java/com/cool/uaa/config/util/SmsUtil.java
@@ -0,0 +1,74 @@
+package com.cool.uaa.config.util;
+
+import com.tencentcloudapi.common.Credential;
+import com.tencentcloudapi.common.exception.TencentCloudSDKException;
+import com.tencentcloudapi.sms.v20190711.SmsClient;
+import com.tencentcloudapi.sms.v20190711.models.SendSmsRequest;
+import com.tencentcloudapi.sms.v20190711.models.SendSmsResponse;
+import com.tencentcloudapi.sms.v20190711.models.SendStatus;
+import domain.Constants;
+import exception.BaseException;
+import com.cool.uaa.config.properties.SmsProperties;
+
+/**
+ * description:
+ *
+ * @author RenShiWei
+ * Date: 2020/10/20 15:03
+ **/
+public class SmsUtil {
+
+ /**
+ * 腾讯云发送短信的基础服务
+ *
+ * @param smsProperties 腾讯云短信服务配置
+ * @param templateId 腾讯云短信模板id
+ * @param templateParams 腾讯云模板需要的参数
+ * @param phoneNumbers 手机号集合
+ * @return 发送短信后的状态的set集合
+ */
+ public static SendStatus[] sendSms(SmsProperties smsProperties, String templateId, String[] templateParams,
+ String[] phoneNumbers) {
+ /*
+ 实例化一个认证对象，入参需要传入腾讯云账户密钥对 secretId 和 secretKey
+ CAM 密钥查询：https://console.cloud.tencent.com/cam/capi
+ */
+ Credential cred = new Credential(smsProperties.getSecretId(), smsProperties.getSecretKey());
+ /*
+ 实例化要请求产品(以sms为例)的client对象
+ 第二个参数是地域信息，可以直接填写字符串ap-guangzhou，或者引用预设的常量
+ */
+ SmsClient client = new SmsClient(cred, "");
+ /*
+ 实例化一个请求对象，根据调用的接口和实际情况，可以进一步设置请求参数
+ */
+ SendSmsRequest req = new SendSmsRequest();
+ //短信应用ID: 短信appId在 [短信控制台] 添加应用后生成的实际SdkAppid，示例如1400006666
+ req.setSmsSdkAppid(smsProperties.getAppId());
+ //短信签名内容: 使用 UTF-8 编码，必须填写已审核通过的签名，签名信息可登录 [短信控制台] 查看
+ req.setSign(smsProperties.getSmsSign());
+ //模板 ID: 必须填写已审核通过的模板 ID。模板ID可登录 [短信控制台] 查看
+ req.setTemplateID(templateId);
+ //下发手机号码，采用 e.164 标准，+[国家或地区码][手机号] 示例如：+8613711112222， 其中前面有一个+号 ，86为国家码，13711112222为手机号，最多不要超过200个手机号
+ req.setPhoneNumberSet(phoneNumbers);
+ //模板参数: 若无模板参数，则设置为空
+ req.setTemplateParamSet(templateParams);
+
+ /* 通过 client 对象调用 SendSms 方法发起请求。注意请求方法名与请求对象是对应的
+ 返回的 res 是一个 SendSmsResponse 类的实例，与请求对象对应
+ */
+ SendSmsResponse res = null;
+ try {
+ //发送短信
+ res = client.SendSms(req);
+ return res.getSendStatusSet();
+ } catch (TencentCloudSDKException e) {
+ e.printStackTrace();
+ //发送短信失败
+ throw new BaseException(Constants.SMS_NOT_SEND,"发送失败");
+ }
+ }
+
+
+}
+
diff --git a/xiaocool-api/uaa/src/main/java/com/cool/uaa/config/util/VerifyCodeUtil.java b/xiaocool-api/uaa/src/main/java/com/cool/uaa/config/util/VerifyCodeUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..74d6dee7308a0d8869c0d37630e7a503a5f91799
--- /dev/null
+++ b/xiaocool-api/uaa/src/main/java/com/cool/uaa/config/util/VerifyCodeUtil.java
@@ -0,0 +1,50 @@
+package com.cool.uaa.config.util;
+
+import java.util.Random;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * 验证码工具类
+ * @author shijun
+ * @date 2024/05/10
+ */
+public class VerifyCodeUtil {
+ //邮箱正则表达式
+ private static final Pattern EMAIL_PATTERN = Pattern.compile("^\\w+((-\\w+)|(\\.\\w+))*\\@[A-Za-z0-9]+((\\.|-)[A-Za-z0-9]+)*\\.[A-Za-z0-9]+$");
+ //验证码的字符集
+ private static final String CODES = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+ //验证码的长度，可以根据需求进行修改
+ private static final int CODE_LENGTH = 6;
+
+ /**
+ * 生成验证码
+ *
+ * @return {@link String }
+ */
+ public static String generateVerifyCode() {
+ Random random = new Random();
+ StringBuilder verifyCode = new StringBuilder(CODE_LENGTH);
+ for (int i = 0; i < CODE_LENGTH; i++) {
+ verifyCode.append(CODES.charAt(random.nextInt(CODES.length())));
+ }
+ return verifyCode.toString();
+ }
+
+ /**
+ * 检测邮箱是否合法
+ *
+ * @param email 用户名
+ * @return 合法状态
+ */
+ public static boolean checkEmail(String email) {
+ // 检查输入是否为空或null
+ if (email == null || email.isEmpty()) {
+ return false;
+ }
+ // 使用正则表达式进行匹配
+ Matcher m = EMAIL_PATTERN.matcher(email);
+ return m.matches();
+ }
+
+}
diff --git a/xiaocool-api/uaa/src/main/java/com/cool/uaa/controller/OAuth2Controller.java b/xiaocool-api/uaa/src/main/java/com/cool/uaa/controller/OAuth2Controller.java
new file mode 100644
index 0000000000000000000000000000000000000000..bbd7798b95bf70e32c1dd78d0440fe7a137f1b35
--- /dev/null
+++ b/xiaocool-api/uaa/src/main/java/com/cool/uaa/controller/OAuth2Controller.java
@@ -0,0 +1,302 @@
+package com.cool.uaa.controller;
+
+
+import cn.dev33.satoken.oauth2.logic.SaOAuth2Handle;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.util.StrUtil;
+import com.cool.uaa.config.util.RedisUtils;
+import com.cool.uaa.service.impl.*;
+import com.fasterxml.jackson.databind.JsonNode;
+import domain.Constants;
+import domain.Result;
+import dto.UserDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Map;
+
+@Slf4j
+@RestController
+@RequestMapping("/oauth2")
+public class OAuth2Controller {
+ public static final String CAPTCHA_SESSION_KEY = "captcha-";
+
+ @Autowired
+ private GiteeServiceImpl giteeService;
+
+ @Autowired
+ private UserServiceImpl userService;
+
+ @Autowired
+ private EmailCaptchaServiceImpl emailService;
+
+ @Autowired
+ private SmsServiceImpl smsService;
+
+ @Autowired
+ private WeChatServiceImpl weChatService;
+
+ @Autowired
+ private QQServiceImpl qqService;
+
+ @Autowired
+ private AlipayServiceImpl alipayService;
+
+ @Autowired
+ private RedisUtils redisUtils;
+
+
+
+ @PostMapping("/doLogin")
+ public Object doLogin(@RequestBody UserDTO userDTO) {
+ try {
+ String redisKey="Captcha:" + CAPTCHA_SESSION_KEY + userDTO.getCode();
+ if (redisUtils.hasKey(redisKey)){
+ String captchaCode=redisUtils.get(redisKey).toString();
+ if (userDTO.getCode().equals(captchaCode)){
+ redisUtils.del(redisKey);
+ if (StrUtil.isBlank(userDTO.getUsername()) || StrUtil.isBlank(userDTO.getPassword())) {
+ return Result.error(Constants.CODE_500,"登录失败");
+ }
+ userDTO.setLoginType("usernameLogin");
+ return userService.doLogin(userDTO);
+ }
+ else {
+ return Result.error(Constants.CODE_400, "验证码错误或已过期");
+ }
+ }
+ else {
+ return Result.error(Constants.CODE_400, "验证码错误或已过期");
+ }
+
+ }
+ catch (Exception e) {
+ throw new RuntimeException(e);}
+ }
+
+
+
+ @PostMapping("/captchaLogin")
+ public Result CaptchaLogin(@RequestBody UserDTO userDTO,HttpServletResponse response) throws IOException {
+ return userService.doLogin(userDTO);
+ }
+
+
+
+ @GetMapping("/authorize")
+ public Object authorize() {
+ return SaOAuth2Handle.serverRequest();
+ }
+
+
+ /**
+ * Gitee模块
+ */
+ @GetMapping("/authorize/gitee")
+ public void giteeAuthorize(HttpServletResponse response) throws IOException {
+ String url = giteeService.getAuthorizationUrl();
+ response.sendRedirect(url);
+ }
+
+
+ @GetMapping("/gitee/callback")
+ public void handleGiteeCallback(@RequestParam("code") String code,
+ HttpServletResponse response,
+ HttpServletRequest request) {
+ try {
+ String accessToken = giteeService.getAccessToken(code);
+ //从第三方平台获取用户信息
+ Map userInfo = giteeService.getUserInfo(accessToken);
+ // 模拟使用 userService 处理用户信息
+ UserDTO userDTO = new UserDTO();
+ userDTO.setLoginType("gitee");
+ userDTO.setAvatar(String.valueOf(userInfo.get("avatar_url")));
+ userDTO.setUsername(String.valueOf(userInfo.get("login")));
+ userDTO.setEmail(String.valueOf(userInfo.get("email")));
+ userDTO.setOpenId(String.valueOf(userInfo.get("id")));
+ userService.doLogin(userDTO);
+ for (String role:userDTO.getRole()){
+ if (role.equals("admin")){
+ response.sendRedirect("https://xiaoku.store/admin/user?token="+StpUtil.getTokenValue());
+ return;
+ }
+ }
+ response.sendRedirect("https://xiaoku.store/AddMeeting?token="+StpUtil.getTokenValue());
+ } catch (Exception e) {
+ throw new RuntimeException("登录失败", e);
+ }
+ }
+
+
+
+ /**
+ * QQ模块
+ */
+ // 获取QQ登录URL
+ @GetMapping("/authorize/qq")
+ public void getQQLoginUrl(HttpServletResponse response) throws IOException {
+ String url = qqService.getQQLoginUrl();
+ response.sendRedirect(url);
+ }
+
+ // QQ回调
+ @GetMapping("/qq/callback")
+ public void qqCallback(@RequestParam("code") String code,
+ HttpServletResponse response,
+ HttpServletRequest request) {
+ try {
+ String accessToken = qqService.getAccessToken(code);
+ //获得qq号
+ JsonNode node = qqService.getOpenId(accessToken);
+ String openId= node.get("openid").asText();
+ String unionId= node.get("unionid").asText();
+ log.info("========openId:{}==========",openId);
+ log.info("========unionid:{}=========",unionId);
+ Map userInfo = qqService.getUserInfo(accessToken, openId);
+ UserDTO userDTO = new UserDTO();
+ userDTO.setLoginType("QQ");
+ userDTO.setAvatar(String.valueOf(userInfo.get("figureurl_qq_1")));
+ userDTO.setNickname(String.valueOf(userInfo.get("nickname")));
+ userDTO.setUsername(unionId.substring(4, 14));
+ userDTO.setOpenId(unionId);
+ // 这里可以根据unionId查询用户是否已存在，未存在则创建用户
+ userService.doLogin(userDTO);
+ for (String role:userDTO.getRole()){
+ if (role.equals("admin")){
+ response.sendRedirect("https://xiaoku.store/admin/user?token="+StpUtil.getTokenValue());
+ return;
+ }
+ }
+ response.sendRedirect("https://xiaoku.store/AddMeeting?token="+StpUtil.getTokenValue());
+ } catch (Exception e) {
+ throw new RuntimeException("登录失败", e);
+ }
+ }
+
+
+
+// 支付宝
+ @GetMapping("/authorize/alipay")
+ public void alipayAuthorize(HttpServletResponse response) throws IOException {
+ String url = alipayService.getAuthorizationUrl();
+ response.sendRedirect(url);
+
+ }
+
+
+// 支付宝回调
+ @GetMapping("/alipay/callback")
+ public void AliPayCallback(@RequestParam("auth_code") String authCode,
+ HttpServletResponse response,
+ HttpServletRequest request) {
+ try {
+ String accessToken = alipayService.getAccessToken(authCode);
+ // 获取用户信息
+ UserDTO userDTO = alipayService.getUserInfo(accessToken);
+ userService.doLogin(userDTO);
+ for (String role:userDTO.getRole()){
+ if (role.equals("admin")){
+ response.sendRedirect("https://xiaoku.store/admin/user?token="+StpUtil.getTokenValue());
+ return;
+ }
+ }
+ response.sendRedirect("https://xiaoku.store/AddMeeting?token="+StpUtil.getTokenValue());
+ } catch (Exception e) {
+ throw new RuntimeException("登录失败", e);
+ }
+}
+
+
+ /**
+ * 短信模块
+ */
+ // 发送短信验证码
+// sendSmsCode type为login/register
+ @GetMapping("/sms-captcha")
+ public Result sendSmsCaptcha(@RequestParam String phone,@RequestParam String type) {
+ if (smsService.sendSmsCode(phone,type))
+ {
+ return Result.success("发送成功");
+ }
+ else {
+ return Result.error("发送失败");
+ }
+
+ }
+
+ //验证短信验证码
+ @GetMapping("/verifySmsCaptcha")
+ public Result verifySmsCaptcha(@RequestParam String phone,@RequestParam String code){
+ if (smsService.verifySmsCode(phone,code))
+ {
+ return Result.success("校验成功");
+ }
+ else {
+ return Result.error("校验失败");
+ }
+ }
+
+
+ /**
+ * 邮箱模块
+ */
+ //发送邮箱验证码
+ @GetMapping("/email-captcha")
+ public Result sendEmailCaptcha(@RequestParam String email,@RequestParam String type) {
+ emailService.sendEmailCaptcha(email,type);
+ return Result.success("发送成功");
+ }
+
+ //验证邮箱验证码
+ @GetMapping("/verifyEmailCaptcha")
+ public Result verifyEmailCaptcha(@RequestParam String email,@RequestParam String code){
+ if (emailService.verifyEmailCode(email,code))
+ {
+ return Result.success("校验成功");
+ }
+ else {
+ return Result.error("校验失败");
+ }
+ }
+
+ /**
+ * 微信模块
+ */
+ // 获取微信登录URL
+ @GetMapping("/authorize/wechat")
+ public String getWeChatLoginUrl() {
+ return weChatService.getWeChatLoginUrl();
+ }
+
+ // 微信回调
+ @GetMapping("/wechat/callback")
+ public String weChatCallback(@RequestParam String code) {
+ try {
+ JsonNode tokenResponse = weChatService.getAccessTokenAndOpenId(code);
+ String accessToken = tokenResponse.get("access_token").asText();
+ String openId = tokenResponse.get("openid").asText();
+
+ JsonNode userInfo = weChatService.getUserInfo(accessToken, openId);
+ String unionId = userInfo.get("unionid").asText();
+
+ // 这里可以根据unionId查询用户是否已存在，未存在则创建用户
+ StpUtil.login(unionId);
+
+ return "登录成功，Access Token: " + StpUtil.getTokenValue();
+ } catch (Exception e) {
+ e.printStackTrace();
+ return "登录失败";
+ }
+ }
+
+
+
+
+
+
+
+}
diff --git a/xiaocool-api/uaa/src/main/java/com/cool/uaa/controller/UserController.java b/xiaocool-api/uaa/src/main/java/com/cool/uaa/controller/UserController.java
new file mode 100644
index 0000000000000000000000000000000000000000..3751f5035f0ed33864869a4391c1fdf563ffc216
--- /dev/null
+++ b/xiaocool-api/uaa/src/main/java/com/cool/uaa/controller/UserController.java
@@ -0,0 +1,143 @@
+package com.cool.uaa.controller;
+
+
+import cn.dev33.satoken.annotation.SaCheckLogin;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.captcha.CaptchaUtil;
+import cn.hutool.captcha.CircleCaptcha;
+import cn.hutool.captcha.generator.RandomGenerator;
+import cn.hutool.core.util.StrUtil;
+import com.cool.uaa.config.util.RedisUtils;
+import com.cool.uaa.service.OAuth2FeignService;
+import com.cool.uaa.service.impl.UserServiceImpl;
+import domain.Constants;
+import domain.Result;
+import dto.UserDTO;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+
+/**
+ *
+ * 前端控制器
+ *
+ *
+ * @author 小飞
+ * @since 2024-04-16
+ */
+@RestController
+@RequestMapping("/user/")
+@Api(tags = "用户信息管理")
+@Slf4j
+public class UserController {
+ public static final String CAPTCHA_SESSION_KEY = "captcha-";
+
+
+ @Resource
+ private UserServiceImpl userService;
+
+ @Autowired
+ private OAuth2FeignService OAuth2FeignService;
+
+ @Autowired
+ private RedisUtils redisUtils;
+
+
+ //注册
+ @PostMapping("register")
+ public Result register(@RequestBody UserDTO userDTO) {
+ String username = userDTO.getUsername();
+ String password = userDTO.getPassword();
+ if (StrUtil.isBlank(username) || StrUtil.isBlank(password)) {
+ return Result.error(Constants.CODE_400, "参数错误");
+ }
+ return Result.success(userService.register(userDTO));
+ }
+
+
+ //验证码
+ @RequestMapping("getCode")
+ public void getCode(HttpServletRequest request, HttpServletResponse response) throws IOException {
+ // 随机生成 4 位验证码
+ RandomGenerator randomGenerator = new RandomGenerator("1345678AaBbEePpQqFfGHhKkrRtT", 4);
+ // 定义图片的显示大小
+ //验证码工具类
+ CircleCaptcha circleCaptcha = CaptchaUtil.createCircleCaptcha(120, 46, 4, 10);
+ response.setContentType("image/jpeg");
+ response.setHeader("Pragma", "No-cache");
+ try {
+ // 调用父类的 setGenerator() 方法，设置验证码的类型
+ circleCaptcha.setGenerator(randomGenerator);
+ // 输出到页面
+ circleCaptcha.write(response.getOutputStream());
+ // 打印日志
+ log.info("生成的验证码:{}", circleCaptcha.getCode());
+ String verifyCode = circleCaptcha.getCode();
+ String redisKey = "Captcha:" + CAPTCHA_SESSION_KEY + verifyCode;
+ redisUtils.set(redisKey, verifyCode, 5, TimeUnit.MINUTES);
+
+ // 关闭流
+ response.getOutputStream().close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ }
+
+ @SaCheckLogin
+ @GetMapping("isLogin")
+ public Result isLogin() {
+ return Result.success("当前的登录状态为", StpUtil.isLogin());
+ }
+
+ /**
+ * 查询token信息
+ */
+ @GetMapping("tokenInfo")
+ public Result tokenInfo() {
+ return Result.success(StpUtil.getTokenInfo());
+ }
+
+
+
+ /**
+ * 查询token信息
+ */
+ @GetMapping("userInfo")
+ public Result userInfo() {
+ return Result.success(StpUtil.getExtra("user"));
+ }
+
+ /**
+ * 获取角色集合
+ */
+ @GetMapping("getRole")
+ public Result getRole() {
+ return Result.success(StpUtil.getRoleList());
+ }
+
+
+
+ @GetMapping("logout")
+ public Result logout(String id) {
+ //强制下线
+ StpUtil.logout(id); // 强制指定账号注销下线
+// StpUtil.logout(10001, "PC"); // 强制指定账号指定端注销下线
+// StpUtil.logoutByTokenValue("token"); // 强制指定 Token 注销下线
+ //踢人下线
+// StpUtil.kickout(10001); // 将指定账号踢下线
+// StpUtil.kickout(10001, "PC"); // 将指定账号指定端踢下线
+// StpUtil.kickoutByTokenValue("token"); // 将指定 Token 踢下线
+ return Result.success();
+ }
+
+}
+
diff --git a/xiaocool-api/uaa/src/main/java/com/cool/uaa/mapper/Oauth2Mapper.java b/xiaocool-api/uaa/src/main/java/com/cool/uaa/mapper/Oauth2Mapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..4c4cf3aad1cf993d99099a787b09f7d9b835eb17
--- /dev/null
+++ b/xiaocool-api/uaa/src/main/java/com/cool/uaa/mapper/Oauth2Mapper.java
@@ -0,0 +1,9 @@
+package com.cool.uaa.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import entity.Oauth2;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface Oauth2Mapper extends BaseMapper {
+}
diff --git a/xiaocool-api/uaa/src/main/java/com/cool/uaa/mapper/UserMapper.java b/xiaocool-api/uaa/src/main/java/com/cool/uaa/mapper/UserMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..4bcaacc3d6f1d24d1e7e5d1b842bcb89203954af
--- /dev/null
+++ b/xiaocool-api/uaa/src/main/java/com/cool/uaa/mapper/UserMapper.java
@@ -0,0 +1,27 @@
+package com.cool.uaa.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import dto.UserRoleDTO;
+import entity.User;
+import org.apache.ibatis.annotations.*;
+
+import java.util.List;
+
+
+@Mapper
+public interface UserMapper extends BaseMapper {
+
+
+ @Select("SELECT sys_role.role FROM sys_role,sys_user_role,`user`\n" +
+ "WHERE sys_role.id=sys_user_role.role_id AND`user`.id=sys_user_role.user_id\n" +
+ "AND `user`.username= #{username}")
+ List findRole(String username);
+
+ @Insert("INSERT INTO sys_user_role (user_id, role_id)\n"+
+ "SELECT `user`.id, sys_role.id\n"+
+ "FROM `user` JOIN sys_role ON 1=1 \n"+
+ " WHERE `user`.username = #{username} AND sys_role.role = #{role}\n")
+ void setUserRole(String username,String role);
+
+}
diff --git a/xiaocool-api/uaa/src/main/java/com/cool/uaa/service/EmailCaptchaService.java b/xiaocool-api/uaa/src/main/java/com/cool/uaa/service/EmailCaptchaService.java
new file mode 100644
index 0000000000000000000000000000000000000000..5d39dff51d64ad7d8fdb3904dd7a641e2f094ad5
--- /dev/null
+++ b/xiaocool-api/uaa/src/main/java/com/cool/uaa/service/EmailCaptchaService.java
@@ -0,0 +1,6 @@
+package com.cool.uaa.service;
+
+public interface EmailCaptchaService {
+ void sendEmailCaptcha(String email,String type);
+
+}
diff --git a/xiaocool-api/uaa/src/main/java/com/cool/uaa/service/ISmsService.java b/xiaocool-api/uaa/src/main/java/com/cool/uaa/service/ISmsService.java
new file mode 100644
index 0000000000000000000000000000000000000000..b8045d3026087dae1c2c1c3ab863c386e5a83876
--- /dev/null
+++ b/xiaocool-api/uaa/src/main/java/com/cool/uaa/service/ISmsService.java
@@ -0,0 +1,32 @@
+package com.cool.uaa.service;
+
+/**
+ * description: 短信业务
+ *
+ * @author RenShiWei
+ * Date: 2020/9/15 22:06
+ **/
+public interface ISmsService {
+
+ /**
+ * description: 发送短信验证码
+ *
+ * @param phone 手机号
+ * @author RenShiWei
+ * Date: 2020/9/16 10:11
+ * @return
+ */
+ boolean sendSmsCode(String phone,String type);
+
+ /**
+ * description:验证短信验证码
+ *
+ * @param phone 手机号
+ * @param code 验证码
+ * @author RenShiWei
+ * Date: 2020/9/16 10:11
+ * @return
+ */
+ boolean verifySmsCode(String phone, String code);
+
+}
diff --git a/xiaocool-api/uaa/src/main/java/com/cool/uaa/service/OAuth2FeignService.java b/xiaocool-api/uaa/src/main/java/com/cool/uaa/service/OAuth2FeignService.java
new file mode 100644
index 0000000000000000000000000000000000000000..790ec3540c3b348b961dfd16cc1c5c2193e79f3e
--- /dev/null
+++ b/xiaocool-api/uaa/src/main/java/com/cool/uaa/service/OAuth2FeignService.java
@@ -0,0 +1,20 @@
+package com.cool.uaa.service;
+
+import domain.Result;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@FeignClient(value = "uaa",path = "/oauth2") //指定调用哪个微服务
+public interface OAuth2FeignService {
+
+
+ @GetMapping("/authorize/gitee")//哪个地址
+ void giteeAuthorize();
+
+ @GetMapping("/hello")
+ String hello();
+}
diff --git a/xiaocool-api/uaa/src/main/resources/Dockerfile b/xiaocool-api/uaa/src/main/resources/Dockerfile
index 9610f05dab4daa2b4ac45b5cf91f703fadc9a670..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/xiaocool-api/uaa/src/main/resources/Dockerfile
+++ b/xiaocool-api/uaa/src/main/resources/Dockerfile
@@ -1,32 +0,0 @@
-# 使用官方Java 8运行时作为基础镜像
-FROM java:8
-
-MAINTAINER yys(1009802251@qq.com)
-
-# 设置时区为Asia/Shanghai
-ENV TZ=Asia/Shanghai
-
-#设置时区
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo '$TZ' > /etc/timezone
-
-VOLUME /tmp
-# 设置工作目录
-WORKDIR /app
-
-# 复制JAR文件和JKS文件到容器内
-COPY uaa.jar /app/app.jar
-COPY face.xiaoku.store.jks /app/face.xiaoku.store.jks
-
-ENV SPRING-CLOUD-NACOS-ADDR 10.1.24.3:8848
-ENV SPRING-CLOUD-NACOS-IP face.xiaoku.store
-ENV SPRING-CLOUD-DOMAIN-NAME xiaoku.store:9091
-ENV SPRING-CLOUD-MYSQL-HOST 10.0.12.16:3310
-ENV SPRING-CLOUD-GATEWAY-HOST 10.0.12.16:9091
-ENV SPRING-CLOUD-DB-NAME meeting
-ENV SPRING-CLOUD-REDIS-HOST 10.0.12.16
-ENV SPRING-CLOUD-REDIS-PWD Yys12300
-ENV NACOS-USERNAME nacos
-ENV NACOS-PWD yys
-
-EXPOSE 3080
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom", "-jar", "/app/app.jar"]
diff --git a/xiaocool-api/uaa/src/main/resources/alipayCertPublicKey_RSA2.crt b/xiaocool-api/uaa/src/main/resources/alipayCertPublicKey_RSA2.crt
deleted file mode 100644
index afcaecfb594378d78eb60d00a0ffb642761accb5..0000000000000000000000000000000000000000
--- a/xiaocool-api/uaa/src/main/resources/alipayCertPublicKey_RSA2.crt
+++ /dev/null
@@ -1,43 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDljCCAn6gAwIBAgIQICQIFtRORjDSjLSo+2cCNjANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
-BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MTkwNwYDVQQDDDBBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IENs
-YXNzIDIgUjEwHhcNMjQwODE2MTIwMzA2WhcNMjkwODE1MTIwMzA2WjB3MQswCQYDVQQGEwJDTjES
-MBAGA1UECgwJ5aea6Im655ubMQ8wDQYDVQQLDAZBbGlwYXkxQzBBBgNVBAMMOuaUr+S7mOWunSjk
-uK3lm70p572R57uc5oqA5pyv5pyJ6ZmQ5YWs5Y+4LTIwODg1MjI3NDQ1NDAyNDcwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7ZYHqfPhim1cw0e4pVsn+94i+v5/F8Tpm5nqU70RhWxpB
-7iP7meu+t+lDBOaOmyzv1QblkCOVAFVHN28L644weH/VAaWSjoSfN6yY4HAwPyHwnu2YVHvCjwX8
-Fd+JA0fCLDZUUP8BnK8i8nonrB9ihL0ZOlT6LGSFwMvO43kqmvI9PUcaeGjKExocm8x4W6xrisAz
-+kvwiE/PGP88xtuBelxEV9GfQX119EJ2pTACGQBT9ZWZt5MndaUJel2nclTyGkrhjCEcPn/8iIsX
-ffvHHHnYTHKQB/aBbcezh61rf6ahzeK3xC4ea76m0lDg0lrfU2OifM0km39lGr5xFcXdAgMBAAGj
-EjAQMA4GA1UdDwEB/wQEAwID+DANBgkqhkiG9w0BAQsFAAOCAQEAdEz02LIqbZl6P9jGsexqshSx
-H7h2qs01wn8QkvAy5ZBYeY6xBPPyEaSyNVDykfxAUk9vmCZS0tj9HWudnEs/IIHI/g/pY1Qroggv
-IHHZn2C7uNWfaL0eUlYwRU9/sFoVYPHZXdBk3kz3MJEQX9N7WZFOXR0+hn+95YG1FXx3soZBmi1/
-/cwiISlwHQQ+rEsrjPLAaZnKXA0oBO5HRSGf0En/+uBCPWCPMqwVWHQTb/40/u8EVp1xpykkkCw6
-/uIjqFP5wtutvbz4Qg8rH2hMhbAiu8j4Iuf1YHbHO2e/68F31DmOjIqjkAx159NDNLSFPYl85MfN
-YQt62hMhC6B9TA==
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIE4jCCAsqgAwIBAgIIYsSr5bKAMl8wDQYJKoZIhvcNAQELBQAwejELMAkGA1UEBhMCQ04xFjAU
-BgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MTEw
-LwYDVQQDDChBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFIxMB4XDTE4MDMy
-MjE0MzQxNVoXDTM3MTEyNjE0MzQxNVowgYIxCzAJBgNVBAYTAkNOMRYwFAYDVQQKDA1BbnQgRmlu
-YW5jaWFsMSAwHgYDVQQLDBdDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTE5MDcGA1UEAwwwQW50IEZp
-bmFuY2lhbCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBDbGFzcyAyIFIxMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAsLMfYaoRoPRbmDcAfXPCmKf43pWRN5yTXa/KJWO0l+mrgQvs89bA
-NEvbDUxlkGwycwtwi5DgBuBgVhLliXu+R9CYgr2dXs8D8Hx/gsggDcyGPLmVrDOnL+dyeauheARZ
-fA3du60fwEwwbGcVIpIxPa/4n3IS/ElxQa6DNgqxh8J9Xwh7qMGl0JK9+bALuxf7B541Gr4p0WEN
-G8fhgjBV4w4ut9eQLOoa1eddOUSZcy46Z7allwowwgt7b5VFfx/P1iKJ3LzBMgkCK7GZ2kiLrL7R
-iqV+h482J7hkJD+ardoc6LnrHO/hIZymDxok+VH9fVeUdQa29IZKrIDVj65THQIDAQABo2MwYTAf
-BgNVHSMEGDAWgBRfdLQEwE8HWurlsdsio4dBspzhATAdBgNVHQ4EFgQUSqHkYINtUSAtDPnS8Xoy
-oP9p7qEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggIB
-AIQ8TzFy4bVIVb8+WhHKCkKNPcJe2EZuIcqvRoi727lZTJOfYy/JzLtckyZYfEI8J0lasZ29wkTt
-a1IjSo+a6XdhudU4ONVBrL70U8Kzntplw/6TBNbLFpp7taRALjUgbCOk4EoBMbeCL0GiYYsTS0mw
-7xdySzmGQku4GTyqutIGPQwKxSj9iSFw1FCZqr4VP4tyXzMUgc52SzagA6i7AyLedd3tbS6lnR5B
-L+W9Kx9hwT8L7WANAxQzv/jGldeuSLN8bsTxlOYlsdjmIGu/C9OWblPYGpjQQIRyvs4Cc/mNhrh+
-14EQgwuemIIFDLOgcD+iISoN8CqegelNcJndFw1PDN6LkVoiHz9p7jzsge8RKay/QW6C03KNDpWZ
-EUCgCUdfHfo8xKeR+LL1cfn24HKJmZt8L/aeRZwZ1jwePXFRVtiXELvgJuM/tJDIFj2KD337iV64
-fWcKQ/ydDVGqfDZAdcU4hQdsrPWENwPTQPfVPq2NNLMyIH9+WKx9Ed6/WzeZmIy5ZWpX1TtTolo6
-OJXQFeItMAjHxW/ZSZTok5IS3FuRhExturaInnzjYpx50a6kS34c5+c8hYq7sAtZ/CNLZmBnBCFD
-aMQqT8xFZJ5uolUaSeXxg7JFY1QsYp5RKvj4SjFwCGKJ2+hPPe9UyyltxOidNtxjaknOCeBHytOr
------END CERTIFICATE-----
diff --git a/xiaocool-api/uaa/src/main/resources/alipayRootCert.crt b/xiaocool-api/uaa/src/main/resources/alipayRootCert.crt
deleted file mode 100644
index 76417c538f5305efe694e9b7ae4dd978045be20f..0000000000000000000000000000000000000000
--- a/xiaocool-api/uaa/src/main/resources/alipayRootCert.crt
+++ /dev/null
@@ -1,88 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBszCCAVegAwIBAgIIaeL+wBcKxnswDAYIKoEcz1UBg3UFADAuMQswCQYDVQQG
-EwJDTjEOMAwGA1UECgwFTlJDQUMxDzANBgNVBAMMBlJPT1RDQTAeFw0xMjA3MTQw
-MzExNTlaFw00MjA3MDcwMzExNTlaMC4xCzAJBgNVBAYTAkNOMQ4wDAYDVQQKDAVO
-UkNBQzEPMA0GA1UEAwwGUk9PVENBMFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAE
-MPCca6pmgcchsTf2UnBeL9rtp4nw+itk1Kzrmbnqo05lUwkwlWK+4OIrtFdAqnRT
-V7Q9v1htkv42TsIutzd126NdMFswHwYDVR0jBBgwFoAUTDKxl9kzG8SmBcHG5Yti
-W/CXdlgwDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFEwysZfZ
-MxvEpgXBxuWLYlvwl3ZYMAwGCCqBHM9VAYN1BQADSAAwRQIgG1bSLeOXp3oB8H7b
-53W+CKOPl2PknmWEq/lMhtn25HkCIQDaHDgWxWFtnCrBjH16/W3Ezn7/U/Vjo5xI
-pDoiVhsLwg==
------END CERTIFICATE-----
-
------BEGIN CERTIFICATE-----
-MIIF0zCCA7ugAwIBAgIIH8+hjWpIDREwDQYJKoZIhvcNAQELBQAwejELMAkGA1UE
-BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5MTEwLwYDVQQDDChBbnQgRmluYW5jaWFsIENlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5IFIxMB4XDTE4MDMyMTEzNDg0MFoXDTM4MDIyODEzNDg0
-MFowejELMAkGA1UEBhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNV
-BAsMF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MTEwLwYDVQQDDChBbnQgRmluYW5j
-aWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFIxMIICIjANBgkqhkiG9w0BAQEF
-AAOCAg8AMIICCgKCAgEAtytTRcBNuur5h8xuxnlKJetT65cHGemGi8oD+beHFPTk
-rUTlFt9Xn7fAVGo6QSsPb9uGLpUFGEdGmbsQ2q9cV4P89qkH04VzIPwT7AywJdt2
-xAvMs+MgHFJzOYfL1QkdOOVO7NwKxH8IvlQgFabWomWk2Ei9WfUyxFjVO1LVh0Bp
-dRBeWLMkdudx0tl3+21t1apnReFNQ5nfX29xeSxIhesaMHDZFViO/DXDNW2BcTs6
-vSWKyJ4YIIIzStumD8K1xMsoaZBMDxg4itjWFaKRgNuPiIn4kjDY3kC66Sl/6yTl
-YUz8AybbEsICZzssdZh7jcNb1VRfk79lgAprm/Ktl+mgrU1gaMGP1OE25JCbqli1
-Pbw/BpPynyP9+XulE+2mxFwTYhKAwpDIDKuYsFUXuo8t261pCovI1CXFzAQM2w7H
-DtA2nOXSW6q0jGDJ5+WauH+K8ZSvA6x4sFo4u0KNCx0ROTBpLif6GTngqo3sj+98
-SZiMNLFMQoQkjkdN5Q5g9N6CFZPVZ6QpO0JcIc7S1le/g9z5iBKnifrKxy0TQjtG
-PsDwc8ubPnRm/F82RReCoyNyx63indpgFfhN7+KxUIQ9cOwwTvemmor0A+ZQamRe
-9LMuiEfEaWUDK+6O0Gl8lO571uI5onYdN1VIgOmwFbe+D8TcuzVjIZ/zvHrAGUcC
-AwEAAaNdMFswCwYDVR0PBAQDAgEGMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFF90
-tATATwda6uWx2yKjh0GynOEBMB8GA1UdIwQYMBaAFF90tATATwda6uWx2yKjh0Gy
-nOEBMA0GCSqGSIb3DQEBCwUAA4ICAQCVYaOtqOLIpsrEikE5lb+UARNSFJg6tpkf
-tJ2U8QF/DejemEHx5IClQu6ajxjtu0Aie4/3UnIXop8nH/Q57l+Wyt9T7N2WPiNq
-JSlYKYbJpPF8LXbuKYG3BTFTdOVFIeRe2NUyYh/xs6bXGr4WKTXb3qBmzR02FSy3
-IODQw5Q6zpXj8prYqFHYsOvGCEc1CwJaSaYwRhTkFedJUxiyhyB5GQwoFfExCVHW
-05ZFCAVYFldCJvUzfzrWubN6wX0DD2dwultgmldOn/W/n8at52mpPNvIdbZb2F41
-T0YZeoWnCJrYXjq/32oc1cmifIHqySnyMnavi75DxPCdZsCOpSAT4j4lAQRGsfgI
-kkLPGQieMfNNkMCKh7qjwdXAVtdqhf0RVtFILH3OyEodlk1HYXqX5iE5wlaKzDop
-PKwf2Q3BErq1xChYGGVS+dEvyXc/2nIBlt7uLWKp4XFjqekKbaGaLJdjYP5b2s7N
-1dM0MXQ/f8XoXKBkJNzEiM3hfsU6DOREgMc1DIsFKxfuMwX3EkVQM1If8ghb6x5Y
-jXayv+NLbidOSzk4vl5QwngO/JYFMkoc6i9LNwEaEtR9PhnrdubxmrtM+RjfBm02
-77q3dSWFESFQ4QxYWew4pHE0DpWbWy/iMIKQ6UZ5RLvB8GEcgt8ON7BBJeMc+Dyi
-kT9qhqn+lw==
------END CERTIFICATE-----
-
------BEGIN CERTIFICATE-----
-MIICiDCCAgygAwIBAgIIQX76UsB/30owDAYIKoZIzj0EAwMFADB6MQswCQYDVQQG
-EwJDTjEWMBQGA1UECgwNQW50IEZpbmFuY2lhbDEgMB4GA1UECwwXQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkxMTAvBgNVBAMMKEFudCBGaW5hbmNpYWwgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgRTEwHhcNMTkwNDI4MTYyMDQ0WhcNNDkwNDIwMTYyMDQ0
-WjB6MQswCQYDVQQGEwJDTjEWMBQGA1UECgwNQW50IEZpbmFuY2lhbDEgMB4GA1UE
-CwwXQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxMTAvBgNVBAMMKEFudCBGaW5hbmNp
-YWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgRTEwdjAQBgcqhkjOPQIBBgUrgQQA
-IgNiAASCCRa94QI0vR5Up9Yr9HEupz6hSoyjySYqo7v837KnmjveUIUNiuC9pWAU
-WP3jwLX3HkzeiNdeg22a0IZPoSUCpasufiLAnfXh6NInLiWBrjLJXDSGaY7vaokt
-rpZvAdmjXTBbMAsGA1UdDwQEAwIBBjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBRZ
-4ZTgDpksHL2qcpkFkxD2zVd16TAfBgNVHSMEGDAWgBRZ4ZTgDpksHL2qcpkFkxD2
-zVd16TAMBggqhkjOPQQDAwUAA2gAMGUCMQD4IoqT2hTUn0jt7oXLdMJ8q4vLp6sg
-wHfPiOr9gxreb+e6Oidwd2LDnC4OUqCWiF8CMAzwKs4SnDJYcMLf2vpkbuVE4dTH
-Rglz+HGcTLWsFs4KxLsq7MuU+vJTBUeDJeDjdA==
------END CERTIFICATE-----
-
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIUEMdk6dVgOEIS2cCP0Q43P90Ps5YwDQYJKoZIhvcNAQEF
-BQAwajELMAkGA1UEBhMCQ04xEzARBgNVBAoMCmlUcnVzQ2hpbmExHDAaBgNVBAsM
-E0NoaW5hIFRydXN0IE5ldHdvcmsxKDAmBgNVBAMMH2lUcnVzQ2hpbmEgQ2xhc3Mg
-MiBSb290IENBIC0gRzMwHhcNMTMwNDE4MDkzNjU2WhcNMzMwNDE4MDkzNjU2WjBq
-MQswCQYDVQQGEwJDTjETMBEGA1UECgwKaVRydXNDaGluYTEcMBoGA1UECwwTQ2hp
-bmEgVHJ1c3QgTmV0d29yazEoMCYGA1UEAwwfaVRydXNDaGluYSBDbGFzcyAyIFJv
-b3QgQ0EgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOPPShpV
-nJbMqqCw6Bz1kehnoPst9pkr0V9idOwU2oyS47/HjJXk9Rd5a9xfwkPO88trUpz5
-4GmmwspDXjVFu9L0eFaRuH3KMha1Ak01citbF7cQLJlS7XI+tpkTGHEY5pt3EsQg
-wykfZl/A1jrnSkspMS997r2Gim54cwz+mTMgDRhZsKK/lbOeBPpWtcFizjXYCqhw
-WktvQfZBYi6o4sHCshnOswi4yV1p+LuFcQ2ciYdWvULh1eZhLxHbGXyznYHi0dGN
-z+I9H8aXxqAQfHVhbdHNzi77hCxFjOy+hHrGsyzjrd2swVQ2iUWP8BfEQqGLqM1g
-KgWKYfcTGdbPB1MCAwEAAaNjMGEwHQYDVR0OBBYEFG/oAMxTVe7y0+408CTAK8hA
-uTyRMB8GA1UdIwQYMBaAFG/oAMxTVe7y0+408CTAK8hAuTyRMA8GA1UdEwEB/wQF
-MAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBLnUTfW7hp
-emMbuUGCk7RBswzOT83bDM6824EkUnf+X0iKS95SUNGeeSWK2o/3ALJo5hi7GZr3
-U8eLaWAcYizfO99UXMRBPw5PRR+gXGEronGUugLpxsjuynoLQu8GQAeysSXKbN1I
-UugDo9u8igJORYA+5ms0s5sCUySqbQ2R5z/GoceyI9LdxIVa1RjVX8pYOj8JFwtn
-DJN3ftSFvNMYwRuILKuqUYSHc2GPYiHVflDh5nDymCMOQFcFG3WsEuB+EYQPFgIU
-1DHmdZcz7Llx8UOZXX2JupWCYzK1XhJb+r4hK5ncf/w8qGtYlmyJpxk3hr1TfUJX
-Yf4Zr0fJsGuv
------END CERTIFICATE-----
\ No newline at end of file
diff --git a/xiaocool-api/uaa/src/main/resources/appCertPublicKey_2021004167605155.crt b/xiaocool-api/uaa/src/main/resources/appCertPublicKey_2021004167605155.crt
deleted file mode 100644
index f32e2bcf5d50843a7cc919f52cbe479bfd9e008b..0000000000000000000000000000000000000000
--- a/xiaocool-api/uaa/src/main/resources/appCertPublicKey_2021004167605155.crt
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEhTCCA22gAwIBAgIQICQIFjj9aJB6AcPuFrGtFzANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
-BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MTkwNwYDVQQDDDBBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IENs
-YXNzIDEgUjEwHhcNMjQwODE2MTIwMzA1WhcNMjkwODE1MTIwMzA1WjBNMQswCQYDVQQGEwJDTjES
-MBAGA1UECgwJ5aea6Im655ubMQ8wDQYDVQQLDAZBbGlwYXkxGTAXBgNVBAMMEDIwODg1MjI3NDQ1
-NDAyNDcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCJdCtQa9RnpA9MB7nlR9TMOl2E
-f21K4FFubRXbX2ov3jEhaq4tgRxYcw2wX2Q/wfAmAU2r2+OV7yIRWjC9VBQtvw/Ub9uBNcMcbTFY
-NYGIOFzKbfx6s4tSd7foNQqFk/syc1Rig20dPfQMV4nbuheoakvvVTk422wGh8sbIzVEkQPV1trI
-rKcbCWYchihoXNseTUcD/dG/afE3MBlUvhJhUdJOPmTgY65ChBUtZb+WN3aAiQwSuAiDqMRIYwf8
-jrEBbwL8kSDaRrT1ZGZIo5vx0cu4jNwzk6DYA5AF6vjlimxZta4pkqR1JUARvrxD9oaNCkvQzKoF
-Tvayc1sgSapFAgMBAAGjggEpMIIBJTAfBgNVHSMEGDAWgBRxB+IEYRbk5fJl6zEPyeD0PJrVkTAd
-BgNVHQ4EFgQUlcWGy6+ht8QSK0iZs3lAqSK5+oQwQAYDVR0gBDkwNzA1BgdggRwBbgEBMCowKAYI
-KwYBBQUHAgEWHGh0dHA6Ly9jYS5hbGlwYXkuY29tL2Nwcy5wZGYwDgYDVR0PAQH/BAQDAgbAMC8G
-A1UdHwQoMCYwJKAioCCGHmh0dHA6Ly9jYS5hbGlwYXkuY29tL2NybDkyLmNybDBgBggrBgEFBQcB
-AQRUMFIwKAYIKwYBBQUHMAKGHGh0dHA6Ly9jYS5hbGlwYXkuY29tL2NhNi5jZXIwJgYIKwYBBQUH
-MAGGGmh0dHA6Ly9jYS5hbGlwYXkuY29tOjgzNDAvMA0GCSqGSIb3DQEBCwUAA4IBAQCDL6KQ/yZg
-/RkUrlJ12qyqAQPcfh80Y+cdHmGFJ5Ri76ssPltIIyJCKbgC78Q9hXJ1VziOyVFj6ppEkIvNmhuQ
-0IsHduGpvoJ7GdgvtgFiVCuggAshV9YSbl2z0cLYrhAEhh8EnrE3j7XSTGT4MS5feyf8rk0xpyIh
-v+DtY9/h2ytfyoJ3s5RntXrSXPSXlFk76bmGqL+kb3CA5XSUOHUD2OkDpdSZzyNBDJCpMBQF5gA2
-/wfuiqI7PILWbZdr1ttJtaWR1jYIP5wi/m5ypE0Bx4xU7+yHHXopBaMw8913sii+SkbMlKwy7OR1
-DT1/6HUCsRtzNJ9s0W2uc3wfZUr3
------END CERTIFICATE-----
\ No newline at end of file
diff --git a/xiaocool-api/uaa/src/main/resources/application-dev.yml b/xiaocool-api/uaa/src/main/resources/application-dev.yml
index f7d111ff9e140cc3a96dcbd8c05113e303a8aab0..979d99b3961c735a8a911725a864c0f6ae43c6c5 100644
--- a/xiaocool-api/uaa/src/main/resources/application-dev.yml
+++ b/xiaocool-api/uaa/src/main/resources/application-dev.yml
@@ -2,8 +2,8 @@
server:
port: 3080
ssl:
- key-store: classpath:server.p12
- key-store-password: Yys12300
+ key-store: xxr.p12 #自签证书
+ key-store-password:
key-store-type: PKCS12
enabled: true
@@ -15,9 +15,9 @@ spring:
# 数据库配置
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: 数据库密码
# Sa-Token 配置
@@ -60,7 +60,7 @@ sa-token:
clientTokenTimeout: 7200
# Past-Client-Token 保存的时间（单位：秒） ，默认为-1，代表延续 Client-Token 的有效时间
pastClientTokenTimeout: 7200
- jwt-secret-key: YysqwqMjlAsdaidaleiq
+ jwt-secret-key:
@@ -73,51 +73,54 @@ mybatis-plus:
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句
mapper-locations: classpath:mapper/*.xml
+#这里你去gitee申请第三方应用填写即可
gitee:
client:
- id: 47099b4eefd7c92eca85b60a6c1f925add6ff432f7a2fcf69fcc3dafa7e1b6e8
- Secret: f7a4f3edb5855a2ed6972cd98d71a117bfaaf389a0fc9318c0e17618045c869d
+ id:
+ Secret:
redirect:
- uri: https://localhost:9091/uaa/oauth2/gitee/callback
+ uri:
wechat:
- app-id: weixin
- app-secret: weixin
- redirect-uri: http://localhost:9091/uaa/oauth2/wechat/callback
+ app-id:
+ app-secret:
+ redirect-uri:
captcha:
email:
- from: 小酷人脸识别
- password: SHCROFWGMDDPJWPW # 这里我随便填的
+ from: xxx
+ password: # 这里我随便填的
host: smtp.163.com
port: 465
- user: xiaocoolface@163.com
+ user: xxx@163.com
expire-time: 300 # 300秒
qq:
- app-id: 102264792
- app-key: PimbCZhb1FG4e1A4
- redirect-uri: http://localhost:9091/uaa/oauth2/qq/callback
+ app-id:
+ app-key:
+ redirect-uri:
+
alipay:
- app-id: 2021004167605155
- redirect-uri: https://localhost:9091/uaa/oauth2/alipay/callback
- merchant-private-key: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCJdCtQa9RnpA9MB7nlR9TMOl2Ef21K4FFubRXbX2ov3jEhaq4tgRxYcw2wX2Q/wfAmAU2r2+OV7yIRWjC9VBQtvw/Ub9uBNcMcbTFYNYGIOFzKbfx6s4tSd7foNQqFk/syc1Rig20dPfQMV4nbuheoakvvVTk422wGh8sbIzVEkQPV1trIrKcbCWYchihoXNseTUcD/dG/afE3MBlUvhJhUdJOPmTgY65ChBUtZb+WN3aAiQwSuAiDqMRIYwf8jrEBbwL8kSDaRrT1ZGZIo5vx0cu4jNwzk6DYA5AF6vjlimxZta4pkqR1JUARvrxD9oaNCkvQzKoFTvayc1sgSapFAgMBAAECggEAV99dZW9Z/dvjL57s18hBIULa0D7KdwjK5kZ0p6bq8qkgTZWuvkaBAYakJLIHG793MES7C/hqGUskQ2WeLRtYPxqbGxtbf9IH5t9joVmrcpNdtsfzldm8Yr9IYfmuvVCqUUlrlAMjOYOGxnEcH81rHG7AFsQr7c5Q1Cfxz2qFvkvrAvpMHkS6ol/lqbeacjYgmKfbZgQsP140GXyDGaR0mvGUd2/v9P0a3rUNxK7pCrVdXV+xnoqy5LN1ald8aGA54Fm60iGFdXF0dHdZISottuIIwsZXiEVlMX8OhWAzJZ+RIvtxBS/zf1oMj9kEuoZg/fzaEH5TY+DU2QOC2g5/DQKBgQC+FaFz76dKDJVB5TNAGWkX5kp1PLmKnQBWm7NCnngTWsMjkl8iE1VyC91uAwsjBJSrdJF39EwI9gobp1024VeZ1URD/V8j7pggoSN9VwdUyYAY/LnyXgQdFrwK25qoNt9ZrtPoMtpJhaTVMGtUHgY7SSMcLKM61G0GFOcbC8OfgwKBgQC5HlpfxlY6DnTf3QgOZQGwXr2ulAK7XaqsyYSxYKpyXahOaxeuKgdDqbmr1ENL8mOIl/Oy2hCa4PR2vxE55DBTMJGZMZo+O6cvyS+jiN38763Mu92zwthuZPI+7PZy7NEr75/f4SUmT/2tdsKN6xQF/12bpkkr6ojDS/4Vp0bclwKBgAS9QVNErGUaPzZvYoG8oHQqF70okG+2TmXaZ/PHQ7Mn1imy4pBU7xJy3Uh65vIukQ5dT6sv+h1XFRVvbNGLeMWrHZKcZJzevAhEPEBJxTMF+x2kX3Z9hZi8EmAq7YY4KAVyaHInom2m2V8/X82vGfSsdCWlr0QuO7GlH8X62xvFAoGACgKyMGuxTgJqH5D8VorvxHHbIA2w+CDgkedz3YO0s+qMp3DzHt/29JnBCKG54emBqGlPLGTOcRGpJqK+c7r7QgRmWzprdOIU8GiYwucr2fm8FE40dvwaaB3dW7nEugJEbXPP2XN7Zs78kNzTOIl1070zeq9LVayhKK57VwBsvJECgYEAkyoqME5ZXpb1Ca1A8mCe2OHCkau4Ep1DoRHLSDWEFnccJWu2ap/0fx3ee3aCiedSIe0gmf4bhOs5QwNbpz+jWb+NBxuabJwHqb3B5jBNboxTnDNBDd0Eu0pEuRZzBG4bk2EXr2uefpDOdLWCyOFjyuPum66aCRJ6cEw6BEcAyyc=
- gateway: https://openapi.alipay.com/gateway.do
- appCertPath: classpath:appCertPublicKey_2021004167605155.crt
- alipayCertPath: classpath:alipayCertPublicKey_RSA2.crt
- rootCertPath: classpath:alipayRootCert.crt
+ app-id:
+ redirect-uri:
+ merchant-private-key:
+ gateway:
+ appCertPath:
+ alipayCertPath:
+ rootCertPath:
+
# 腾讯云短信服务配置
sms-config:
# 腾讯云账户密钥对 secretId 和 secretKey
- secretId: AKIDrYL1TmaWIqPtEQQ5b2NbcP2TgelmKpFY
- secretKey: a2MjAZniYJsJYaNwOdeaKvJdv63sVZTI
+ secretId:
+ secretKey:
# 短信应用appId和appKey
- appId: 1400918823
- appKey: 256fb5f9562ee4c2d8c6c76c48ea675c
+ appId:
+ appKey:
# 签名
- smsSign: 小酷系统网站
+ smsSign:
# 过期时间
expireTime: 6 # 6min
# redis存储前缀
@@ -125,6 +128,5 @@ sms-config:
# 模板id
templateIds:
code:
- login: 2188925
- register: 2188927
- binding: 2240633
+ login:
+ register:
diff --git a/xiaocool-api/uaa/src/main/resources/application-pro.yml b/xiaocool-api/uaa/src/main/resources/application-pro.yml
index 6a5be46fbb33eb5c75e98bb465bba232344a98a5..85dbe90780b7c48d50c8dc5b8648ea6c2fd8377d 100644
--- a/xiaocool-api/uaa/src/main/resources/application-pro.yml
+++ b/xiaocool-api/uaa/src/main/resources/application-pro.yml
@@ -2,8 +2,8 @@
server:
port: 3080
ssl:
- key-store: /app/face.xiaoku.store.jks # 指向容器内的JKS文件路径
- key-store-password: 7m2svo5d
+ key-store: /app/xx.jks # 指向容器内的JKS文件路径
+ key-store-password: xx
key-store-type: JKS
enabled: true
@@ -29,18 +29,17 @@ spring:
# Redis服务器连接密码（默认为空）
# password:
# 连接超时时间（毫秒）
- timeout: 15000ms
+ timeout: 3000ms
lettuce:
pool:
# 连接池最大连接数
max-active: 200
# 连接池最大阻塞等待时间（使用负值表示没有限制）
- max-wait: -1ms # 设置合理的连接池等待时间
+ max-wait: -1ms
# 连接池中的最大空闲连接
max-idle: 10
# 连接池中的最小空闲连接
- min-idle: 5
-
+ min-idle: 0
# Sa-Token 配置
sa-token:
@@ -82,7 +81,7 @@ sa-token:
clientTokenTimeout: 7200
# Past-Client-Token 保存的时间（单位：秒） ，默认为-1，代表延续 Client-Token 的有效时间
pastClientTokenTimeout: 7200
- jwt-secret-key: YysqwqMjlAsdaidaleiq
+ jwt-secret-key:
@@ -95,52 +94,53 @@ mybatis-plus:
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句
mapper-locations: classpath:mapper/*.xml
+
gitee:
client:
- id: c0f271396fbb07ad0fe26ef31ef4b53a88975055f892fbbadb84dd6fc66c729d
- Secret: e056db8e0312ac700e14d70a8601d0db684dcb054bcac4ae87c33fd3f6e3065a
+ id:
+ Secret:
redirect:
- uri: https://${SPRING-CLOUD-DOMAIN-GATEWAY}/uaa/oauth2/gitee/callback
+ uri: https://${SPRING-CLOUD-DOMAIN-NAME}/uaa/oauth2/gitee/callback
wechat:
app-id: weixin
app-secret: weixin
- redirect-uri: https://${SPRING-CLOUD-DOMAIN-GATEWAY}/uaa/oauth2/wechat/callback
+ redirect-uri: https://${SPRING-CLOUD-DOMAIN-NAME}/uaa/oauth2/wechat/callback
captcha:
email:
- from: 小酷人脸识别
- password: SHCROFWGMDDPJWPW # 这里我随便填的
+ from: xxxx
+ password: # 这里我随便填的
host: smtp.163.com
port: 465
- user: xiaocoolface@163.com
+ user: xxxx@163.com
expire-time: 300 # 300秒
qq:
- app-id: 102264792
- app-key: PimbCZhb1FG4e1A4
- redirect-uri: https://${SPRING-CLOUD-DOMAIN-NAME}/uaa/oauth2/qq/callback
+ app-id:
+ app-key:
+ redirect-uri:
alipay:
- app-id: 2021004167605155
- redirect-uri: https://${SPRING-CLOUD-DOMAIN-NAME}/uaa/oauth2/alipay/callback
- merchant-private-key: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCJdCtQa9RnpA9MB7nlR9TMOl2Ef21K4FFubRXbX2ov3jEhaq4tgRxYcw2wX2Q/wfAmAU2r2+OV7yIRWjC9VBQtvw/Ub9uBNcMcbTFYNYGIOFzKbfx6s4tSd7foNQqFk/syc1Rig20dPfQMV4nbuheoakvvVTk422wGh8sbIzVEkQPV1trIrKcbCWYchihoXNseTUcD/dG/afE3MBlUvhJhUdJOPmTgY65ChBUtZb+WN3aAiQwSuAiDqMRIYwf8jrEBbwL8kSDaRrT1ZGZIo5vx0cu4jNwzk6DYA5AF6vjlimxZta4pkqR1JUARvrxD9oaNCkvQzKoFTvayc1sgSapFAgMBAAECggEAV99dZW9Z/dvjL57s18hBIULa0D7KdwjK5kZ0p6bq8qkgTZWuvkaBAYakJLIHG793MES7C/hqGUskQ2WeLRtYPxqbGxtbf9IH5t9joVmrcpNdtsfzldm8Yr9IYfmuvVCqUUlrlAMjOYOGxnEcH81rHG7AFsQr7c5Q1Cfxz2qFvkvrAvpMHkS6ol/lqbeacjYgmKfbZgQsP140GXyDGaR0mvGUd2/v9P0a3rUNxK7pCrVdXV+xnoqy5LN1ald8aGA54Fm60iGFdXF0dHdZISottuIIwsZXiEVlMX8OhWAzJZ+RIvtxBS/zf1oMj9kEuoZg/fzaEH5TY+DU2QOC2g5/DQKBgQC+FaFz76dKDJVB5TNAGWkX5kp1PLmKnQBWm7NCnngTWsMjkl8iE1VyC91uAwsjBJSrdJF39EwI9gobp1024VeZ1URD/V8j7pggoSN9VwdUyYAY/LnyXgQdFrwK25qoNt9ZrtPoMtpJhaTVMGtUHgY7SSMcLKM61G0GFOcbC8OfgwKBgQC5HlpfxlY6DnTf3QgOZQGwXr2ulAK7XaqsyYSxYKpyXahOaxeuKgdDqbmr1ENL8mOIl/Oy2hCa4PR2vxE55DBTMJGZMZo+O6cvyS+jiN38763Mu92zwthuZPI+7PZy7NEr75/f4SUmT/2tdsKN6xQF/12bpkkr6ojDS/4Vp0bclwKBgAS9QVNErGUaPzZvYoG8oHQqF70okG+2TmXaZ/PHQ7Mn1imy4pBU7xJy3Uh65vIukQ5dT6sv+h1XFRVvbNGLeMWrHZKcZJzevAhEPEBJxTMF+x2kX3Z9hZi8EmAq7YY4KAVyaHInom2m2V8/X82vGfSsdCWlr0QuO7GlH8X62xvFAoGACgKyMGuxTgJqH5D8VorvxHHbIA2w+CDgkedz3YO0s+qMp3DzHt/29JnBCKG54emBqGlPLGTOcRGpJqK+c7r7QgRmWzprdOIU8GiYwucr2fm8FE40dvwaaB3dW7nEugJEbXPP2XN7Zs78kNzTOIl1070zeq9LVayhKK57VwBsvJECgYEAkyoqME5ZXpb1Ca1A8mCe2OHCkau4Ep1DoRHLSDWEFnccJWu2ap/0fx3ee3aCiedSIe0gmf4bhOs5QwNbpz+jWb+NBxuabJwHqb3B5jBNboxTnDNBDd0Eu0pEuRZzBG4bk2EXr2uefpDOdLWCyOFjyuPum66aCRJ6cEw6BEcAyyc=
- gateway: https://openapi.alipay.com/gateway.do
- appCertPath: /app/appCertPublicKey_2021004167605155.crt
- alipayCertPath: /app/alipayCertPublicKey_RSA2.crt
- rootCertPath: /app/alipayRootCert.crt
+ app-id:
+ redirect-uri:
+ merchant-private-key:
+ gateway:
+ appCertPath:
+ alipayCertPath:
+ rootCertPath:
# 腾讯云短信服务配置
sms-config:
# 腾讯云账户密钥对 secretId 和 secretKey
- secretId: AKIDrYL1TmaWIqPtEQQ5b2NbcP2TgelmKpFY
- secretKey: a2MjAZniYJsJYaNwOdeaKvJdv63sVZTI
+ secretId:
+ secretKey:
# 短信应用appId和appKey
- appId: 1400918823
- appKey: 256fb5f9562ee4c2d8c6c76c48ea675c
+ appId:
+ appKey:
# 签名
- smsSign: 小酷系统网站
+ smsSign:
# 过期时间
expireTime: 6 # 6min
# redis存储前缀
@@ -148,6 +148,5 @@ sms-config:
# 模板id
templateIds:
code:
- login: 2188925
- register: 2188927
- binding: 2240633
+ login:
+ register:
diff --git a/xiaocool-api/uaa/src/main/resources/application.yml b/xiaocool-api/uaa/src/main/resources/application.yml
index fcc3de989b3c9f9fe0a44756ea23e8fca87ff642..15bafba9a20b38375ba38c39281d6aa798415093 100644
--- a/xiaocool-api/uaa/src/main/resources/application.yml
+++ b/xiaocool-api/uaa/src/main/resources/application.yml
@@ -1,4 +1,3 @@
spring:
profiles:
- active: pro
-# active: dev
+ active: #这里如果是生产环境就是pro如果是本地测试环境就是dev，对应application-pro/dev.yaml
\ No newline at end of file
diff --git a/xiaocool-api/uaa/src/main/resources/bootstrap-dev.yml b/xiaocool-api/uaa/src/main/resources/bootstrap-dev.yml
index 2270a85922d1d1ac40d5f8eadd0408157a941b12..a1e6bd401c384d8ac5c3e56fdb30fc1f647549c6 100644
--- a/xiaocool-api/uaa/src/main/resources/bootstrap-dev.yml
+++ b/xiaocool-api/uaa/src/main/resources/bootstrap-dev.yml
@@ -1,11 +1,11 @@
spring:
cloud:
nacos:
- username: nacos
- password: nacos
discovery:
- server-addr: localhost:8848 #Nacos服务注册中心地址
+ server-addr: localhost:8848
secure: true # 指示服务是通过 HTTPS 访问的
+ username: nacos
+ password: nacos
config:
server-addr: localhost:8848 #Nacos作为配置中心地址
file-extension: yml #指定yaml格式的配置
@@ -15,19 +15,18 @@ spring:
redis:
# Redis数据库索引（默认为0）
database: 1
- password: Yys12300
port: 6379
- host: 124.222.32.229
+ host: localhost
# Redis服务器连接密码（默认为空）
# password:
# 连接超时时间（毫秒）
- timeout: 5000ms
+ timeout: 1000ms
lettuce:
pool:
# 连接池最大连接数
max-active: 200
# 连接池最大阻塞等待时间（使用负值表示没有限制）
- max-wait: 5000ms # 设置合理的连接池等待时间
+ max-wait: -1ms
# 连接池中的最大空闲连接
max-idle: 10
# 连接池中的最小空闲连接
diff --git a/xiaocool-api/uaa/src/main/resources/bootstrap.yml b/xiaocool-api/uaa/src/main/resources/bootstrap.yml
index e81069d01fdaae8cb1d4182e4ab2e687447bf66d..20ea93ae3857d7eb1b60735654b98f21217845f4 100644
--- a/xiaocool-api/uaa/src/main/resources/bootstrap.yml
+++ b/xiaocool-api/uaa/src/main/resources/bootstrap.yml
@@ -1,4 +1,3 @@
spring:
profiles:
- active: pro
-# active: dev
\ No newline at end of file
+ active: #这里如果是生产环境就是pro如果是本地测试环境就是dev，对应bootstrap-pro/dev.yaml
\ No newline at end of file
diff --git a/xiaocool-api/uaa/src/main/resources/face.xiaoku.store.jks b/xiaocool-api/uaa/src/main/resources/face.xiaoku.store.jks
deleted file mode 100644
index 51fb9d5666c0298db44a8c169ce24787a8f4069f..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/src/main/resources/face.xiaoku.store.jks and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/mapper/UserMapper.xml b/xiaocool-api/uaa/src/main/resources/mapper/UserMapper.xml
similarity index 100%
rename from xiaocool-api/uaa/target/classes/mapper/UserMapper.xml
rename to xiaocool-api/uaa/src/main/resources/mapper/UserMapper.xml
diff --git a/xiaocool-api/uaa/src/main/resources/server.p12 b/xiaocool-api/uaa/src/main/resources/server.p12
deleted file mode 100644
index 0888d80d43133f4cad3be3ca407c7113e6b599ae..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/src/main/resources/server.p12 and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/templates/EmailVerificationCode.html b/xiaocool-api/uaa/src/main/resources/templates/EmailVerificationCode.html
similarity index 100%
rename from xiaocool-api/uaa/target/classes/templates/EmailVerificationCode.html
rename to xiaocool-api/uaa/src/main/resources/templates/EmailVerificationCode.html
diff --git a/xiaocool-api/uaa/target/classes/templates/confirm.html b/xiaocool-api/uaa/src/main/resources/templates/confirm.html
similarity index 100%
rename from xiaocool-api/uaa/target/classes/templates/confirm.html
rename to xiaocool-api/uaa/src/main/resources/templates/confirm.html
diff --git a/xiaocool-api/uaa/target/classes/templates/login.html b/xiaocool-api/uaa/src/main/resources/templates/login.html
similarity index 100%
rename from xiaocool-api/uaa/target/classes/templates/login.html
rename to xiaocool-api/uaa/src/main/resources/templates/login.html
diff --git a/xiaocool-api/uaa/src/main/resources/xiaoku.store.jks b/xiaocool-api/uaa/src/main/resources/xiaoku.store.jks
deleted file mode 100644
index 130d8ab023f94df8196465e0ab4faa3723ffbce3..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/src/main/resources/xiaoku.store.jks and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/Dockerfile b/xiaocool-api/uaa/target/classes/Dockerfile
deleted file mode 100644
index 9610f05dab4daa2b4ac45b5cf91f703fadc9a670..0000000000000000000000000000000000000000
--- a/xiaocool-api/uaa/target/classes/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-# 使用官方Java 8运行时作为基础镜像
-FROM java:8
-
-MAINTAINER yys(1009802251@qq.com)
-
-# 设置时区为Asia/Shanghai
-ENV TZ=Asia/Shanghai
-
-#设置时区
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo '$TZ' > /etc/timezone
-
-VOLUME /tmp
-# 设置工作目录
-WORKDIR /app
-
-# 复制JAR文件和JKS文件到容器内
-COPY uaa.jar /app/app.jar
-COPY face.xiaoku.store.jks /app/face.xiaoku.store.jks
-
-ENV SPRING-CLOUD-NACOS-ADDR 10.1.24.3:8848
-ENV SPRING-CLOUD-NACOS-IP face.xiaoku.store
-ENV SPRING-CLOUD-DOMAIN-NAME xiaoku.store:9091
-ENV SPRING-CLOUD-MYSQL-HOST 10.0.12.16:3310
-ENV SPRING-CLOUD-GATEWAY-HOST 10.0.12.16:9091
-ENV SPRING-CLOUD-DB-NAME meeting
-ENV SPRING-CLOUD-REDIS-HOST 10.0.12.16
-ENV SPRING-CLOUD-REDIS-PWD Yys12300
-ENV NACOS-USERNAME nacos
-ENV NACOS-PWD yys
-
-EXPOSE 3080
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom", "-jar", "/app/app.jar"]
diff --git a/xiaocool-api/uaa/target/classes/alipayCertPublicKey_RSA2.crt b/xiaocool-api/uaa/target/classes/alipayCertPublicKey_RSA2.crt
deleted file mode 100644
index afcaecfb594378d78eb60d00a0ffb642761accb5..0000000000000000000000000000000000000000
--- a/xiaocool-api/uaa/target/classes/alipayCertPublicKey_RSA2.crt
+++ /dev/null
@@ -1,43 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDljCCAn6gAwIBAgIQICQIFtRORjDSjLSo+2cCNjANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
-BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MTkwNwYDVQQDDDBBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IENs
-YXNzIDIgUjEwHhcNMjQwODE2MTIwMzA2WhcNMjkwODE1MTIwMzA2WjB3MQswCQYDVQQGEwJDTjES
-MBAGA1UECgwJ5aea6Im655ubMQ8wDQYDVQQLDAZBbGlwYXkxQzBBBgNVBAMMOuaUr+S7mOWunSjk
-uK3lm70p572R57uc5oqA5pyv5pyJ6ZmQ5YWs5Y+4LTIwODg1MjI3NDQ1NDAyNDcwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7ZYHqfPhim1cw0e4pVsn+94i+v5/F8Tpm5nqU70RhWxpB
-7iP7meu+t+lDBOaOmyzv1QblkCOVAFVHN28L644weH/VAaWSjoSfN6yY4HAwPyHwnu2YVHvCjwX8
-Fd+JA0fCLDZUUP8BnK8i8nonrB9ihL0ZOlT6LGSFwMvO43kqmvI9PUcaeGjKExocm8x4W6xrisAz
-+kvwiE/PGP88xtuBelxEV9GfQX119EJ2pTACGQBT9ZWZt5MndaUJel2nclTyGkrhjCEcPn/8iIsX
-ffvHHHnYTHKQB/aBbcezh61rf6ahzeK3xC4ea76m0lDg0lrfU2OifM0km39lGr5xFcXdAgMBAAGj
-EjAQMA4GA1UdDwEB/wQEAwID+DANBgkqhkiG9w0BAQsFAAOCAQEAdEz02LIqbZl6P9jGsexqshSx
-H7h2qs01wn8QkvAy5ZBYeY6xBPPyEaSyNVDykfxAUk9vmCZS0tj9HWudnEs/IIHI/g/pY1Qroggv
-IHHZn2C7uNWfaL0eUlYwRU9/sFoVYPHZXdBk3kz3MJEQX9N7WZFOXR0+hn+95YG1FXx3soZBmi1/
-/cwiISlwHQQ+rEsrjPLAaZnKXA0oBO5HRSGf0En/+uBCPWCPMqwVWHQTb/40/u8EVp1xpykkkCw6
-/uIjqFP5wtutvbz4Qg8rH2hMhbAiu8j4Iuf1YHbHO2e/68F31DmOjIqjkAx159NDNLSFPYl85MfN
-YQt62hMhC6B9TA==
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIE4jCCAsqgAwIBAgIIYsSr5bKAMl8wDQYJKoZIhvcNAQELBQAwejELMAkGA1UEBhMCQ04xFjAU
-BgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MTEw
-LwYDVQQDDChBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFIxMB4XDTE4MDMy
-MjE0MzQxNVoXDTM3MTEyNjE0MzQxNVowgYIxCzAJBgNVBAYTAkNOMRYwFAYDVQQKDA1BbnQgRmlu
-YW5jaWFsMSAwHgYDVQQLDBdDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTE5MDcGA1UEAwwwQW50IEZp
-bmFuY2lhbCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBDbGFzcyAyIFIxMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAsLMfYaoRoPRbmDcAfXPCmKf43pWRN5yTXa/KJWO0l+mrgQvs89bA
-NEvbDUxlkGwycwtwi5DgBuBgVhLliXu+R9CYgr2dXs8D8Hx/gsggDcyGPLmVrDOnL+dyeauheARZ
-fA3du60fwEwwbGcVIpIxPa/4n3IS/ElxQa6DNgqxh8J9Xwh7qMGl0JK9+bALuxf7B541Gr4p0WEN
-G8fhgjBV4w4ut9eQLOoa1eddOUSZcy46Z7allwowwgt7b5VFfx/P1iKJ3LzBMgkCK7GZ2kiLrL7R
-iqV+h482J7hkJD+ardoc6LnrHO/hIZymDxok+VH9fVeUdQa29IZKrIDVj65THQIDAQABo2MwYTAf
-BgNVHSMEGDAWgBRfdLQEwE8HWurlsdsio4dBspzhATAdBgNVHQ4EFgQUSqHkYINtUSAtDPnS8Xoy
-oP9p7qEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggIB
-AIQ8TzFy4bVIVb8+WhHKCkKNPcJe2EZuIcqvRoi727lZTJOfYy/JzLtckyZYfEI8J0lasZ29wkTt
-a1IjSo+a6XdhudU4ONVBrL70U8Kzntplw/6TBNbLFpp7taRALjUgbCOk4EoBMbeCL0GiYYsTS0mw
-7xdySzmGQku4GTyqutIGPQwKxSj9iSFw1FCZqr4VP4tyXzMUgc52SzagA6i7AyLedd3tbS6lnR5B
-L+W9Kx9hwT8L7WANAxQzv/jGldeuSLN8bsTxlOYlsdjmIGu/C9OWblPYGpjQQIRyvs4Cc/mNhrh+
-14EQgwuemIIFDLOgcD+iISoN8CqegelNcJndFw1PDN6LkVoiHz9p7jzsge8RKay/QW6C03KNDpWZ
-EUCgCUdfHfo8xKeR+LL1cfn24HKJmZt8L/aeRZwZ1jwePXFRVtiXELvgJuM/tJDIFj2KD337iV64
-fWcKQ/ydDVGqfDZAdcU4hQdsrPWENwPTQPfVPq2NNLMyIH9+WKx9Ed6/WzeZmIy5ZWpX1TtTolo6
-OJXQFeItMAjHxW/ZSZTok5IS3FuRhExturaInnzjYpx50a6kS34c5+c8hYq7sAtZ/CNLZmBnBCFD
-aMQqT8xFZJ5uolUaSeXxg7JFY1QsYp5RKvj4SjFwCGKJ2+hPPe9UyyltxOidNtxjaknOCeBHytOr
------END CERTIFICATE-----
diff --git a/xiaocool-api/uaa/target/classes/alipayRootCert.crt b/xiaocool-api/uaa/target/classes/alipayRootCert.crt
deleted file mode 100644
index 76417c538f5305efe694e9b7ae4dd978045be20f..0000000000000000000000000000000000000000
--- a/xiaocool-api/uaa/target/classes/alipayRootCert.crt
+++ /dev/null
@@ -1,88 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBszCCAVegAwIBAgIIaeL+wBcKxnswDAYIKoEcz1UBg3UFADAuMQswCQYDVQQG
-EwJDTjEOMAwGA1UECgwFTlJDQUMxDzANBgNVBAMMBlJPT1RDQTAeFw0xMjA3MTQw
-MzExNTlaFw00MjA3MDcwMzExNTlaMC4xCzAJBgNVBAYTAkNOMQ4wDAYDVQQKDAVO
-UkNBQzEPMA0GA1UEAwwGUk9PVENBMFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAE
-MPCca6pmgcchsTf2UnBeL9rtp4nw+itk1Kzrmbnqo05lUwkwlWK+4OIrtFdAqnRT
-V7Q9v1htkv42TsIutzd126NdMFswHwYDVR0jBBgwFoAUTDKxl9kzG8SmBcHG5Yti
-W/CXdlgwDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFEwysZfZ
-MxvEpgXBxuWLYlvwl3ZYMAwGCCqBHM9VAYN1BQADSAAwRQIgG1bSLeOXp3oB8H7b
-53W+CKOPl2PknmWEq/lMhtn25HkCIQDaHDgWxWFtnCrBjH16/W3Ezn7/U/Vjo5xI
-pDoiVhsLwg==
------END CERTIFICATE-----
-
------BEGIN CERTIFICATE-----
-MIIF0zCCA7ugAwIBAgIIH8+hjWpIDREwDQYJKoZIhvcNAQELBQAwejELMAkGA1UE
-BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5MTEwLwYDVQQDDChBbnQgRmluYW5jaWFsIENlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5IFIxMB4XDTE4MDMyMTEzNDg0MFoXDTM4MDIyODEzNDg0
-MFowejELMAkGA1UEBhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNV
-BAsMF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MTEwLwYDVQQDDChBbnQgRmluYW5j
-aWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFIxMIICIjANBgkqhkiG9w0BAQEF
-AAOCAg8AMIICCgKCAgEAtytTRcBNuur5h8xuxnlKJetT65cHGemGi8oD+beHFPTk
-rUTlFt9Xn7fAVGo6QSsPb9uGLpUFGEdGmbsQ2q9cV4P89qkH04VzIPwT7AywJdt2
-xAvMs+MgHFJzOYfL1QkdOOVO7NwKxH8IvlQgFabWomWk2Ei9WfUyxFjVO1LVh0Bp
-dRBeWLMkdudx0tl3+21t1apnReFNQ5nfX29xeSxIhesaMHDZFViO/DXDNW2BcTs6
-vSWKyJ4YIIIzStumD8K1xMsoaZBMDxg4itjWFaKRgNuPiIn4kjDY3kC66Sl/6yTl
-YUz8AybbEsICZzssdZh7jcNb1VRfk79lgAprm/Ktl+mgrU1gaMGP1OE25JCbqli1
-Pbw/BpPynyP9+XulE+2mxFwTYhKAwpDIDKuYsFUXuo8t261pCovI1CXFzAQM2w7H
-DtA2nOXSW6q0jGDJ5+WauH+K8ZSvA6x4sFo4u0KNCx0ROTBpLif6GTngqo3sj+98
-SZiMNLFMQoQkjkdN5Q5g9N6CFZPVZ6QpO0JcIc7S1le/g9z5iBKnifrKxy0TQjtG
-PsDwc8ubPnRm/F82RReCoyNyx63indpgFfhN7+KxUIQ9cOwwTvemmor0A+ZQamRe
-9LMuiEfEaWUDK+6O0Gl8lO571uI5onYdN1VIgOmwFbe+D8TcuzVjIZ/zvHrAGUcC
-AwEAAaNdMFswCwYDVR0PBAQDAgEGMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFF90
-tATATwda6uWx2yKjh0GynOEBMB8GA1UdIwQYMBaAFF90tATATwda6uWx2yKjh0Gy
-nOEBMA0GCSqGSIb3DQEBCwUAA4ICAQCVYaOtqOLIpsrEikE5lb+UARNSFJg6tpkf
-tJ2U8QF/DejemEHx5IClQu6ajxjtu0Aie4/3UnIXop8nH/Q57l+Wyt9T7N2WPiNq
-JSlYKYbJpPF8LXbuKYG3BTFTdOVFIeRe2NUyYh/xs6bXGr4WKTXb3qBmzR02FSy3
-IODQw5Q6zpXj8prYqFHYsOvGCEc1CwJaSaYwRhTkFedJUxiyhyB5GQwoFfExCVHW
-05ZFCAVYFldCJvUzfzrWubN6wX0DD2dwultgmldOn/W/n8at52mpPNvIdbZb2F41
-T0YZeoWnCJrYXjq/32oc1cmifIHqySnyMnavi75DxPCdZsCOpSAT4j4lAQRGsfgI
-kkLPGQieMfNNkMCKh7qjwdXAVtdqhf0RVtFILH3OyEodlk1HYXqX5iE5wlaKzDop
-PKwf2Q3BErq1xChYGGVS+dEvyXc/2nIBlt7uLWKp4XFjqekKbaGaLJdjYP5b2s7N
-1dM0MXQ/f8XoXKBkJNzEiM3hfsU6DOREgMc1DIsFKxfuMwX3EkVQM1If8ghb6x5Y
-jXayv+NLbidOSzk4vl5QwngO/JYFMkoc6i9LNwEaEtR9PhnrdubxmrtM+RjfBm02
-77q3dSWFESFQ4QxYWew4pHE0DpWbWy/iMIKQ6UZ5RLvB8GEcgt8ON7BBJeMc+Dyi
-kT9qhqn+lw==
------END CERTIFICATE-----
-
------BEGIN CERTIFICATE-----
-MIICiDCCAgygAwIBAgIIQX76UsB/30owDAYIKoZIzj0EAwMFADB6MQswCQYDVQQG
-EwJDTjEWMBQGA1UECgwNQW50IEZpbmFuY2lhbDEgMB4GA1UECwwXQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkxMTAvBgNVBAMMKEFudCBGaW5hbmNpYWwgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgRTEwHhcNMTkwNDI4MTYyMDQ0WhcNNDkwNDIwMTYyMDQ0
-WjB6MQswCQYDVQQGEwJDTjEWMBQGA1UECgwNQW50IEZpbmFuY2lhbDEgMB4GA1UE
-CwwXQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxMTAvBgNVBAMMKEFudCBGaW5hbmNp
-YWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgRTEwdjAQBgcqhkjOPQIBBgUrgQQA
-IgNiAASCCRa94QI0vR5Up9Yr9HEupz6hSoyjySYqo7v837KnmjveUIUNiuC9pWAU
-WP3jwLX3HkzeiNdeg22a0IZPoSUCpasufiLAnfXh6NInLiWBrjLJXDSGaY7vaokt
-rpZvAdmjXTBbMAsGA1UdDwQEAwIBBjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBRZ
-4ZTgDpksHL2qcpkFkxD2zVd16TAfBgNVHSMEGDAWgBRZ4ZTgDpksHL2qcpkFkxD2
-zVd16TAMBggqhkjOPQQDAwUAA2gAMGUCMQD4IoqT2hTUn0jt7oXLdMJ8q4vLp6sg
-wHfPiOr9gxreb+e6Oidwd2LDnC4OUqCWiF8CMAzwKs4SnDJYcMLf2vpkbuVE4dTH
-Rglz+HGcTLWsFs4KxLsq7MuU+vJTBUeDJeDjdA==
------END CERTIFICATE-----
-
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIUEMdk6dVgOEIS2cCP0Q43P90Ps5YwDQYJKoZIhvcNAQEF
-BQAwajELMAkGA1UEBhMCQ04xEzARBgNVBAoMCmlUcnVzQ2hpbmExHDAaBgNVBAsM
-E0NoaW5hIFRydXN0IE5ldHdvcmsxKDAmBgNVBAMMH2lUcnVzQ2hpbmEgQ2xhc3Mg
-MiBSb290IENBIC0gRzMwHhcNMTMwNDE4MDkzNjU2WhcNMzMwNDE4MDkzNjU2WjBq
-MQswCQYDVQQGEwJDTjETMBEGA1UECgwKaVRydXNDaGluYTEcMBoGA1UECwwTQ2hp
-bmEgVHJ1c3QgTmV0d29yazEoMCYGA1UEAwwfaVRydXNDaGluYSBDbGFzcyAyIFJv
-b3QgQ0EgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOPPShpV
-nJbMqqCw6Bz1kehnoPst9pkr0V9idOwU2oyS47/HjJXk9Rd5a9xfwkPO88trUpz5
-4GmmwspDXjVFu9L0eFaRuH3KMha1Ak01citbF7cQLJlS7XI+tpkTGHEY5pt3EsQg
-wykfZl/A1jrnSkspMS997r2Gim54cwz+mTMgDRhZsKK/lbOeBPpWtcFizjXYCqhw
-WktvQfZBYi6o4sHCshnOswi4yV1p+LuFcQ2ciYdWvULh1eZhLxHbGXyznYHi0dGN
-z+I9H8aXxqAQfHVhbdHNzi77hCxFjOy+hHrGsyzjrd2swVQ2iUWP8BfEQqGLqM1g
-KgWKYfcTGdbPB1MCAwEAAaNjMGEwHQYDVR0OBBYEFG/oAMxTVe7y0+408CTAK8hA
-uTyRMB8GA1UdIwQYMBaAFG/oAMxTVe7y0+408CTAK8hAuTyRMA8GA1UdEwEB/wQF
-MAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBLnUTfW7hp
-emMbuUGCk7RBswzOT83bDM6824EkUnf+X0iKS95SUNGeeSWK2o/3ALJo5hi7GZr3
-U8eLaWAcYizfO99UXMRBPw5PRR+gXGEronGUugLpxsjuynoLQu8GQAeysSXKbN1I
-UugDo9u8igJORYA+5ms0s5sCUySqbQ2R5z/GoceyI9LdxIVa1RjVX8pYOj8JFwtn
-DJN3ftSFvNMYwRuILKuqUYSHc2GPYiHVflDh5nDymCMOQFcFG3WsEuB+EYQPFgIU
-1DHmdZcz7Llx8UOZXX2JupWCYzK1XhJb+r4hK5ncf/w8qGtYlmyJpxk3hr1TfUJX
-Yf4Zr0fJsGuv
------END CERTIFICATE-----
\ No newline at end of file
diff --git a/xiaocool-api/uaa/target/classes/appCertPublicKey_2021004167605155.crt b/xiaocool-api/uaa/target/classes/appCertPublicKey_2021004167605155.crt
deleted file mode 100644
index f32e2bcf5d50843a7cc919f52cbe479bfd9e008b..0000000000000000000000000000000000000000
--- a/xiaocool-api/uaa/target/classes/appCertPublicKey_2021004167605155.crt
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEhTCCA22gAwIBAgIQICQIFjj9aJB6AcPuFrGtFzANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
-BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MTkwNwYDVQQDDDBBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IENs
-YXNzIDEgUjEwHhcNMjQwODE2MTIwMzA1WhcNMjkwODE1MTIwMzA1WjBNMQswCQYDVQQGEwJDTjES
-MBAGA1UECgwJ5aea6Im655ubMQ8wDQYDVQQLDAZBbGlwYXkxGTAXBgNVBAMMEDIwODg1MjI3NDQ1
-NDAyNDcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCJdCtQa9RnpA9MB7nlR9TMOl2E
-f21K4FFubRXbX2ov3jEhaq4tgRxYcw2wX2Q/wfAmAU2r2+OV7yIRWjC9VBQtvw/Ub9uBNcMcbTFY
-NYGIOFzKbfx6s4tSd7foNQqFk/syc1Rig20dPfQMV4nbuheoakvvVTk422wGh8sbIzVEkQPV1trI
-rKcbCWYchihoXNseTUcD/dG/afE3MBlUvhJhUdJOPmTgY65ChBUtZb+WN3aAiQwSuAiDqMRIYwf8
-jrEBbwL8kSDaRrT1ZGZIo5vx0cu4jNwzk6DYA5AF6vjlimxZta4pkqR1JUARvrxD9oaNCkvQzKoF
-Tvayc1sgSapFAgMBAAGjggEpMIIBJTAfBgNVHSMEGDAWgBRxB+IEYRbk5fJl6zEPyeD0PJrVkTAd
-BgNVHQ4EFgQUlcWGy6+ht8QSK0iZs3lAqSK5+oQwQAYDVR0gBDkwNzA1BgdggRwBbgEBMCowKAYI
-KwYBBQUHAgEWHGh0dHA6Ly9jYS5hbGlwYXkuY29tL2Nwcy5wZGYwDgYDVR0PAQH/BAQDAgbAMC8G
-A1UdHwQoMCYwJKAioCCGHmh0dHA6Ly9jYS5hbGlwYXkuY29tL2NybDkyLmNybDBgBggrBgEFBQcB
-AQRUMFIwKAYIKwYBBQUHMAKGHGh0dHA6Ly9jYS5hbGlwYXkuY29tL2NhNi5jZXIwJgYIKwYBBQUH
-MAGGGmh0dHA6Ly9jYS5hbGlwYXkuY29tOjgzNDAvMA0GCSqGSIb3DQEBCwUAA4IBAQCDL6KQ/yZg
-/RkUrlJ12qyqAQPcfh80Y+cdHmGFJ5Ri76ssPltIIyJCKbgC78Q9hXJ1VziOyVFj6ppEkIvNmhuQ
-0IsHduGpvoJ7GdgvtgFiVCuggAshV9YSbl2z0cLYrhAEhh8EnrE3j7XSTGT4MS5feyf8rk0xpyIh
-v+DtY9/h2ytfyoJ3s5RntXrSXPSXlFk76bmGqL+kb3CA5XSUOHUD2OkDpdSZzyNBDJCpMBQF5gA2
-/wfuiqI7PILWbZdr1ttJtaWR1jYIP5wi/m5ypE0Bx4xU7+yHHXopBaMw8913sii+SkbMlKwy7OR1
-DT1/6HUCsRtzNJ9s0W2uc3wfZUr3
------END CERTIFICATE-----
\ No newline at end of file
diff --git a/xiaocool-api/uaa/target/classes/application-dev.yml b/xiaocool-api/uaa/target/classes/application-dev.yml
deleted file mode 100644
index f7d111ff9e140cc3a96dcbd8c05113e303a8aab0..0000000000000000000000000000000000000000
--- a/xiaocool-api/uaa/target/classes/application-dev.yml
+++ /dev/null
@@ -1,130 +0,0 @@
-#application.yml
-server:
- port: 3080
- ssl:
- key-store: classpath:server.p12
- key-store-password: Yys12300
- key-store-type: PKCS12
- enabled: true
-
-spring:
- application:
- name: uaa
-
-
- # 数据库配置
- 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
-
-
-# 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
-
-
- oauth2:
- # 是否打开模式：授权码（Authorization Code）
- is-code: true
- # 是否打开模式：隐藏式（Implicit）
- is-implicit: true
- # 是否打开模式：密码式（Password）
- is-password: true
- # 是否打开模式：凭证式（Client Credentials）
- is-client: false
- # 是否在每次 Refresh-Token 刷新 Access-Token 时，产生一个新的 Refresh-Token
- isNewRefresh: false
- # Code授权码 保存的时间（单位：秒） 默认五分钟
- codeTimeout: 300
- # Access-Token 保存的时间（单位：秒）默认两个小时
- accessTokenTimeout: 7200
- # Refresh-Token 保存的时间（单位：秒） 默认30 天
- refreshTokenTimeout: 2592000
- # Client-Token 保存的时间（单位：秒） 默认两个小时
- clientTokenTimeout: 7200
- # Past-Client-Token 保存的时间（单位：秒） ，默认为-1，代表延续 Client-Token 的有效时间
- pastClientTokenTimeout: 7200
- jwt-secret-key: YysqwqMjlAsdaidaleiq
-
-
-
-
-#mybatis-plus的相关依赖
-mybatis-plus:
- global-config:
- banner: off #关闭mybatis-plus的启动动画
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句
- mapper-locations: classpath:mapper/*.xml
-
-gitee:
- client:
- id: 47099b4eefd7c92eca85b60a6c1f925add6ff432f7a2fcf69fcc3dafa7e1b6e8
- Secret: f7a4f3edb5855a2ed6972cd98d71a117bfaaf389a0fc9318c0e17618045c869d
- redirect:
- uri: https://localhost:9091/uaa/oauth2/gitee/callback
-
-wechat:
- app-id: weixin
- app-secret: weixin
- redirect-uri: http://localhost:9091/uaa/oauth2/wechat/callback
-
-captcha:
- email:
- from: 小酷人脸识别
- password: SHCROFWGMDDPJWPW # 这里我随便填的
- host: smtp.163.com
- port: 465
- user: xiaocoolface@163.com
- expire-time: 300 # 300秒
-
-qq:
- app-id: 102264792
- app-key: PimbCZhb1FG4e1A4
- redirect-uri: http://localhost:9091/uaa/oauth2/qq/callback
-
-alipay:
- app-id: 2021004167605155
- redirect-uri: https://localhost:9091/uaa/oauth2/alipay/callback
- merchant-private-key: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCJdCtQa9RnpA9MB7nlR9TMOl2Ef21K4FFubRXbX2ov3jEhaq4tgRxYcw2wX2Q/wfAmAU2r2+OV7yIRWjC9VBQtvw/Ub9uBNcMcbTFYNYGIOFzKbfx6s4tSd7foNQqFk/syc1Rig20dPfQMV4nbuheoakvvVTk422wGh8sbIzVEkQPV1trIrKcbCWYchihoXNseTUcD/dG/afE3MBlUvhJhUdJOPmTgY65ChBUtZb+WN3aAiQwSuAiDqMRIYwf8jrEBbwL8kSDaRrT1ZGZIo5vx0cu4jNwzk6DYA5AF6vjlimxZta4pkqR1JUARvrxD9oaNCkvQzKoFTvayc1sgSapFAgMBAAECggEAV99dZW9Z/dvjL57s18hBIULa0D7KdwjK5kZ0p6bq8qkgTZWuvkaBAYakJLIHG793MES7C/hqGUskQ2WeLRtYPxqbGxtbf9IH5t9joVmrcpNdtsfzldm8Yr9IYfmuvVCqUUlrlAMjOYOGxnEcH81rHG7AFsQr7c5Q1Cfxz2qFvkvrAvpMHkS6ol/lqbeacjYgmKfbZgQsP140GXyDGaR0mvGUd2/v9P0a3rUNxK7pCrVdXV+xnoqy5LN1ald8aGA54Fm60iGFdXF0dHdZISottuIIwsZXiEVlMX8OhWAzJZ+RIvtxBS/zf1oMj9kEuoZg/fzaEH5TY+DU2QOC2g5/DQKBgQC+FaFz76dKDJVB5TNAGWkX5kp1PLmKnQBWm7NCnngTWsMjkl8iE1VyC91uAwsjBJSrdJF39EwI9gobp1024VeZ1URD/V8j7pggoSN9VwdUyYAY/LnyXgQdFrwK25qoNt9ZrtPoMtpJhaTVMGtUHgY7SSMcLKM61G0GFOcbC8OfgwKBgQC5HlpfxlY6DnTf3QgOZQGwXr2ulAK7XaqsyYSxYKpyXahOaxeuKgdDqbmr1ENL8mOIl/Oy2hCa4PR2vxE55DBTMJGZMZo+O6cvyS+jiN38763Mu92zwthuZPI+7PZy7NEr75/f4SUmT/2tdsKN6xQF/12bpkkr6ojDS/4Vp0bclwKBgAS9QVNErGUaPzZvYoG8oHQqF70okG+2TmXaZ/PHQ7Mn1imy4pBU7xJy3Uh65vIukQ5dT6sv+h1XFRVvbNGLeMWrHZKcZJzevAhEPEBJxTMF+x2kX3Z9hZi8EmAq7YY4KAVyaHInom2m2V8/X82vGfSsdCWlr0QuO7GlH8X62xvFAoGACgKyMGuxTgJqH5D8VorvxHHbIA2w+CDgkedz3YO0s+qMp3DzHt/29JnBCKG54emBqGlPLGTOcRGpJqK+c7r7QgRmWzprdOIU8GiYwucr2fm8FE40dvwaaB3dW7nEugJEbXPP2XN7Zs78kNzTOIl1070zeq9LVayhKK57VwBsvJECgYEAkyoqME5ZXpb1Ca1A8mCe2OHCkau4Ep1DoRHLSDWEFnccJWu2ap/0fx3ee3aCiedSIe0gmf4bhOs5QwNbpz+jWb+NBxuabJwHqb3B5jBNboxTnDNBDd0Eu0pEuRZzBG4bk2EXr2uefpDOdLWCyOFjyuPum66aCRJ6cEw6BEcAyyc=
- gateway: https://openapi.alipay.com/gateway.do
- appCertPath: classpath:appCertPublicKey_2021004167605155.crt
- alipayCertPath: classpath:alipayCertPublicKey_RSA2.crt
- rootCertPath: classpath:alipayRootCert.crt
-
-# 腾讯云短信服务配置
-sms-config:
- # 腾讯云账户密钥对 secretId 和 secretKey
- secretId: AKIDrYL1TmaWIqPtEQQ5b2NbcP2TgelmKpFY
- secretKey: a2MjAZniYJsJYaNwOdeaKvJdv63sVZTI
- # 短信应用appId和appKey
- appId: 1400918823
- appKey: 256fb5f9562ee4c2d8c6c76c48ea675c
- # 签名
- smsSign: 小酷系统网站
- # 过期时间
- expireTime: 6 # 6min
- # redis存储前缀
- phonePrefix: captcha-sms-
- # 模板id
- templateIds:
- code:
- login: 2188925
- register: 2188927
- binding: 2240633
diff --git a/xiaocool-api/uaa/target/classes/application-pro.yml b/xiaocool-api/uaa/target/classes/application-pro.yml
deleted file mode 100644
index 6a5be46fbb33eb5c75e98bb465bba232344a98a5..0000000000000000000000000000000000000000
--- a/xiaocool-api/uaa/target/classes/application-pro.yml
+++ /dev/null
@@ -1,153 +0,0 @@
-#application.yml
-server:
- port: 3080
- ssl:
- key-store: /app/face.xiaoku.store.jks # 指向容器内的JKS文件路径
- key-store-password: 7m2svo5d
- key-store-type: JKS
- enabled: true
-
-spring:
- application:
- name: uaa
-
-
- # 数据库配置
- 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: 15000ms
- lettuce:
- pool:
- # 连接池最大连接数
- max-active: 200
- # 连接池最大阻塞等待时间（使用负值表示没有限制）
- max-wait: -1ms # 设置合理的连接池等待时间
- # 连接池中的最大空闲连接
- max-idle: 10
- # 连接池中的最小空闲连接
- min-idle: 5
-
-
-# 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
-
-
- oauth2:
- # 是否打开模式：授权码（Authorization Code）
- is-code: true
- # 是否打开模式：隐藏式（Implicit）
- is-implicit: true
- # 是否打开模式：密码式（Password）
- is-password: true
- # 是否打开模式：凭证式（Client Credentials）
- is-client: false
- # 是否在每次 Refresh-Token 刷新 Access-Token 时，产生一个新的 Refresh-Token
- isNewRefresh: false
- # Code授权码 保存的时间（单位：秒） 默认五分钟
- codeTimeout: 300
- # Access-Token 保存的时间（单位：秒）默认两个小时
- accessTokenTimeout: 7200
- # Refresh-Token 保存的时间（单位：秒） 默认30 天
- refreshTokenTimeout: 2592000
- # Client-Token 保存的时间（单位：秒） 默认两个小时
- clientTokenTimeout: 7200
- # Past-Client-Token 保存的时间（单位：秒） ，默认为-1，代表延续 Client-Token 的有效时间
- pastClientTokenTimeout: 7200
- jwt-secret-key: YysqwqMjlAsdaidaleiq
-
-
-
-
-#mybatis-plus的相关依赖
-mybatis-plus:
- global-config:
- banner: off #关闭mybatis-plus的启动动画
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句
- mapper-locations: classpath:mapper/*.xml
-
-gitee:
- client:
- id: c0f271396fbb07ad0fe26ef31ef4b53a88975055f892fbbadb84dd6fc66c729d
- Secret: e056db8e0312ac700e14d70a8601d0db684dcb054bcac4ae87c33fd3f6e3065a
- redirect:
- uri: https://${SPRING-CLOUD-DOMAIN-GATEWAY}/uaa/oauth2/gitee/callback
-
-wechat:
- app-id: weixin
- app-secret: weixin
- redirect-uri: https://${SPRING-CLOUD-DOMAIN-GATEWAY}/uaa/oauth2/wechat/callback
-
-captcha:
- email:
- from: 小酷人脸识别
- password: SHCROFWGMDDPJWPW # 这里我随便填的
- host: smtp.163.com
- port: 465
- user: xiaocoolface@163.com
- expire-time: 300 # 300秒
-
-qq:
- app-id: 102264792
- app-key: PimbCZhb1FG4e1A4
- redirect-uri: https://${SPRING-CLOUD-DOMAIN-NAME}/uaa/oauth2/qq/callback
-
-alipay:
- app-id: 2021004167605155
- redirect-uri: https://${SPRING-CLOUD-DOMAIN-NAME}/uaa/oauth2/alipay/callback
- merchant-private-key: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCJdCtQa9RnpA9MB7nlR9TMOl2Ef21K4FFubRXbX2ov3jEhaq4tgRxYcw2wX2Q/wfAmAU2r2+OV7yIRWjC9VBQtvw/Ub9uBNcMcbTFYNYGIOFzKbfx6s4tSd7foNQqFk/syc1Rig20dPfQMV4nbuheoakvvVTk422wGh8sbIzVEkQPV1trIrKcbCWYchihoXNseTUcD/dG/afE3MBlUvhJhUdJOPmTgY65ChBUtZb+WN3aAiQwSuAiDqMRIYwf8jrEBbwL8kSDaRrT1ZGZIo5vx0cu4jNwzk6DYA5AF6vjlimxZta4pkqR1JUARvrxD9oaNCkvQzKoFTvayc1sgSapFAgMBAAECggEAV99dZW9Z/dvjL57s18hBIULa0D7KdwjK5kZ0p6bq8qkgTZWuvkaBAYakJLIHG793MES7C/hqGUskQ2WeLRtYPxqbGxtbf9IH5t9joVmrcpNdtsfzldm8Yr9IYfmuvVCqUUlrlAMjOYOGxnEcH81rHG7AFsQr7c5Q1Cfxz2qFvkvrAvpMHkS6ol/lqbeacjYgmKfbZgQsP140GXyDGaR0mvGUd2/v9P0a3rUNxK7pCrVdXV+xnoqy5LN1ald8aGA54Fm60iGFdXF0dHdZISottuIIwsZXiEVlMX8OhWAzJZ+RIvtxBS/zf1oMj9kEuoZg/fzaEH5TY+DU2QOC2g5/DQKBgQC+FaFz76dKDJVB5TNAGWkX5kp1PLmKnQBWm7NCnngTWsMjkl8iE1VyC91uAwsjBJSrdJF39EwI9gobp1024VeZ1URD/V8j7pggoSN9VwdUyYAY/LnyXgQdFrwK25qoNt9ZrtPoMtpJhaTVMGtUHgY7SSMcLKM61G0GFOcbC8OfgwKBgQC5HlpfxlY6DnTf3QgOZQGwXr2ulAK7XaqsyYSxYKpyXahOaxeuKgdDqbmr1ENL8mOIl/Oy2hCa4PR2vxE55DBTMJGZMZo+O6cvyS+jiN38763Mu92zwthuZPI+7PZy7NEr75/f4SUmT/2tdsKN6xQF/12bpkkr6ojDS/4Vp0bclwKBgAS9QVNErGUaPzZvYoG8oHQqF70okG+2TmXaZ/PHQ7Mn1imy4pBU7xJy3Uh65vIukQ5dT6sv+h1XFRVvbNGLeMWrHZKcZJzevAhEPEBJxTMF+x2kX3Z9hZi8EmAq7YY4KAVyaHInom2m2V8/X82vGfSsdCWlr0QuO7GlH8X62xvFAoGACgKyMGuxTgJqH5D8VorvxHHbIA2w+CDgkedz3YO0s+qMp3DzHt/29JnBCKG54emBqGlPLGTOcRGpJqK+c7r7QgRmWzprdOIU8GiYwucr2fm8FE40dvwaaB3dW7nEugJEbXPP2XN7Zs78kNzTOIl1070zeq9LVayhKK57VwBsvJECgYEAkyoqME5ZXpb1Ca1A8mCe2OHCkau4Ep1DoRHLSDWEFnccJWu2ap/0fx3ee3aCiedSIe0gmf4bhOs5QwNbpz+jWb+NBxuabJwHqb3B5jBNboxTnDNBDd0Eu0pEuRZzBG4bk2EXr2uefpDOdLWCyOFjyuPum66aCRJ6cEw6BEcAyyc=
- gateway: https://openapi.alipay.com/gateway.do
- appCertPath: /app/appCertPublicKey_2021004167605155.crt
- alipayCertPath: /app/alipayCertPublicKey_RSA2.crt
- rootCertPath: /app/alipayRootCert.crt
-
-
-# 腾讯云短信服务配置
-sms-config:
- # 腾讯云账户密钥对 secretId 和 secretKey
- secretId: AKIDrYL1TmaWIqPtEQQ5b2NbcP2TgelmKpFY
- secretKey: a2MjAZniYJsJYaNwOdeaKvJdv63sVZTI
- # 短信应用appId和appKey
- appId: 1400918823
- appKey: 256fb5f9562ee4c2d8c6c76c48ea675c
- # 签名
- smsSign: 小酷系统网站
- # 过期时间
- expireTime: 6 # 6min
- # redis存储前缀
- phonePrefix: captcha-sms-
- # 模板id
- templateIds:
- code:
- login: 2188925
- register: 2188927
- binding: 2240633
diff --git a/xiaocool-api/uaa/target/classes/application.yml b/xiaocool-api/uaa/target/classes/application.yml
deleted file mode 100644
index fcc3de989b3c9f9fe0a44756ea23e8fca87ff642..0000000000000000000000000000000000000000
--- a/xiaocool-api/uaa/target/classes/application.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-spring:
- profiles:
- active: pro
-# active: dev
diff --git a/xiaocool-api/uaa/target/classes/bootstrap-dev.yml b/xiaocool-api/uaa/target/classes/bootstrap-dev.yml
deleted file mode 100644
index 2270a85922d1d1ac40d5f8eadd0408157a941b12..0000000000000000000000000000000000000000
--- a/xiaocool-api/uaa/target/classes/bootstrap-dev.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-spring:
- cloud:
- nacos:
- username: nacos
- password: nacos
- discovery:
- server-addr: localhost:8848 #Nacos服务注册中心地址
- secure: true # 指示服务是通过 HTTPS 访问的
- config:
- server-addr: localhost:8848 #Nacos作为配置中心地址
- file-extension: yml #指定yaml格式的配置
- refresh-enabled: true #动态刷新配置
-
- #redis相关基础配置
- redis:
- # Redis数据库索引（默认为0）
- database: 1
- password: Yys12300
- port: 6379
- host: 124.222.32.229
- # Redis服务器连接密码（默认为空）
- # password:
- # 连接超时时间（毫秒）
- timeout: 5000ms
- lettuce:
- pool:
- # 连接池最大连接数
- max-active: 200
- # 连接池最大阻塞等待时间（使用负值表示没有限制）
- max-wait: 5000ms # 设置合理的连接池等待时间
- # 连接池中的最大空闲连接
- max-idle: 10
- # 连接池中的最小空闲连接
- min-idle: 0
\ No newline at end of file
diff --git a/xiaocool-api/uaa/target/classes/bootstrap-pro.yml b/xiaocool-api/uaa/target/classes/bootstrap-pro.yml
deleted file mode 100644
index b09d967333484c79511e935d90ea42065c0e99c4..0000000000000000000000000000000000000000
--- a/xiaocool-api/uaa/target/classes/bootstrap-pro.yml
+++ /dev/null
@@ -1,18 +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/uaa/target/classes/bootstrap.yml b/xiaocool-api/uaa/target/classes/bootstrap.yml
deleted file mode 100644
index e81069d01fdaae8cb1d4182e4ab2e687447bf66d..0000000000000000000000000000000000000000
--- a/xiaocool-api/uaa/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/uaa/target/classes/com/cool/uaa/UaaApplication.class b/xiaocool-api/uaa/target/classes/com/cool/uaa/UaaApplication.class
deleted file mode 100644
index 9b8e1fc78417d10e46a26a61076d447abb56b4d1..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/classes/com/cool/uaa/UaaApplication.class and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/com/cool/uaa/config/FeignInterceptor.class b/xiaocool-api/uaa/target/classes/com/cool/uaa/config/FeignInterceptor.class
deleted file mode 100644
index ae012f910689008ce51546f96934ff981207027f..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/classes/com/cool/uaa/config/FeignInterceptor.class and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/com/cool/uaa/config/SaTokenConfig.class b/xiaocool-api/uaa/target/classes/com/cool/uaa/config/SaTokenConfig.class
deleted file mode 100644
index f15c684ac54b377135975d904945771d12febb10..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/classes/com/cool/uaa/config/SaTokenConfig.class and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/com/cool/uaa/config/SaTokenOAuth2Config.class b/xiaocool-api/uaa/target/classes/com/cool/uaa/config/SaTokenOAuth2Config.class
deleted file mode 100644
index 044c98b9f5d7ea92337786582d9936676ea1d38b..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/classes/com/cool/uaa/config/SaTokenOAuth2Config.class and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/com/cool/uaa/config/properties/EmailProperties.class b/xiaocool-api/uaa/target/classes/com/cool/uaa/config/properties/EmailProperties.class
deleted file mode 100644
index 3624a9e25d86b026326f9324fd6d2e74a08b1be0..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/classes/com/cool/uaa/config/properties/EmailProperties.class and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/com/cool/uaa/config/properties/SmsProperties.class b/xiaocool-api/uaa/target/classes/com/cool/uaa/config/properties/SmsProperties.class
deleted file mode 100644
index 776574a92e899b99fffefe7aa35957ea83f15e13..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/classes/com/cool/uaa/config/properties/SmsProperties.class and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/com/cool/uaa/config/util/RedisUtils.class b/xiaocool-api/uaa/target/classes/com/cool/uaa/config/util/RedisUtils.class
deleted file mode 100644
index 2d07d80bcc0700462ac3243465ab151b52857793..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/classes/com/cool/uaa/config/util/RedisUtils.class and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/com/cool/uaa/config/util/SmsCodeUtil.class b/xiaocool-api/uaa/target/classes/com/cool/uaa/config/util/SmsCodeUtil.class
deleted file mode 100644
index 784f1651788418b6fcf77af0f06fc55a2377627d..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/classes/com/cool/uaa/config/util/SmsCodeUtil.class and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/com/cool/uaa/config/util/SmsUtil.class b/xiaocool-api/uaa/target/classes/com/cool/uaa/config/util/SmsUtil.class
deleted file mode 100644
index 2387b100695643801d8f968226212d4702e8d354..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/classes/com/cool/uaa/config/util/SmsUtil.class and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/com/cool/uaa/config/util/VerifyCodeUtil.class b/xiaocool-api/uaa/target/classes/com/cool/uaa/config/util/VerifyCodeUtil.class
deleted file mode 100644
index c0860fa160ebd2ac7d97f018e08c314e3badb3c7..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/classes/com/cool/uaa/config/util/VerifyCodeUtil.class and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/com/cool/uaa/controller/OAuth2Controller.class b/xiaocool-api/uaa/target/classes/com/cool/uaa/controller/OAuth2Controller.class
deleted file mode 100644
index 318419e8a6bcb06136f99d2ed92230b596fcf165..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/classes/com/cool/uaa/controller/OAuth2Controller.class and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/com/cool/uaa/controller/UserController.class b/xiaocool-api/uaa/target/classes/com/cool/uaa/controller/UserController.class
deleted file mode 100644
index c7a0dd33106253d6e03c1c6b01aa0da0af827d84..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/classes/com/cool/uaa/controller/UserController.class and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/com/cool/uaa/mapper/Oauth2Mapper.class b/xiaocool-api/uaa/target/classes/com/cool/uaa/mapper/Oauth2Mapper.class
deleted file mode 100644
index b4232be6ec72eaad8f113dfffa5aea608d5dd6ad..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/classes/com/cool/uaa/mapper/Oauth2Mapper.class and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/com/cool/uaa/mapper/UserMapper.class b/xiaocool-api/uaa/target/classes/com/cool/uaa/mapper/UserMapper.class
deleted file mode 100644
index 8ef3f639be3849062867ed2d582890c9938e0e66..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/classes/com/cool/uaa/mapper/UserMapper.class and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/com/cool/uaa/service/EmailCaptchaService.class b/xiaocool-api/uaa/target/classes/com/cool/uaa/service/EmailCaptchaService.class
deleted file mode 100644
index 8e3eb33b9b3b38c286066994a4a19e955e44216a..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/classes/com/cool/uaa/service/EmailCaptchaService.class and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/com/cool/uaa/service/ISmsService.class b/xiaocool-api/uaa/target/classes/com/cool/uaa/service/ISmsService.class
deleted file mode 100644
index a474a8f82fcc32f4b869e779c9e5809e4db93e74..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/classes/com/cool/uaa/service/ISmsService.class and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/com/cool/uaa/service/OAuth2FeignService.class b/xiaocool-api/uaa/target/classes/com/cool/uaa/service/OAuth2FeignService.class
deleted file mode 100644
index ceb1d02427e0574d2654ddee806d29294b56af5a..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/classes/com/cool/uaa/service/OAuth2FeignService.class and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/com/cool/uaa/service/UserService.class b/xiaocool-api/uaa/target/classes/com/cool/uaa/service/UserService.class
deleted file mode 100644
index 6eb5ec50a550fcb23f44686a1f0b56b3c94e44af..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/classes/com/cool/uaa/service/UserService.class and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/com/cool/uaa/service/impl/AlipayServiceImpl.class b/xiaocool-api/uaa/target/classes/com/cool/uaa/service/impl/AlipayServiceImpl.class
deleted file mode 100644
index a2db2cf21dffd195e3b31f96ea0575e6c34047f6..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/classes/com/cool/uaa/service/impl/AlipayServiceImpl.class and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/com/cool/uaa/service/impl/EmailCaptchaServiceImpl.class b/xiaocool-api/uaa/target/classes/com/cool/uaa/service/impl/EmailCaptchaServiceImpl.class
deleted file mode 100644
index cbd9edba38aa2ea2f5d30dbc5e004e41be7cee10..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/classes/com/cool/uaa/service/impl/EmailCaptchaServiceImpl.class and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/com/cool/uaa/service/impl/GiteeServiceImpl.class b/xiaocool-api/uaa/target/classes/com/cool/uaa/service/impl/GiteeServiceImpl.class
deleted file mode 100644
index f6160314b7c020b57ffd288c85ca6351746e0c16..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/classes/com/cool/uaa/service/impl/GiteeServiceImpl.class and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/com/cool/uaa/service/impl/QQServiceImpl.class b/xiaocool-api/uaa/target/classes/com/cool/uaa/service/impl/QQServiceImpl.class
deleted file mode 100644
index 227b19743f8c4297196347c1d937c7ec3612c326..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/classes/com/cool/uaa/service/impl/QQServiceImpl.class and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/com/cool/uaa/service/impl/SaOAuth2TemplateImpl.class b/xiaocool-api/uaa/target/classes/com/cool/uaa/service/impl/SaOAuth2TemplateImpl.class
deleted file mode 100644
index 4f5ed787276a939b0f0337bb4e35108652f6aa2a..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/classes/com/cool/uaa/service/impl/SaOAuth2TemplateImpl.class and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/com/cool/uaa/service/impl/SmsServiceImpl.class b/xiaocool-api/uaa/target/classes/com/cool/uaa/service/impl/SmsServiceImpl.class
deleted file mode 100644
index 71e1fce048d4a1b355334a2349303b53a1810eac..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/classes/com/cool/uaa/service/impl/SmsServiceImpl.class and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/com/cool/uaa/service/impl/StpInterfaceImpl.class b/xiaocool-api/uaa/target/classes/com/cool/uaa/service/impl/StpInterfaceImpl.class
deleted file mode 100644
index 9430d398996c7e86df7a955adb1c00cbadec3aac..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/classes/com/cool/uaa/service/impl/StpInterfaceImpl.class and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/com/cool/uaa/service/impl/UserServiceImpl.class b/xiaocool-api/uaa/target/classes/com/cool/uaa/service/impl/UserServiceImpl.class
deleted file mode 100644
index 6aa21a3f82fe20648b2cfa3b075f612037b4d3c7..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/classes/com/cool/uaa/service/impl/UserServiceImpl.class and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/com/cool/uaa/service/impl/WeChatServiceImpl.class b/xiaocool-api/uaa/target/classes/com/cool/uaa/service/impl/WeChatServiceImpl.class
deleted file mode 100644
index b933d2dfb1546d2ca1c3bc22a4c5fd0e8428d58c..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/classes/com/cool/uaa/service/impl/WeChatServiceImpl.class and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/education_deploy.sh b/xiaocool-api/uaa/target/classes/education_deploy.sh
deleted file mode 100644
index c1177e0c3e3c85ef95747af5e085cb5b68115196..0000000000000000000000000000000000000000
--- a/xiaocool-api/uaa/target/classes/education_deploy.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-docker build -t uaa .
-docker run -p 3080:3080 -d --restart=always uaa
\ No newline at end of file
diff --git a/xiaocool-api/uaa/target/classes/face.xiaoku.store.jks b/xiaocool-api/uaa/target/classes/face.xiaoku.store.jks
deleted file mode 100644
index 51fb9d5666c0298db44a8c169ce24787a8f4069f..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/classes/face.xiaoku.store.jks and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/server.p12 b/xiaocool-api/uaa/target/classes/server.p12
deleted file mode 100644
index 0888d80d43133f4cad3be3ca407c7113e6b599ae..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/classes/server.p12 and /dev/null differ
diff --git a/xiaocool-api/uaa/target/classes/xiaoku.store.jks b/xiaocool-api/uaa/target/classes/xiaoku.store.jks
deleted file mode 100644
index 130d8ab023f94df8196465e0ab4faa3723ffbce3..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/classes/xiaoku.store.jks and /dev/null differ
diff --git a/xiaocool-api/uaa/target/maven-archiver/pom.properties b/xiaocool-api/uaa/target/maven-archiver/pom.properties
deleted file mode 100644
index 630acb75304a2108a6011054db4c4b0f432631d3..0000000000000000000000000000000000000000
--- a/xiaocool-api/uaa/target/maven-archiver/pom.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-artifactId=uaa
-groupId=com.example
-version=0.0.1-SNAPSHOT
diff --git a/xiaocool-api/uaa/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/xiaocool-api/uaa/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
deleted file mode 100644
index 9e9a63f52f74cbed68fa97065bbb241c356e0818..0000000000000000000000000000000000000000
--- a/xiaocool-api/uaa/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ /dev/null
@@ -1,27 +0,0 @@
-com\cool\uaa\service\impl\QQServiceImpl.class
-com\cool\uaa\mapper\Oauth2Mapper.class
-com\cool\uaa\config\properties\EmailProperties.class
-com\cool\uaa\service\OAuth2FeignService.class
-com\cool\uaa\config\properties\SmsProperties.class
-com\cool\uaa\service\impl\SaOAuth2TemplateImpl.class
-com\cool\uaa\config\FeignInterceptor.class
-com\cool\uaa\service\impl\GiteeServiceImpl.class
-com\cool\uaa\service\impl\WeChatServiceImpl.class
-com\cool\uaa\config\SaTokenConfig.class
-com\cool\uaa\service\EmailCaptchaService.class
-com\cool\uaa\controller\UserController.class
-com\cool\uaa\service\impl\EmailCaptchaServiceImpl.class
-com\cool\uaa\service\impl\AlipayServiceImpl.class
-com\cool\uaa\config\SaTokenOAuth2Config.class
-com\cool\uaa\service\impl\SmsServiceImpl.class
-com\cool\uaa\config\util\SmsUtil.class
-com\cool\uaa\config\util\RedisUtils.class
-com\cool\uaa\config\util\SmsCodeUtil.class
-com\cool\uaa\config\util\VerifyCodeUtil.class
-com\cool\uaa\service\impl\UserServiceImpl.class
-com\cool\uaa\controller\OAuth2Controller.class
-com\cool\uaa\mapper\UserMapper.class
-com\cool\uaa\service\ISmsService.class
-com\cool\uaa\service\UserService.class
-com\cool\uaa\service\impl\StpInterfaceImpl.class
-com\cool\uaa\UaaApplication.class
diff --git a/xiaocool-api/uaa/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/xiaocool-api/uaa/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
deleted file mode 100644
index c4bd7feaa4f968b279543c3ccc2f0590632d8bc4..0000000000000000000000000000000000000000
--- a/xiaocool-api/uaa/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ /dev/null
@@ -1,27 +0,0 @@
-E:\xiaocool-api\uaa\src\main\java\com\cool\uaa\mapper\UserMapper.java
-E:\xiaocool-api\uaa\src\main\java\com\cool\uaa\service\impl\GiteeServiceImpl.java
-E:\xiaocool-api\uaa\src\main\java\com\cool\uaa\config\util\SmsCodeUtil.java
-E:\xiaocool-api\uaa\src\main\java\com\cool\uaa\mapper\Oauth2Mapper.java
-E:\xiaocool-api\uaa\src\main\java\com\cool\uaa\service\impl\AlipayServiceImpl.java
-E:\xiaocool-api\uaa\src\main\java\com\cool\uaa\config\util\RedisUtils.java
-E:\xiaocool-api\uaa\src\main\java\com\cool\uaa\config\util\SmsUtil.java
-E:\xiaocool-api\uaa\src\main\java\com\cool\uaa\UaaApplication.java
-E:\xiaocool-api\uaa\src\main\java\com\cool\uaa\config\properties\SmsProperties.java
-E:\xiaocool-api\uaa\src\main\java\com\cool\uaa\config\SaTokenConfig.java
-E:\xiaocool-api\uaa\src\main\java\com\cool\uaa\controller\OAuth2Controller.java
-E:\xiaocool-api\uaa\src\main\java\com\cool\uaa\service\impl\WeChatServiceImpl.java
-E:\xiaocool-api\uaa\src\main\java\com\cool\uaa\service\ISmsService.java
-E:\xiaocool-api\uaa\src\main\java\com\cool\uaa\config\properties\EmailProperties.java
-E:\xiaocool-api\uaa\src\main\java\com\cool\uaa\service\impl\UserServiceImpl.java
-E:\xiaocool-api\uaa\src\main\java\com\cool\uaa\config\util\VerifyCodeUtil.java
-E:\xiaocool-api\uaa\src\main\java\com\cool\uaa\service\impl\SaOAuth2TemplateImpl.java
-E:\xiaocool-api\uaa\src\main\java\com\cool\uaa\service\OAuth2FeignService.java
-E:\xiaocool-api\uaa\src\main\java\com\cool\uaa\service\impl\SmsServiceImpl.java
-E:\xiaocool-api\uaa\src\main\java\com\cool\uaa\config\FeignInterceptor.java
-E:\xiaocool-api\uaa\src\main\java\com\cool\uaa\config\SaTokenOAuth2Config.java
-E:\xiaocool-api\uaa\src\main\java\com\cool\uaa\controller\UserController.java
-E:\xiaocool-api\uaa\src\main\java\com\cool\uaa\service\EmailCaptchaService.java
-E:\xiaocool-api\uaa\src\main\java\com\cool\uaa\service\impl\QQServiceImpl.java
-E:\xiaocool-api\uaa\src\main\java\com\cool\uaa\service\UserService.java
-E:\xiaocool-api\uaa\src\main\java\com\cool\uaa\service\impl\StpInterfaceImpl.java
-E:\xiaocool-api\uaa\src\main\java\com\cool\uaa\service\impl\EmailCaptchaServiceImpl.java
diff --git a/xiaocool-api/uaa/target/uaa.jar b/xiaocool-api/uaa/target/uaa.jar
deleted file mode 100644
index 00cc9a7cde42089b5b2bcd375f618cef078be202..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/uaa.jar and /dev/null differ
diff --git a/xiaocool-api/uaa/target/uaa.jar.original b/xiaocool-api/uaa/target/uaa.jar.original
deleted file mode 100644
index 7ca6af2b3b821b46454e03a9706f3ddb3ff8bb91..0000000000000000000000000000000000000000
Binary files a/xiaocool-api/uaa/target/uaa.jar.original and /dev/null differ