From 5bc90263b194ac5e762d6e6284e88c5222071bf1 Mon Sep 17 00:00:00 2001
From: Bunny <1319900154@qq.com>
Date: Fri, 4 Jul 2025 15:23:21 +0800
Subject: [PATCH] =?UTF-8?q?:wrench:=20=E7=94=9F=E6=88=90=E5=99=A8=E5=92=8C?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.yml        |   6 ++-
 .../mapper/mapper/resourceMapper.xml.vm       |  11 ++--
 .../images => images}/wx_alipay.png           | Bin
 mall-common/src/main/java/com/mall/App.java   |  13 -----
 .../com/mall/common/domain/package-info.java  |   1 +
 .../mall/common/domain/vo/package-info.java   |   1 +
 .../java/com/mall/common/package-info.java    |   1 +
 .../mall/product/MallProductApplication.java  |  13 +++++
 .../com/mall/product/domain/entity/Attr.java  |  49 ++++++++++++++++++
 .../src/main/resources/application-dev.yml    |   7 +++
 .../src/main/resources/application.yaml       |  36 +++++++++++++
 mall-product/src/main/resources/banner.txt    |  13 +++++
 12 files changed, 129 insertions(+), 22 deletions(-)
 rename {generator-code-server/images => images}/wx_alipay.png (100%)
 delete mode 100644 mall-common/src/main/java/com/mall/App.java
 create mode 100644 mall-common/src/main/java/com/mall/common/domain/package-info.java
 create mode 100644 mall-common/src/main/java/com/mall/common/domain/vo/package-info.java
 create mode 100644 mall-common/src/main/java/com/mall/common/package-info.java
 create mode 100644 mall-product/src/main/java/com/mall/product/MallProductApplication.java
 create mode 100644 mall-product/src/main/java/com/mall/product/domain/entity/Attr.java
 create mode 100644 mall-product/src/main/resources/application-dev.yml
 create mode 100644 mall-product/src/main/resources/application.yaml
 create mode 100644 mall-product/src/main/resources/banner.txt

diff --git a/generator-code-server/src/main/resources/application.yml b/generator-code-server/src/main/resources/application.yml
index 49c1f3f..0275386 100644
--- a/generator-code-server/src/main/resources/application.yml
+++ b/generator-code-server/src/main/resources/application.yml
@@ -17,4 +17,8 @@ spring:
     password: ${bunny.master.password}
     hikari:
       maximum-pool-size: 20
-      connection-timeout: 30000
\ No newline at end of file
+      connection-timeout: 30000
+
+logging:
+  file:
+    path: "logs/${spring.application.name}"
\ No newline at end of file
diff --git a/generator-code-server/src/main/resources/vms/server/mapper/mapper/resourceMapper.xml.vm b/generator-code-server/src/main/resources/vms/server/mapper/mapper/resourceMapper.xml.vm
index 0471987..6f2df2b 100644
--- a/generator-code-server/src/main/resources/vms/server/mapper/mapper/resourceMapper.xml.vm
+++ b/generator-code-server/src/main/resources/vms/server/mapper/mapper/resourceMapper.xml.vm
@@ -17,17 +17,12 @@
     <!-- 分页查询${comment}内容 -->
     <select id="selectListByPage" resultType="${package}.domain.vo.${classUppercaseName}Vo">
         select
-        base.*,
-        create_user.username as create_username,
-        update_user.username as update_username
-        from $tableName base
-        left join sys_user create_user on create_user.id = base.create_user
-        left join sys_user update_user on update_user.id = base.update_user
+        <include refid="Base_Column_List"/>
+        from $tableName
         <where>
-            base.is_deleted = 0
             #foreach($field in $columnInfoList)
                 <if test="dto.${field.lowercaseName} != null and dto.${field.lowercaseName} != ''">
