diff --git a/db/1schema.sql b/db/1schema.sql
index ff544d375..e5f329f44 100644
--- a/db/1schema.sql
+++ b/db/1schema.sql
@@ -10,8 +10,8 @@ create database `pigxx_zipkin` default character set utf8mb4 collate utf8mb4_gen
-- pigx 任务相关库
create database `pigxx_job` default character set utf8mb4 collate utf8mb4_general_ci;
--- pigx 公众号管理模块
+-- pigx 公众号管理相关库
create database `pigxx_mp` default character set utf8mb4 collate utf8mb4_general_ci;
--- pigx 公众号管理模块
+-- pigx nacos配置相关库
create database `pigxx_config` default character set utf8mb4 collate utf8mb4_general_ci;
\ No newline at end of file
diff --git a/pigx-register/src/main/java/com/alibaba/nacos/PigxNacosApplication.java b/pigx-register/src/main/java/com/alibaba/nacos/PigxNacosApplication.java
index 95afbc383..82f43caff 100755
--- a/pigx-register/src/main/java/com/alibaba/nacos/PigxNacosApplication.java
+++ b/pigx-register/src/main/java/com/alibaba/nacos/PigxNacosApplication.java
@@ -16,7 +16,7 @@
package com.alibaba.nacos;
-import com.alibaba.nacos.console.config.ConfigConstant;
+import com.alibaba.nacos.console.config.ConfigConstants;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.scheduling.annotation.EnableScheduling;
@@ -32,7 +32,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
public class PigxNacosApplication {
public static void main(String[] args) {
- System.setProperty(ConfigConstant.STANDALONE_MODE, "true");
+ System.setProperty(ConfigConstants.STANDALONE_MODE, "true");
SpringApplication.run(PigxNacosApplication.class, args);
}
}
diff --git a/pigx-register/src/main/java/com/alibaba/nacos/console/config/ConfigConstant.java b/pigx-register/src/main/java/com/alibaba/nacos/console/config/ConfigConstant.java
deleted file mode 100644
index 448b6111f..000000000
--- a/pigx-register/src/main/java/com/alibaba/nacos/console/config/ConfigConstant.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.alibaba.nacos.console.config;
-
-/**
- * @author lengleng
- * @date 2019-04-19
- *
- * 覆盖nacos 默认配置
- */
-public interface ConfigConstant {
- /**
- * The System property name of Standalone mode
- */
- String STANDALONE_MODE = "nacos.standalone";
-
- /**
- * 环境变量
- */
- String USER_HOME = "user.home";
-
- /**
- * nacos 日志路径配置
- */
- String NACOS_LOGS_PATH = "nacos.logs.path";
-
- /**
- * nacos 家目录
- */
- String NACOS_HOME = "nacos.home";
-
-
- /**
- * tomcat 目录
- */
- String TOMCAT_DIR = "server.tomcat.basedir";
-
- /**
- * tomcat 日志配置
- */
- String TOMCAT_ACCESS_LOG = "server.tomcat.accesslog.enabled";
-}
diff --git a/pigx-register/src/main/java/com/alibaba/nacos/console/config/ConfigConstants.java b/pigx-register/src/main/java/com/alibaba/nacos/console/config/ConfigConstants.java
new file mode 100644
index 000000000..be8368f6a
--- /dev/null
+++ b/pigx-register/src/main/java/com/alibaba/nacos/console/config/ConfigConstants.java
@@ -0,0 +1,15 @@
+package com.alibaba.nacos.console.config;
+
+/**
+ * @author lengleng
+ * @date 2019-04-19
+ *
+ * 覆盖nacos 默认配置
+ */
+public interface ConfigConstants {
+ /**
+ * The System property name of Standalone mode
+ */
+ String STANDALONE_MODE = "nacos.standalone";
+
+}
diff --git a/pigx-register/src/main/resources/bootstrap.yml b/pigx-register/src/main/resources/bootstrap.yml
index bdaffec9c..666b2b385 100755
--- a/pigx-register/src/main/resources/bootstrap.yml
+++ b/pigx-register/src/main/resources/bootstrap.yml
@@ -1,5 +1,4 @@
nacos:
- port: 8849
cmdb:
dumpTaskInterval: 3600
eventTaskInterval: 10
@@ -14,12 +13,9 @@ db:
url:
0: jdbc:mysql://127.0.0.1:3306/pigxx_config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true
-# 关闭nacos 登录
spring:
datasource:
platform: mysql
- security:
- enabled: false
server:
tomcat:
diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/config/DynamicDataSourceConfig.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/config/DynamicDataSourceConfig.java
index 10c7c0e90..dd880025e 100644
--- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/config/DynamicDataSourceConfig.java
+++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/config/DynamicDataSourceConfig.java
@@ -1,7 +1,7 @@
package com.pig4cloud.pigx.codegen.config;
import com.mysql.cj.jdbc.Driver;
-import com.pig4cloud.pigx.codegen.util.DataSourceConstant;
+import com.pig4cloud.pigx.codegen.util.DataSourceConstants;
import com.zaxxer.hikari.HikariDataSource;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -60,18 +60,18 @@ public class DynamicDataSourceConfig implements TransactionManagementConfigurer
dds.setUsername(dataSourceProperties.getUsername());
dds.setPassword(dataSourceProperties.getPassword());
- List> dbList = new JdbcTemplate(dds).queryForList(DataSourceConstant.QUERY_DS_SQL);
+ List> dbList = new JdbcTemplate(dds).queryForList(DataSourceConstants.QUERY_DS_SQL);
log.info("开始 -> 初始化动态数据源");
Optional.of(dbList).ifPresent(list -> list.forEach(db -> {
- log.info("数据源:{}", db.get(DataSourceConstant.DS_NAME));
+ log.info("数据源:{}", db.get(DataSourceConstants.DS_NAME));
HikariDataSource ds = new HikariDataSource();
- ds.setJdbcUrl(String.valueOf(db.get(DataSourceConstant.DS_JDBC_URL)));
+ ds.setJdbcUrl(String.valueOf(db.get(DataSourceConstants.DS_JDBC_URL)));
ds.setDriverClassName(Driver.class.getName());
- ds.setUsername((String) db.get(DataSourceConstant.DS_USER_NAME));
+ ds.setUsername((String) db.get(DataSourceConstants.DS_USER_NAME));
- String decPwd = stringEncryptor.decrypt((String) db.get(DataSourceConstant.DS_USER_PWD));
+ String decPwd = stringEncryptor.decrypt((String) db.get(DataSourceConstants.DS_USER_PWD));
ds.setPassword(decPwd);
- dataSourceMap.put(db.get(DataSourceConstant.DS_ROUTE_KEY), ds);
+ dataSourceMap.put(db.get(DataSourceConstants.DS_ROUTE_KEY), ds);
}));
log.info("完毕 -> 初始化动态数据源,共计 {} 条", dataSourceMap.size());
diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/DataSourceConstant.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/DataSourceConstants.java
similarity index 93%
rename from pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/DataSourceConstant.java
rename to pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/DataSourceConstants.java
index d69d719b3..9bc663d87 100644
--- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/DataSourceConstant.java
+++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/DataSourceConstants.java
@@ -6,7 +6,7 @@ package com.pig4cloud.pigx.codegen.util;
*
* 数据源相关常量
*/
-public interface DataSourceConstant {
+public interface DataSourceConstants {
/**
* 查询数据源的SQL
*/