zgty/zt-dsc
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并 Base

Browse Source
This commit is contained in:
Administrator
2025-09-04 00:50:45 +00:00
committed by chenbowen
parent 79344ba84d
commit f79e3eceeb
15 changed files with 307 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
base-server/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM openjdk:17-jre-slim FROM 172.16.46.66:10043/base-service/eclipse-temurin:21-jre
# 设置应用目录 # 设置应用目录
WORKDIR /app WORKDIR /app

5
base-server/src/main/java/cn/iocoder/yudao/base/controller/base/BaseController.java → base-server/src/main/java/cn/iocoder/yudao/base/controller/base/BaseDemoController.java
View File

@@ -1,12 +1,13 @@
package cn.iocoder.yudao.base.controller.base; package cn.iocoder.yudao.base.controller.base;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
/** /**
@@ -17,7 +18,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@Tag(name = "base") @Tag(name = "base")
@RestController @RestController
@RequestMapping("/base") @RequestMapping("/base")
public class BaseController { public class BaseDemoController {
@GetMapping("/hello") @GetMapping("/hello")
@Operation(summary = "Hello base") @Operation(summary = "Hello base")

2
base-server/src/main/resources/application.yml
View File

@@ -104,7 +104,7 @@ xxl:
yudao: yudao:
info: info:
version: 1.0.0 version: 1.0.0
base-package: cn.iocoder.yudao.module base-package: cn.iocoder.yudao
web: web:
admin-ui: admin-ui:
url: http://dashboard.yudao.iocoder.cn # Admin 管理后台 UI 的地址 url: http://dashboard.yudao.iocoder.cn # Admin 管理后台 UI 的地址

30
yudao-module-base/yudao-module-base-server/pom.xml
View File

@@ -131,21 +131,21 @@
<build> <build>
<!-- 设置构建的 jar 包名 --> <!-- 设置构建的 jar 包名 -->
<finalName>${project.artifactId}</finalName> <finalName>${project.artifactId}</finalName>
<plugins> <!-- <plugins>-->
<!-- 打包 --> <!-- &lt;!&ndash; 打包 &ndash;&gt;-->
<plugin> <!-- <plugin>-->
<groupId>org.springframework.boot</groupId> <!-- <groupId>org.springframework.boot</groupId>-->
<artifactId>spring-boot-maven-plugin</artifactId> <!-- <artifactId>spring-boot-maven-plugin</artifactId>-->
<version>${spring.boot.version}</version> <!-- <version>${spring.boot.version}</version>-->
<executions> <!-- <executions>-->
<execution> <!-- <execution>-->
<goals> <!-- <goals>-->
<goal>repackage</goal> <!-- 将引入的 jar 打入其中 --> <!-- <goal>repackage</goal> &lt;!&ndash; 将引入的 jar 打入其中 &ndash;&gt;-->
</goals> <!-- </goals>-->
</execution> <!-- </execution>-->
</executions> <!-- </executions>-->
</plugin> <!-- </plugin>-->
</plugins> <!-- </plugins>-->
</build> </build>
</project> </project>

3
yudao-module-base/yudao-module-base-server/src/main/java/cn/iocoder/yudao/module/base/BaseServerApplication.java
View File

@@ -1,14 +1,13 @@
package cn.iocoder.yudao.module.base; package cn.iocoder.yudao.module.base;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
/** /**
* Base 模块的启动类 * Base 模块的启动类
* *
* @author ZT * @author ZT
*/ */
@SpringBootApplication //@SpringBootApplication
public class BaseServerApplication { public class BaseServerApplication {
public static void main(String[] args) { public static void main(String[] args) {

2
yudao-module-base/yudao-module-base-server/src/main/java/cn/iocoder/yudao/module/base/controller/admin/base/BaseController.java → yudao-module-base/yudao-module-base-server/src/main/java/cn/iocoder/yudao/module/base/controller/admin/base/BaseTestController.java
View File

@@ -17,7 +17,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - Base") @Tag(name = "管理后台 - Base")
@RestController @RestController
@RequestMapping("/admin/base/base") @RequestMapping("/admin/base/base")
public class BaseController { public class BaseTestController {
@GetMapping("/hello") @GetMapping("/hello")
@Operation(summary = "Hello Base") @Operation(summary = "Hello Base")

10
yudao-module-base/yudao-module-base-server/src/main/java/cn/iocoder/yudao/module/base/framework/rpc/config/RpcConfiguration.java Normal file
View File

@@ -0,0 +1,10 @@
package cn.iocoder.yudao.module.base.framework.rpc.config;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.Configuration;
@Configuration(value = "baseRpcConfiguration", proxyBeanMethods = false)
@EnableFeignClients(clients = {DeptApi.class})
public class RpcConfiguration {
}

6
yudao-module-base/yudao-module-base-server/src/main/java/cn/iocoder/yudao/module/base/framework/security/config/SecurityConfiguration.java
View File

@@ -9,11 +9,9 @@ import org.springframework.security.config.annotation.web.configurers.AuthorizeH
/** /**
* Base 模块的 Security 配置 * Template 模块的 Security 配置
*
* @author ZT
*/ */
@Configuration(proxyBeanMethods = false) @Configuration("baseSecurityConfiguration")
public class SecurityConfiguration { public class SecurityConfiguration {
@Bean @Bean

30
yudao-module-contract-order/yudao-module-contract-order-server/pom.xml
View File

@@ -131,21 +131,21 @@
<build> <build>
<!-- 设置构建的 jar 包名 --> <!-- 设置构建的 jar 包名 -->
<finalName>${project.artifactId}</finalName> <finalName>${project.artifactId}</finalName>
<plugins> <!-- <plugins>-->
<!-- 打包 --> <!-- &lt;!&ndash; 打包 &ndash;&gt;-->
<plugin> <!-- <plugin>-->
<groupId>org.springframework.boot</groupId> <!-- <groupId>org.springframework.boot</groupId>-->
<artifactId>spring-boot-maven-plugin</artifactId> <!-- <artifactId>spring-boot-maven-plugin</artifactId>-->
<version>${spring.boot.version}</version> <!-- <version>${spring.boot.version}</version>-->
<executions> <!-- <executions>-->
<execution> <!-- <execution>-->
<goals> <!-- <goals>-->
<goal>repackage</goal> <!-- 将引入的 jar 打入其中 --> <!-- <goal>repackage</goal> &lt;!&ndash; 将引入的 jar 打入其中 &ndash;&gt;-->
</goals> <!-- </goals>-->
</execution> <!-- </execution>-->
</executions> <!-- </executions>-->
</plugin> <!-- </plugin>-->
</plugins> <!-- </plugins>-->
</build> </build>
</project> </project>

3
yudao-module-contract-order/yudao-module-contract-order-server/src/main/java/cn/iocoder/yudao/module/contractorder/ContractOrderServerApplication.java
View File

@@ -1,14 +1,13 @@
package cn.iocoder.yudao.module.contractorder; package cn.iocoder.yudao.module.contractorder;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
/** /**
* ContractOrder 模块的启动类 * ContractOrder 模块的启动类
* *
* @author ZT * @author ZT
*/ */
@SpringBootApplication //@SpringBootApplication
public class ContractOrderServerApplication { public class ContractOrderServerApplication {
public static void main(String[] args) { public static void main(String[] args) {

Some files were not shown because too many files have changed in this diff Show More