重新初始化 system 服务

pom.xml

@@ -28,6 +28,7 @@
 <!--        <module>mall-spring-boot-starter-cache</module>-->
         <module>user-service-project</module>
         <module>user-web-app</module>
+        <module>system-service-project</module>
     </modules>
     <packaging>pom</packaging>
 

system-service-project/pom.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>onemall</artifactId>
+        <groupId>cn.iocoder.mall</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>system-service-project</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>system-service-api</module>
+        <module>system-service-app</module>
+    </modules>
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- onemall 基础 bom 文件  -->
+            <dependency>
+                <groupId>cn.iocoder.mall</groupId>
+                <artifactId>mall-dependencies</artifactId>
+                <version>1.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>cn.iocoder.mall</groupId>
+                <artifactId>common-framework</artifactId>
+                <version>1.0-SNAPSHOT</version>
+            </dependency>
+
+            <!-- 自身项目 -->
+            <dependency>
+                <groupId>cn.iocoder.mall</groupId>
+                <artifactId>system-service-api</artifactId>
+                <version>1.0-SNAPSHOT</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+</project>

system-service-project/system-service-api/pom.xml

@@ -3,28 +3,29 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>user</artifactId>
+        <artifactId>system-service-project</artifactId>
         <groupId>cn.iocoder.mall</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>user-application</artifactId>
+    <artifactId>system-service-api</artifactId>
-
 
     <dependencies>
-        <!-- Mall 相关 -->
         <dependency>
             <groupId>cn.iocoder.mall</groupId>
-            <artifactId>user-rest</artifactId>
+            <artifactId>common-framework</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>cn.iocoder.mall</groupId>
-            <artifactId>user-rpc</artifactId>
-            <version>1.0-SNAPSHOT</version>
         </dependency>
 
+        <!-- 工具类相关 -->
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/enums/SystemErrorCodeEnum.java

