From 410c198de31d0690abe67ca963afd32f70c1b81e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Tue, 31 Oct 2023 08:45:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=81=BF=E8=83=BD=E4=BA=91=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/{main => cloud}/MainApiApplicationTests.java  |  2 +-
 .../AppCloudBootApplication.java}                      |  6 +++---
 .../app-cloud-boot/src/main/resources/bootstrap.yml    | 10 +++++-----
 .../AppCloudBootApplicationTests.java}                 |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename app-cloud/app-cloud-api/src/test/java/com/njcn/{main => cloud}/MainApiApplicationTests.java (88%)
 rename app-cloud/app-cloud-boot/src/main/java/com/njcn/{main/MainBootApplication.java => cloud/AppCloudBootApplication.java} (78%)
 rename app-cloud/app-cloud-boot/src/test/java/com/njcn/{main/MainBootApplicationTests.java => cloud/AppCloudBootApplicationTests.java} (71%)

diff --git a/app-cloud/app-cloud-api/src/test/java/com/njcn/main/MainApiApplicationTests.java b/app-cloud/app-cloud-api/src/test/java/com/njcn/cloud/MainApiApplicationTests.java
similarity index 88%
rename from app-cloud/app-cloud-api/src/test/java/com/njcn/main/MainApiApplicationTests.java
rename to app-cloud/app-cloud-api/src/test/java/com/njcn/cloud/MainApiApplicationTests.java
index c657c6d..abb4a84 100644
--- a/app-cloud/app-cloud-api/src/test/java/com/njcn/main/MainApiApplicationTests.java
+++ b/app-cloud/app-cloud-api/src/test/java/com/njcn/cloud/MainApiApplicationTests.java
@@ -1,4 +1,4 @@
-package com.njcn.main;
+package com.njcn.cloud;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/app-cloud/app-cloud-boot/src/main/java/com/njcn/main/MainBootApplication.java b/app-cloud/app-cloud-boot/src/main/java/com/njcn/cloud/AppCloudBootApplication.java
similarity index 78%
rename from app-cloud/app-cloud-boot/src/main/java/com/njcn/main/MainBootApplication.java
rename to app-cloud/app-cloud-boot/src/main/java/com/njcn/cloud/AppCloudBootApplication.java
index 0daa1aa..2c894a7 100644
--- a/app-cloud/app-cloud-boot/src/main/java/com/njcn/main/MainBootApplication.java
+++ b/app-cloud/app-cloud-boot/src/main/java/com/njcn/cloud/AppCloudBootApplication.java
@@ -1,4 +1,4 @@
-package com.njcn.main;
+package com.njcn.cloud;
 
 import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
@@ -11,10 +11,10 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @MapperScan("com.njcn.**.mapper")
 @EnableFeignClients(basePackages = "com.njcn")
 @SpringBootApplication(scanBasePackages = "com.njcn")
-public class MainBootApplication {
+public class AppCloudBootApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(MainBootApplication.class, args);
+		SpringApplication.run(AppCloudBootApplication.class, args);
 	}
 
 }
diff --git a/app-cloud/app-cloud-boot/src/main/resources/bootstrap.yml b/app-cloud/app-cloud-boot/src/main/resources/bootstrap.yml
index 4a3c04c..a0ac7cf 100644
--- a/app-cloud/app-cloud-boot/src/main/resources/bootstrap.yml
+++ b/app-cloud/app-cloud-boot/src/main/resources/bootstrap.yml
@@ -22,11 +22,11 @@ spring:
     nacos:
       discovery:
         ip: @service.server.url@
-        server-addr: @nacos.url@
-        namespace: @nacos.namespace@
+        server-addr: 192.168.1.13:18848
+        namespace: 78588706-e06f-4580-b612-b26d72493fcb
       config:
-        server-addr: @nacos.url@
-        namespace: @nacos.namespace@
+        server-addr: 192.168.1.13:18848
+        namespace: 78588706-e06f-4580-b612-b26d72493fcb
         file-extension: yaml
         shared-configs:
           - data-id: share-config.yaml
@@ -42,7 +42,7 @@ logging:
     root: info
 #mybatis????
 mybatis-plus:
-  type-aliases-package: com.njcn.main.pojo
+  type-aliases-package: com.njcn.cloud.pojo
 mqtt:
   client-id: @artifactId@${random.value}
 
diff --git a/app-cloud/app-cloud-boot/src/test/java/com/njcn/main/MainBootApplicationTests.java b/app-cloud/app-cloud-boot/src/test/java/com/njcn/cloud/AppCloudBootApplicationTests.java
similarity index 71%
rename from app-cloud/app-cloud-boot/src/test/java/com/njcn/main/MainBootApplicationTests.java
rename to app-cloud/app-cloud-boot/src/test/java/com/njcn/cloud/AppCloudBootApplicationTests.java
index 9653d8f..1476786 100644
--- a/app-cloud/app-cloud-boot/src/test/java/com/njcn/main/MainBootApplicationTests.java
+++ b/app-cloud/app-cloud-boot/src/test/java/com/njcn/cloud/AppCloudBootApplicationTests.java
@@ -1,10 +1,10 @@
-package com.njcn.main;
+package com.njcn.cloud;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest
-class MainBootApplicationTests {
+class AppCloudBootApplicationTests {
 
 	@Test
 	void contextLoads() {