ThbTech/JavaProjectRepo
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main-framework' into develop-business-css

Browse Source
This commit is contained in:
zhengsl 2025-11-12 18:15:45 +08:00
commit 6fba87f156
18 changed files with 148 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/.gitignore vendored Normal file
View File

@ -0,0 +1,8 @@
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

9
.idea/JavaProjectRepo.iml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

19
.idea/compiler.xml Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
<profile default="true" name="Default" enabled="true" />
<profile name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<module name="platform" />
</profile>
</annotationProcessing>
</component>
<component name="JavacSettings">
<option name="ADDITIONAL_OPTIONS_OVERRIDE">
<module name="platform" options="-parameters" />
</option>
</component>
</project>

6
.idea/encodings.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="file://$PROJECT_DIR$/framework/src/main/java" charset="UTF-8" />
</component>
</project>

6
.idea/inspectionProfiles/Project_Default.xml Normal file
View File

@ -0,0 +1,6 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
</profile>
</component>

20
.idea/jarRepositories.xml Normal file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="https://repo.maven.apache.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
</component>
</project>

14
.idea/misc.xml Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="MavenProjectsManager">
<option name="originalFiles">
<list>
<option value="$PROJECT_DIR$/framework/pom.xml" />
</list>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_21" project-jdk-name="21" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

8
.idea/modules.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/JavaProjectRepo.iml" filepath="$PROJECT_DIR$/.idea/JavaProjectRepo.iml" />
</modules>
</component>
</project>

6
.idea/prettier.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="PrettierConfiguration">
<option name="myConfigurationMode" value="AUTOMATIC" />
</component>
</project>

6
.idea/vcs.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

2
framework/frontend/src/layout/components/Sidebar/MixNav.vue
View File

