Merge branch 'master' of http://gitea.lunor.cn/java_templates/ruoyi_java in...

chenhj

5 天以前 4c0bd42a9f5989f93df221bd760b5d831f1c6464

Merge branch 'master' of http://gitea.lunor.cn/java_templates/ruoyi_java into chen

 pom.xml

@@ -35,7 +35,7 @@
        <jakarta.version>6.0.0</jakarta.version>
        <springdoc.version>2.6.0</springdoc.version>
        <postgresql.version>42.7.3</postgresql.version>
        <mybatis-plus.version>3.5.3.1</mybatis-plus.version>
        <mybatis-plus.version>3.5.12</mybatis-plus.version>
        <freemarker.version>2.3.30</freemarker.version>
        <minio.version>8.4.3</minio.version>
        <okhttp.version>4.9.0</okhttp.version>
@@ -156,13 +156,6 @@
                <version>${ruoyi.version}</version>
            </dependency>

            <!-- ä»£ç ç”Ÿæˆ-->
            <dependency>
                <groupId>com.ruoyi</groupId>
                <artifactId>ruoyi-generator</artifactId>
                <version>${ruoyi.version}</version>
            </dependency>

            <!-- æ ¸å¿ƒæ¨¡å—-->
            <dependency>
                <groupId>com.ruoyi</groupId>
@@ -227,10 +220,17 @@
            <scope>provided</scope>
        </dependency>

        <!-- MyBatis-Plus æ ¸å¿ƒä¾èµ– -->
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-core</artifactId>
            <version>3.5.12</version> <!-- ä¸Žä½ çš„ Spring Boot å…¼å®¹çš„版本 -->
        </dependency>

        <!--mybatis-plus-->
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-boot-starter</artifactId>
            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
            <version>${mybatis-plus.version}</version>
        </dependency>

@@ -254,7 +254,6 @@
        <module>ruoyi-framework</module>
        <module>ruoyi-system</module>
        <module>ruoyi-quartz</module>
        <module>ruoyi-generator</module>
        <module>ruoyi-common</module>
        <module>basic-server</module>
    </modules>

 ruoyi-admin/pom.xml

@@ -74,12 +74,6 @@
            <artifactId>ruoyi-quartz</artifactId>
        </dependency>

        <!-- ä»£ç ç”Ÿæˆ-->
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-generator</artifactId>
        </dependency>

        <!-- postgresql驱动包 -->
        <dependency>
            <groupId>org.postgresql</groupId>

 ruoyi-common/pom.xml

@@ -128,13 +128,7 @@
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
            <version>3.5.10</version>
        </dependency>

        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-jsqlparser</artifactId>
            <version>3.5.10</version>
            <version>3.5.12</version>
        </dependency>

        <!-- minio -->

 ruoyi-framework/pom.xml

@@ -53,6 +53,18 @@
            <artifactId>oshi-core</artifactId>
        </dependency>

        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
            <version>3.5.12</version>
        </dependency>

        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-extension</artifactId>
            <version>3.5.6</version>
        </dependency>

        <!-- ç³»ç»Ÿæ¨¡å—-->
        <dependency>
            <groupId>com.ruoyi</groupId>

 ruoyi-generator/pom.xml

ÎļþÒÑɾ³ý

 ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java

ÎļþÒÑɾ³ý

 ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java

ÎļþÒÑɾ³ý

 ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java

ÎļþÒÑɾ³ý

 ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java

ÎļþÒÑɾ³ý

 ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java

ÎļþÒÑɾ³ý

 ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java

ÎļþÒÑɾ³ý

 ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java

ÎļþÒÑɾ³ý

 ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java

ÎļþÒÑɾ³ý

 ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java

ÎļþÒÑɾ³ý

 ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java

ÎļþÒÑɾ³ý

 ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java

ÎļþÒÑɾ³ý

 ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java

ÎļþÒÑɾ³ý

 ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java

ÎļþÒÑɾ³ý

 ruoyi-generator/src/main/resources/generator.yml.example

ÎļþÒÑɾ³ý

 ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml

ÎļþÒÑɾ³ý

 ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml

ÎļþÒÑɾ³ý

 ruoyi-generator/src/main/resources/vm/java/controller.java.vm

ÎļþÒÑɾ³ý

 ruoyi-generator/src/main/resources/vm/java/domain.java.vm

ÎļþÒÑɾ³ý

 ruoyi-generator/src/main/resources/vm/java/mapper.java.vm

ÎļþÒÑɾ³ý

 ruoyi-generator/src/main/resources/vm/java/service.java.vm

ÎļþÒÑɾ³ý

 ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm

ÎļþÒÑɾ³ý

 ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm

ÎļþÒÑɾ³ý

 ruoyi-generator/src/main/resources/vm/js/api.js.vm

ÎļþÒÑɾ³ý

 ruoyi-generator/src/main/resources/vm/sql/sql.vm

ÎļþÒÑɾ³ý

 ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm

ÎļþÒÑɾ³ý

 ruoyi-generator/src/main/resources/vm/vue/index.vue.vm

ÎļþÒÑɾ³ý

 ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm

ÎļþÒÑɾ³ý

 ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm

ÎļþÒÑɾ³ý

 ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm

ÎļþÒÑɾ³ý