@@ -0,0 +1,109 @@
+package cn.iocoder.mall.systemservice.enums;
+
+import cn.iocoder.common.framework.util.ServiceExceptionUtil;
+
+/**
+ * 错误码枚举类
+ *
+ * system 系统，使用 1-002-000-000 段
+ */
+public enum SystemErrorCodeEnum implements ServiceExceptionUtil.Enumerable<SystemErrorCodeEnum> {
+
+    // ========== OAUTH2 模块 ==========
+    OAUTH2_UNKNOWN(1001001000, "未知错误"), // 预留
+    // 预留 1001001001 ~ 1001001099 错误码，方便前端
+    OAUTH2_ACCESS_TOKEN_NOT_FOUND(1001001001, "访问令牌不存在"),
+    OAUTH2_ACCESS_TOKEN_TOKEN_EXPIRED(1001001002, "访问令牌已过期"),
+    OAUTH2_ACCESS_TOKEN_INVALID(1001001003, "访问令牌已失效"),
+    OAUTH2_NOT_AUTHENTICATE(1001001004, "账号未登陆"),
+    OAUTH2_REFRESH_TOKEN_NOT_FOUND(1001001005, "刷新令牌不存在"),
+    OAUTH_REFRESH_TOKEN_EXPIRED(1001001006, "访问令牌已过期"),
+    OAUTH_REFRESH_TOKEN_INVALID(1001001007, "刷新令牌已失效"),
+    // 其它 1001001100 开始
+    OAUTH2_ACCOUNT_NOT_FOUND(1001001100, "账号不存在"),
+    OAUTH2_ACCOUNT_PASSWORD_ERROR(1001001101, "密码不正确"),
+
+    // ========== 管理员模块 1002002000 ==========
+    ADMIN_NOT_FOUND(1002002000, "管理员不存在"),
+// 废弃    ADMIN_USERNAME_NOT_REGISTERED(1002002000, "账号不存在"),
+// 废弃    ADMIN_PASSWORD_ERROR(1002002001, "密码不正确"),
+//    ADMIN_IS_DISABLE(1002002002, "账号被禁用"),
+//    ADMIN_USERNAME_EXISTS(1002002002, "账号已经存在"),
+//    ADMIN_STATUS_EQUALS(1002002003, "账号已经是该状态"),
+//    ADMIN_DELETE_ONLY_DISABLE(1002002004, "只有关闭的账号才可以删除"),
+//    ADMIN_ADMIN_STATUS_CAN_NOT_UPDATE(1002002005, "管理员的账号状态不允许变更"),
+//    ADMIN_ASSIGN_ROLE_NOT_EXISTS(1002002006, "分配员工角色时，有角色不存在"),
+//    ADMIN_ADMIN_CAN_NOT_UPDATE(1002002008, "管理员的账号不允许变更"),
+
+    // ========== 资源模块 1002003000 ==========
+    RESOURCE_NAME_DUPLICATE(1002003000, "已经存在该名字的资源"),
+    RESOURCE_PARENT_NOT_EXISTS(1002003001, "父资源不存在"),
+    RESOURCE_PARENT_ERROR(1002003002, "不能设置自己为父资源"),
+    RESOURCE_NOT_EXISTS(1002003003, "资源不存在"),
+    RESOURCE_EXISTS_CHILDREN(1002003004, "存在子资源，无法删除"),
+    RESOURCE_PARENT_NOT_MENU(1002003005, "父资源的类型必须是菜单"),
+
+    // ========== 角色模块 1002004000 ==========
+    ROLE_NOT_EXISTS(1002004000, "角色不存在"),
+    ROLE_NAME_DUPLICATE(1002004001, "已经存在名为【{}}】的角色"),
+    ROLE_CODE_DUPLICATE(1002004002, "已经存在编码为【{}}】的角色"),
+    ROLE_CAN_NOT_UPDATE_SYSTEM_TYPE_ROLE(1002004004, "不能修改类型为系统内置的角色"),
+    ROLE_CAN_NOT_DELETE_SYSTEM_TYPE_ROLE(1002004005, "不能删除类型为系统内置的角色"),
+
+    // ========== 数据字典模块 1002005000 ==========
+//    DATA_DICT_EXISTS(1002005000, "该数据字典已经存在"),
+//    DATA_DICT_NOT_EXISTS(1002005001, "该数据字典不存在"),
+
+    // ========== 短信模板 1002006000 ==========
+    SMS_PLATFORM_FAIL(1002006000, "短信平台调用失败【具体错误会动态替换】"),
+    SMS_SIGN_NOT_EXISTENT(1002006001, "短信签名不存在"),
+    SMS_SIGN_IS_EXISTENT(1002006002, "短信签名已存在"),
+    SMS_TEMPLATE_NOT_EXISTENT(1002006020, "短信签名不存在"),
+    SMS_TEMPLATE_IS_EXISTENT(1002006021, "短信签名不存在"),
+    SMS_NOT_SEND_CLIENT(1002006030, "短信没有发送的client"),
+
+    // ========== 部门模块 1002007000 ==========
+//    DEPT_SAME_LEVEL_NAME_EXITS(1002007001,"当前级别部门名字已存在"),
+//    DEPT_PARENT_NOT_EXITS(1002007002,"父级部门不存在"),
+//    DEPT_NOT_EXITS(1002007003, "当前部门不存在"),
+//    DEPT_EXITS_CHILDREN(1002007004, "当前部门存在子部门"),
+//    DEPT_PARENT_NOT_LEGAL(1002007005, "父级部门不合法"),
+
+    // ========== 授权模块 1002008000 ==========
+    AUTHORIZATION_PERMISSION_DENY(1002008001, "没有该操作权限"),
+    AUTHORIZATION_DEMO_PERMISSION_DENY(1002008002, "演示账号，暂不允许写操作。欢迎加入我们的交流群：http://t.cn/EKEr5WE"),
+    AUTHORIZATION_ROLE_ASSIGN_RESOURCE_NOT_EXISTS(1002004001, "分配角色资源时，有资源不存在"),
+
+    // ========== 错误码模块 1002009000 ==========
+    ERROR_CODE_NOT_EXISTS(1002009000, "错误码不存在"),
+    ERROR_CODE_DUPLICATE(1002009001, "已经存在编码为【{}}】的错误码"),
+    ERROR_CAN_NOT_UPDATE_SYSTEM_TYPE_ERROR(1002004003, "不能修改类型为系统内置的错误码"),
+    ;
+
+
+    private final int code;
+    private final String message;
+
+    SystemErrorCodeEnum(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    @Override
+    public int getCode() {
+        return code;
+    }
+
+    @Override
+    public String getMessage() {
+        return message;
+    }
+
+    // TODO: 2020-05-22 封装成start的时候，直接在start中定义一个统一的枚举，从中取值；
+    @Override
+    public int getGroup() {
+        return 0;
+    }
+
+
+}

system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/oauth/OAuth2Rpc.java

@@ -0,0 +1,4 @@
+package cn.iocoder.mall.systemservice.rpc.oauth;
+
+public interface OAuth2Rpc {
+}

system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/package-info.java

@@ -0,0 +1 @@
+package cn.iocoder.mall.systemservice.rpc;

system-service-project/system-service-app/pom.xml

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>system-service-project</artifactId>
+        <groupId>cn.iocoder.mall</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>system-service-service</artifactId>
+    <dependencies>
+        <!-- RPC 相关 -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-dubbo</artifactId>
+        </dependency>
+
+        <dependency>
+            <!-- 系统服务 -->
+            <groupId>cn.iocoder.mall</groupId>
+            <artifactId>system-service-api</artifactId>
+        </dependency>
+
+        <!-- Registry 和 Config 相关 -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+
+        <!-- DB 相关 -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.iocoder.mall</groupId>
+            <artifactId>mall-spring-boot-starter-mybatis</artifactId>
+        </dependency>
+
+        <!-- 工具类相关 -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct</artifactId> <!-- use mapstruct-jdk8 for Java 8 or higher -->
+        </dependency>
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct-jdk8</artifactId>
+        </dependency>
+
+        <!--        <dependency>-->
+        <!--            <groupId>javax.el</groupId>-->
+        <!--            <artifactId>javax.el-api</artifactId>-->
+        <!--            <version>3.0.0</version>-->
+        <!--        </dependency>-->
+
+        <!--        <dependency>-->
+        <!--            <groupId>javax.el</groupId>-->
+        <!--            <artifactId>javax.el-api</artifactId>-->
+        <!--            <version>3.0.1-b06</version>-->
+        <!--        </dependency>-->
+
+    </dependencies>
+
+</project>

system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/SystemServiceApplication.java

@@ -0,0 +1,13 @@
+package cn.iocoder.mall.systemservice;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SystemServiceApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SystemServiceApplication.class, args);
+    }
+
+}