-                    and base.${field.columnName} like CONCAT('%',#{dto.${field.lowercaseName}},'%')
+                    and ${field.columnName} like CONCAT('%',#{dto.${field.lowercaseName}},'%')
                 </if>
             #end
         </where>
diff --git a/generator-code-server/images/wx_alipay.png b/images/wx_alipay.png
similarity index 100%
rename from generator-code-server/images/wx_alipay.png
rename to images/wx_alipay.png
diff --git a/mall-common/src/main/java/com/mall/App.java b/mall-common/src/main/java/com/mall/App.java
deleted file mode 100644
index 38d1876..0000000
--- a/mall-common/src/main/java/com/mall/App.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.mall;
-
-/**
- * Hello world!
- *
- */
-public class App 
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
-    }
-}
diff --git a/mall-common/src/main/java/com/mall/common/domain/package-info.java b/mall-common/src/main/java/com/mall/common/domain/package-info.java
new file mode 100644
index 0000000..da06dba
--- /dev/null
+++ b/mall-common/src/main/java/com/mall/common/domain/package-info.java
@@ -0,0 +1 @@
+package com.mall.common.domain;
\ No newline at end of file
diff --git a/mall-common/src/main/java/com/mall/common/domain/vo/package-info.java b/mall-common/src/main/java/com/mall/common/domain/vo/package-info.java
new file mode 100644
index 0000000..35f546c
--- /dev/null
+++ b/mall-common/src/main/java/com/mall/common/domain/vo/package-info.java
@@ -0,0 +1 @@
+package com.mall.common.domain.vo;
\ No newline at end of file
diff --git a/mall-common/src/main/java/com/mall/common/package-info.java b/mall-common/src/main/java/com/mall/common/package-info.java
new file mode 100644
index 0000000..7dbd19b
--- /dev/null
+++ b/mall-common/src/main/java/com/mall/common/package-info.java
@@ -0,0 +1 @@
+package com.mall.common;
\ No newline at end of file
diff --git a/mall-product/src/main/java/com/mall/product/MallProductApplication.java b/mall-product/src/main/java/com/mall/product/MallProductApplication.java
new file mode 100644
index 0000000..032bde5
--- /dev/null
+++ b/mall-product/src/main/java/com/mall/product/MallProductApplication.java
@@ -0,0 +1,13 @@
+package com.mall.product;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+@EnableTransactionManagement
+@SpringBootApplication
+public class MallProductApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(MallProductApplication.class, args);
+    }
+}
diff --git a/mall-product/src/main/java/com/mall/product/domain/entity/Attr.java b/mall-product/src/main/java/com/mall/product/domain/entity/Attr.java
new file mode 100644
index 0000000..2310a98
--- /dev/null
+++ b/mall-product/src/main/java/com/mall/product/domain/entity/Attr.java
@@ -0,0 +1,49 @@
+package com.mall.product.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("pms_attr")
+@Schema(name = "Attr对象", title = "商品属性", description = "商品属性的实体类对象")
+public class Attr {
+
+    @Schema(name = "attrId", title = "属性id")
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long attrId;
+
+    @Schema(name = "attrName", title = "属性名")
+    private String attrName;
+
+    @Schema(name = "searchType", title = "是否需要检索[0-不需要，1-需要]")
+    private Integer searchType;
+
+    @Schema(name = "valueType", title = "值类型[0-为单个值，1-可以选择多个值]")
+    private Integer valueType;
+
+    @Schema(name = "icon", title = "属性图标")
+    private String icon;
+
+    @Schema(name = "valueSelect", title = "可选值列表[用逗号分隔]")
+    private String valueSelect;
+
+    @Schema(name = "attrType", title = "属性类型[0-销售属性，1-基本属性，2-既是销售属性又是基本属性]")
+    private Integer attrType;
+
+    @Schema(name = "enable", title = "启用状态[0 - 禁用，1 - 启用]")
+    private Long enable;
+
+    @Schema(name = "catelogId", title = "所属分类")
+    private Long catelogId;
+
+    @Schema(name = "showDesc", title = "快速展示【是否展示在介绍上；0-否 1-是】，在sku中仍然可以调整")
+    private Integer showDesc;
+
+}
\ No newline at end of file
diff --git a/mall-product/src/main/resources/application-dev.yml b/mall-product/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..53196f1
--- /dev/null
+++ b/mall-product/src/main/resources/application-dev.yml
@@ -0,0 +1,7 @@
+bunny:
+  master:
+    host: rm-bp12z6hlv46vi6g8mro.mysql.rds.aliyuncs.com
+    port: 3306
+    database: gulimall_pms
+    username: gulimall
+    password: "0212Gulimall"
diff --git a/mall-product/src/main/resources/application.yaml b/mall-product/src/main/resources/application.yaml
new file mode 100644
index 0000000..79ab242
--- /dev/null
+++ b/mall-product/src/main/resources/application.yaml
@@ -0,0 +1,36 @@
+server:
+  port: 8001
+
+spring:
+  profiles:
+    active: prod
+  application:
+    name: service-product
+
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://${bunny.master.host}:${bunny.master.port}/${bunny.master.database}?serverTimezone=GMT%2B8&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true
+    username: ${bunny.master.username}
+    password: ${bunny.master.password}
+    hikari:
+      maximum-pool-size: 20
+      connection-timeout: 30000
+
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+
+mybatis-plus:
+  mapper-locations: classpath:/mapper/*.xml
+  global-config:
+    db-config:
+      id-type: auto
+      logic-delete-value: 1
+      logic-not-delete-value: 0
+
+logging:
+  file:
+    path: "logs/${spring.application.name}"
+  level:
+    com.mall.product: debug
+    root: info
diff --git a/mall-product/src/main/resources/banner.txt b/mall-product/src/main/resources/banner.txt
new file mode 100644
index 0000000..89b2c00
--- /dev/null
+++ b/mall-product/src/main/resources/banner.txt
@@ -0,0 +1,13 @@
+
+
+,-----.                                       ,--.   ,--.        ,--.,--.
+|  |) /_ ,--.,--.,--,--, ,--,--, ,--. ,--.    |   `.'   | ,--,--.|  ||  |
+|  .-.  \|  ||  ||      \|      \ \  '  /     |  |'.'|  |' ,-.  ||  ||  |
+|  '--' /'  ''  '|  ||  ||  ||  |  \   '      |  |   |  |\ '-'  ||  ||  |
+`------'  `----' `--''--'`--''--'.-'  /       `--'   `--' `--`--'`--'`--'
+                                 `---'
+
+
+Service Name${spring.application.name}
+SpringBoot Version: ${spring-boot.version}${spring-boot.formatted-version}
+Spring Active：${spring.profiles.active}