diff --git a/cloud-auth/src/main/java/com/muyu/auth/form/RegisterBody.java b/cloud-auth/src/main/java/com/muyu/auth/form/RegisterBody.java index 50224fd..d14e4ed 100644 --- a/cloud-auth/src/main/java/com/muyu/auth/form/RegisterBody.java +++ b/cloud-auth/src/main/java/com/muyu/auth/form/RegisterBody.java @@ -21,7 +21,7 @@ public class RegisterBody extends LoginBody { */ private String firmName; /** - * 登录人名称 + * 公司注册人名称 */ private String nickName; /** diff --git a/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java b/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java index 054f6d1..6e669ab 100644 --- a/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java +++ b/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java @@ -132,7 +132,7 @@ public class SysLoginService { sysUser.setUserName(username); //公司邮箱 sysUser.setEmail(registerBody.getEmail()); - //名称 + //公司注册人名称 sysUser.setNickName(registerBody.getNickName()); //公司密码 sysUser.setPassword(SecurityUtils.encryptPassword(password)); diff --git a/cloud-modules/cloud-modules-firmmanage/pom.xml b/cloud-modules/cloud-modules-firmmanage/pom.xml index 1194a9e..325ed67 100644 --- a/cloud-modules/cloud-modules-firmmanage/pom.xml +++ b/cloud-modules/cloud-modules-firmmanage/pom.xml @@ -17,4 +17,89 @@ UTF-8 + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + com.mysql + mysql-connector-j + + + + + com.muyu + cloud-common-datasource + + + + + com.muyu + cloud-common-datascope + + + + + com.muyu + cloud-common-log + + + + + com.muyu + cloud-common-api-doc + + + + com.muyu + cloud-common-rabbit + + + + com.muyu + cloud-common-core + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + + diff --git a/cloud-modules/cloud-modules-firmmanage/src/main/java/com/muyu/Main.java b/cloud-modules/cloud-modules-firmmanage/src/main/java/com/muyu/Main.java deleted file mode 100644 index b958a41..0000000 --- a/cloud-modules/cloud-modules-firmmanage/src/main/java/com/muyu/Main.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.muyu; - -/** - * @Author：weiran - * @Package：com.muyu - * @Project：Default (Template) Project - * @name：${NAME} - * @Date：2024/9/27 12:13 - */ -public class Main { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} diff --git a/cloud-modules/cloud-modules-firmmanage/src/main/java/com/muyu/firmmanage/controller/FirmManageController.java b/cloud-modules/cloud-modules-firmmanage/src/main/java/com/muyu/firmmanage/controller/FirmManageController.java new file mode 100644 index 0000000..0392416 --- /dev/null +++ b/cloud-modules/cloud-modules-firmmanage/src/main/java/com/muyu/firmmanage/controller/FirmManageController.java @@ -0,0 +1,16 @@ +package com.muyu.firmmanage.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Author：weiran + * @Package：com.muyu.firmmanage.controller + * @Project：cloud-server-8 + * @name：FirmManageController + * @Date：2024/9/27 12:27 + */ +@RestController +@RequestMapping("/firmmanage") +public class FirmManageController { +} diff --git a/cloud-modules/cloud-modules-firmmanage/src/main/java/com/muyu/firmmanage/domain/Firm.java b/cloud-modules/cloud-modules-firmmanage/src/main/java/com/muyu/firmmanage/domain/Firm.java new file mode 100644 index 0000000..3421bd3 --- /dev/null +++ b/cloud-modules/cloud-modules-firmmanage/src/main/java/com/muyu/firmmanage/domain/Firm.java @@ -0,0 +1,20 @@ +package com.muyu.firmmanage.domain; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * @Author：weiran + * @Package：com.muyu.firmmanage.domain + * @Project：cloud-server-8 + * @name：Firm + * @Date：2024/9/27 12:29 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +public class Firm { +} diff --git a/cloud-modules/cloud-modules-firmmanage/src/main/java/com/muyu/firmmanage/mapper/FirmManageMapper.java b/cloud-modules/cloud-modules-firmmanage/src/main/java/com/muyu/firmmanage/mapper/FirmManageMapper.java new file mode 100644 index 0000000..f8573ce --- /dev/null +++ b/cloud-modules/cloud-modules-firmmanage/src/main/java/com/muyu/firmmanage/mapper/FirmManageMapper.java @@ -0,0 +1,14 @@ +package com.muyu.firmmanage.mapper; + +import org.apache.ibatis.annotations.Mapper; + +/** + * @Author：weiran + * @Package：com.muyu.firmmanage.mapper + * @Project：cloud-server-8 + * @name：FirmManageMapper + * @Date：2024/9/27 12:28 + */ +@Mapper +public interface FirmManageMapper { +} diff --git a/cloud-modules/cloud-modules-firmmanage/src/main/java/com/muyu/firmmanage/service/FirmManageService.java b/cloud-modules/cloud-modules-firmmanage/src/main/java/com/muyu/firmmanage/service/FirmManageService.java new file mode 100644 index 0000000..d277dcc --- /dev/null +++ b/cloud-modules/cloud-modules-firmmanage/src/main/java/com/muyu/firmmanage/service/FirmManageService.java @@ -0,0 +1,11 @@ +package com.muyu.firmmanage.service; + +/** + * @Author：weiran + * @Package：com.muyu.firmmanage.service + * @Project：cloud-server-8 + * @name：FirmManageService + * @Date：2024/9/27 12:28 + */ +public interface FirmManageService { +} diff --git a/cloud-modules/cloud-modules-firmmanage/src/main/java/com/muyu/firmmanage/service/impl/FirmManageServiceImpl.java b/cloud-modules/cloud-modules-firmmanage/src/main/java/com/muyu/firmmanage/service/impl/FirmManageServiceImpl.java new file mode 100644 index 0000000..1c84c75 --- /dev/null +++ b/cloud-modules/cloud-modules-firmmanage/src/main/java/com/muyu/firmmanage/service/impl/FirmManageServiceImpl.java @@ -0,0 +1,15 @@ +package com.muyu.firmmanage.service.impl; + +import com.muyu.firmmanage.service.FirmManageService; +import org.springframework.stereotype.Service; + +/** + * @Author：weiran + * @Package：com.muyu.firmmanage.service.impl + * @Project：cloud-server-8 + * @name：FirmManageServiceImpl + * @Date：2024/9/27 12:28 + */ +@Service +public class FirmManageServiceImpl implements FirmManageService { +} diff --git a/cloud-modules/cloud-modules-firmmanage/src/main/resources/banner.txt b/cloud-modules/cloud-modules-firmmanage/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/cloud-modules/cloud-modules-firmmanage/src/main/resources/banner.txt @@ -0,0 +1,2 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} diff --git a/cloud-modules/cloud-modules-firmmanage/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-firmmanage/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..4a296f6 --- /dev/null +++ b/cloud-modules/cloud-modules-firmmanage/src/main/resources/bootstrap.yml @@ -0,0 +1,59 @@ +# Tomcat +server: + port: 9701 + +nacos: + addr: 159.75.188.178:8848 + user-name: nacos + password: nacos + namespace: weiran +# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all +# Spring +spring: + amqp: + deserialization: + trust: + all: true + main: + allow-bean-definition-overriding: true + application: + # 应用名称 + name: cloud-firmmanage + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: ${nacos.addr} + # nacos用户名 + username: ${nacos.user-name} + # nacos密码 + password: ${nacos.password} + # 命名空间 + namespace: ${nacos.namespace} + config: + # 服务注册地址 + server-addr: ${nacos.addr} + # nacos用户名 + username: ${nacos.user-name} + # nacos密码 + password: ${nacos.password} + # 命名空间 + namespace: ${nacos.namespace} + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + # 系统共享配置 + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + # 系统环境Config共享配置 + - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + # xxl-job 配置文件 + - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + # rabbit 配置文件 + - application-rabbit-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + com.muyu.system.mapper: DEBUG diff --git a/cloud-modules/cloud-modules-firmmanage/src/main/resources/logback/dev.xml b/cloud-modules/cloud-modules-firmmanage/src/main/resources/logback/dev.xml new file mode 100644 index 0000000..8ae6fa7 --- /dev/null +++ b/cloud-modules/cloud-modules-firmmanage/src/main/resources/logback/dev.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + diff --git a/cloud-modules/cloud-modules-firmmanage/src/main/resources/logback/prod.xml b/cloud-modules/cloud-modules-firmmanage/src/main/resources/logback/prod.xml new file mode 100644 index 0000000..5be0a23 --- /dev/null +++ b/cloud-modules/cloud-modules-firmmanage/src/main/resources/logback/prod.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + ${log.sky.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + + + ERROR + + ACCEPT + + DENY + + + + + + + + ${log.sky.pattern} + + + + + + + + + + + + + + + + + + + + diff --git a/cloud-modules/cloud-modules-firmmanage/src/main/resources/logback/test.xml b/cloud-modules/cloud-modules-firmmanage/src/main/resources/logback/test.xml new file mode 100644 index 0000000..5be0a23 --- /dev/null +++ b/cloud-modules/cloud-modules-firmmanage/src/main/resources/logback/test.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + ${log.sky.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + + + ERROR + + ACCEPT + + DENY + + + + + + + + ${log.sky.pattern} + + + + + + + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index eca4fe7..0655a47 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,14 @@ + + + com.muyu + cloud-common-saas + 3.6.3 + + org.springframework.boot