Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

华为云处理

Browse Source
This commit is contained in:
hongawen
2023-02-15 11:27:49 +08:00
parent 6e840fa650
commit bec51dc9ac
57 changed files with 245 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-user/user-api/pom.xml
View File

@@ -29,7 +29,7 @@
</dependency>
<dependency>
<groupId>com.njcn</groupId>
<artifactId>common-microservice</artifactId>
<artifactId>${micro.sdk}</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>

2
pqs-user/user-api/src/main/java/com/njcn/user/api/AuthClientFeignClient.java
View File

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.PathVariable;
* @version 1.0.0
* @date 2021年12月15日 13:27
*/
@FeignClient(value = ServerInfo.USER, path = "/authClient", fallbackFactory = AuthClientFeignClientFallbackFactory.class)
@FeignClient(value = ServerInfo.USER, path = "/authClient", fallbackFactory = AuthClientFeignClientFallbackFactory.class,contextId = "authClient")
public interface AuthClientFeignClient {

30
pqs-user/user-api/src/main/java/com/njcn/user/api/DeptFeignClient.java
View File

@@ -16,16 +16,19 @@ import java.util.List;
/**
* @author denghuajun
* @date 2022/1/11
* 部门相关业务对外接口
* 部门相关业务对外接口
*/
@FeignClient(value = ServerInfo.USER,
// url = "http://127.0.0.1:10201",
path = "/dept", fallbackFactory = DeptFeignClientFallbackFactory.class)
path = "/dept", fallbackFactory = DeptFeignClientFallbackFactory.class,
contextId = "dept"
)
public interface DeptFeignClient {
/**
* 根据条件获取后代部门索引
* @param id 部门id
*
* @param id 部门id
* @param type 指定部门类型
* @return 后代部门索引
*/
@@ -34,18 +37,20 @@ public interface DeptFeignClient {
/**
* 根据区域获取部门id
*
* @param area
* @author xy
* @return
* @author xy
*/
@GetMapping("/getDeptIdByArea")
HttpResult<String> getDeptIdByArea(@RequestParam("area") String area);
/**
* 根据部门id获取区域id
*
* @param deptId
* @author denghuajun
* @return
* @author denghuajun
*/
@GetMapping("/getAreaIdByDeptId")
HttpResult<String> getAreaIdByDeptId(@RequestParam("deptId") String deptId);
@@ -81,7 +86,6 @@ public interface DeptFeignClient {
HttpResult<List<String>> getDepSonSelfCodetByDeptId(@RequestParam("deptId") String deptId);
/**
* 根据部门id获取子部门ids
*/
@@ -107,12 +111,12 @@ public interface DeptFeignClient {
HttpResult<Dept> getRootDept();
/**
* @Description: 获取当前部门的的下级子部门list，如果没子部门就是返回当前部门
* @Param: [deptId]
* @return: com.njcn.common.pojo.response.HttpResult<java.util.List<com.njcn.user.pojo.po.Dept>>
* @Author: clam
* @Date: 2023/1/10
*/
* @Description: 获取当前部门的的下级子部门list，如果没子部门就是返回当前部门
* @Param: [deptId]
* @return: com.njcn.common.pojo.response.HttpResult<java.util.List < com.njcn.user.pojo.po.Dept>>
* @Author: clam
* @Date: 2023/1/10
*/
@GetMapping("/getDepSonDetailIdByDeptId")
HttpResult<List<DeptDTO>> getDepSonDetailByDeptId(@RequestParam("deptId")String deptId) ;
HttpResult<List<DeptDTO>> getDepSonDetailByDeptId(@RequestParam("deptId") String deptId);
}

2
pqs-user/user-api/src/main/java/com/njcn/user/api/UserFeignClient.java
View File

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.PutMapping;
* @version 1.0.0
* @date 2021年05月08日 15:11
*/
@FeignClient(value = ServerInfo.USER,path = "/user",fallbackFactory = UserFeignClientFallbackFactory.class)
@FeignClient(value = ServerInfo.USER,path = "/user",fallbackFactory = UserFeignClientFallbackFactory.class,contextId = "user")
public interface UserFeignClient {
/**

78
pqs-user/user-boot/src/main/resources/bootstrap.yml
View File

@@ -13,35 +13,61 @@ server:
feign:
sentinel:
enabled: true
spring:
application:
name: @artifactId@
#nacos注册中心以及配置中心的指定
cloud:
nacos:
discovery:
ip: @service.server.url@
server-addr: @nacos.url@
namespace: @nacos.namespace@
config:
server-addr: @nacos.url@
namespace: @nacos.namespace@
file-extension: yaml
shared-configs:
- data-id: share-config.yaml
refresh: true
- data-Id: share-config-datasource-db.yaml
refresh: true
main:
allow-bean-definition-overriding: true
#nacos注册中心以及配置中心的指定
cloud:
servicecomb:
service:
name: ${spring.application.name}
version: 0.0.1
application: pms-application
environment: production
discovery:
address: https://116.63.42.60:30100
health-check-interval: 10
poll-interval: 15000
wait-time-for-shut-down-in-millis: 15000
# config:
# server-addr: https://116.63.42.60:30110
# server-type: kie
# kie:
# custom-label: ${spring.application.name}
# custom-label-value: default
# 自定义配置，使用文本的key/value配置项作为yaml格式配置
# fileSource: cse.share.yaml,cse.db.yaml
#项目日志的配置
logging:
config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
level:
root: info
# cloud:
# nacos:
# discovery:
# ip: @service.server.url@
# server-addr: @nacos.url@
# namespace: @nacos.namespace@
# config:
# server-addr: @nacos.url@
# namespace: @nacos.namespace@
# file-extension: yaml
# shared-configs:
# - data-id: share-config.yaml
# refresh: true
# - data-Id: share-config-datasource-db.yaml
# refresh: true
# main:
# allow-bean-definition-overriding: true
#
#
##项目日志的配置
#logging:
# config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
# level:
# root: info
#mybatis配置信息
@@ -51,3 +77,11 @@ mybatis-plus:
mqtt:
client-id: @artifactId@${random.value}
#oss服务器配置
min:
io:
endpoint: http://192.168.1.13:9009
accessKey: minio
secretKey: minio@123
bucket: excelreport