Merge branch 'master' into feature_longhu

# Conflicts:
#	pom.xml

pom.xml

@@ -351,6 +351,7 @@
 
     </dependencies>
 
+
     <build>
         <finalName>${project.artifactId}</finalName>
         <plugins>
@@ -362,10 +363,16 @@
                 <configuration>
                     <source>21</source>
                     <target>21</target>
-                    <compilerArgs>--enable-preview</compilerArgs>
                 </configuration>
             </plugin>
 
+            <!-- Spring Boot 插件（全局生效） -->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>3.2.12</version>
+            </plugin>
+
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>

src/test/java/Test1.java

@@ -0,0 +1,13 @@
+
+import com.hr.InterfacePlatformApplication;
+import com.hr.generate.generateClass;
+import org.springframework.boot.test.context.SpringBootTest;
+
+
+/***
+ * 生成类
+ */
+@SpringBootTest(classes = InterfacePlatformApplication.class)
+public class Test1 extends generateClass {
+
+}

src/test/resources/bootstrap.yml

@@ -1,13 +1,3 @@
-jasypt:
-  encryptor:
-    algorithm: PBEWITHHMACSHA512ANDAES_256
-    iv-generator-classname: org.jasypt.iv.RandomIvGenerator
-    password: fgyuajrdyujr6ydhserghj7tthse446y # 这里的秘钥一般不会写在配置文件中，为了方便理解暂时放在这里
-    property:
-      prefix: ENC(
-      suffix: )
-
-# Tomcat
 server:
   port: 9700
 # Spring
@@ -17,5 +7,9 @@ spring:
     active: dev
   application:
     # 应用名称
-    name: demo1
-    key: enc(1YBUry4rvr7Py2FSroVJPQ==)
+    name: InterfacePlatform
+
+  cloud:
+    nacos:
+      config:
+        namespace: Auth