花神诞祭

添加AutoConfig，解除对启动类包名的限制

(cherry picked from commit e954b81)

unicorn-core/src/main/java/com/lwohvye/core/config/UnicornAutoConfiguration.java

@@ -0,0 +1,32 @@
+/*
+ *    Copyright (c) 2022.  lWoHvYe(Hongyan Wang)
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.lwohvye.core.config;
+
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+
+@ComponentScan("com.lwohvye") // 通过配置这个，启动类的路径不再限制为com.lwohvye or higher
+@EnableAspectJAutoProxy // 当启动类不再higher path时，aop会失效，需要显示通过该注解开启
+@EnableJpaRepositories(basePackages = {"com.lwohvye.sys.modules.*.repository","com.lwohvye.*.repository"})
+@EntityScan(basePackages = {"com.lwohvye.api.modules.*.domain","com.lwohvye.*.domain"})
+@EnableJpaAuditing(auditorAwareRef = "auditorAware") // 开启Jpa审计
+// @EnableAutoConfiguration // A circular @Import has been detected:
+public class UnicornAutoConfiguration {
+}

unicorn-core/src/main/resources/META-INF/spring.factories

@@ -0,0 +1 @@
+# Loading auto-configurations from spring.factories is deprecated. see: x.imports in /META-INF/spring

unicorn-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,18 @@
+#
+#    Copyright (c) 2022.  lWoHvYe(Hongyan Wang)
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+# since Spring Boot 2.7 Auto-configuration Registration
+com.lwohvye.core.config.UnicornAutoConfiguration

unicorn-system/pom.xml

@@ -110,8 +110,8 @@
 
         <!--Mysql依赖包-->
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
             <!--scope元素主要用来控制依赖的使用范围，指定当前包的依赖范围和依赖的传递性，也就是哪些依赖在哪些classpath中可用。
             常见的可选值有：compile, provided, runtime, test, system等。-->
             <scope>runtime</scope>

valentine-starter/src/main/java/com/lwohvye/ValentineP2P.kt → valentine-starter/src/main/java/com/unicorn/ValentineP2P.kt

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package com.lwohvye
+package com.unicorn
 
 import com.lwohvye.core.annotation.RespResultBody
 import com.lwohvye.core.annotation.rest.AnonymousGetMapping
@@ -50,7 +50,6 @@ import org.springframework.web.bind.annotation.RestController
 // 通过exclude SecurityAutoConfiguration可以屏蔽Spring Security的相关Control，这比定一个Config然后anyRequest().permitAll()要优雅，直接exclude AutoConfig，这是之前没有想到的方法，后续在别的地方应该还会用到
 //@SpringBootApplication(exclude = [SecurityAutoConfiguration::class]) // 对于默认的Config可以这样，但当已经定义了一个SecurityConfig时，通过这个是不行的，因为虽然exclude了AutoConfig，但有手动Register Bean；这种方式的可行性需进一步验证
 @EnableTransactionManagement // 开启事务
-@EnableJpaAuditing(auditorAwareRef = "auditorAware") // 开启Jpa审计
 @EnableRetry //开启重试机制
 @EnableConfigurationProperties //开启 @ConfigurationProperties 注解
 @EnableLogRecord(tenant = "com.unicorn.valentineP2P")

valentine-starter/src/main/java/com/lwohvye/vs/rest/RsLogController.java → valentine-starter/src/main/java/com/unicorn/vs/rest/RsLogController.java

@@ -14,9 +14,10 @@
  *    limitations under the License.
  */
 
-package com.lwohvye.vs.rest;
+package com.unicorn.vs.rest;
 
 import com.lwohvye.core.annotation.RespResultBody;
+import com.lwohvye.core.annotation.log.OprLog;
 import com.lwohvye.core.annotation.rest.AnonymousGetMapping;
 import com.lwohvye.core.utils.result.ResultInfo;
 import com.lwohvye.sys.modules.infrastructure.constants.LogRecordType;
@@ -49,6 +50,7 @@ public class RsLogController {
     @Value("${local.rs.iList}")
     private Integer[] ints;
 
+    @OprLog("ooo")
     @LogRecord(
             fail = "执行失败，失败原因：「{{#_errorMsg}}」",
             success = "收到请求{{#version}},执行结果:{{#_ret}}",

valentine-starter/src/main/java/module-info.java

@@ -5,9 +5,9 @@
     requires kotlin.stdlib;
     requires kotlinx.coroutines.core.jvm;
 
-    exports com.lwohvye.vs.rest to spring.beans, spring.web;
+    exports com.unicorn.vs.rest to spring.beans, spring.web;
 
     opens config; // 注意，resources目录下的子目标并没有被open，所以需要单独open，或者直接open整个module
-    opens com.lwohvye;
-    opens com.lwohvye.vs.rest to spring.core;
+    opens com.unicorn;
+    opens com.unicorn.vs.rest to spring.core;
 }