| 2024-12-03 | houzhongjian |  |
| 2024-12-03 | houzhongjian | |
| 2024-12-03 | houzhongjian | |
pom.xml
@@ -26,6 +26,8 @@ <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version> <flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version> <!-- 统一依赖管理 --> <spring.framework.version>5.3.39</spring.framework.version> <spring.security.version>5.8.14</spring.security.version> <spring.boot.version>2.7.18</spring.boot.version> <spring.cloud.version>2021.0.9</spring.cloud.version> <spring.cloud.alibaba.version>2021.0.6.1</spring.cloud.alibaba.version> @@ -82,24 +84,26 @@ <ip2region.version>2.7.0</ip2region.version> <bizlog-sdk.version>3.0.6</bizlog-sdk.version> <reflections.version>0.10.2</reflections.version> <!-- 三方云服务相关 --> <okio.version>3.5.0</okio.version> <okhttp3.version>4.11.0</okhttp3.version> <commons-io.version>2.15.1</commons-io.version> <minio.version>8.5.7</minio.version> <aliyun-java-sdk-core.version>4.6.4</aliyun-java-sdk-core.version> <aliyun-java-sdk-dysmsapi.version>2.2.1</aliyun-java-sdk-dysmsapi.version> <tencentcloud-sdk-java.version>3.1.880</tencentcloud-sdk-java.version> <justauth.version>1.0.8</justauth.version> <jimureport.version>1.6.6</jimureport.version> <xercesImpl.version>2.12.2</xercesImpl.version> <weixin-java.version>4.6.0</weixin-java.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> <dependencyManagement> <dependencies> <!-- 统一依赖管理 --> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-framework-bom</artifactId> <!-- JDK8 版本独有：保证 Spring Framework 尽量高 --> <version>${spring.framework.version}</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.springframework.security</groupId> <artifactId>spring-security-bom</artifactId> <!-- JDK8 版本独有：保证 Spring Security 尽量高 --> <version>${spring.security.version}</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> @@ -383,12 +387,6 @@ </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <version>${commons-io.version}</version> </dependency> <dependency> <groupId>org.apache.tika</groupId> <artifactId>tika-core</artifactId> <!-- 文件类型的识别 --> <version>${tika-core.version}</version> @@ -473,84 +471,6 @@ <groupId>org.reflections</groupId> <artifactId>reflections</artifactId> <version>${reflections.version}</version> </dependency> <!-- 三方云服务相关 --> <dependency> <groupId>com.squareup.okio</groupId> <artifactId>okio</artifactId> <version>${okio.version}</version> </dependency> <dependency> <groupId>com.squareup.okhttp3</groupId> <artifactId>okhttp</artifactId> <version>${okhttp3.version}</version> </dependency> <dependency> <groupId>io.minio</groupId> <artifactId>minio</artifactId> <version>${minio.version}</version> </dependency> <dependency> <groupId>com.github.binarywang</groupId> <artifactId>weixin-java-pay</artifactId> <version>${weixin-java.version}</version> </dependency> <dependency> <groupId>com.github.binarywang</groupId> <artifactId>wx-java-mp-spring-boot-starter</artifactId> <version>${weixin-java.version}</version> </dependency> <dependency> <groupId>com.github.binarywang</groupId> <artifactId>wx-java-miniapp-spring-boot-starter</artifactId> <version>${weixin-java.version}</version> </dependency> <dependency> <groupId>com.xingyuv</groupId> <artifactId>spring-boot-starter-justauth</artifactId> <!-- 社交登陆（例如说，个人微信、企业微信等等） --> <version>${justauth.version}</version> <exclusions> <exclusion> <groupId>cn.hutool</groupId> <artifactId>hutool-core</artifactId> </exclusion> </exclusions> </dependency> <dependency> <groupId>com.github.binarywang</groupId> <artifactId>wx-java-miniapp-spring-boot-starter</artifactId> <version>${weixin-java.version}</version> </dependency> <!-- SMS SDK begin --> <dependency> <groupId>com.aliyun</groupId> <artifactId>aliyun-java-sdk-core</artifactId> <version>${aliyun-java-sdk-core.version}</version> <exclusions> <exclusion> <artifactId>opentracing-api</artifactId> <groupId>io.opentracing</groupId> </exclusion> <exclusion> <artifactId>opentracing-util</artifactId> <groupId>io.opentracing</groupId> </exclusion> </exclusions> </dependency> <dependency> <groupId>com.aliyun</groupId> <artifactId>aliyun-java-sdk-dysmsapi</artifactId> <version>${aliyun-java-sdk-dysmsapi.version}</version> </dependency> <dependency> <groupId>com.tencentcloudapi</groupId> <artifactId>tencentcloud-sdk-java-sms</artifactId> <version>${tencentcloud-sdk-java.version}</version> </dependency> </dependencies> shasteel-api/pom.xml
@@ -45,26 +45,4 @@ </dependencies> <build> <plugins> <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <version>3.3.0</version> <executions> <execution> <phase>package</phase> <goals> <goal>single</goal> </goals> </execution> </executions> </plugin> </plugins> </build> </project> shasteel-biz/pom.xml
@@ -110,32 +110,6 @@ <artifactId>spring-boot-starter-captcha-plus</artifactId> <!-- 验证码，一般用于登录使用 --> </dependency> <!-- 三方云服务相关 --> <dependency> <groupId>com.xingyuv</groupId> <artifactId>spring-boot-starter-justauth</artifactId> <!-- 社交登陆（例如说，个人微信、企业微信等等） --> </dependency> <dependency> <groupId>com.github.binarywang</groupId> <artifactId>wx-java-mp-spring-boot-starter</artifactId> <!-- 微信登录（公众号） --> </dependency> <dependency> <groupId>com.github.binarywang</groupId> <artifactId>wx-java-miniapp-spring-boot-starter</artifactId> <!-- 微信登录（小程序） --> </dependency> <dependency> <groupId>com.aliyun</groupId> <artifactId>aliyun-java-sdk-core</artifactId> <!-- 短信（阿里云） --> </dependency> <dependency> <groupId>com.aliyun</groupId> <artifactId>aliyun-java-sdk-dysmsapi</artifactId> <!-- 短信（阿里云） --> </dependency> <dependency> <groupId>com.tencentcloudapi</groupId> <artifactId>tencentcloud-sdk-java-sms</artifactId> <!-- 短信（腾讯云） --> </dependency> <!-- 定时任务 --> <dependency> <groupId>org.quartz-scheduler</groupId> shasteel-biz/src/main/java/com/iailab/module/shasteel/framework/security/config/SecurityConfiguration.java
@@ -5,7 +5,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer; import org.springframework.security.config.annotation.web.configurers.AuthorizeHttpRequestsConfigurer; /** * System 模块的 Security 配置 @@ -18,18 +18,18 @@ return new AuthorizeRequestsCustomizer() { @Override public void customize(ExpressionUrlAuthorizationConfigurer<HttpSecurity>.ExpressionInterceptUrlRegistry registry) { public void customize(AuthorizeHttpRequestsConfigurer<HttpSecurity>.AuthorizationManagerRequestMatcherRegistry registry) { // TODO iailab：这个每个项目都需要重复配置，得捉摸有没通用的方案 // Swagger 接口文档 registry.antMatchers("/v3/api-docs/**").permitAll() // 元数据 .antMatchers("/swagger-ui.html").permitAll(); // Swagger UI registry.requestMatchers("/v3/api-docs/**").permitAll() // 元数据 .requestMatchers("/swagger-ui.html").permitAll(); // Swagger UI // Druid 监控 registry.antMatchers("/druid/**").anonymous(); registry.requestMatchers("/druid/**").anonymous(); // Spring Boot Actuator 的安全配置 registry.antMatchers("/actuator").anonymous() .antMatchers("/actuator/**").anonymous(); registry.requestMatchers("/actuator").anonymous() .requestMatchers("/actuator/**").anonymous(); // RPC 服务的安全配置 registry.antMatchers(ApiConstants.PREFIX + "/**").permitAll(); registry.requestMatchers(ApiConstants.PREFIX + "/**").permitAll(); } }; shasteel-biz/src/main/java/com/iailab/module/shasteel/framework/sms/config/SmsCodeProperties.java
文件已删除 shasteel-biz/src/main/java/com/iailab/module/shasteel/framework/sms/config/SmsConfiguration.java
文件已删除 shasteel-biz/src/main/java/com/iailab/module/shasteel/framework/sms/core/client/SmsClient.java
文件已删除 shasteel-biz/src/main/java/com/iailab/module/shasteel/framework/sms/core/client/SmsClientFactory.java
文件已删除 shasteel-biz/src/main/java/com/iailab/module/shasteel/framework/sms/core/client/dto/SmsReceiveRespDTO.java
文件已删除 shasteel-biz/src/main/java/com/iailab/module/shasteel/framework/sms/core/client/dto/SmsSendRespDTO.java
文件已删除 shasteel-biz/src/main/java/com/iailab/module/shasteel/framework/sms/core/client/dto/SmsTemplateRespDTO.java
文件已删除 shasteel-biz/src/main/java/com/iailab/module/shasteel/framework/sms/core/client/impl/AbstractSmsClient.java
文件已删除 shasteel-biz/src/main/java/com/iailab/module/shasteel/framework/sms/core/client/impl/AliyunSmsClient.java
文件已删除 shasteel-biz/src/main/java/com/iailab/module/shasteel/framework/sms/core/client/impl/DebugDingTalkSmsClient.java
文件已删除 shasteel-biz/src/main/java/com/iailab/module/shasteel/framework/sms/core/client/impl/SmsClientFactoryImpl.java
文件已删除 shasteel-biz/src/main/java/com/iailab/module/shasteel/framework/sms/core/client/impl/TencentSmsClient.java
文件已删除 shasteel-biz/src/main/java/com/iailab/module/shasteel/framework/sms/core/enums/SmsChannelEnum.java
文件已删除 shasteel-biz/src/main/java/com/iailab/module/shasteel/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java
文件已删除 shasteel-biz/src/main/java/com/iailab/module/shasteel/framework/sms/core/property/SmsChannelProperties.java
文件已删除 shasteel-biz/src/main/resources/application-dev.yaml
@@ -36,17 +36,8 @@ datasource: master: url: jdbc:mysql://172.16.8.100:3306/iailab_expert_tenant_shasteel?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/iailab_expert_tenant_shasteel?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai # MySQL Connector/J 5.X 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/iailab_expert_tenant_shasteel # PostgreSQL 连接的示例 # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=iailab_expert_tenant_shasteel # SQLServer 连接的示例 # url: jdbc:dm://10.211.55.4:5236?schema=IAILAB_FAST # DM 连接的示例 username: root password: 123456 # username: sa # SQL Server 连接的示例 # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W # SQL Server 连接的示例 # username: SYSDBA # DM 连接的示例 # password: SYSDBA # DM 连接的示例 slave: # 模拟从库，可根据自己需要修改 lazy: true # 开启懒加载，保证启动速度 url: jdbc:mysql://127.0.0.1:3306/iailab_expert_tenant_shasteel?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true @@ -55,40 +46,27 @@ # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 redis: host: 127.0.0.1 # 地址 host: 172.16.8.100 # 地址 port: 6379 # 端口 database: 8 # 数据库索引 password: 123456 # 密码，建议生产环境开启 --- #################### 定时任务相关配置 #################### --- #################### MQ 消息队列相关配置 #################### xxl: job: enabled: true # 是否开启调度中心，默认为 true 开启 admin: addresses: http://172.16.8.100:9090/xxl-job-admin # 调度中心部署跟地址 # rocketmq 配置项，对应 RocketMQProperties 配置类 rocketmq: name-server: 127.0.0.1:9876 # RocketMQ Namesrv --- #################### 微信公众号、小程序相关配置 #################### wx: mp: # 公众号配置（必填），参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 文档 # app-id: wx041349c6f39b268b # secret: 5abee519483bc9f8cb37ce280e814bd0 app-id: wx5b23ba7a5589ecbb # 测试号 secret: 2a7b3b20c537e52e74afd395eb85f61f # 存储配置，解决 AccessToken 的跨节点的共享 config-storage: type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取 key-prefix: wx # Redis Key 的前缀 http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台 miniapp: # 小程序配置（必填），参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-miniapp-spring-boot-starter/README.md 文档 # appid: wx62056c0d5e8db250 # secret: 333ae72f41552af1e998fe1f54e1584a appid: wx63c280fe3248a3e7 # wenhualian的接口测试号 secret: 6f270509224a7ae1296bbf1c8cb97aed config-storage: type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取 key-prefix: wa # Redis Key 的前缀 http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台 spring: # RabbitMQ 配置项，对应 RabbitProperties 配置类 rabbitmq: host: 172.16.8.200 # RabbitMQ 服务的地址 port: 5672 # RabbitMQ 服务的端口 username: admin # RabbitMQ 服务的账号 password: admin123 # RabbitMQ 服务的密码 # Kafka 配置项，对应 KafkaProperties 配置类 kafka: bootstrap-servers: 127.0.0.1:9092 # 指定 Kafka Broker 地址，可以设置多个，以逗号分隔 --- #################### 平台相关配置 #################### @@ -103,36 +81,3 @@ access-log: # 访问日志的配置项 enable: false sms-code: # 短信验证码相关的配置项 expire-times: 10m send-frequency: 1m send-maximum-quantity-per-day: 10 begin-code: 9999 # 这里配置 9999 的原因是，测试方便。 end-code: 9999 # 这里配置 9999 的原因是，测试方便。 justauth: enabled: true type: DINGTALK: # 钉钉 client-id: dingvrnreaje3yqvzhxg client-secret: i8E6iZyDvZj51JIb0tYsYfVQYOks9Cq1lgryEjFRqC79P3iJcrxEwT6Qk2QvLrLI ignore-check-redirect-uri: true WECHAT_ENTERPRISE: # 企业微信 client-id: wwd411c69a39ad2e54 client-secret: 1wTb7hYxnpT2TUbIeHGXGo7T0odav1ic10mLdyyATOw agent-id: 1000004 ignore-check-redirect-uri: true # noinspection SpringBootApplicationYaml WECHAT_MINI_APP: # 微信小程序 client-id: ${wx.miniapp.appid} client-secret: ${wx.miniapp.secret} ignore-check-redirect-uri: true ignore-check-state: true # 微信小程序，不会使用到 state，所以不进行校验 WECHAT_MP: # 微信公众号 client-id: ${wx.mp.app-id} client-secret: ${wx.mp.secret} ignore-check-redirect-uri: true cache: type: REDIS prefix: 'social_auth_state:' # 缓存前缀，目前只对 Redis 缓存生效，默认 JUSTAUTH::STATE:: timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟 shasteel-biz/src/main/resources/application-test.yaml
@@ -60,36 +60,6 @@ database: 8 # 数据库索引 password: 123456 # 密码，建议生产环境开启 --- #################### 定时任务相关配置 #################### xxl: job: enabled: true # 是否开启调度中心，默认为 true 开启 admin: addresses: http://172.16.8.100:9090/xxl-job-admin # 调度中心部署跟地址 --- #################### 微信公众号、小程序相关配置 #################### wx: mp: # 公众号配置（必填），参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 文档 # app-id: wx041349c6f39b268b # secret: 5abee519483bc9f8cb37ce280e814bd0 app-id: wx5b23ba7a5589ecbb # 测试号 secret: 2a7b3b20c537e52e74afd395eb85f61f # 存储配置，解决 AccessToken 的跨节点的共享 config-storage: type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取 key-prefix: wx # Redis Key 的前缀 http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台 miniapp: # 小程序配置（必填），参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-miniapp-spring-boot-starter/README.md 文档 # appid: wx62056c0d5e8db250 # secret: 333ae72f41552af1e998fe1f54e1584a appid: wx63c280fe3248a3e7 # wenhualian的接口测试号 secret: 6f270509224a7ae1296bbf1c8cb97aed config-storage: type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取 key-prefix: wa # Redis Key 的前缀 http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台 --- #################### 平台相关配置 #################### # 平台配置项，设置当前项目所有自定义的配置 @@ -110,29 +80,3 @@ begin-code: 9999 # 这里配置 9999 的原因是，测试方便。 end-code: 9999 # 这里配置 9999 的原因是，测试方便。 justauth: enabled: true type: DINGTALK: # 钉钉 client-id: dingvrnreaje3yqvzhxg client-secret: i8E6iZyDvZj51JIb0tYsYfVQYOks9Cq1lgryEjFRqC79P3iJcrxEwT6Qk2QvLrLI ignore-check-redirect-uri: true WECHAT_ENTERPRISE: # 企业微信 client-id: wwd411c69a39ad2e54 client-secret: 1wTb7hYxnpT2TUbIeHGXGo7T0odav1ic10mLdyyATOw agent-id: 1000004 ignore-check-redirect-uri: true # noinspection SpringBootApplicationYaml WECHAT_MINI_APP: # 微信小程序 client-id: ${wx.miniapp.appid} client-secret: ${wx.miniapp.secret} ignore-check-redirect-uri: true ignore-check-state: true # 微信小程序，不会使用到 state，所以不进行校验 WECHAT_MP: # 微信公众号 client-id: ${wx.mp.app-id} client-secret: ${wx.mp.secret} ignore-check-redirect-uri: true cache: type: REDIS prefix: 'social_auth_state:' # 缓存前缀，目前只对 Redis 缓存生效，默认 JUSTAUTH::STATE:: timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟 shasteel-biz/src/main/resources/application.yaml
@@ -4,11 +4,11 @@ name: shasteel-server profiles: active: test active: dev cloud: nacos: server-addr: 172.16.8.100:8848 # Nacos 服务器地址 server-addr: localhost:8848 # Nacos 服务器地址 username: nacos password: nacos discovery: # 【配置中心】配置项