system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/config/DatabaseConfiguration.java

@@ -0,0 +1,28 @@
+package cn.iocoder.mall.systemservice.config;
+
+import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector;
+import com.baomidou.mybatisplus.core.injector.ISqlInjector;
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+@Configuration
+@MapperScan("cn.iocoder.mall.systemservice.dal.mysql.mapper") // 扫描对应的 Mapper 接口
+@EnableTransactionManagement(proxyTargetClass = true) // 启动事务管理。
+public class DatabaseConfiguration {
+
+    // 数据库连接池 Druid
+
+    @Bean
+    public ISqlInjector sqlInjector() {
+        return new DefaultSqlInjector(); // MyBatis Plus 逻辑删除
+    }
+
+    @Bean
+    public PaginationInterceptor paginationInterceptor() {
+        return new PaginationInterceptor(); // MyBatis Plus 分页插件
+    }
+
+}

system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/config/ServiceExceptionConfiguration.java

@@ -0,0 +1,20 @@
+package cn.iocoder.mall.systemservice.config;
+
+import cn.iocoder.common.framework.util.ServiceExceptionUtil;
+import cn.iocoder.mall.systemservice.enums.SystemErrorCodeEnum;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.event.EventListener;
+
+import java.util.Arrays;
+
+@Configuration
+public class ServiceExceptionConfiguration {
+
+    @EventListener(ApplicationReadyEvent.class)
+    public void initMessages() {
+        Arrays.stream(SystemErrorCodeEnum.values()).forEach(
+                item -> ServiceExceptionUtil.put(item.getCode(), item.getMessage()));
+    }
+
+}

system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/oauth/OAuth2RpcImpl.java

@@ -0,0 +1,7 @@
+package cn.iocoder.mall.systemservice.rpc.oauth;
+
+import org.apache.dubbo.config.annotation.Service;
+
+@Service(version = "${dubbo.provider.OAuth2Rpc.version}", validation = "false")
+public class OAuth2RpcImpl implements OAuth2Rpc {
+}

system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/package-info.java

@@ -0,0 +1 @@
+package cn.iocoder.mall.systemservice.rpc;

system-service-project/system-service-app/src/main/resources/application-dev.yaml