@ -126,6 +126,8 @@ function logout() {
</template>
<style lang="scss" scoped>
@use '@/styles/variables.module' as variables;
.horizontal-header {
display: flex;
display: -webkit-flex;

4
framework/frontend/src/layout/components/Sidebar/index.vue
View File

@ -41,3 +41,7 @@ const activeMenu = computed<string>(() => {
</el-scrollbar>
</div>
</template>
<style lang="scss" scoped>
@use '@/styles/variables.module' as variables;
</style>

6
framework/frontend/src/layout/index.vue
View File

@ -91,11 +91,11 @@ function toggleSideBar() {
</template>
<style lang="scss" scoped>
@import '@/styles/mixin.scss';
@import '@/styles/variables.module.scss';
@use '@/styles/mixin.scss' as mixin;
@use '@/styles/variables.module.scss' as variables;
.app-wrapper {
@include clearfix;
// @include clearfix;
position: relative;
height: 100%;
width: 100%;

8
framework/frontend/src/styles/index.scss
View File

@ -1,7 +1,7 @@
@import 'src/styles/variables.module';
@import 'src/styles/element-plus';
@import './sidebar.scss';
@import './tailwind.scss';
@use 'src/styles/variables.module' as variables;
@use 'src/styles/element-plus' as element-plus;
@use './sidebar' as sidebar;
@use './tailwind' as tailwind;
html,body,#app{
height: 100%;

30
framework/frontend/src/styles/sidebar.scss
View File

@ -1,3 +1,5 @@
@use 'src/styles/variables.module' as variables;
svg {
vertical-align: text-bottom !important;
}
@ -5,14 +7,14 @@ svg {
.main-container {
// min-height: 100%;
transition: margin-left 0.28s;
margin-left: $sideBarWidth;
margin-left: variables.$sideBarWidth;
position: relative;
}
.sidebar-container {
transition: width 0.28s;
width: $sideBarWidth !important;
background-color: $menuBg;
width: variables.$sideBarWidth !important;
background-color: variables.$menuBg;
height: calc(100vh - 60px);
padding-top: 15px;
position: absolute;
@ -70,25 +72,25 @@ svg {
.submenu-title-noDropdown,
.el-sub-menu__title {
&:hover {
color: $menuHover !important;
color: variables.$menuHover !important;
}
}
// .is-active > .el-sub-menu__title {
// color: $subMenuActiveText !important;
// color: variables.$subMenuActiveText !important;
// }
& .nest-menu .el-sub-menu > .el-sub-menu__title,
& .el-sub-menu .el-menu-item {
min-width: $sideBarWidth !important;
background-color: $subMenuBg !important;
min-width: variables.$sideBarWidth !important;
background-color: variables.$subMenuBg !important;
&:hover {
color: $subMenuHover !important;
color: variables.$subMenuHover !important;
}
}
.el-menu-item.is-active {
border-right: 3px solid $subMenuHover;
border-right: 3px solid variables.$subMenuHover;
background: #e8f3ff !important;
}
}
@ -159,7 +161,7 @@ svg {
}
.el-menu--collapse .el-menu .el-sub-menu {
min-width: $sideBarWidth !important;
min-width: variables.$sideBarWidth !important;
}
// mobile responsive
@ -170,14 +172,14 @@ svg {
.sidebar-container {
transition: transform 0.28s;
width: $sideBarWidth !important;
width: variables.$sideBarWidth !important;
}
&.hideSidebar {
.sidebar-container {
pointer-events: none;
transition-duration: 0.3s;
transform: translate3d(-$sideBarWidth, 0, 0);
transform: translate3d(- variables.$sideBarWidth, 0, 0);
}
}
}
@ -206,8 +208,8 @@ svg {
.el-menu-item {
&:hover {
background-color: #ffffff;
// you can use $subMenuHover
color: $menuHover !important;
// you can use variables.$subMenuHover
color: variables.$menuHover !important;
}
}

8
framework/frontend/vite.config.ts
View File

@ -39,6 +39,14 @@ export default ({ mode }: ConfigEnv): UserConfig => {
alias: {
'@': path.resolve('./src')
}
},
css: {
preprocessorOptions: {
scss: {
silenceDeprecations: ['legacy-js-api'],
api: 'modern-compiler' // 使用现代API
}
}
}
};
};

66
framework/pom.xml
View File

@ -312,70 +312,8 @@
</resources>
<plugins>
<!-- 在 Java 编译前构建前端，并将构建产物复制到后端资源目录 -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>frontend-install</id>
<phase>generate-resources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>npm</executable>
<workingDirectory>${project.basedir}/frontend</workingDirectory>
<arguments>
<argument>install</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>frontend-build</id>
<phase>generate-resources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>npm</executable>
<workingDirectory>${project.basedir}/frontend</workingDirectory>
<arguments>
<argument>run</argument>
<argument>build:mvn</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
<executions>
<execution>
<id>copy-frontend</id>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<skip>true</skip>
<overwrite>true</overwrite>
<failOnError>false</failOnError>
<outputDirectory>${project.basedir}/src/main/resources/static</outputDirectory>
<resources>
<resource>
<directory>${project.basedir}/frontend/dist</directory>
<filtering>false</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
@ -402,7 +340,7 @@
<!-- 统一设置 JVM 编码为 UTF-8，避免控制台中文乱码 -->
<jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
<!-- 以独立 JVM 运行，从而应用 jvmArguments -->
<fork>true</fork>
<!-- <fork>true</fork>-->
<excludes>
<exclude>
<groupId>org.projectlombok</groupId>

5
framework/src/main/java/com/yfd/platform/PlatformApplication.java
View File

@ -6,6 +6,7 @@ import com.yfd.platform.utils.SpringContextHolder;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.web.servlet.ServletComponentScan;
import org.springframework.cache.annotation.EnableCaching;
@ -18,8 +19,8 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@EnableTransactionManagement
@ServletComponentScan("com.yfd.platform.config")
@MapperScan(basePackages = "com.yfd.platform.modules.*.mapper,com.yfd.platform.*.mapper")
@SpringBootApplication(exclude= {DataSourceAutoConfiguration.class})
@MapperScan(basePackages = "com.yfd.platform.*.mapper")
@SpringBootApplication(exclude= {DataSourceAutoConfiguration.class, RedisAutoConfiguration.class})
@Import({DynamicDataSourceConfig.class})
@EnableCaching
public class PlatformApplication {