From ce960feb014a7f80050787b16c695f777da7e382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A6=8F=E8=B4=A2?= <1471584931@qq.com> Date: Thu, 23 Oct 2025 10:32:46 +0800 Subject: [PATCH] =?UTF-8?q?---=E4=BF=AE=E5=A4=8Dcallservice=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=AD=A3=E5=B8=B8=E8=B0=83=E7=94=A8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- itc-pcitc-demo/itc-pcitc-demo-service/pom.xml | 13 ++++++ .../java/com/xjrsoft/config/AppConfig.java | 31 +++++++++++++ .../module/test/controller/CallTest.java | 35 +++++++++++++++ .../src/main/resources/bootstrap-remote.yml | 45 +++++++++++++++++++ .../src/main/resources/bootstrap.yml | 2 +- .../src/test/java/com/xjrsoft/CallTest.java | 25 +++++++++++ .../target/classes/bootstrap.yml | 2 +- .../common/db/service/CommonCallService.java | 9 ++-- itc-pcitc-mdm/itc-pcitc-mdm-start/pom.xml | 2 +- .../test/java/com/xjrsoft/test/CallTest.java | 5 --- 10 files changed, 157 insertions(+), 12 deletions(-) create mode 100644 itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/config/AppConfig.java create mode 100644 itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/module/test/controller/CallTest.java create mode 100644 itc-pcitc-demo/itc-pcitc-demo-service/src/main/resources/bootstrap-remote.yml create mode 100644 itc-pcitc-demo/itc-pcitc-demo-service/src/test/java/com/xjrsoft/CallTest.java delete mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-start/src/test/java/com/xjrsoft/test/CallTest.java diff --git a/itc-pcitc-demo/itc-pcitc-demo-service/pom.xml b/itc-pcitc-demo/itc-pcitc-demo-service/pom.xml index ccb7ac9..9fceb92 100644 --- a/itc-pcitc-demo/itc-pcitc-demo-service/pom.xml +++ b/itc-pcitc-demo/itc-pcitc-demo-service/pom.xml @@ -64,6 +64,19 @@ ${revision} + + org.springframework.boot + spring-boot-starter-test + test + + + app diff --git a/itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/config/AppConfig.java b/itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/config/AppConfig.java new file mode 100644 index 0000000..236ac41 --- /dev/null +++ b/itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/config/AppConfig.java @@ -0,0 +1,31 @@ +package com.xjrsoft.config; + +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.config.BeanFactoryPostProcessor; +import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; +import org.springframework.beans.factory.support.BeanDefinitionRegistry; +import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor; +import org.springframework.beans.factory.support.DefaultListableBeanFactory; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class AppConfig { + + + @Bean + public static BeanDefinitionRegistryPostProcessor allowCircularReferences() { + return new BeanDefinitionRegistryPostProcessor() { + @Override + public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) { + // 不直接强转 registry，而是在 postProcessBeanFactory 中操作 BeanFactory + } + + @Override + public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) { + // 此处的 beanFactory 一定是 ConfigurableListableBeanFactory 实例 + ((DefaultListableBeanFactory)beanFactory).setAllowCircularReferences(true); + } + }; + } +} diff --git a/itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/module/test/controller/CallTest.java b/itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/module/test/controller/CallTest.java new file mode 100644 index 0000000..f391208 --- /dev/null +++ b/itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/module/test/controller/CallTest.java @@ -0,0 +1,35 @@ +package com.xjrsoft.module.test.controller; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.xjrsoft.common.model.result.R; +import com.xjrsoft.module.common.db.service.CommonCallService; +import com.xjrsoft.module.dev.entity.Testfrom3; +import com.xjrsoft.module.dev.vo.Testfrom3Vo; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.bean.BeanUtil; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("/test/call") +public class CallTest { + + + // 注入待测试的服务 + @Autowired + private CommonCallService callService; + + @GetMapping(value = "/fSave") + @ApiOperation(value="根据id查询Testfrom3信息") + public R info(){ + String out = callService.saveAfter("lng_b_price_term", 12); + System.out.println(out); + return R.ok(null); + } + +} diff --git a/itc-pcitc-demo/itc-pcitc-demo-service/src/main/resources/bootstrap-remote.yml b/itc-pcitc-demo/itc-pcitc-demo-service/src/main/resources/bootstrap-remote.yml new file mode 100644 index 0000000..10a6441 --- /dev/null +++ b/itc-pcitc-demo/itc-pcitc-demo-service/src/main/resources/bootstrap-remote.yml @@ -0,0 +1,45 @@ +spring: + cloud: + nacos: #nacos监控 + config: + server-addr: 47.94.165.164:8848 # nacos 配置中心地址 + namespace: ITC-MS + group: DNE + username: nacos + password: Lng@123 + extension-configs: + - data-id: global-dev.yml + refresh: true + group: DNE + + - data-id: discovery-dev.yml + refresh: true + group: DNE + + - data-id: datasource-dev.yml + refresh: true + group: DNE + + - data-id: seata-dev.yml + refresh: true + group: DNE + + - data-id: redis-dev.yml + refresh: true + group: DNE + + - data-id: magic-api.yml + refresh: true + group: DNE + + - data-id: sa-token.yml + refresh: true + group: DNE + + - data-id: camunda.yml + refresh: true + group: DNE + + - data-id: sentinel-dev.yml + refresh: true + group: DNE \ No newline at end of file diff --git a/itc-pcitc-demo/itc-pcitc-demo-service/src/main/resources/bootstrap.yml b/itc-pcitc-demo/itc-pcitc-demo-service/src/main/resources/bootstrap.yml index d2afbfe..1a9a95d 100644 --- a/itc-pcitc-demo/itc-pcitc-demo-service/src/main/resources/bootstrap.yml +++ b/itc-pcitc-demo/itc-pcitc-demo-service/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ spring: main: allow-bean-definition-overriding: true profiles: - active: dev + active: remote cloud: nacos: #nacos监控 config: diff --git a/itc-pcitc-demo/itc-pcitc-demo-service/src/test/java/com/xjrsoft/CallTest.java b/itc-pcitc-demo/itc-pcitc-demo-service/src/test/java/com/xjrsoft/CallTest.java new file mode 100644 index 0000000..ef888b6 --- /dev/null +++ b/itc-pcitc-demo/itc-pcitc-demo-service/src/test/java/com/xjrsoft/CallTest.java @@ -0,0 +1,25 @@ +package com.xjrsoft; + +import org.junit.jupiter.api.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; +import com.xjrsoft.module.common.db.service.CommonCallService; + +@RunWith(SpringRunner.class) +@SpringBootTest(classes = ITCDemoApplication.class) +public class CallTest { + + // 注入待测试的服务 + @Autowired + private CommonCallService callService; + + + @Test + public void testCallSave() { + String out = callService.saveAfter("Ing_b_price_term", 12); + System.out.println(out); + } + +} diff --git a/itc-pcitc-demo/itc-pcitc-demo-service/target/classes/bootstrap.yml b/itc-pcitc-demo/itc-pcitc-demo-service/target/classes/bootstrap.yml index d2afbfe..1a9a95d 100644 --- a/itc-pcitc-demo/itc-pcitc-demo-service/target/classes/bootstrap.yml +++ b/itc-pcitc-demo/itc-pcitc-demo-service/target/classes/bootstrap.yml @@ -7,7 +7,7 @@ spring: main: allow-bean-definition-overriding: true profiles: - active: dev + active: remote cloud: nacos: #nacos监控 config: diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/common/db/service/CommonCallService.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/common/db/service/CommonCallService.java index 116d037..ce370c8 100644 --- a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/common/db/service/CommonCallService.java +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/common/db/service/CommonCallService.java @@ -4,6 +4,7 @@ import java.util.List; import org.springframework.stereotype.Component; +import com.google.api.client.util.Lists; import com.pictc.jdbc.JdbcTools; import com.pictc.jdbc.model.JdbcParam; import com.pictc.utils.ListUtils; @@ -37,7 +38,7 @@ public class CommonCallService { */ public String saveAfter(String table,long id) { String sql = StringUtils.format("{? = call pc_{0}.f_save(?)}",table); - List params = ListUtils.newArrayList(JdbcParam.ofLong(id)); + List params = Lists.newArrayList(); JdbcParam outParam = JdbcParam.ofString(null).setOut(true); params.add(outParam); params.add(JdbcParam.ofLong(id)); @@ -55,7 +56,7 @@ public class CommonCallService { */ public String deleteBefore(String table,Long id) { String sql = StringUtils.format("{? = call pc_{0}.f_delete(?)}",table); - List params = ListUtils.newArrayList(JdbcParam.ofLong(id)); + List params = Lists.newArrayList(); JdbcParam outParam = JdbcParam.ofString(null).setOut(true); params.add(outParam); params.add(JdbcParam.ofLong(id)); @@ -74,7 +75,7 @@ public class CommonCallService { */ public String disableBefore(String table,Long id) { String sql = StringUtils.format("{? = call pc_{0}.f_off(?)}",table); - List params = ListUtils.newArrayList(JdbcParam.ofLong(id)); + List params = Lists.newArrayList(); JdbcParam outParam = JdbcParam.ofString(null).setOut(true); params.add(outParam); params.add(JdbcParam.ofLong(id)); @@ -92,7 +93,7 @@ public class CommonCallService { */ public String enableBefore(String table,Long id) { String sql = StringUtils.format("{? = call pc_{0}.f_on(?)}",table); - List params = ListUtils.newArrayList(JdbcParam.ofLong(id)); + List params = Lists.newArrayList(); JdbcParam outParam = JdbcParam.ofString(null).setOut(true); params.add(outParam); params.add(JdbcParam.ofLong(id)); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-start/pom.xml b/itc-pcitc-mdm/itc-pcitc-mdm-start/pom.xml index a2e25d9..f966173 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-start/pom.xml +++ b/itc-pcitc-mdm/itc-pcitc-mdm-start/pom.xml @@ -24,7 +24,7 @@ com.geg - itc-ms-system-service + itc-pcitc-mdm-service ${revision} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-start/src/test/java/com/xjrsoft/test/CallTest.java b/itc-pcitc-mdm/itc-pcitc-mdm-start/src/test/java/com/xjrsoft/test/CallTest.java deleted file mode 100644 index 7fca435..0000000 --- a/itc-pcitc-mdm/itc-pcitc-mdm-start/src/test/java/com/xjrsoft/test/CallTest.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.xjrsoft.test; - -public class CallTest { - -}