@@ -0,0 +1,20 @@
+spring:
+  # 数据源配置项
+  datasource:
+    url: jdbc:mysql://400-infra.server.iocoder.cn:3306/mall_system?useSSL=false&useUnicode=true&characterEncoding=UTF-8
+    driver-class-name: com.mysql.jdbc.Driver
+    username: root
+    password: 3WLiVUBEwTbvAfsh
+  # Spring Cloud 配置项
+  cloud:
+    nacos:
+      # Spring Cloud Nacos Discovery 配置项
+      discovery:
+        server-addr: 400-infra.server.iocoder.cn:8848 # Nacos 服务器地址
+        namespace: dev # Nacos 命名空间
+
+# Dubbo 配置项
+dubbo:
+  # Dubbo 注册中心
+  registry:
+    address: spring-cloud://400-infra.server.iocoder.cn:8848 # 指定 Dubbo 服务注册中心的地址

system-service-project/system-service-app/src/main/resources/application-local.yaml

@@ -0,0 +1,20 @@
+spring:
+  # 数据源配置项
+  datasource:
+    url: jdbc:mysql://400-infra.server.iocoder.cn:3306/mall_system?useSSL=false&useUnicode=true&characterEncoding=UTF-8
+    driver-class-name: com.mysql.jdbc.Driver
+    username: root
+    password: 3WLiVUBEwTbvAfsh
+  # Spring Cloud 配置项
+  cloud:
+    nacos:
+      # Spring Cloud Nacos Discovery 配置项
+      discovery:
+        server-addr: 400-infra.server.iocoder.cn:8848 # Nacos 服务器地址
+        namespace: local # Nacos 命名空间
+
+# Dubbo 配置项
+dubbo:
+  # Dubbo 注册中心
+  registry:
+    address: spring-cloud://400-infra.server.iocoder.cn:8848 # 指定 Dubbo 服务注册中心的地址

system-service-project/system-service-app/src/main/resources/application.yaml

@@ -0,0 +1,37 @@
+spring:
+  # Application 的配置项
+  application:
+    name: system-service
+  # Profile 的配置项
+  profiles:
+    active: local
+
+# MyBatis Plus 配置项
+mybatis-plus:
+  configuration:
+    map-underscore-to-camel-case: true # 虽然默认为 true ，但是还是显示去指定下。
+  global-config:
+    db-config:
+      id-type: auto
+      logic-delete-value: 1 # 逻辑已删除值(默认为 1)
+      logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
+  mapper-locations: classpath*:mapper/*.xml
+  type-aliases-package: cn.iocoder.mall.systemservice.dal.mysql.dataobject
+
+# Dubbo 配置项
+dubbo:
+  # Spring Cloud Alibaba Dubbo 专属配置
+  cloud:
+    subscribed-services: '' # 设置订阅的应用列表，默认为 * 订阅所有应用
+  # Dubbo 提供者的协议
+  protocol:
+    name: dubbo
+    port: -1
+  # Dubbo 提供服务的扫描基础包
+  scan:
+    base-packages: cn.iocoder.mall.systemservice.rpc
+  # Dubbo 服务提供者的配置
+  provider:
+    filter: -exception
+    OAuth2Rpc:
+      version: 1.0.0

user/pom.xml

@@ -15,7 +15,6 @@
 <!--        <module>user-application</module>-->
 <!--        <module>user-service-api</module>-->
 <!--        <module>user-service-impl</module>-->
-        <module>user-application</module>
         <module>user-rest</module>
         <module>user-rpc</module>
         <module>user-rpc-api</module>

user/user-application/src/main/java/cn/iocoder/mall/user/application/UserApplication.java

@@ -1,24 +0,0 @@
-package cn.iocoder.mall.user.application;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.context.config.ConfigFileApplicationListener;
-
-@SpringBootApplication(scanBasePackages = {"cn.iocoder.mall.system"})
-public class UserApplication {
-
-    /**
-     * 设置需要读取的配置文件的名字。
-     * 基于 {@link org.springframework.boot.context.config.ConfigFileApplicationListener#CONFIG_NAME_PROPERTY} 实现。
-     */
-    private static final String CONFIG_NAME_VALUE = "biz,rest,rpc,application";
-
-    public static void main(String[] args) {
-        // 设置环境变量
-        System.setProperty(ConfigFileApplicationListener.CONFIG_NAME_PROPERTY, CONFIG_NAME_VALUE);
-
-        // 启动 Spring Boot 应用
-        SpringApplication.run(UserApplication.class, args);
-    }
-
-}

user/user-application/src/main/resources/application.yaml

@@ -1,8 +0,0 @@
-spring:
-  # Application 的配置项
-  application:
-    name: user-application
-  # Profile 的配置项
-  profiles:
-    active: local
-