Commit 845194a1 authored by fangxinjiang's avatar fangxinjiang

配置文件拆分

parent abc6d0c5
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
<module>yifu-common</module> <module>yifu-common</module>
<module>yifu-visual</module> <module>yifu-visual</module>
<module>yifu-job</module> <module>yifu-job</module>
<module>yifu-consumer</module> <module>yifu-check</module>
</modules> </modules>
<dependencyManagement> <dependencyManagement>
......
...@@ -10,14 +10,14 @@ ...@@ -10,14 +10,14 @@
<version>1.0.0</version> <version>1.0.0</version>
</parent> </parent>
<artifactId>yifu-consumer</artifactId> <artifactId>yifu-check</artifactId>
<description>服务消费</description> <description>服务消费</description>
<packaging>pom</packaging> <packaging>pom</packaging>
<!--项目子模块--> <!--项目子模块-->
<modules> <modules>
<module>consumer-api</module> <module>yifu-check-api</module>
<module>consumer-biz</module> <module>yifu-check-biz</module>
</modules> </modules>
</project> </project>
...@@ -6,14 +6,14 @@ ...@@ -6,14 +6,14 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.yifu.cloud.plus.v1</groupId> <groupId>com.yifu.cloud.plus.v1</groupId>
<artifactId>yifu-consumer</artifactId> <artifactId>yifu-check</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
</parent> </parent>
<artifactId>consumer-api</artifactId> <artifactId>yifu-check-api</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<description>consumer 接口模块</description> <description>身份证+手机号验证模块</description>
<dependencies> <dependencies>
<!-- core 工具类 --> <!-- core 工具类 -->
......
...@@ -6,14 +6,14 @@ ...@@ -6,14 +6,14 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.yifu.cloud.plus.v1</groupId> <groupId>com.yifu.cloud.plus.v1</groupId>
<artifactId>yifu-consumer</artifactId> <artifactId>yifu-check</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
</parent> </parent>
<artifactId>consumer-biz</artifactId> <artifactId>yifu-check-biz</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<description>consumer 业务模块</description> <description>身份证+手机号验证模块</description>
<dependencies> <dependencies>
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<!--必备: 依赖api模块--> <!--必备: 依赖api模块-->
<dependency> <dependency>
<groupId>com.yifu.cloud.plus.v1</groupId> <groupId>com.yifu.cloud.plus.v1</groupId>
<artifactId>consumer-api</artifactId> <artifactId>yifu-check-api</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
</dependency> </dependency>
<!--选配: orm 模块--> <!--选配: orm 模块-->
...@@ -42,31 +42,16 @@ ...@@ -42,31 +42,16 @@
<groupId>com.yifu.cloud.plus.v1</groupId> <groupId>com.yifu.cloud.plus.v1</groupId>
<artifactId>yifu-common-security</artifactId> <artifactId>yifu-common-security</artifactId>
</dependency> </dependency>
<!--必备:服务处理-->
<!--<dependency>
<groupId>com.yifu.cloud.plus.v1</groupId>
<artifactId>yifu-common-feign</artifactId>
</dependency>-->
<!--必备:日志处理--> <!--必备:日志处理-->
<dependency> <dependency>
<groupId>com.yifu.cloud.plus.v1</groupId> <groupId>com.yifu.cloud.plus.v1</groupId>
<artifactId>yifu-common-log</artifactId> <artifactId>yifu-common-log</artifactId>
</dependency> </dependency>
<!--必备:swagger--> <!--必备:swagger-->
<!--<dependency> <dependency>
<groupId>com.yifu.cloud.plus.v1</groupId> <groupId>com.yifu.cloud.plus.v1</groupId>
<artifactId>yifu-common-swagger</artifactId> <artifactId>yifu-common-swagger</artifactId>
</dependency>--> </dependency>
<!--必备: 注册中心客户端-->
<!-- <dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>-->
<!--必备: 配置中心客户端-->
<!--<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
</dependency>-->
<!--必备:undertow容器--> <!--必备:undertow容器-->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
# 数据源配置
spring:
redis:
host: 192.168.1.65
port: 22379
password: '@yf_2017'
datasource:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
username: root
password: yf_zsk
url: jdbc:mysql://192.168.1.65:22306/yifu_checks?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
config:
activate:
on-profile: dev
# 数据源配置
spring:
redis:
host: 127.0.0.1
password: '@yf_2017'
datasource:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
username: root
password: yf_zsk
url: jdbc:mysql://192.168.1.65:22306/yifu_checks?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
config:
activate:
on-profile: test
\ No newline at end of file
server: server:
port: 7002 port: 5022
# 加解密根密码 # 加解密根密码
jasypt: jasypt:
encryptor: encryptor:
...@@ -43,37 +43,4 @@ ignore: ...@@ -43,37 +43,4 @@ ignore:
- /actuator/** - /actuator/**
spring: spring:
application: application:
name: @artifactId@ name: @artifactId@
\ No newline at end of file
---
# 数据源配置
spring:
redis:
host: 127.0.0.1
password: '@yf_2017'
datasource:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
username: root
password: yf_zsk
url: jdbc:mysql://192.168.1.65:22306/consumer?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
config:
activate:
on-profile: test
---
# 数据源配置
spring:
redis:
host: 192.168.1.65
port: 22379
password: '@yf_2017'
datasource:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
username: root
password: yf_zsk
url: jdbc:mysql://192.168.1.65:22306/consumer?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
config:
activate:
on-profile: dev
...@@ -171,6 +171,29 @@ public class DictController { ...@@ -171,6 +171,29 @@ public class DictController {
return R.ok(sysDictItemService.getById(id)); return R.ok(sysDictItemService.getById(id));
} }
/**
* 通过id查询父级字典的字典值
* @param itemType
* @return R
*/
@SysLog("通过id查询父级字典的字典值")
@GetMapping("/getParentDictItemByType")
public R<List<SysDictItem>> getParentDictItemByType(String itemType) {
SysDict dict = sysDictService.getOne(Wrappers.<SysDict>query().lambda()
.eq(SysDict::getType,itemType)
.eq(SysDict::getDelFlag,CommonConstants.ZERO_STRING)
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isEmpty(dict)){
return R.ok();
}
if (Common.isNotNull(dict.getParentItemType())){
return R.ok(sysDictItemService.list(Wrappers.<SysDictItem>query().lambda()
.eq(SysDictItem::getType,dict.getParentItemType())
.eq(SysDictItem::getDelFlag,CommonConstants.ZERO_STRING)));
}
return R.ok();
}
/** /**
* 新增字典项 * 新增字典项
* @param sysDictItem 字典项 * @param sysDictItem 字典项
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment