npm - @llryiop/avatar-boot-cli - Versions diffs - 1.0.0 → 1.0.2 - Mend

@llryiop/avatar-boot-cli 1.0.0 → 1.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (72) hide show

package/templates/README.md CHANGED Viewed

@@ -144,106 +144,71 @@
 项目采用 API + Service 双模块结构，每个功能模块在两个工程中都有对应的独立包结构：
 ```
-avatar-scaffold-project/
-├── avatar-scaffold-api/                      # API 模块（接口定义）
-│   └── src/main/java/com/iflytek/avatar/
-│       ├── common/                            # 公共模块（跨功能共享）
-│       │   ├── constant/                      # 系统级常量
-│       │   │   └── ApiConstant.java
-│       │   ├── enums/                          # 公共枚举
-│       │   │   └── ResultCodeEnum.java
-│       │   ├── exception/                       # 公共异常
-│       │   │   ├── BusinessException.java
-│       │   │   └── ErrorCode.java
-│       │   └── dto/                             # 公共DTO
-│       │       ├── PageRequest.java             # 分页请求基类
-│       │       └── PageResponse.java            # 分页响应基类
-│       │
-│       ├── login/                               # 登录功能模块
-│       │   ├── api/                             # Feign接口定义
-│       │   │   └── LoginFeignClient.java
-│       │   ├── constant/                         # 模块常量
-│       │   │   └── LoginConstant.java
-│       │   ├── enums/                            # 模块枚举
-│       │   │   └── LoginTypeEnum.java
-│       │   ├── exception/                         # 模块异常
-│       │   │   └── LoginException.java
-│       │   └── dto/                               # **DTO目录（统一命名）**
-│       │       ├── request/                       # 请求DTO
-│       │       │   ├── LoginRequest.java
-│       │       │   └── RefreshTokenRequest.java
-│       │       └── response/                      # 响应DTO
-│       │           ├── LoginResponse.java
-│       │           └── TokenInfoResponse.java
-│       │
-│       └── user/                                 # 用户功能模块
-│           ├── api/
-│           │   └── UserFeignClient.java
-│           ├── constant/
-│           │   └── UserConstant.java
-│           ├── enums/
-│           │   └── UserStatusEnum.java
-│           ├── exception/
-│           │   └── UserException.java
-│           └── dto/
-│               ├── request/
-│               │   ├── CreateUserRequest.java
-│               │   ├── UpdateUserRequest.java
-│               │   └── UserQueryRequest.java
-│               └── response/
-│                   ├── UserDetailResponse.java
-│                   └── UserSimpleResponse.java
-│
-└── avatar-scaffold-service/                   # Service 模块（业务实现）
-    └── src/main/java/com/iflytek/avatar/
-        ├── common/                              # 公共实现
-        │   ├── config/                           # 全局配置
-        │   │   ├── MyBatisConfig.java
-        │   │   ├── RedisConfig.java
-        │   │   └── SwaggerConfig.java
-        │   ├── utils/                             # 公共工具类
-        │   │   ├── JwtUtils.java
-        │   │   └── RedisUtils.java
-        │   └── interceptor/                       # 全局拦截器
-        │       └── LoginInterceptor.java
-        │
-        ├── login/                                 # 登录功能实现
-        │   ├── config/                             # 模块配置
-        │   │   └── LoginConfig.java
-        │   ├── controller/                          # REST控制器（实现API）
-        │   │   └── LoginController.java
-        │   ├── service/                             # 业务逻辑层
-        │   │   ├── LoginService.java               # 接口
-        │   │   └── impl/
-        │   │       └── LoginServiceImpl.java       # 实现
-        │   ├── repository/                          # **数据访问层（使用repository）**
-        │   │   ├── mapper/                          # MyBatis Mapper接口
-        │   │   │   └── UserLoginMapper.java
-        │   │   └── entity/                          # **数据库实体（统一用entity）**
-        │   │       ├── UserLoginEntity.java        # 用户登录表实体
-        │   │       └── UserTokenEntity.java        # 用户Token表实体
-        │   ├── converter/                           # **对象转换器（DO <-> DTO）**
-        │   │   └── LoginConverter.java
-        │   └── utils/                               # 模块工具类
-        │       └── LoginUtils.java
-        │
-        └── user/                                    # 用户功能实现
-            ├── controller/
-            │   └── UserController.java
-            ├── service/
-            │   ├── UserService.java
-            │   └── impl/
-            │       └── UserServiceImpl.java
-            ├── repository/
-            │   ├── mapper/
-            │   │   └── UserMapper.java
-            │   └── entity/
-            │       ├── UserEntity.java             # 用户主表实体
-            │       └── UserProfileEntity.java      # 用户档案表实体
-            ├── converter/
-            │   └── UserConverter.java
-            └── validator/                           # **参数校验器**
-                └── UserValidator.java
+avatar-scaffold-project/
+  ├── pom.xml                                      # 根 POM，聚合模块管理
+  ├── CLAUDE.md                                    # AI 开发规范文档
+  ├── README.md                                    # 项目说明文档
+  │
+  ├── avatar-scaffold-api/                         # API 模块（接口定义层）
+  │   ├── pom.xml
+  │   └── src/main/java/com/iflytek/avatar/
+  │       └── login/
+  │           ├── api/
+  │           │   └── LoginFeignClient.java        # Feign 客户端
+  │           ├── constant/
+  │           │   └── LoginConstant.java           # 业务常量
+  │           ├── dto/
+  │           │   ├── request/
+  │           │   │   ├── LoginRequest.java
+  │           │   │   └── RefreshTokenRequest.java
+  │           │   └── response/
+  │           │       ├── LoginResponse.java
+  │           │       └── TokenInfoResponse.java
+  │           ├── enums/
+  │           │   └── LoginTypeEnum.java           # 登录类型枚举
+  │           └── exception/
+  │               ├── LoginErrorCode.java          # ★ 新增：错误码枚举/常量
+  │               └── LoginException.java          # 业务异常定义
+  │
+  ├── avatar-scaffold-service/                     # Service 模块（业务实现层）
+  │   ├── pom.xml
+  │   ├── k8s-app/
+  │   │   ├── Dockerfile                           # x86 镜像构建
+  │   │   └── Dockerfile-arm64                     # ARM64 镜像构建
+  │   ├── packaging/
+  │   │   └── assembly.xml                         # Maven Assembly 打包配置
+  │   ├── logs/                                    # 本地运行日志
+  │   └── src/main/
+  │       ├── java/com/iflytek/avatar/
+  │       │   ├── Application.java                 # Spring Boot 启动类
+  │       │   └── login/
+  │       │       ├── config/
+  │       │       │   └── LoginConfig.java         # 登录配置 Bean
+  │       │       ├── controller/
+  │       │       │   └── LoginController.java     # REST 接口实现
+  │       │       ├── converter/
+  │       │       │   └── LoginConverter.java      # Entity ↔ DTO 转换
+  │       │       ├── feign/
+  │       │       │   └── DemoFeign.java           # 调用其他服务的 Feign 客户端
+  │       │       ├── repository/
+  │       │       │   ├── UserLoginRepository.java # Repository 封装
+  │       │       │   ├── entity/
+  │       │       │   │   ├── UserLoginEntity.java
+  │       │       │   │   └── UserTokenEntity.java
+  │       │       │   └── mapper/
+  │       │       │       └── UserLoginMapper.java # MyBatis Plus Mapper
+  │       │       ├── service/
+  │       │       │   ├── LoginService.java        # Service 接口
+  │       │       │   └── impl/
+  │       │       │       └── LoginServiceImpl.java
+  │       │       └── utils/
+  │       │           └── LoginUtils.java
+  │       └── resources/
+  │           ├── application.yaml                 # 主配置（激活 profile）
+  │           ├── application-local.yaml
+  │           ├── application-dev.yaml
+  │           ├── application-test.yaml
+  └──         └── application-prod.yaml
 ```
 ### 架构规则

package/templates/avatar-scaffold-api/pom.xml CHANGED Viewed

@@ -31,11 +31,6 @@
             <groupId>jakarta.validation</groupId>
             <artifactId>jakarta.validation-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <optional>true</optional>
-        </dependency>
     </dependencies>
 </project>

package/templates/avatar-scaffold-api/src/main/java/com/iflytek/avatar/login/api/LoginFeignClient.java CHANGED Viewed

@@ -16,6 +16,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 @FeignClient(
     name = "avatar-scaffold-service",
     path = "/api/login",
+    contextId = "loginFeignClient",
+    url = "${avatar.login-service.url}",
     configuration = com.iflytek.avatar.boot.config.FeignLoggingConfiguration.class
 )
 public interface LoginFeignClient {

package/templates/avatar-scaffold-api/src/main/java/com/iflytek/avatar/login/exception/LoginErrorCode.java ADDED Viewed

@@ -0,0 +1,25 @@
+package com.iflytek.avatar.login.exception;
+import com.iflytek.avatar.boot.entity.response.IResultCode;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+@Getter
+@AllArgsConstructor
+public enum LoginErrorCode implements IResultCode {
+    LOGIN_ERROR_CODE(40000001, "登录失败")
+    ;
+    private final int code;
+    private final String message;
+    @Override
+    public int getCode() {
+        return code;
+    }
+    @Override
+    public String getMessage() {
+        return message;
+    }
+}

package/templates/avatar-scaffold-service/pom.xml CHANGED Viewed

@@ -32,116 +32,54 @@
             <groupId>com.iflytek.avatar.boot</groupId>
             <artifactId>avatar-boot-starter-nacos</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>com.iflytek.avatar.boot</groupId>-->
-<!--            <artifactId>avatar-boot-starter-mysql</artifactId>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>com.iflytek.avatar.boot</groupId>-->
-<!--            <artifactId>avatar-boot-starter-redis</artifactId>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>com.iflytek.avatar.boot</groupId>
+            <artifactId>avatar-boot-starter-mysql</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>1.18.36</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <version>3.5.3</version>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>appassembler-maven-plugin</artifactId>
-                <version>1.10</version>
-                <configuration>
-                    <repositoryLayout>flat</repositoryLayout>
-                    <!-- 在脚本的classpath开始增加配置文件路径 -->
-                    <includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
-                    <!-- 生成配置文件路径 -->
-                    <configurationDirectory>conf</configurationDirectory>
-                    <!-- 配置文件原路径 -->
-                    <configurationSourceDirectory>src/main/resources</configurationSourceDirectory>
-                    <!-- 从原配置文件复制 -->
-                    <copyConfigurationDirectory>true</copyConfigurationDirectory>
-                    <includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
-                    <!-- 生成哪几种平台的脚本 -->
-                    <platforms>
-                        <platform>unix</platform>
-                        <platform>windows</platform>
-                    </platforms>
-                    <!-- 生成脚本的后缀 -->
-                    <binFileExtensions>
-                        <unix>.sh</unix>
-                        <windows>.bat</windows>
-                    </binFileExtensions>
-                    <!-- 使用classpath通配符 -->
-                    <useWildcardClassPath>true</useWildcardClassPath>
-                    <!-- JVM参数 -->
-                    <!--					<extraJvmArguments>-Xms512m -Xmx2048m</extraJvmArguments>-->
-                    <!-- 依赖包目录 -->
-                    <repositoryName>lib</repositoryName>
-                    <programs>
-                        <program>
-                            <name>startup</name>
-                            <mainClass>com.iflytek.avatar.Application</mainClass>
-                        </program>
-                    </programs>
-                </configuration>
-                <!-- 绑定生命周期 -->
                 <executions>
                     <execution>
-                        <id>appassembler</id>
-                        <phase>package</phase>
                         <goals>
-                            <goal>assemble</goal>
+                            <goal>repackage</goal>
                         </goals>
                     </execution>
                 </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
-                    <appendAssemblyId>false</appendAssemblyId>
-                    <descriptors>
-                        <descriptor>packaging/assembly.xml</descriptor>
-                    </descriptors>
+                    <mainClass>com.iflytek.avatar.Application</mainClass>
                 </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.13.0</version>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                    <encoding>${project.build.sourceEncoding}</encoding>
-                </configuration>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.4.1</version>
             </plugin>
-            <!-- 设置程序启动的Main Class -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.0.2</version>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.2.5</version>
                 <configuration>
-                    <excludes>
-                        <!--以类路径目录为基础-->
-                        <exclude>*.yml</exclude>
-                        <exclude>*.properties</exclude>
-                    </excludes>
+                    <argLine>-Djava.security.manager=allow</argLine>
+                    <useManifestOnlyJar>false</useManifestOnlyJar>
                 </configuration>
             </plugin>
         </plugins>

package/templates/avatar-scaffold-service/src/main/java/com/iflytek/avatar/login/feign/DemoFeign.java CHANGED Viewed

@@ -9,7 +9,10 @@ import org.springframework.web.bind.annotation.RequestParam;
 import java.util.Map;
-@FeignClient(name = "demo", url = "http://127.0.0.1:8888", configuration = FeignLoggingConfiguration.class)
+@FeignClient(name = "demo",
+        url = "http://127.0.0.1:8888",
+        contextId = "demoFeign",
+        configuration = FeignLoggingConfiguration.class)
 public interface DemoFeign {
     @GetMapping("/demo")

package/templates/avatar-scaffold-service/src/main/java/com/iflytek/avatar/login/repository/UserLoginRepository.java ADDED Viewed

@@ -0,0 +1,10 @@
+package com.iflytek.avatar.login.repository;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.iflytek.avatar.login.repository.entity.UserLoginEntity;
+import com.iflytek.avatar.login.repository.mapper.UserLoginMapper;
+import org.springframework.stereotype.Component;
+@Component
+public class UserLoginRepository extends ServiceImpl<UserLoginMapper, UserLoginEntity> {
+}

package/templates/avatar-scaffold-service/src/main/java/com/iflytek/avatar/login/repository/mapper/UserLoginMapper.java CHANGED Viewed

@@ -1,12 +1,15 @@
 package com.iflytek.avatar.login.repository.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.iflytek.avatar.login.repository.entity.UserLoginEntity;
+import org.apache.ibatis.annotations.Mapper;
 /**
  * 用户登录 Mapper（MyBatis）
  * 启用 avatar-boot-starter-mysql 后添加 @Mapper 并编写 XML/注解 SQL；当前为 Demo 接口定义。
  */
-public interface UserLoginMapper {
+@Mapper
+public interface UserLoginMapper extends BaseMapper<UserLoginEntity> {
     /**
      * 插入登录记录

package/templates/avatar-scaffold-service/src/main/resources/application-dev.yaml CHANGED Viewed

@@ -2,14 +2,14 @@ spring:
   config:
     import:
       # 使用 optional: 前缀，Nacos 不可用时不会阻止启动
-      - optional:nacos:${spring.application.name}.yaml?group=${NACOS_GROUP:AVATAR_PLATFORM}&refreshEnabled=true
+      - optional:nacos:${spring.application.name}.yaml?group=${NACOS_GROUP:DEFAULT_GROUP}&refreshEnabled=true
       - optional:nacos:common-database.yaml?group=SHARED_GROUP&refreshEnabled=true
       - optional:nacos:common-redis.yaml?group=SHARED_GROUP&refreshEnabled=true
   # nacos 配置
   cloud:
     nacos:
-      server-addr: ${NACOS_SERVER_ADDR:172.29.242.247:8848}
+      server-addr: ${NACOS_SERVER_ADDR:172.31.250.98:8848}
       namespace: ${NACOS_NAMESPACE:dev}
       username: ${NACOS_USERNAME:nacos}
       password: ${NACOS_PASSWORD:Xnrpt@2026}
@@ -17,13 +17,11 @@ spring:
       config:
         enabled: true
         file-extension: yaml
-        group: ${NACOS_GROUP:AVATAR_PLATFORM}
       discovery:
         enabled: true
         register-enabled: true
         ephemeral: true
-        group: ${NACOS_GROUP:AVATAR_PLATFORM}
         metadata:
           version: 1.0.0
-          environment: dev
+          environment: oma

package/templates/avatar-scaffold-service/src/main/resources/application-local.yaml CHANGED Viewed

@@ -11,21 +11,28 @@ spring:
       discovery:
         enabled: false
-  # ============================================
-  # 本地数据库配置
-  # ============================================
   datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://localhost:3306/avatar_scaffold?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
-    username: ${DB_USERNAME:root}
-    password: ${DB_PASSWORD:root}
-    type: com.zaxxer.hikari.HikariDataSource
-    hikari:
-      minimum-idle: 5
-      maximum-pool-size: 20
-      connection-timeout: 30000
-      idle-timeout: 600000
-      max-lifetime: 1800000
+    dynamic:
+      primary: master  # 指定主数据源
+      strict: false    # 非严格模式,未匹配到数据源时使用主数据源
+      datasource:
+        master:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          username: root
+          password: Xnrpt@2026
+          url: jdbc:mysql://mysql1_23306_test.xfyousheng.com:23306/avatar_zhizuo?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+          type: com.alibaba.druid.pool.DruidDataSource
+          druid:
+            initial-size: 5
+            min-idle: 5
+            max-active: 20
+            max-wait: 60000
+            time-between-eviction-runs-millis: 60000
+            min-evictable-idle-time-millis: 300000
+            validation-query: SELECT 1
+            test-while-idle: true
+            test-on-borrow: false
+            test-on-return: false
   # ============================================
   # 本地 Redis 配置
@@ -52,10 +59,3 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
     log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
-# 日志配置
-logging:
-  level:
-    com.iflytek.avatar: DEBUG
-    com.alibaba.nacos: ERROR
-    com.alibaba.cloud.nacos: ERROR

package/templates/pom.xml CHANGED Viewed

@@ -2,6 +2,14 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.iflytek.avatar.boot</groupId>
+        <artifactId>avatar-boot-parent</artifactId>
+        <version>1.0.1</version>
+        <relativePath/>
+    </parent>
     <groupId>com.iflytek.avatar</groupId>
     <artifactId>avatar-template</artifactId>
     <version>1.0.0-SNAPSHOT</version>
@@ -14,32 +22,15 @@
     <packaging>pom</packaging>
-    <description>
-        模板代码
-    </description>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
         <java.version>21</java.version>
-        <avatar.boot.version>1.0.0-SNAPSHOT</avatar.boot.version>
+        <avatar.boot.version>1.0.1</avatar.boot.version>
     </properties>
-    <!-- 依赖声明 -->
-    <dependencyManagement>
-       <dependencies>
-           <dependency>
-               <groupId>com.iflytek.avatar.boot</groupId>
-               <artifactId>avatar-boot-dependency</artifactId>
-               <version>${avatar.boot.version}</version>
-               <type>pom</type>
-               <scope>import</scope>
-           </dependency>
-       </dependencies>
-    </dependencyManagement>
     <build>
         <plugins>
             <plugin>