优化构建配置和网络连接设置

- 移除特定平台的JAVE依赖,改用Maven profiles实现跨平台支持
- 更新开发环境配置使用Tailscale网络地址(100.80.201.143)
- 添加macOS Apple Silicon和Linux x86_64的Maven profiles配置
- 升级JAVE版本到3.5.0并优化依赖管理
- 清理代码格式,移除多余的空行导入
This commit is contained in:
irving
2025-09-06 19:42:41 -04:00
parent 102608b85c
commit dd2342a234
5 changed files with 59 additions and 67376 deletions

67364
backend.txt

File diff suppressed because it is too large Load Diff

View File

@@ -93,11 +93,6 @@
<artifactId>jave-core</artifactId>
</dependency>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-nativebin-linux64</artifactId>
</dependency>
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-pay</artifactId>

View File

@@ -20,13 +20,11 @@ import com.starry.admin.modules.personnel.service.IPlayPersonnelAdminInfoService
import com.starry.admin.modules.system.module.entity.SysTenantEntity;
import com.starry.admin.modules.system.service.impl.SysTenantServiceImpl;
import com.starry.admin.utils.SecurityUtils;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.common.error.WxErrorException;
import me.chanjar.weixin.mp.api.WxMpService;

View File

@@ -18,8 +18,8 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource
# 配置MySQL的驱动程序类
driver-class-name: com.p6spy.engine.spy.P6SpyDriver
# 数据库连接地址(以MySql为例)
url: ${SPRING_DATASOURCE_URL:jdbc:p6spy:mysql://primary:3306/play-with?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8}
# 数据库连接地址(以MySql为例) - Using Tailscale IP for Docker containers
url: ${SPRING_DATASOURCE_URL:jdbc:p6spy:mysql://100.80.201.143:3306/play-with?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8}
# 数据库对应的用户名
username: ${SPRING_DATASOURCE_USERNAME:root}
# 数据库对应的密码
@@ -75,10 +75,11 @@ spring:
# HTML 中 Reset All 按钮
reset-enable: true
redis:
host: ${SPRING_REDIS_HOST:127.0.0.1} # Redis服务器地址
host: ${SPRING_REDIS_HOST:100.80.201.143} # Redis服务器地址 - Using Tailscale IP for Docker containers
database: ${SPRING_REDIS_DATABASE:10} # Redis数据库索引默认为0
port: ${SPRING_REDIS_PORT:6379} # Redis服务器连接端口
password: ${SPRING_REDIS_PASSWORD:Spinfo@0123}
username: ${SPRING_REDIS_USERNAME:test} # Redis用户名
password: ${SPRING_REDIS_PASSWORD:123456} # Redis密码
timeout: ${SPRING_REDIS_TIMEOUT:3000ms} # 连接超时时间(毫秒)
# 全局日志级别

55
pom.xml
View File

@@ -50,7 +50,7 @@
<easyexcel.version>2.2.11</easyexcel.version>
<!-- weichat-->
<weixin-java.version>4.6.0</weixin-java.version>
<ws-schild.version>3.1.1</ws-schild.version>
<ws-schild.version>3.5.0</ws-schild.version>
<!-- Lombok -->
<lombok.version>1.18.30</lombok.version>
<!-- Flyway -->
@@ -225,6 +225,13 @@
<artifactId>jave-nativebin-linux64</artifactId>
<version>${ws-schild.version}</version>
</dependency>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-nativebin-osxm1</artifactId>
<version>${ws-schild.version}</version>
</dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
@@ -249,6 +256,14 @@
</dependencyManagement>
<build>
<extensions>
<extension>
<groupId>kr.motd.maven</groupId>
<artifactId>os-maven-plugin</artifactId>
<version>1.7.1</version>
</extension>
</extensions>
<plugins>
<!-- Spotless Maven Plugin for Code Formatting -->
<plugin>
@@ -316,4 +331,42 @@
-->
</plugins>
</build>
<profiles>
<!-- macOS Apple Silicon -->
<profile>
<id>osx-arm64</id>
<activation>
<os>
<name>Mac OS X</name>
<arch>aarch64</arch>
</os>
</activation>
<dependencies>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-nativebin-osxm1</artifactId>
<scope>runtime</scope>
</dependency>
</dependencies>
</profile>
<!-- 部署容器Linux x86_64 -->
<profile>
<id>linux-x86_64</id>
<activation>
<os>
<name>Linux</name>
<arch>amd64</arch>
</os>
</activation>
<dependencies>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-nativebin-linux64</artifactId>
<scope>runtime</scope>
</dependency>
</dependencies>
</profile>
</profiles>
</project>