zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✨ 添加新特性。支持nacos

Browse Source
This commit is contained in:
冷冷 committed 2019-04-18 16:17:08 +08:00
1 parent 4901c2974e
commit e935fa3d72
304 files changed
+51587 -710
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pigx-visual/pigx-activiti/pom.xml
+6 -1
View File
@@ -32,10 +32,15 @@
<description>工作流管理模块</description>
<dependencies>
<!--注册中心客户端-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>
<!--配置中心客户端-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-config</artifactId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
</dependency>
<!--common code -->
<dependency>
pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml
+7 -17
View File
@@ -4,23 +4,13 @@ server:
spring:
application:
name: @artifactId@
# 配置中心
cloud:
config:
fail-fast: true
name: ${spring.application.name}
profile: ${spring.profiles.active}
nacos:
discovery:
enabled: true
service-id: pigx-config
server-addr: ${NACOS-HOST:pigx-nacos}:${NACOS-PORT:8848}
config:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
file-extension: yml
shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
profiles:
active: dev
# 注册中心配置
eureka:
instance:
prefer-ip-address: true
client:
service-url:
defaultZone: http://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eureka/
active: dev
pigx-visual/pigx-codegen/pom.xml
+6 -1
View File
@@ -15,10 +15,15 @@
<description>代码生成模块</description>
<dependencies>
<!--注册中心客户端-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>
<!--配置中心客户端-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-config</artifactId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
</dependency>
<!--数据操作-->
<dependency>
pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml
+7 -16
View File
@@ -4,22 +4,13 @@ server:
spring:
application:
name: @artifactId@
#配置中心
cloud:
config:
fail-fast: true
name: ${spring.application.name}
profile: ${spring.profiles.active}
nacos:
discovery:
enabled: true
service-id: pigx-config
server-addr: ${NACOS-HOST:pigx-nacos}:${NACOS-PORT:8848}
config:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
file-extension: yml
shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
profiles:
active: dev
# 注册中心配置
eureka:
instance:
prefer-ip-address: true
client:
service-url:
defaultZone: http://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eureka/
active: dev
pigx-visual/pigx-daemon-elastic-job/pom.xml
+6 -1
View File
@@ -32,10 +32,15 @@
<description>基于elastic-job后台跑批定时任务模块</description>
<dependencies>
<!--注册中心客户端-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>
<!--配置中心客户端-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-config</artifactId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
</dependency>
<!--跑批任务-->
<dependency>
pigx-visual/pigx-daemon-elastic-job/src/main/resources/bootstrap.yml
+7 -16
View File
@@ -4,22 +4,13 @@ server:
spring:
application:
name: @artifactId@
#配置中心
cloud:
config:
fail-fast: true
name: ${spring.application.name}
profile: ${spring.profiles.active}
nacos:
discovery:
enabled: true
service-id: pigx-config
server-addr: ${NACOS-HOST:pigx-nacos}:${NACOS-PORT:8848}
config:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
file-extension: yml
shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
profiles:
active: dev
# 注册中心配置
eureka:
instance:
prefer-ip-address: true
client:
service-url:
defaultZone: http://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eureka/
active: dev
pigx-visual/pigx-daemon-quartz/pom.xml
+6 -1
View File
@@ -15,10 +15,15 @@
<description>基于quartz后台跑批定时任务模块</description>
<dependencies>
<!--注册中心客户端-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>
<!--配置中心客户端-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-config</artifactId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
</dependency>
<!--日志处理-->
<dependency>
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobController.java
+5 -5
View File
@@ -123,20 +123,20 @@ public class SysJobController {
/**
* 通过id删除定时任务
*
* @param jobId id
* @param id id
* @return R
*/
@SysLog("删除定时任务")
@DeleteMapping("/{id}")
@PreAuthorize("@pms.hasPermission('job_sys_job_del')")
@ApiOperation(value = "唯一标识查询定时任务，暂停任务才能删除")
public R removeById(@PathVariable Integer jobId) {
SysJob querySysJob = this.sysJobService.getById(jobId);
public R removeById(@PathVariable Integer id) {
SysJob querySysJob = this.sysJobService.getById(id);
if (JOB_STATUS_NOT_RUNNING.getType().equals(querySysJob.getJobStatus())) {
this.taskUtil.removeJob(querySysJob, scheduler);
this.sysJobService.removeById(jobId);
this.sysJobService.removeById(id);
} else if (JOB_STATUS_RELEASE.getType().equals(querySysJob.getJobStatus())) {
this.sysJobService.removeById(jobId);
this.sysJobService.removeById(id);
}
return R.builder().build();
}
pigx-visual/pigx-daemon-quartz/src/main/resources/bootstrap.yml
+7 -16
View File
@@ -7,22 +7,13 @@ quartz:
spring:
application:
name: @artifactId@
#配置中心
cloud:
config:
fail-fast: true
name: ${spring.application.name}
profile: ${spring.profiles.active}
nacos:
discovery:
enabled: true
service-id: pigx-config
server-addr: ${NACOS-HOST:pigx-nacos}:${NACOS-PORT:8848}
config:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
file-extension: yml
shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
profiles:
active: dev
# 注册中心配置
eureka:
instance:
prefer-ip-address: true
client:
service-url:
defaultZone: http://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eureka/
active: dev
pigx-visual/pigx-monitor/pom.xml
+12 -1
View File
@@ -57,16 +57,27 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-turbine</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
</exclusion>
</exclusions>
</dependency>
<!--Redis-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis-reactive</artifactId>
</dependency>
<!--注册中心客户端-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>
<!--配置中心客户端-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-config</artifactId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
</dependency>
<!--web 模块-->
<dependency>
pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml
+7 -15
View File
@@ -4,26 +4,18 @@ server:
spring:
application:
name: @artifactId@
#配置中心
cloud:
config:
fail-fast: true
name: ${spring.application.name}
profile: ${spring.profiles.active}
nacos:
discovery:
enabled: true
service-id: pigx-config
server-addr: ${NACOS-HOST:pigx-nacos}:${NACOS-PORT:8848}
config:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
file-extension: yml
shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
profiles:
active: dev
# 注册中心配置
eureka:
instance:
prefer-ip-address: true
client:
service-url:
defaultZone: http://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eureka/
turbine:
app-config: pigx-upms,pigx-auth
app-config: pigx-upms-biz,pigx-auth
cluster-name-expression: new String("default")
combine-host-port: true
pigx-visual/pigx-mp-manager/.rebel.xml.bak
+14
View File
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
Refer to https://manuals.zeroturnaround.com/jrebel/standalone/config.html for more information.
-->
<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_1.xsd">
<classpath>
<dir name="/Users/lengleng/work/my/super/pigx/pigx-visual/pigx-mp-manager/target/classes">
</dir>
</classpath>
</application>
pigx-visual/pigx-mp-manager/pom.xml
+6 -1
View File
@@ -15,10 +15,15 @@
<description>微信公众号管理模块</description>
<dependencies>
<!--注册中心客户端-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>
<!--配置中心客户端-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-config</artifactId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
</dependency>
<!--数据操作-->
<dependency>
pigx-visual/pigx-mp-manager/src/main/resources/bootstrap.yml
+7 -16
View File
@@ -4,22 +4,13 @@ server:
spring:
application:
name: @artifactId@
#配置中心
cloud:
config:
fail-fast: true
name: ${spring.application.name}
profile: ${spring.profiles.active}
nacos:
discovery:
enabled: true
service-id: pigx-config
server-addr: ${NACOS-HOST:pigx-nacos}:${NACOS-PORT:8848}
config:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
file-extension: yml
shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
profiles:
active: dev
# 注册中心配置
eureka:
instance:
prefer-ip-address: true
client:
service-url:
defaultZone: http://pig:pig@pigx-eureka:8761/eureka/
active: dev
pigx-visual/pigx-tx-manager/pom.xml
+3 -3
View File
@@ -24,15 +24,15 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-undertow</artifactId>
</dependency>
<!--eureka-->
<!--注册中心客户端-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>
<!--配置中心客户端-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-config</artifactId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
</dependency>
<!--LCN-->
<dependency>
pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml
+7 -17
View File
@@ -4,23 +4,13 @@ server:
spring:
application:
name: @artifactId@
#配置中心
cloud:
config:
fail-fast: true
name: ${spring.application.name}
profile: ${spring.profiles.active}
nacos:
discovery:
enabled: true
service-id: pigx-config
server-addr: ${NACOS-HOST:pigx-nacos}:${NACOS-PORT:8848}
config:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
file-extension: yml
shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
profiles:
active: dev
# 注册中心配置
eureka:
instance:
prefer-ip-address: true
client:
service-url:
defaultZone: http://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eureka/
active: dev
pigx-visual/pigx-zipkin/pom.xml
+6 -1
View File
@@ -41,7 +41,12 @@
<!--配置中心客户端-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-config</artifactId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
</dependency>
<!--注册中心客户端-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>
<!--zipkin-->
<dependency>
pigx-visual/pigx-zipkin/src/main/resources/bootstrap.yml
+7 -16
View File
@@ -4,22 +4,13 @@ server:
spring:
application:
name: @artifactId@
#配置中心
cloud:
config:
fail-fast: true
name: ${spring.application.name}
profile: ${spring.profiles.active}
nacos:
discovery:
enabled: true
service-id: pigx-config
server-addr: ${NACOS-HOST:pigx-nacos}:${NACOS-PORT:8848}
config:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
file-extension: yml
shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
profiles:
active: dev
# 注册中心配置
eureka:
instance:
prefer-ip-address: true
client:
service-url:
defaultZone: http://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eureka/
active: dev