From f9e8cc1f0d2a2b3d03253597b0a312b2de4cb925 Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Sat, 8 Feb 2025 10:01:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=20pom=20=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 17 ++++++++++++ .../src/main/resources/application.yml | 2 ++ cash-api/pom.xml | 27 +++++++++++++++++++ cash-api/system-server/pom.xml | 6 ++++- .../main/java/com/czg/SystemApplication.java | 4 +++ .../src/main/resources/application-dev.yml | 17 ++++++++++++ .../src/main/resources/application.yml | 4 ++- .../main/java/com/czg/group/InsertGroup.java | 7 +++++ .../main/java/com/czg/group/UpdateGroup.java | 7 +++++ cash-dependencies/pom.xml | 1 + cash-service/account-service/pom.xml | 6 +---- cash-service/pom.xml | 6 +++++ cash-service/system-service/pom.xml | 6 +---- .../czg/service/system/dto/SysParamsDTO.java | 15 +++++++++++ .../system/service/SysParamsService.java | 15 +++++++++++ pom.xml | 24 +++-------------- 16 files changed, 131 insertions(+), 33 deletions(-) create mode 100644 cash-api/account-server/src/main/resources/application-dev.yml create mode 100644 cash-api/system-server/src/main/resources/application-dev.yml create mode 100644 cash-common/cash-common-tools/src/main/java/com/czg/group/InsertGroup.java create mode 100644 cash-common/cash-common-tools/src/main/java/com/czg/group/UpdateGroup.java create mode 100644 cash-service/system-service/src/main/java/com/czg/service/system/dto/SysParamsDTO.java diff --git a/cash-api/account-server/src/main/resources/application-dev.yml b/cash-api/account-server/src/main/resources/application-dev.yml new file mode 100644 index 000000000..684554888 --- /dev/null +++ b/cash-api/account-server/src/main/resources/application-dev.yml @@ -0,0 +1,17 @@ + +spring: + cloud: + nacos: + config: + bootstrap: + enabled: true + data-id: account-server + group: DEFAULT_GROUP + auto-refresh: true + server-addr: 101.37.12.135:8848 + namespace: 237e1905-0a66-4375-9bb6-a51c3c034aca + file-extension: yaml + discovery: + server-addr: 101.37.12.135:8848 + namespace: 237e1905-0a66-4375-9bb6-a51c3c034aca + diff --git a/cash-api/account-server/src/main/resources/application.yml b/cash-api/account-server/src/main/resources/application.yml index 464199ad2..13cc14c72 100644 --- a/cash-api/account-server/src/main/resources/application.yml +++ b/cash-api/account-server/src/main/resources/application.yml @@ -6,6 +6,8 @@ server: spring: application: name: account-server + profiles: + active: dev logging: config: classpath:logback.xml diff --git a/cash-api/pom.xml b/cash-api/pom.xml index d6a56ea08..580100f30 100644 --- a/cash-api/pom.xml +++ b/cash-api/pom.xml @@ -30,5 +30,32 @@ org.springframework.boot spring-boot-starter-web + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + 2023.0.3.2 + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + 2023.0.3.2 + + + + org.springframework.cloud + spring-cloud-starter-bootstrap + 4.1.4 + + + + org.springframework.cloud + spring-cloud-starter-openfeign + 4.2.0 + + diff --git a/cash-api/system-server/pom.xml b/cash-api/system-server/pom.xml index fca4daea0..0fa0c866f 100644 --- a/cash-api/system-server/pom.xml +++ b/cash-api/system-server/pom.xml @@ -18,4 +18,8 @@ UTF-8 - \ No newline at end of file + + + + + diff --git a/cash-api/system-server/src/main/java/com/czg/SystemApplication.java b/cash-api/system-server/src/main/java/com/czg/SystemApplication.java index 0954627c2..150c80001 100644 --- a/cash-api/system-server/src/main/java/com/czg/SystemApplication.java +++ b/cash-api/system-server/src/main/java/com/czg/SystemApplication.java @@ -2,11 +2,15 @@ package com.czg; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.openfeign.EnableFeignClients; /** * @author ww */ @SpringBootApplication +@EnableDiscoveryClient +@EnableFeignClients public class SystemApplication { public static void main(String[] args) { diff --git a/cash-api/system-server/src/main/resources/application-dev.yml b/cash-api/system-server/src/main/resources/application-dev.yml new file mode 100644 index 000000000..12f54f758 --- /dev/null +++ b/cash-api/system-server/src/main/resources/application-dev.yml @@ -0,0 +1,17 @@ + +spring: + cloud: + nacos: + config: + bootstrap: + enabled: true + data-id: system-server + group: DEFAULT_GROUP + auto-refresh: true + server-addr: 101.37.12.135:8848 + namespace: 237e1905-0a66-4375-9bb6-a51c3c034aca + file-extension: yaml + discovery: + server-addr: 101.37.12.135:8848 + namespace: 237e1905-0a66-4375-9bb6-a51c3c034aca + diff --git a/cash-api/system-server/src/main/resources/application.yml b/cash-api/system-server/src/main/resources/application.yml index b6e8d2a0c..66edd8e23 100644 --- a/cash-api/system-server/src/main/resources/application.yml +++ b/cash-api/system-server/src/main/resources/application.yml @@ -4,6 +4,8 @@ server: spring: application: name: system-server + profiles: + active: dev logging: - config: classpath:logback.xml \ No newline at end of file + config: classpath:logback.xml diff --git a/cash-common/cash-common-tools/src/main/java/com/czg/group/InsertGroup.java b/cash-common/cash-common-tools/src/main/java/com/czg/group/InsertGroup.java new file mode 100644 index 000000000..f0f55dae2 --- /dev/null +++ b/cash-common/cash-common-tools/src/main/java/com/czg/group/InsertGroup.java @@ -0,0 +1,7 @@ +package com.czg.group; + +/** + * @author GYJoker + */ +public interface InsertGroup { +} diff --git a/cash-common/cash-common-tools/src/main/java/com/czg/group/UpdateGroup.java b/cash-common/cash-common-tools/src/main/java/com/czg/group/UpdateGroup.java new file mode 100644 index 000000000..68d5b4789 --- /dev/null +++ b/cash-common/cash-common-tools/src/main/java/com/czg/group/UpdateGroup.java @@ -0,0 +1,7 @@ +package com.czg.group; + +/** + * @author GYJoker + */ +public interface UpdateGroup { +} diff --git a/cash-dependencies/pom.xml b/cash-dependencies/pom.xml index 79f60c893..42e785d97 100644 --- a/cash-dependencies/pom.xml +++ b/cash-dependencies/pom.xml @@ -78,6 +78,7 @@ fastjson2 ${fastjson2.version} + diff --git a/cash-service/account-service/pom.xml b/cash-service/account-service/pom.xml index b862208a0..ed5318cc7 100644 --- a/cash-service/account-service/pom.xml +++ b/cash-service/account-service/pom.xml @@ -18,11 +18,7 @@ - - com.czg - cash-common-sa-token - 1.0.0 - + diff --git a/cash-service/pom.xml b/cash-service/pom.xml index 11288da73..f32a3130f 100644 --- a/cash-service/pom.xml +++ b/cash-service/pom.xml @@ -34,6 +34,12 @@ 1.0.0 + + com.czg + cash-common-sa-token + 1.0.0 + + com.mybatis-flex mybatis-flex-spring-boot3-starter diff --git a/cash-service/system-service/pom.xml b/cash-service/system-service/pom.xml index 3a69d427e..ff1c05dd7 100644 --- a/cash-service/system-service/pom.xml +++ b/cash-service/system-service/pom.xml @@ -17,11 +17,7 @@ UTF-8 - - org.projectlombok - lombok - provided - + diff --git a/cash-service/system-service/src/main/java/com/czg/service/system/dto/SysParamsDTO.java b/cash-service/system-service/src/main/java/com/czg/service/system/dto/SysParamsDTO.java new file mode 100644 index 000000000..b9103da1f --- /dev/null +++ b/cash-service/system-service/src/main/java/com/czg/service/system/dto/SysParamsDTO.java @@ -0,0 +1,15 @@ +package com.czg.service.system.dto; + +import lombok.Data; + +/** + * @author GYJoker + */ +@Data +public class SysParamsDTO { + private Long id; + private String paramCode; + private String paramValue; + private String paramType; + private String remark; +} diff --git a/cash-service/system-service/src/main/java/com/czg/service/system/service/SysParamsService.java b/cash-service/system-service/src/main/java/com/czg/service/system/service/SysParamsService.java index 9908762bb..27e584a1b 100644 --- a/cash-service/system-service/src/main/java/com/czg/service/system/service/SysParamsService.java +++ b/cash-service/system-service/src/main/java/com/czg/service/system/service/SysParamsService.java @@ -1,5 +1,7 @@ package com.czg.service.system.service; +import com.czg.resp.CzgResult; +import com.czg.service.system.dto.SysParamsDTO; import com.mybatisflex.core.service.IService; import com.czg.service.system.entity.SysParams; @@ -11,4 +13,17 @@ import com.czg.service.system.entity.SysParams; */ public interface SysParamsService extends IService { + /** + * 新增参数 + * @param paramsDTO 参数 + * @return 新增结果 + */ + CzgResult insertParams(SysParamsDTO paramsDTO); + + /** + * 修改参数 + * @param paramsDTO 参数 + * @return 修改结果 + */ + CzgResult updateParams(SysParamsDTO paramsDTO); } diff --git a/pom.xml b/pom.xml index dcf2df845..9d142fbac 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ 陕西超掌柜科技有限公司 - http://www.sxczgkj.com + https://www.sxczgkj.cn @@ -94,26 +94,8 @@ --> - - com.github.whvcse - easy-captcha - 1.6.2 - - - org.projectlombok - lombok - 1.18.22 - - - com.alibaba - druid-spring-boot-3-starter - 1.2.23 - - - com.alibaba.fastjson2 - fastjson2 - 2.0.54 - + +