Merge branch 'master' into jdk8-dev

pigx-app-server/pigx-app-server-biz/pom.xml

@@ -94,6 +94,9 @@
 	<profiles>
 		<profile>
 			<id>cloud</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
 			<build>
 				<plugins>
 					<plugin>

pigx-auth/pom.xml

@@ -110,6 +110,9 @@
     <profiles>
         <profile>
             <id>cloud</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <build>
                 <plugins>
                     <plugin>

pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/pom.xml

@@ -126,6 +126,9 @@
     <profiles>
         <profile>
             <id>cloud</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <build>
                 <plugins>
                     <plugin>

pigx-flow/pigx-flow-task/pigx-flow-task-biz/pom.xml

@@ -117,6 +117,9 @@
     <profiles>
         <profile>
             <id>cloud</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <build>
                 <plugins>
                     <plugin>

pigx-register/Dockerfile

@@ -1,4 +1,4 @@
-FROM moxm/java:1.8-full
+FROM registry.cn-hangzhou.aliyuncs.com/dockerhub_mirror/java:1.8-full
 
 RUN mkdir -p /pigx-register
 

pigx-upms/pigx-upms-biz/pom.xml

@@ -188,6 +188,9 @@
     <profiles>
         <profile>
             <id>cloud</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <build>
                 <plugins>
                     <plugin>

pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java

@@ -42,6 +42,7 @@ import lombok.RequiredArgsConstructor;
 import org.anyline.metadata.Column;
 import org.anyline.metadata.Database;
 import org.anyline.metadata.Table;
+import org.anyline.proxy.CacheProxy;
 import org.anyline.proxy.ServiceProxy;
 import org.anyline.service.AnylineService;
 import org.jetbrains.annotations.NotNull;
@@ -101,6 +102,7 @@ public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> i
     public List<String> queryTableColumn(String dsName, String tableName) {
         // 手动切换数据源
         DynamicDataSourceContextHolder.push(dsName);
+        CacheProxy.clear();
         return ServiceProxy.metadata().columns(tableName).values().stream().map(Column::getName).collect(Collectors.toList());
     }
 
@@ -115,6 +117,7 @@ public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> i
     public IPage queryTablePage(Page<Table> page, GenTable table) {
         // 手动切换数据源
         DynamicDataSourceContextHolder.push(table.getDsName());
+        CacheProxy.clear();
         List<Table> tableList = ServiceProxy.metadata().tables()
                 .values().stream().filter(t -> {
                     if (StrUtil.isBlank(table.getTableName())) {
@@ -151,6 +154,7 @@ public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> i
     public List<String> queryTableList(String dsName) {
         // 手动切换数据源
         DynamicDataSourceContextHolder.push(dsName);
+        CacheProxy.clear();
         return ServiceProxy.metadata().tables().values().stream().map(Table::getName).collect(Collectors.toList());
     }
 
@@ -190,6 +194,7 @@ public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> i
         // 查询表是否存在
         GenTable table = new GenTable();
         // 从数据库获取表信息
+        CacheProxy.clear();
         AnylineService service = ServiceProxy.service();
         Table tableMetadata = service.metadata().table(tableName);
         Database database = service.metadata().database();

pigx-visual/pigx-daemon-elastic-job/pom.xml

@@ -96,6 +96,9 @@
 	<profiles>
 		<profile>
 			<id>cloud</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
 			<build>
 				<plugins>
 					<plugin>

pigx-visual/pigx-daemon-quartz/pom.xml

@@ -104,6 +104,9 @@
     <profiles>
         <profile>
             <id>cloud</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <build>
                 <plugins>
                     <plugin>
@@ -120,5 +123,8 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>boot</id>
+        </profile>
     </profiles>
 </project>

pigx-visual/pigx-mp-platform/pom.xml

@@ -123,6 +123,9 @@
 	<profiles>
 		<profile>
 			<id>cloud</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
 			<build>
 				<plugins>
 					<plugin>

pigx-visual/pigx-pay-platform/pom.xml

@@ -146,6 +146,9 @@
     <profiles>
         <profile>
             <id>cloud</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <build>
                 <plugins>
                     <plugin>