From f8c25d1fab78aa4e0a6bdb10f91e61698af434c4 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 01 七月 2022 14:34:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/DemoInfoService.java | 7
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/entity/TestTable.java | 33 +++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/DemoInfoServiceImpl.java | 9
safePlatfrom-out-web/src/main/resources/config/application-prod.yaml | 12
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/DemoInfo.java | 34 +++
safePlatfrom-out-web/src/main/resources/config/application-dev.yaml | 16 +
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/service/impl/DemoServiceImpl.java | 38 ++++
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigGoalManage.java | 75 ++++++++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/Test.java | 11 +
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DataSourceConfig.java | 10
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/DemoServiceImpl.java | 19 +
/dev/null | 60 ------
emergency/emergency-service/src/main/resource/mapper/emergency/DemoInfoRepository.xml | 6
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/DemoService.java | 5
goal-manage/goal-manage-service/src/main/resources/config/mapper/goalManage/TestTableRepository.xml | 13 +
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/repository/TestTableRepository.java | 9 +
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigEmergency.java | 75 ++++++++
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/service/baseService/impl/TestTableServiceImpl.java | 15 +
safePlatfrom-out-web/pom.xml | 5
safePlatfrom-out-web/src/main/resources/config/application-test.yaml | 18 +-
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/DemoInfoRepository.java | 7
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/controller/DemoController.java | 12 +
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/service/baseService/TestTableService.java | 8
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/service/DemoService.java | 8
24 files changed, 407 insertions(+), 98 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/Test.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/Test.java
index 9cc6852..d26310d 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/Test.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/Test.java
@@ -1,9 +1,11 @@
package com.gkhy.safePlatform.emergency.controller;
import com.gkhy.safePlatform.account.rpc.apimodel.UserAccountService;
+import com.gkhy.safePlatform.emergency.service.DemoService;
import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
@@ -15,12 +17,17 @@
@DubboReference(check = false)
private UserAccountService userAccountService;
-// private Logger logger = LogManager.getLogger(Test.class);
-
+ @Autowired
+ private DemoService demoService;
@RequestMapping(value = "/t/rpc",method = RequestMethod.GET)
public Object testRpc(String id){
String resp = userAccountService.sayName(id);
return resp;
}
+
+ @RequestMapping(value = "/t/get",method = RequestMethod.GET)
+ public Object testEmergencyGetById(Long id){
+ return demoService.getById(id);
+ }
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/DemoInfo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/DemoInfo.java
index 39166be..0294c35 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/DemoInfo.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/DemoInfo.java
@@ -1,13 +1,43 @@
package com.gkhy.safePlatform.emergency.entity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
import java.util.Date;
-@TableName("demo")
-public class DemoInfo {
+@TableName("demo_table")
+public class DemoInfo implements Serializable {
+
+ @TableId(type = IdType.AUTO)
+ private Long id;
private String name;
private Date gmtCreate;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Date getGmtCreate() {
+ return gmtCreate;
+ }
+
+ public void setGmtCreate(Date gmtCreate) {
+ this.gmtCreate = gmtCreate;
+ }
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/DemoInfoRepository.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/DemoInfoRepository.java
index f3b3747..659fb42 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/DemoInfoRepository.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/DemoInfoRepository.java
@@ -1,4 +1,9 @@
package com.gkhy.safePlatform.emergency.repository;
-public interface DemoInfoRepository {
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gkhy.safePlatform.emergency.entity.DemoInfo;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface DemoInfoRepository extends BaseMapper<DemoInfo> {
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/DemoService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/DemoService.java
index e26d4ff..54975dd 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/DemoService.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/DemoService.java
@@ -1,10 +1,11 @@
package com.gkhy.safePlatform.emergency.service;
+import com.gkhy.safePlatform.commons.vo.ResultVO;
+import com.gkhy.safePlatform.emergency.entity.DemoInfo;
import org.springframework.beans.factory.annotation.Autowired;
public interface DemoService {
-
-
+ ResultVO<DemoInfo> getById(Long id);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/DemoInfoService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/DemoInfoService.java
index 389292f..71c4f5b 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/DemoInfoService.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/DemoInfoService.java
@@ -1,6 +1,9 @@
package com.gkhy.safePlatform.emergency.service.baseService;
-public interface DemoInfoService {
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gkhy.safePlatform.emergency.entity.DemoInfo;
+import org.springframework.stereotype.Repository;
-// DO
+public interface DemoInfoService extends IService<DemoInfo> {
+
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/DemoInfoServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/DemoInfoServiceImpl.java
index 32b1aa0..47d5511 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/DemoInfoServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/DemoInfoServiceImpl.java
@@ -1,8 +1,15 @@
package com.gkhy.safePlatform.emergency.service.baseService.impl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gkhy.safePlatform.emergency.entity.DemoInfo;
+import com.gkhy.safePlatform.emergency.repository.DemoInfoRepository;
import com.gkhy.safePlatform.emergency.service.baseService.DemoInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service("demoInfoService")
-public class DemoInfoServiceImpl implements DemoInfoService {
+public class DemoInfoServiceImpl extends ServiceImpl<DemoInfoRepository, DemoInfo> implements DemoInfoService {
+
+ @Autowired
+ private DemoInfoRepository demoInfoRepository;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/DemoServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/DemoServiceImpl.java
index 0c2014f..16c5b6b 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/DemoServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/DemoServiceImpl.java
@@ -1,5 +1,8 @@
package com.gkhy.safePlatform.emergency.service.impl;
+import com.gkhy.safePlatform.commons.enums.ResultCodes;
+import com.gkhy.safePlatform.commons.vo.ResultVO;
+import com.gkhy.safePlatform.emergency.entity.DemoInfo;
import com.gkhy.safePlatform.emergency.service.DemoService;
import com.gkhy.safePlatform.emergency.service.baseService.DemoInfoService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -10,9 +13,17 @@
@Autowired
private DemoInfoService demoInfoService;
- // 1
- //2
-
- //返回的都是dto 到controller
+ @Override
+ public ResultVO<DemoInfo> getById(Long id) {
+ ResultVO<DemoInfo> resultVO = new ResultVO<>();
+ DemoInfo demoInfo = demoInfoService.getById(id);
+ if(demoInfo != null && demoInfo.getId() > 0){
+ resultVO.setCode(ResultCodes.OK.getCode());
+ resultVO.setData(demoInfo);
+ }else {
+ resultVO.setCode(ResultCodes.OK.getCode());
+ }
+ return resultVO;
+ }
}
diff --git a/emergency/emergency-service/src/main/resource/mapper/emergency/DemoInfoRepository.xml b/emergency/emergency-service/src/main/resource/mapper/emergency/DemoInfoRepository.xml
index ad16d78..37ba791 100644
--- a/emergency/emergency-service/src/main/resource/mapper/emergency/DemoInfoRepository.xml
+++ b/emergency/emergency-service/src/main/resource/mapper/emergency/DemoInfoRepository.xml
@@ -4,8 +4,10 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gkhy.safePlatform.emergency.repository.DemoInfoRepository">
- <resultMap type="DemoInfoDo" id="DemoInfoDoResult">
- <result property="eventId" column="event_id" />
+ <resultMap type="com.gkhy.safePlatform.emergency.entity.DemoInfo" id="DemoInfoResult">
+ <id column="id" property="id" jdbcType="BIGINT"/>
+ <result column="name" property="name" jdbcType="VARCHAR"/>
+ <result column="gmt_create" property="gmtCreate" jdbcType="TIMESTAMP"/>
</resultMap>
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/controller/DemoController.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/controller/DemoController.java
index b9ab4dc..71df661 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/controller/DemoController.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/controller/DemoController.java
@@ -17,4 +17,16 @@
public Object testRpc(String name,String email){
return demoService.getUserDescInfo(name,email);
}
+
+ @RequestMapping(value = "/test/get",method = RequestMethod.GET)
+ public Object testDataSourceGet(Long id){
+ return demoService.getById(id);
+ }
+
+ @RequestMapping(value = "/test/save",method = RequestMethod.GET)
+ public Object testDataSourceSave(String title){
+ return demoService.saveOne(title);
+ }
+
+
}
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/entity/TestTable.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/entity/TestTable.java
new file mode 100644
index 0000000..497c0c7
--- /dev/null
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/entity/TestTable.java
@@ -0,0 +1,33 @@
+package com.gkhy.safePlatform.goalManage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@TableName("test_table")
+public class TestTable implements Serializable {
+
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ private String title;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+}
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/repository/TestTableRepository.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/repository/TestTableRepository.java
new file mode 100644
index 0000000..77b76b0
--- /dev/null
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/repository/TestTableRepository.java
@@ -0,0 +1,9 @@
+package com.gkhy.safePlatform.goalManage.repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gkhy.safePlatform.goalManage.entity.TestTable;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface TestTableRepository extends BaseMapper<TestTable> {
+}
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/service/DemoService.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/service/DemoService.java
index 02c1f5d..ef772d4 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/service/DemoService.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/service/DemoService.java
@@ -1,6 +1,14 @@
package com.gkhy.safePlatform.goalManage.service;
+import com.gkhy.safePlatform.commons.vo.ResultVO;
+import com.gkhy.safePlatform.goalManage.entity.TestTable;
+
public interface DemoService {
String getUserDescInfo(String name,String email);
+
+ ResultVO<TestTable> getById(Long id);
+
+ ResultVO<TestTable> saveOne(String title);
+
}
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/service/baseService/TestTableService.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/service/baseService/TestTableService.java
new file mode 100644
index 0000000..9168657
--- /dev/null
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/service/baseService/TestTableService.java
@@ -0,0 +1,8 @@
+package com.gkhy.safePlatform.goalManage.service.baseService;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gkhy.safePlatform.goalManage.entity.TestTable;
+
+public interface TestTableService extends IService<TestTable> {
+
+}
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/service/baseService/impl/TestTableServiceImpl.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/service/baseService/impl/TestTableServiceImpl.java
new file mode 100644
index 0000000..f9220f4
--- /dev/null
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/service/baseService/impl/TestTableServiceImpl.java
@@ -0,0 +1,15 @@
+package com.gkhy.safePlatform.goalManage.service.baseService.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gkhy.safePlatform.goalManage.entity.TestTable;
+import com.gkhy.safePlatform.goalManage.repository.TestTableRepository;
+import com.gkhy.safePlatform.goalManage.service.baseService.TestTableService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service("testTableService")
+public class TestTableServiceImpl extends ServiceImpl<TestTableRepository, TestTable> implements TestTableService {
+
+ @Autowired
+ private TestTableRepository testTableRepository;
+}
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/service/impl/DemoServiceImpl.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/service/impl/DemoServiceImpl.java
index ab7644e..b4dccbc 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/service/impl/DemoServiceImpl.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/service/impl/DemoServiceImpl.java
@@ -1,9 +1,14 @@
package com.gkhy.safePlatform.goalManage.service.impl;
+import com.gkhy.safePlatform.commons.enums.ResultCodes;
+import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.emergency.rpc.api.EmergencyDemoRpcAPi;
import com.gkhy.safePlatform.emergency.rpc.api.model.User;
+import com.gkhy.safePlatform.goalManage.entity.TestTable;
import com.gkhy.safePlatform.goalManage.service.DemoService;
+import com.gkhy.safePlatform.goalManage.service.baseService.TestTableService;
import org.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
@@ -12,6 +17,9 @@
@DubboReference(check = false)
private EmergencyDemoRpcAPi emergencyDemoRpcProvider;
+ @Autowired
+ private TestTableService testTableService;
+
@Override
public String getUserDescInfo(String name, String email) {
User user = new User();
@@ -19,4 +27,34 @@
user.setEmail(email);
return emergencyDemoRpcProvider.sayHello(user);
}
+
+ @Override
+ public ResultVO<TestTable> getById(Long id) {
+ ResultVO<TestTable> resultVO = new ResultVO<>();
+ TestTable testTableInfo = testTableService.getById(id);
+ if(testTableInfo != null){
+ resultVO.setCode(ResultCodes.OK.getCode());
+ resultVO.setData(testTableInfo);
+ }else {
+ resultVO.setCode(ResultCodes.OK.getCode());
+ }
+ return resultVO;
+ }
+
+ @Override
+ public ResultVO<TestTable> saveOne(String title) {
+ ResultVO<TestTable> resultVO = new ResultVO<>();
+ TestTable testTable = new TestTable();
+ if(title == null || title.isEmpty() || title.trim().isEmpty()){
+ resultVO.setCode(ResultCodes.SERVER_PARAM_NULL.getCode());
+ }else {
+ testTable.setTitle(title);
+ if(testTableService.save(testTable)){
+ resultVO.setCode(ResultCodes.OK.getCode());
+ }else {
+ resultVO.setCode(ResultCodes.SERVER_UPDATE_ERROR.getCode());
+ }
+ }
+ return resultVO;
+ }
}
diff --git a/goal-manage/goal-manage-service/src/main/resources/config/mapper/goalManage/TestTableRepository.xml b/goal-manage/goal-manage-service/src/main/resources/config/mapper/goalManage/TestTableRepository.xml
new file mode 100644
index 0000000..614dd2e
--- /dev/null
+++ b/goal-manage/goal-manage-service/src/main/resources/config/mapper/goalManage/TestTableRepository.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gkhy.safePlatform.goalManage.entity.TestTable">
+
+ <resultMap id="TestTableMap" type="com.gkhy.safePlatform.goalManage.entity.TestTable">
+ <id column="id" property="id" jdbcType="BIGINT"/>
+ <result property="title" column="title"/>
+ </resultMap>
+
+
+</mapper>
diff --git a/safePlatfrom-out-web/pom.xml b/safePlatfrom-out-web/pom.xml
index 5ff1ebe..2d7cea8 100644
--- a/safePlatfrom-out-web/pom.xml
+++ b/safePlatfrom-out-web/pom.xml
@@ -33,6 +33,11 @@
<artifactId>goal-manage-service</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>com.gkhy.safePlatfrom</groupId>
+ <artifactId>goal-manage-rpc-provider</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DataSourceConfig.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DataSourceConfig.java
index 9b511fb..159f486 100644
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DataSourceConfig.java
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DataSourceConfig.java
@@ -16,8 +16,14 @@
public class DataSourceConfig {
@Bean
- @ConfigurationProperties("spring.datasource.one")
- DataSource dsOne(){
+ @ConfigurationProperties("spring.datasource.goalmanage")
+ DataSource dsGoalManage(){
+ return DruidDataSourceBuilder.create().build();
+ }
+
+ @Bean
+ @ConfigurationProperties("spring.datasource.emergency")
+ DataSource dsEmergency(){
return DruidDataSourceBuilder.create().build();
}
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigEmergency.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigEmergency.java
new file mode 100644
index 0000000..685c3a7
--- /dev/null
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigEmergency.java
@@ -0,0 +1,75 @@
+package com.gkhy.safePlatform.config.database;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+import org.apache.ibatis.plugin.Interceptor;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionTemplate;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.stereotype.Repository;
+
+import javax.sql.DataSource;
+import java.util.ArrayList;
+import java.util.Arrays;
+
+@Configuration
+@MapperScan(basePackages = {"com.gkhy.safePlatform.emergency","com.gkhy.safePlatform.emergency"},
+ sqlSessionTemplateRef = "sqlTemplateEmergency",annotationClass =
+ Repository.class)
+public class MyBatisConfigEmergency {
+
+ @Autowired
+ @Qualifier("dsEmergency")
+ DataSource dsEmergency;
+
+ @Autowired
+ private MybatisPlusInterceptor mybatisPlusInterceptor;
+
+ @Bean(name = "datasourceEmergency")
+ @ConfigurationProperties(prefix = "spring.datasource.emergency")
+ public DruidDataSource druidDataSourceA(){
+ return DruidDataSourceBuilder.create().build();
+ }
+
+ @Bean(name = "sqlFactoryEmergency")
+ public SqlSessionFactory sqlSessionFactory(@Qualifier("datasourceEmergency") DruidDataSource dataSource)
+ throws Exception
+ {
+ MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean();
+ factoryBean.setDataSource(dataSource);
+ ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
+
+ //-------------------
+ Resource[] rs1 = resolver.getResources("classpath*:config/mapper/emergency/**Mapper.xml");
+// Resource[] rs2 = resolver.getResources("classpath*:config/mapper/goalManage/**Mapper.xml");
+ ArrayList<Resource> resourceArrayList = new ArrayList<>(Arrays.asList(rs1));
+// resourceArrayList.addAll(new ArrayList<>(Arrays.asList(rs2)));
+ Resource[] resourceArray = new Resource[resourceArrayList.size()];
+ resourceArrayList.toArray(resourceArray);
+ factoryBean.setMapperLocations(resourceArray);
+ //-------------------
+
+// factoryBean.setMapperLocations(resolver.getResources("classpath*:config/mapper/**/**Mapper.xml"));
+ //设置分页插件
+ Interceptor[] plugins = {mybatisPlusInterceptor};
+ factoryBean.setPlugins(plugins);
+ return factoryBean.getObject();
+ }
+
+ @Bean(name = "sqlTemplateEmergency")
+ public SqlSessionTemplate sqlSessionTemplate(@Qualifier("sqlFactoryEmergency") SqlSessionFactory sqlSessionFactory)
+ {
+ return new SqlSessionTemplate(sqlSessionFactory);
+ }
+
+}
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigGoalManage.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigGoalManage.java
new file mode 100644
index 0000000..cb05d9e
--- /dev/null
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigGoalManage.java
@@ -0,0 +1,75 @@
+package com.gkhy.safePlatform.config.database;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+import org.apache.ibatis.plugin.Interceptor;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionTemplate;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.stereotype.Repository;
+
+import javax.sql.DataSource;
+import java.util.ArrayList;
+import java.util.Arrays;
+
+@Configuration
+@MapperScan(basePackages = {"com.gkhy.safePlatform.goalManage"},
+ sqlSessionTemplateRef = "sqlTemplateGoalManage",annotationClass =
+ Repository.class)
+public class MyBatisConfigGoalManage {
+
+ @Autowired
+ @Qualifier("dsGoalManage")
+ DataSource dsGoalManage;
+
+ @Autowired
+ private MybatisPlusInterceptor mybatisPlusInterceptor;
+
+ @Bean(name = "dataSourceGoalManage")
+ @ConfigurationProperties(prefix = "spring.datasource.goalmanage")
+ public DruidDataSource dataSourceGoalManage(){
+ return DruidDataSourceBuilder.create().build();
+ }
+
+ @Bean(name = "sqlFactoryGoalManage")
+ public SqlSessionFactory sqlSessionFactory(@Qualifier("dataSourceGoalManage") DruidDataSource dataSource)
+ throws Exception
+ {
+ MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean();
+ factoryBean.setDataSource(dataSource);
+ ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
+
+ //-------------------
+ Resource[] rs1 = resolver.getResources("classpath*:config/mapper/goalManage/**Mapper.xml");
+// Resource[] rs2 = resolver.getResources("classpath*:config/mapper/goalManage/**Mapper.xml");
+ ArrayList<Resource> resourceArrayList = new ArrayList<>(Arrays.asList(rs1));
+// resourceArrayList.addAll(new ArrayList<>(Arrays.asList(rs2)));
+ Resource[] resourceArray = new Resource[resourceArrayList.size()];
+ resourceArrayList.toArray(resourceArray);
+ factoryBean.setMapperLocations(resourceArray);
+ //-------------------
+
+// factoryBean.setMapperLocations(resolver.getResources("classpath*:config/mapper/**/**Mapper.xml"));
+ //设置分页插件
+ Interceptor[] plugins = {mybatisPlusInterceptor};
+ factoryBean.setPlugins(plugins);
+ return factoryBean.getObject();
+ }
+
+ @Bean(name = "sqlTemplateGoalManage")
+ public SqlSessionTemplate sqlSessionTemplate(@Qualifier("sqlFactoryGoalManage") SqlSessionFactory sqlSessionFactory)
+ {
+ return new SqlSessionTemplate(sqlSessionFactory);
+ }
+
+}
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigOne.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigOne.java
deleted file mode 100644
index df4e0b5..0000000
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigOne.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.gkhy.safePlatform.config.database;
-
-import com.alibaba.druid.pool.DruidDataSource;
-import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
-import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
-import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
-import org.apache.ibatis.plugin.Interceptor;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.mybatis.spring.SqlSessionTemplate;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-import org.springframework.core.io.support.ResourcePatternResolver;
-import org.springframework.stereotype.Repository;
-
-import javax.sql.DataSource;
-
-@Configuration
-@MapperScan(basePackages = "com.gkhy.safePlatform",sqlSessionTemplateRef = "sqlTemplate1",annotationClass =
- Repository.class)
-public class MyBatisConfigOne {
-
- @Autowired
- @Qualifier("dsOne")
- DataSource dsOne;
-
- @Autowired
- private MybatisPlusInterceptor mybatisPlusInterceptor;
-
- @Bean(name = "datasource1")
- @ConfigurationProperties(prefix = "spring.datasource.one")
- public DruidDataSource druidDataSourceA(){
- return DruidDataSourceBuilder.create().build();
- }
-
- @Bean(name = "sqlFactory1")
- public SqlSessionFactory sqlSessionFactory(@Qualifier("datasource1") DruidDataSource dataSource)
- throws Exception
- {
- MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean();
- factoryBean.setDataSource(dataSource);
- ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
- factoryBean.setMapperLocations(resolver.getResources("classpath*:config/mapper/**/**Mapper.xml"));
- //设置分页插件
- Interceptor[] plugins = {mybatisPlusInterceptor};
- factoryBean.setPlugins(plugins);
- return factoryBean.getObject();
- }
-
- @Bean(name = "sqlTemplate1")
- public SqlSessionTemplate sqlSessionTemplate(@Qualifier("sqlFactory1") SqlSessionFactory sqlSessionFactory)
- {
- return new SqlSessionTemplate(sqlSessionFactory);
- }
-
-}
diff --git a/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml b/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml
index 4279034..8449e89 100644
--- a/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml
+++ b/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml
@@ -9,11 +9,17 @@
# mysql
spring:
datasource:
- one:
+ emergency:
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://twt.sinanoaq.com:13306/zhongtai.demo?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
- username: root
- password: Sinanoaq#415
+ url: jdbc:mysql://192.168.0.52:3306/safeplatform.emergency.dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ username: gkhy_dev_out_team
+ password: Adsdf675T6AC7yga
+ type: com.alibaba.druid.pool.DruidDataSource
+ goalmanage:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://192.168.0.52:3306/safeplatform.goalmanage.dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ username: gkhy_dev_out_team
+ password: Adsdf675T6AC7yga
type: com.alibaba.druid.pool.DruidDataSource
@@ -26,7 +32,7 @@
protocol: nacos
address: nacos://192.168.0.52:8848?namespace=e07a2454-136b-4498-99eb-09dae3336ebe&username=gkhy_safeplatform_out&password=9485uyJHISes09t
application:
- name: gkhy-safeplatform-account-provider
+ name: gkhy-safeplatform-out
scan:
# 扫描rpc接口定义包
base-packages: com.gkhy.safePlatform
diff --git a/safePlatfrom-out-web/src/main/resources/config/application-prod.yaml b/safePlatfrom-out-web/src/main/resources/config/application-prod.yaml
index 1fc34f4..d7474cc 100644
--- a/safePlatfrom-out-web/src/main/resources/config/application-prod.yaml
+++ b/safePlatfrom-out-web/src/main/resources/config/application-prod.yaml
@@ -24,7 +24,7 @@
dubbo:
registry:
protocol: nacos
- address: nacos://192.168.0.62:18848?namespace=71701971-5257-48d9-b745-a4218022b397&username=gkhy_safeplatform_out&password=9485uyJHISes09t
+ address: nacos://192.168.0.52:8848?namespace=71701971-5257-48d9-b745-a4218022b397&username=gkhy_safeplatform_out&password=9485uyJHISes09t
application:
name: gkhy-safeplatform-account-provider
scan:
@@ -41,13 +41,13 @@
check: false
minio:
- endPoint: 192.168.0.62
+ endPoint: 192.168.0.52
port: 9001
- accessKey: kH6eiQtNrWqGNb1r
- secretKey: ff5ykVUJJn0hi5PghsitdGNSsrW0Xrju
+ accessKey: MhLac53T2KD88fwD
+ secretKey: dGcLziFwyKaXuMcug385cfb6iGy61U8q
secure: false
- bucketName: szh-stu
- urlPrefix: http://192.168.0.62/file
+ bucketName: safeplatform-dev
+ urlPrefix: http://192.168.0.52/file
diff --git a/safePlatfrom-out-web/src/main/resources/config/application-test.yaml b/safePlatfrom-out-web/src/main/resources/config/application-test.yaml
index 780cb2d..5109dfa 100644
--- a/safePlatfrom-out-web/src/main/resources/config/application-test.yaml
+++ b/safePlatfrom-out-web/src/main/resources/config/application-test.yaml
@@ -11,9 +11,9 @@
datasource:
one:
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://twt.sinanoaq.com:13306/zhongtai.demo?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
- username: root
- password: Sinanoaq#415
+ url: jdbc:mysql://192.168.0.52:3306/safeplatform.out.test?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ username: gkhy_dev_out_team
+ password: Adsdf675T6AC7yga
type: com.alibaba.druid.pool.DruidDataSource
@@ -24,7 +24,7 @@
dubbo:
registry:
protocol: nacos
- address: nacos://192.168.0.62:18848?namespace=e07a2454-136b-4498-99eb-09dae3336ebe&username=gkhy_safeplatform_out&password=9485uyJHISes09t
+ address: nacos://192.168.0.52:8848?namespace=e07a2454-136b-4498-99eb-09dae3336ebe&username=gkhy_safeplatform_out&password=9485uyJHISes09t
application:
name: gkhy-safeplatform-account-provider
scan:
@@ -41,13 +41,13 @@
check: false
minio:
- endPoint: 192.168.0.62
+ endPoint: 192.168.0.52
port: 9001
- accessKey: kH6eiQtNrWqGNb1r
- secretKey: ff5ykVUJJn0hi5PghsitdGNSsrW0Xrju
+ accessKey: MhLac53T2KD88fwD
+ secretKey: dGcLziFwyKaXuMcug385cfb6iGy61U8q
secure: false
- bucketName: szh-stu
- urlPrefix: http://192.168.0.62/file
+ bucketName: safeplatform-test
+ urlPrefix: http://192.168.0.52/file
--
Gitblit v1.9.2