Merge branch 'dev' of https://git.pig4cloud.com/pig/pigx into leng_dev

pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/ProcessStatusEnum.java

@@ -29,23 +29,18 @@ import lombok.Getter;
 public enum ProcessStatusEnum {
 
 	/**
-	 * 图片资源
+	 * 激活
 	 */
-	ACTIVE("active", "图片资源"),
+	ACTIVE("active"),
 
 	/**
-	 * xml资源
+	 * 暂停
 	 */
-	SUSPEND("suspend", "xml资源");
+	SUSPEND("suspend");
 
 	/**
-	 * 类型
+	 * 状态
 	 */
 	private final String status;
 
-	/**
-	 * 描述
-	 */
-	private final String description;
-
 }

pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/ClassUtils.java

@@ -84,7 +84,7 @@ public class ClassUtils extends org.springframework.util.ClassUtils {
 		specificMethod = BridgeMethodResolver.findBridgedMethod(specificMethod);
 		// 先找方法，再找方法上的类
 		A annotation = AnnotatedElementUtils.findMergedAnnotation(specificMethod, annotationType);
-		;
+		
 		if (null != annotation) {
 			return annotation;
 		}

pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/GatewayConfigProperties.java

@@ -5,8 +5,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * @author lengleng
  * @date 2020/10/2
@@ -23,10 +21,4 @@ public class GatewayConfigProperties {
 	 * 网关解密登录前端密码 秘钥 {@link com.pig4cloud.pigx.gateway.filter.PasswordDecoderFilter}
 	 */
 	public String encodeKey;
-
-	/**
-	 * 网关不需要校验验证码的客户端 {@link com.pig4cloud.pigx.gateway.filter.ValidateCodeGatewayFilter}
-	 */
-	public List<String> ignoreClients;
-
 }

pigx-visual/pigx-codegen/src/main/resources/generator.properties

@@ -35,6 +35,9 @@ timestamp=LocalDateTime
 int2=Integer
 int4=Integer
 int8=Long
+bpchar=String
+float4=Float
+float8=Float
 
 #ORACLE \u7279\u6B8A\u7C7B\u578B\u8F6C\u6362\u89C4\u5219
 INT=Integer

pigx-visual/pigx-codegen/src/main/resources/mapper/GeneratorMssqlMapper.xml

@@ -16,7 +16,7 @@
 			 ) T
 		<where>
 			<if test="tableName != null and tableName.trim() != ''">
-				and T.tableName like concat('%', #{tableName}, '%')
+				and T.tableName = #{tableName}
 			</if>
 		</where>
 		ORDER BY T.tableName

pigx-visual/pigx-codegen/src/main/resources/mapper/GeneratorPgMapper.xml

@@ -15,7 +15,7 @@
 		AND relname NOT LIKE'sql_%'
 		AND relchecks = 0
 		<if test="tableName != null and tableName.trim() != ''">
-			and pc.relname like concat('%', #{tableName}, '%')
+			and pc.relname = #{tableName}
 		</if>
 		ORDER BY relname
 	</select>

pigx-visual/pigx-xxl-job-admin/src/main/resources/application.yml

@@ -16,8 +16,8 @@ spring:
   datasource:
     url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
     driver-class-name: com.mysql.cj.jdbc.Driver
-    username: ${MYSQL-PWD:root}
-    password: ${MYSQL-PWD:root}
+    username: ${MYSQL_USER:root}
+    password: ${MYSQL_PWD:root}
   mvc:
     static-path-pattern: /static/**
   freemarker: