Skip to content

Administrator / framework-tools

Go to a project
Commit aa89fdb3 by renrui
Options

[add]解决冲突

2 parents 93e63469 c82fcd3c
Expand all
Inline Side-by-side
Showing with 10 additions and 104 deletions
framework-analysis/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.arch</groupId> <groupId>org.arch</groupId>
<artifactId>framework-tool</artifactId> <artifactId>framework-tools</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</parent> </parent>
......
framework-overall/pom.xml → framework-asset/pom.xml
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.arch</groupId> <groupId>org.arch</groupId>
<artifactId>framework-tool</artifactId> <artifactId>framework-tools</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>framework-overall</artifactId> <artifactId>framework-asset</artifactId>
<name>总体架构</name> <name>总体架构</name>
<properties> <properties>
<maven.compiler.source>8</maven.compiler.source> <maven.compiler.source>8</maven.compiler.source>
......
framework-overall/src/main/resources/bootstrap.yml → framework-asset/src/main/resources/bootstrap.yml
spring: spring:
application: application:
name: arch-overall name: framework-asset
main: main:
# 解决升级 Spring Boot 2.6后，因循环引用导致启动时报错是否允许循环引用 # 解决升级 Spring Boot 2.6后，因循环引用导致启动时报错是否允许循环引用
allow-circular-references: true allow-circular-references: true
......
framework-base/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.arch</groupId> <groupId>org.arch</groupId>
<artifactId>framework-tool</artifactId> <artifactId>framework-tools</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</parent> </parent>
......
framework-clouds/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.arch</groupId> <groupId>org.arch</groupId>
<artifactId>framework-tool</artifactId> <artifactId>framework-tools</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</parent> </parent>
<name>微服务组件</name> <name>微服务组件</name>
......
framework-gateway/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.arch</groupId> <groupId>org.arch</groupId>
<artifactId>framework-tool</artifactId> <artifactId>framework-tools</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</parent> </parent>
......
framework-gateway/src/main/resources/bootstrap.yml
spring: spring:
application: application:
name: arch-gateway name: framework-gateway
main: main:
# 解决升级 Spring Boot 2.6后，因循环引用导致启动时报错是否允许循环引用 # 解决升级 Spring Boot 2.6后，因循环引用导致启动时报错是否允许循环引用
allow-circular-references: true allow-circular-references: true
......
framework-system-manage/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.arch</groupId> <groupId>org.arch</groupId>
<artifactId>framework-tool</artifactId> <artifactId>framework-tools</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</parent> </parent>
......
framework-system-manage/src/main/resources/bootstrap.yml
spring: spring:
application: application:
name: arch-manage name: framework-system-manage
main: main:
# 解决升级 Spring Boot 2.6后，因循环引用导致启动时报错是否允许循环引用 # 解决升级 Spring Boot 2.6后，因循环引用导致启动时报错是否允许循环引用
allow-circular-references: true allow-circular-references: true
......
framework-system/pom.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.arch</groupId>
<artifactId>framework-tool</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>framework-system</artifactId>
<name>系统架构</name>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<!-- <dependency>
<groupId>org.arch</groupId>
<artifactId>log</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.arch</groupId>
<artifactId>nacos</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>-->
<dependency>
<groupId>org.arch</groupId>
<artifactId>framework-overall</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
framework-system/src/main/java/org/arch/system/ArchSystemApp.java deleted 100644 → 0
package org.arch.system;
import org.dromara.x.file.storage.spring.EnableFileStorage;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.EnableMBeanExport;
import org.springframework.jmx.support.RegistrationPolicy;
@SpringBootApplication
@EnableMBeanExport(registration = RegistrationPolicy.IGNORE_EXISTING)
public class ArchSystemApp {
public static void main(String[] args) {
SpringApplication.run(ArchSystemApp.class, args);
}
}
framework-system/src/main/resources/bootstrap-dev.yml deleted 100644 → 0
server:
port: 17008
nacos:
server-addr: 192.168.0.200:18848
username: nacos
password: nacos
namespace: ${NAMESPACE:arch}
file-extension: yaml
spring:
cloud:
nacos:
config:
group: DEFAULT_GROUP
server-addr: ${nacos.server-addr}
username: ${nacos.username}
password: ${nacos.password}
namespace: ${nacos.namespace}
# 公共配置
shared-configs:
- data-id: common-storage.${nacos.file-extension}
refresh: true
- data-id: common-config.${nacos.file-extension}
refresh: true
- data-id: common-filters.${nacos.file-extension}
refresh: true
- data-id: common-datasource.${nacos.file-extension}
- data-id: common-mybatis.${nacos.file-extension}
- data-id: common-redis.${nacos.file-extension}
refresh: true
discovery:
ip: localhost
server-addr: ${nacos.server-addr}
username: ${nacos.username}
password: ${nacos.password}
namespace: ${nacos.namespace}
config:
activate:
on-profile: dev
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!